From 9925c36a17e7347d27da706eb11634542819a27b Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Tue, 24 May 2022 11:15:29 +0200
Subject: [PATCH] Fix crash reports not sent

---
 app/build.gradle                              |  6 +--
 .../app/fedilab/android/MainApplication.java  | 49 +++++++++++++------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7ff6a2d9a..3be9c5de4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -100,9 +100,9 @@ dependencies {
     implementation "androidx.work:work-runtime:2.7.1"
     implementation 'app.futured.hauler:hauler:5.0.0'
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
-    implementation "ch.acra:acra-mail:5.5.0"
-    implementation "ch.acra:acra-limiter:5.5.0"
-    implementation "ch.acra:acra-notification:5.5.0"
+    implementation "ch.acra:acra-mail:5.9.3"
+    implementation "ch.acra:acra-limiter:5.9.3"
+    implementation "ch.acra:acra-notification:5.9.3"
 
     implementation "com.madgag.spongycastle:bctls-jdk15on:1.58.0.0"
     implementation 'com.github.UnifiedPush:android-connector:2.0.0'
diff --git a/app/src/main/java/app/fedilab/android/MainApplication.java b/app/src/main/java/app/fedilab/android/MainApplication.java
index 5fea3aaf4..451f1150e 100644
--- a/app/src/main/java/app/fedilab/android/MainApplication.java
+++ b/app/src/main/java/app/fedilab/android/MainApplication.java
@@ -27,10 +27,10 @@ import com.jaredrummler.cyanea.Cyanea;
 import com.jaredrummler.cyanea.prefs.CyaneaTheme;
 
 import org.acra.ACRA;
-import org.acra.annotation.AcraNotification;
+import org.acra.ReportField;
 import org.acra.config.CoreConfigurationBuilder;
-import org.acra.config.LimiterConfigurationBuilder;
 import org.acra.config.MailSenderConfigurationBuilder;
+import org.acra.config.NotificationConfigurationBuilder;
 import org.acra.data.StringFormat;
 
 import java.util.List;
@@ -38,8 +38,6 @@ import java.util.List;
 import es.dmoral.toasty.Toasty;
 
 
-@AcraNotification(
-        resIcon = R.mipmap.ic_launcher, resTitle = R.string.crash_title, resChannelName = R.string.set_crash_reports, resText = R.string.crash_message)
 
 public class MainApplication extends MultiDexApplication {
 
@@ -70,24 +68,43 @@ public class MainApplication extends MultiDexApplication {
         StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
         StrictMode.setVmPolicy(builder.build());
 
-
-        boolean send_crash_reports = sharedpreferences.getBoolean(getString(R.string.SET_SEND_CRASH_REPORTS), false);
-        if (send_crash_reports) {
-            CoreConfigurationBuilder ACRABuilder = new CoreConfigurationBuilder(this);
-            ACRABuilder.setBuildConfigClass(BuildConfig.class).setReportFormat(StringFormat.KEY_VALUE_LIST);
-            int versionCode = BuildConfig.VERSION_CODE;
-            ACRABuilder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder.class).setReportAsFile(true).setMailTo("hello@fedilab.app").setSubject("[Fedilab] - Crash Report " + versionCode).setEnabled(true);
-            ACRABuilder.getPluginConfigurationBuilder(LimiterConfigurationBuilder.class).setEnabled(true);
-            ACRA.init(this, ACRABuilder);
-        }
-
         Toasty.Config.getInstance().apply();
     }
 
-
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(base);
         MultiDex.install(MainApplication.this);
+        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(MainApplication.this);
+        boolean send_crash_reports = sharedpreferences.getBoolean(getString(R.string.SET_SEND_CRASH_REPORTS), false);
+        if (send_crash_reports) {
+            ACRA.init(this, new CoreConfigurationBuilder()
+                    //core configuration:
+                    .withBuildConfigClass(BuildConfig.class)
+                    .withReportFormat(StringFormat.KEY_VALUE_LIST)
+                    .withPluginConfigurations(
+                            new MailSenderConfigurationBuilder()
+                                    .withMailTo("hello@fedilab.app")
+                                    .withReportAsFile(true)
+                                    .withReportFileName("crash_report.txt")
+                                    .withSubject("[Fedilab] - Crash Report " + BuildConfig.VERSION_CODE)
+                                    .build(),
+                            new NotificationConfigurationBuilder()
+                                    .withResIcon(R.mipmap.ic_launcher)
+                                    .withChannelName(getString(R.string.set_crash_reports))
+                                    .withTitle(getString(R.string.crash_title))
+                                    .withText(getString(R.string.crash_message))
+                                    .build()
+                    ).withReportContent(
+                            ReportField.INSTALLATION_ID,
+                            ReportField.APP_VERSION_CODE,
+                            ReportField.ANDROID_VERSION,
+                            ReportField.PHONE_MODEL,
+                            ReportField.TOTAL_MEM_SIZE,
+                            ReportField.AVAILABLE_MEM_SIZE,
+                            ReportField.USER_CRASH_DATE,
+                            ReportField.STACK_TRACE)
+            );
+        }
     }
 }