Merge branch 'fix/acra-build-failed' into beta

renyuneyun · Apr 24, 2022 · 634278d · 634278d
2 parents 4f1d09d + f56b3ea
commit 634278d
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 136 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,6 +11,8 @@ tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
 }
 
+def acraVersion = '5.9.3'
+
 android {
     compileSdkVersion 31
     // buildToolsVersion '29.0.3' is no longer needed since Android Gradle plugin 3.1.0.
@@ -48,7 +50,6 @@ android {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                    'proguard-rules-acra.pro',
                     'proguard-rules-guava.pro',
                     'proguard-rules.pro'
         }
@@ -72,8 +73,9 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation "ch.acra:acra-core:5.5.0"
-    implementation "ch.acra:acra-toast:5.5.0"
+    implementation "ch.acra:acra-core:$acraVersion"
+    implementation "ch.acra:acra-dialog:$acraVersion"
+    implementation "ch.acra:acra-mail:$acraVersion"
     implementation 'com.github.AppIntro:AppIntro:6.2.0'
     implementation 'com.github.daniel-stoneuk:material-about-library:3.1.2'
     implementation 'com.google.android.material:material:1.5.0'

diff --git a/app/proguard-rules-acra.pro b/app/proguard-rules-acra.pro
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,3 +18,8 @@
 
 # ProGuard warns, but don't know why
 -keep class local_skill.eventplugin.EventData {*;}
+
+# Some libraries used by (maybe) ACRA(?).
+-dontwarn javax.annotation.processing.AbstractProcessor
+-dontwarn javax.annotation.processing.Processor
+-dontwarn javax.annotation.processing.SupportedOptions
diff --git a/app/src/main/java/ryey/easer/EaserApplication.java b/app/src/main/java/ryey/easer/EaserApplication.java
@@ -20,12 +20,10 @@
 package ryey.easer;
 
 import android.Manifest;
-import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import android.os.Environment;
 import android.preference.PreferenceManager;
 
 import androidx.annotation.NonNull;
@@ -39,26 +37,19 @@
 import com.zeugmasolutions.localehelper.LocaleHelperApplicationDelegate;
 
 import org.acra.ACRA;
-import org.acra.annotation.AcraCore;
-import org.acra.annotation.AcraToast;
-
-import java.io.File;
+import org.acra.config.CoreConfigurationBuilder;
+import org.acra.config.DialogConfigurationBuilder;
+import org.acra.config.MailSenderConfigurationBuilder;
 
 import ryey.easer.core.log.ActivityLogService;
 
-@AcraCore(buildConfigClass = BuildConfig.class,
-        reportSenderFactoryClasses = ErrorSenderFactory.class)
-@AcraToast(resText=R.string.prompt_error_logged)
 public class EaserApplication extends MultiDexApplication {
 
-    static final String LOG_DIR = new File(Environment.getExternalStorageDirectory(), "/logger/error").getAbsolutePath();
-
     static final int[] THEME_NIGHT_MODE = {
             AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM,
             AppCompatDelegate.MODE_NIGHT_NO,
             AppCompatDelegate.MODE_NIGHT_YES,
     };
-
     private final LocaleHelperApplicationDelegate localeAppDelegate = new LocaleHelperApplicationDelegate();
 
     @Override
@@ -96,6 +87,17 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(localeAppDelegate.attachBaseContext(base));
-        ACRA.init(this);
+
+        ACRA.init(this, new CoreConfigurationBuilder()
+                .withPluginConfigurations(
+                        new MailSenderConfigurationBuilder()
+                                .withMailTo("[email protected]")
+                                .withReportAsFile(true)
+                                .build(),
+                        new DialogConfigurationBuilder()
+                                .withText(getString(R.string.prompt_acra_dialog_text))
+                                .build()
+                )
+        );
     }
 }
diff --git a/app/src/main/java/ryey/easer/ErrorSender.kt b/app/src/main/java/ryey/easer/ErrorSender.kt
diff --git a/app/src/main/java/ryey/easer/ErrorSenderFactory.kt b/app/src/main/java/ryey/easer/ErrorSenderFactory.kt
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -192,6 +192,7 @@
     <string name="text_dynamics">動值</string>
     <string name="title_new_dynamics_link">新建動值鏈接</string>
     <string name="title_dynamics_link">動值链接</string>
+    <string name="prompt_acra_dialog_text">Easer剛剛不幸崩潰了。\n錯誤日誌已被捕獲（鳴謝ACRA庫）。\n您可以考慮將其發送給開發者以協助查錯。</string>
 
     <string-array name="array_themes">
         <item>跟隨系統</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -194,6 +194,7 @@
     <string name="category_operation_easer">@string/easer</string>
     <string name="category_operation_misc">Misc</string>
     <string name="category_operation_unknown">Unknown</string>
+    <string name="prompt_acra_dialog_text">Easer just crashed.\nWe have captured the error information (thanks to ACRA library).\nYou can email the developer for bug report.</string>
 
     <string-array name="array_themes">
         <item>Follow system</item>

diff --git a/gradle.properties b/gradle.properties
@@ -17,3 +17,6 @@ android.enableJetifier=true
 android.useAndroidX=true
 systemProp.http.proxyHost=localhost
 systemProp.http.proxyPort=1088
+
+# Fix 'running out of JVM memory'. See https://stackoverflow.com/questions/59624003/daemon-is-stopping-immediately-jvm-garbage-collector-thrashing-and-after-running
+org.gradle.jvmargs=-Xmx2048M