diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9f95ca9..8f568ef 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -467,7 +467,7 @@ dependencies { implementation("androidx.security:security-crypto:1.1.0-alpha06") // some utils - implementation("commons-io:commons-io:20030203.000550") + implementation("commons-io:commons-io:2.11.0") implementation("org.apache.commons:commons-compress:1.23.0") // analytics diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index b2de4b1..1901417 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -192,6 +192,7 @@ -keepclassmembers class kotlin.SafePublicationLazyImpl { java.lang.Object _value; } +-keepclassmembers class org.apache.commons.compress.archivers.zip.* { *; } # fix bug with androidx work and future # -keep class androidx.work.impl.utils.futures.* { *; } diff --git a/app/src/main/java/com/fox2code/mmm/CrashHandler.java b/app/src/main/java/com/fox2code/mmm/CrashHandler.java index af6d4f0..649829c 100644 --- a/app/src/main/java/com/fox2code/mmm/CrashHandler.java +++ b/app/src/main/java/com/fox2code/mmm/CrashHandler.java @@ -106,7 +106,9 @@ public class CrashHandler extends FoxActivity { }); // get restart button findViewById(R.id.restart).setOnClickListener(v -> { - // Restart the app + // Restart the app and submit sans feedback + Throwable sentryException = (Throwable) getIntent().getSerializableExtra("sentryException"); + if (crashReportingEnabled) Sentry.captureException(sentryException); finish(); startActivity(getPackageManager().getLaunchIntentForPackage(getPackageName())); }); @@ -169,4 +171,4 @@ public class CrashHandler extends FoxActivity { runOnUiThread(() -> view.setBackgroundResource(R.drawable.baseline_copy_all_24)); }).start(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/fox2code/mmm/MainActivity.java b/app/src/main/java/com/fox2code/mmm/MainActivity.java index cb9359f..3d001d4 100644 --- a/app/src/main/java/com/fox2code/mmm/MainActivity.java +++ b/app/src/main/java/com/fox2code/mmm/MainActivity.java @@ -738,7 +738,7 @@ public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRe } // if it's still null, but it's enabled, throw an error if (AndroidacyRepoData.getInstance().isEnabled() && AndroidacyRepoData.getInstance().memberLevel == null) { - throw new IllegalStateException("AndroidacyRepoData is enabled, but member level is null"); + Timber.e("AndroidacyRepoData is enabled, but member level is null"); } if (AndroidacyRepoData.getInstance() != null && AndroidacyRepoData.getInstance().isEnabled() && Objects.equals(AndroidacyRepoData.getInstance().memberLevel, "Guest")) { runtimeUtils.showUpgradeSnackbar(this, this); @@ -763,4 +763,4 @@ public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRe } } } -} \ No newline at end of file +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 13865ce..7111a3d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,8 +17,8 @@ gradleEnterprise { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - google() mavenCentral() + google() // enable jitpack maven { setUrl("https://jitpack.io") } }