Fix Error reporting and update libraries.

Author: Fox2Code

app/build.gradle

@@ -83,8 +83,6 @@ configurations {
 }
 
 dependencies {
-    // Error reporting
-    implementation 'io.sentry:sentry-android:6.4.0'
     // UI
     implementation 'androidx.appcompat:appcompat:1.5.0'
     implementation 'androidx.emoji2:emoji2:1.2.0'
@@ -100,16 +98,20 @@ dependencies {
     implementation "dev.rikka.rikkax.insets:insets:1.3.0"
     implementation 'com.github.Dimezis:BlurView:version-1.6.6'
     implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
-    implementation 'com.github.Fox2Code:FoxCompat:0.1.0'
+    implementation 'com.github.Fox2Code:FoxCompat:0.1.2'
 
     // Utils
     implementation 'androidx.work:work-runtime:2.7.1'
     implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
     implementation 'com.squareup.okhttp3:okhttp-brotli:4.9.3'
     implementation 'com.github.topjohnwu.libsu:io:5.0.1'
-    implementation 'com.github.Fox2Code:RosettaX:1.0.8'
+    implementation 'com.github.Fox2Code:RosettaX:1.0.9'
     implementation 'com.github.Fox2Code:AndroidANSI:1.0.1'
 
+    // Error reporting
+    implementation 'io.sentry:sentry-android:6.4.0'
+    implementation 'io.sentry:sentry-android-fragment:6.4.0'
+
     // Markdown
     implementation "io.noties.markwon:core:4.6.2"
     implementation "io.noties.markwon:html:4.6.2"

app/src/main/AndroidManifest.xml

@@ -74,23 +74,23 @@
             android:parentActivityName=".MainActivity"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity">
-            <intent-filter>
+            <!-- <intent-filter>
                 <action android:name="${applicationId}.intent.action.INSTALL_MODULE_INTERNAL" />
-            </intent-filter>
+            </intent-filter> -->
         </activity>
         <activity
             android:name=".markdown.MarkdownActivity"
             android:exported="false"
             android:parentActivityName=".MainActivity"
-            android:theme="@style/Theme.MagiskModuleManager"></activity>
+            android:theme="@style/Theme.MagiskModuleManager" />
         <activity
             android:name=".androidacy.AndroidacyActivity"
             android:exported="false"
             android:parentActivityName=".MainActivity"
             android:theme="@style/Theme.MagiskModuleManager">
-            <intent-filter>
+            <!-- <intent-filter>
                 <action android:name="${applicationId}.intent.action.OPEN_ANDROIDACY_INTERNAL" />
-            </intent-filter>
+            </intent-filter> -->
         </activity>
         <activity
             android:name="com.mikepenz.aboutlibraries.ui.LibsActivity"

app/src/main/java/com/fox2code/mmm/MainApplication.java

@@ -9,6 +9,8 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.os.SystemClock;
+import android.system.ErrnoException;
+import android.system.Os;
 import android.text.SpannableStringBuilder;
 import android.util.Log;
 
@@ -21,6 +23,7 @@
 import com.fox2code.foxcompat.FoxActivity;
 import com.fox2code.foxcompat.FoxApplication;
 import com.fox2code.foxcompat.FoxThemeWrapper;
+import com.fox2code.foxcompat.internal.FoxProcessExt;
 import com.fox2code.mmm.installer.InstallerInitializer;
 import com.fox2code.mmm.utils.GMSProviderInstaller;
 import com.fox2code.mmm.utils.Http;
@@ -46,7 +49,10 @@
 import io.noties.prism4j.annotations.PrismBundle;
 import io.sentry.JsonObjectWriter;
 import io.sentry.NoOpLogger;
+import io.sentry.TypeCheckHint;
+import io.sentry.UncaughtExceptionHandlerIntegration;
 import io.sentry.android.core.SentryAndroid;
+import io.sentry.hints.DiskFlushNotification;
 
 @PrismBundle(
         includeAll = true,
@@ -62,7 +68,10 @@ public class MainApplication extends FoxApplication
             new SimpleDateFormat(timeFormatString, timeFormatLocale);
     private static final Shell.Builder shellBuilder;
     private static final long secret;
+    @SuppressLint("RestrictedApi") // Use FoxProcess wrapper helper.
+    private static final boolean wrapped = !FoxProcessExt.isRootLoader();
     private static SharedPreferences bootSharedPreferences;
+    private static String relPackageName = BuildConfig.APPLICATION_ID;
     private static MainApplication INSTANCE;
     private static boolean firstBoot;
 
@@ -88,13 +97,20 @@ public static void addSecret(Intent intent) {
         ComponentName componentName = intent.getComponent();
         String packageName = componentName != null ?
                 componentName.getPackageName() : intent.getPackage();
-        if (!BuildConfig.APPLICATION_ID.equalsIgnoreCase(packageName)) {
+        if (!BuildConfig.APPLICATION_ID.equalsIgnoreCase(packageName) &&
+                !relPackageName.equals(packageName)) {
             // Code safeguard, we should never reach here.
             throw new IllegalArgumentException("Can't add secret to outbound Intent");
         }
         intent.putExtra("secret", secret);
     }
 
+    // Is application wrapped, and therefore must reduce it's feature set.
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    public static boolean isWrapped() {
+        return wrapped;
+    }
+
     public static boolean checkSecret(Intent intent) {
         return intent != null && intent.getLongExtra("secret", ~secret) == secret;
     }
@@ -154,7 +170,7 @@ && getSharedPreferences().getBoolean("pref_use_magisk_install_command", false)
     }
 
     public static boolean isBackgroundUpdateCheckEnabled() {
-        return getSharedPreferences().getBoolean("pref_background_update_check", true);
+        return !wrapped && getSharedPreferences().getBoolean("pref_background_update_check", true);
     }
 
     public static boolean isAndroidacyTestMode() {
@@ -175,8 +191,8 @@ public static void setHasGottenRootAccess(boolean bool) {
     }
 
     public static boolean isCrashReportingEnabled() {
-        return getSharedPreferences().getBoolean(
-                "crash_reporting", BuildConfig.DEFAULT_ENABLE_CRASH_REPORTING);
+        return getSharedPreferences().getBoolean("pref_crash_reporting",
+                BuildConfig.DEFAULT_ENABLE_CRASH_REPORTING && !BuildConfig.DEBUG);
     }
 
     public static SharedPreferences getBootSharedPreferences() {
@@ -310,6 +326,7 @@ public boolean isLightTheme() {
     @Override
     public void onCreate() {
         if (INSTANCE == null) INSTANCE = this;
+        relPackageName = this.getPackageName();
         super.onCreate();
         /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             DynamicColors.applyToActivitiesIfAvailable(this,
@@ -352,6 +369,7 @@ public void onCreate() {
                 Log.d("MainApplication", "Emoji compat loaded!");
             }, "Emoji compat init.").start();
         }
+
         SentryAndroid.init(this, options -> {
             // Note: Sentry library only take a screenshot of Fox Magisk Module Manager.
             // The screen shot doesn't and cannot contain other applications (if in multi windows)
@@ -361,6 +379,8 @@ public void onCreate() {
             // it's a serious bug and a security issue you should report to Google
             // Google bug bounties on Android are huge, so you can also get rich by doing that.
             options.setAttachScreenshot(true);
+            // User interaction tracing is not needed to get context of crash
+            options.setEnableUserInteractionTracing(false);
             // Add a callback that will be used before the event is sent to Sentry.
             // With this callback, you can modify the event or, when returning null, also discard the event.
             options.setBeforeSend((event, hint) -> {
@@ -373,6 +393,11 @@ public void write(char[] cbuf) {
                                 stringBuilder.append(cbuf);
                             }
 
+                            @Override
+                            public void write(String str) {
+                                stringBuilder.append(str);
+                            }
+
                             @Override
                             public void write(char[] chars, int i, int i1) {
                                 stringBuilder.append(chars, i, i1);
@@ -399,6 +424,10 @@ public void close() {}
                     return event;
                 } else {
                     Log.i(TAG, "Blocked sentry report according to user preference");
+                    // We need to do this to avoid crash delay on crash when the event is dropped
+                    DiskFlushNotification diskFlushNotification = hint.getAs(
+                            TypeCheckHint.SENTRY_TYPE_CHECK_HINT, DiskFlushNotification.class);
+                    if (diskFlushNotification != null) diskFlushNotification.markFlushed();
                     return null;
                 }
             });