Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,13 @@ fastlane/report.xml
.idea/

app/CMakeUserPresets.json

venv/

infra/scw-transfer/.terraform/
infra/scw-transfer/.terraform.lock.hcl
infra/scw-transfer/secret.auto.tfvars

# Terraform state files
*.tfstate
*.tfstate.backup
12 changes: 1 addition & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import org.apache.tools.ant.filters.ReplaceTokens

plugins {
id 'com.android.application'
id 'com.google.gms.google-services'
id 'com.google.firebase.crashlytics'
id 'app.opendocument.conanandroidgradleplugin'
}

Expand Down Expand Up @@ -51,6 +49,7 @@ android {
)
}
}

Comment thread
TomTasche marked this conversation as resolved.
Outdated
}

flavorDimensions "default"
Expand Down Expand Up @@ -93,8 +92,6 @@ android {
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.txt'

firebaseCrashlytics.nativeSymbolUploadEnabled true
ndk.debugSymbolLevel = "full"
}
}
Expand Down Expand Up @@ -135,13 +132,6 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:34.1.0')
implementation 'com.google.firebase:firebase-storage'
implementation 'com.google.firebase:firebase-auth'
implementation 'com.google.firebase:firebase-crashlytics-ndk'
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-config'

implementation 'com.google.android.gms:play-services-ads:24.3.0'
implementation 'com.google.android.play:review:2.0.2'
implementation 'com.google.android.ump:user-messaging-platform:3.1.0'
Expand Down
65 changes: 0 additions & 65 deletions app/src/lite/google-services.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
import android.os.Parcel;
import android.os.Parcelable;

import com.google.firebase.analytics.FirebaseAnalytics;

import java.io.File;
import java.util.LinkedList;
import java.util.List;

import at.tomtasche.reader.nonfree.AnalyticsManager;
import at.tomtasche.reader.nonfree.AnalyticsConstants;
import at.tomtasche.reader.nonfree.CrashManager;

public abstract class FileLoader {
Expand Down Expand Up @@ -86,7 +85,7 @@ void callOnSuccess(Result result) {
mainHandler.post(new Runnable() {
@Override
public void run() {
analyticsManager.report("loader_success_" + type, FirebaseAnalytics.Param.CONTENT_TYPE, result.options.fileType, FirebaseAnalytics.Param.CONTENT, result.options.fileExtension);
analyticsManager.report("loader_success_" + type, AnalyticsConstants.PARAM_CONTENT_TYPE, result.options.fileType, AnalyticsConstants.PARAM_CONTENT, result.options.fileExtension);

FileLoaderListener strongReferenceListener = listener;
if (strongReferenceListener != null) {
Expand All @@ -103,7 +102,7 @@ void callOnError(Result result, Throwable t) {
mainHandler.post(new Runnable() {
@Override
public void run() {
analyticsManager.report("loader_error_" + type, FirebaseAnalytics.Param.CONTENT_TYPE, result.options.fileType, FirebaseAnalytics.Param.CONTENT, result.options.fileExtension);
analyticsManager.report("loader_error_" + type, AnalyticsConstants.PARAM_CONTENT_TYPE, result.options.fileType, AnalyticsConstants.PARAM_CONTENT, result.options.fileExtension);

FileLoaderListener strongReferenceListener = listener;
if (strongReferenceListener != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@

import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.firebase.analytics.FirebaseAnalytics;

import java.io.File;
import java.io.OutputStream;

import at.tomtasche.reader.R;
import at.tomtasche.reader.nonfree.AnalyticsConstants;
import at.tomtasche.reader.nonfree.AnalyticsManager;
import at.tomtasche.reader.nonfree.ConfigManager;
import at.tomtasche.reader.nonfree.CrashManager;
Expand Down Expand Up @@ -134,12 +133,12 @@ public void onSuccess(FileLoader.Result result) {
if (result.loaderType == FileLoader.LoaderType.METADATA) {
if (!coreLoader.isSupported(options)) {
crashManager.log("we do not expect this file to be an ODF: " + options.originalUri.toString());
analyticsManager.report("load_odf_error_expected", FirebaseAnalytics.Param.CONTENT_TYPE, options.fileType);
analyticsManager.report("load_odf_error_expected", AnalyticsConstants.PARAM_CONTENT_TYPE, options.fileType);
}

loadWithType(FileLoader.LoaderType.CORE, options);
} else {
analyticsManager.report("load_success", FirebaseAnalytics.Param.CONTENT_TYPE, options.fileType, FirebaseAnalytics.Param.CONTENT, result.loaderType.toString());
analyticsManager.report("load_success", AnalyticsConstants.PARAM_CONTENT_TYPE, options.fileType, AnalyticsConstants.PARAM_CONTENT, result.loaderType.toString());

if (currentListener != null) {
currentListener.onLoadSuccess(result);
Expand Down Expand Up @@ -167,7 +166,7 @@ public void onError(FileLoader.Result result, Throwable error) {
}

if (result.loaderType == FileLoader.LoaderType.CORE) {
analyticsManager.report("load_odf_error", FirebaseAnalytics.Param.CONTENT_TYPE, options.fileType);
analyticsManager.report("load_odf_error", AnalyticsConstants.PARAM_CONTENT_TYPE, options.fileType);

if (rawLoader.isSupported(options)) {
loadWithType(FileLoader.LoaderType.RAW, options);
Expand All @@ -192,7 +191,7 @@ public void onError(FileLoader.Result result, Throwable error) {

// MetadataLoader failed, so there's no point in trying to parse or upload the file

analyticsManager.report("load_error", FirebaseAnalytics.Param.CONTENT_TYPE, options.fileType, FirebaseAnalytics.Param.CONTENT, result.loaderType.toString());
analyticsManager.report("load_error", AnalyticsConstants.PARAM_CONTENT_TYPE, options.fileType, AnalyticsConstants.PARAM_CONTENT, result.loaderType.toString());

if (currentListener != null) {
currentListener.onError(result, error);
Expand Down Expand Up @@ -238,7 +237,7 @@ private void saveSync(FileLoader.Result lastResult, Uri outFile, String htmlDiff
}
});
} catch (Throwable e) {
analyticsManager.report("save_error", FirebaseAnalytics.Param.CONTENT_TYPE, lastResult.options.fileType);
analyticsManager.report("save_error", AnalyticsConstants.PARAM_CONTENT_TYPE, lastResult.options.fileType);
crashManager.log(e, lastResult.options.originalUri);

if (currentListener != null) {
Expand Down Expand Up @@ -287,4 +286,4 @@ public interface LoaderListener {
void onUnsupported(FileLoader.Result result);
void onSaveError();
}
}
}
Loading
Loading