Merge pull request #192 from Androidacy/master

Reworks Androidacy support

Author: Fox2Code

README.md

@@ -2,8 +2,7 @@
 
 ## Fox Module contest
 
-[NoStorageRestrict](https://github.com/Magisk-Modules-Alt-Repo/NoStorageRestrict) 
-by [@DanGLES3](https://github.com/DanGLES3) won via vote in community telegram server.
+[NoStorageRestrict](https://github.com/Magisk-Modules-Alt-Repo/NoStorageRestrict) by [@DanGLES3](https://github.com/DanGLES3) won via vote in community telegram server.
 
 Module description: Removes the restriction when selecting folders (Downloads/Android) through the file manager on Android 11 and higher
 
@@ -19,12 +18,11 @@ Main activity:
 
 ## What is this? 
 
-The official Magisk is dropping support to download online modules...  
-So I made my own app to do that! :3
+The official Magisk has dropped support to download online modules, so I made Fox's Magisk Module Manager to help you download and install Magisk modules.
 
 **This app is not officially supported by Magisk or its developers**
 
-**The modules shown in this app are not affiliated with this app**  
+**The modules shown in this app are not affiliated with this app or Magisk**  
 (Please contact repo owners instead)
 
 ## Requirements

app/build.gradle

@@ -34,6 +34,7 @@ android {
         "default" {
             dimension "type"
             buildConfigField "boolean", "ENABLE_AUTO_UPDATER", "true"
+            buildConfigField "boolean", "DEFAULT_ENABLE_CRASH_REPORTING", "true"
             buildConfigField(
                 "java.util.List<String>",
                 "ENABLED_REPOS",
@@ -50,6 +51,9 @@ android {
             // with our keys, so the APK wouldn't install anyways).
             buildConfigField "boolean", "ENABLE_AUTO_UPDATER", "false"
 
+            // Disable crash reporting for F-Droid flavor by default
+            buildConfigField "boolean", "DEFAULT_ENABLE_CRASH_REPORTING", "false"
+
             // Repo with ads or tracking feature are disabled by default for the
             // F-Droid flavor.
             buildConfigField(
@@ -79,6 +83,8 @@ 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'
@@ -87,7 +93,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'androidx.webkit:webkit:1.4.0'
+    implementation 'androidx.webkit:webkit:1.5.0'
     implementation 'com.google.android.material:material:1.6.1'
     implementation "com.mikepenz:aboutlibraries:${latestAboutLibsRelease}"
     implementation "dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0"

app/src/main/AndroidManifest.xml

@@ -5,7 +5,9 @@
     tools:ignore="QueryAllPackagesPermission">
 
     <!-- Wifi is not the only way to get an internet connection -->
-    <uses-feature android:name="android.hardware.wifi" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.wifi"
+        android:required="false" />
 
     <!-- Retrieve online modules -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -16,89 +18,107 @@
     <!-- Open config apps for applications -->
     <uses-permission-sdk-23 android:name="android.permission.QUERY_ALL_PACKAGES" />
     <!-- Supposed to fix bugs with old firmware, only requested on pre Marshmallow -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="22" />
     <!-- Post background notifications -->
     <uses-permission-sdk-23 android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".MainApplication"
         android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/full_backup_content"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="@bool/lang_support_rtl"
         android:testOnly="false"
         android:theme="@style/Theme.MagiskModuleManager"
-        android:fullBackupContent="@xml/full_backup_content"
-        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:usesCleartextTraffic="false"
-        tools:targetApi="s"
+        tools:ignore="ManifestResource"
         tools:replace="android:supportsRtl"
-        tools:ignore="ManifestResource">
-        <receiver android:name="com.fox2code.mmm.background.BackgroundBootListener"
+        tools:targetApi="s">
+        <receiver
+            android:name="com.fox2code.mmm.background.BackgroundBootListener"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
+
         <activity
             android:name=".settings.SettingsActivity"
-            android:parentActivityName=".MainActivity"
             android:exported="true"
-            android:label="@string/title_activity_settings">
+            android:label="@string/title_activity_settings"
+            android:parentActivityName=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
             </intent-filter>
         </activity>
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:launchMode="singleTask"
-            android:label="@string/app_name_short">
+            android:label="@string/app_name_short"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name=".installer.InstallerActivity"
-            android:parentActivityName=".MainActivity"
             android:exported="false"
-            android:screenOrientation="portrait"
             android:launchMode="singleTop"
+            android:parentActivityName=".MainActivity"
+            android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="${applicationId}.intent.action.INSTALL_MODULE_INTERNAL" />
             </intent-filter>
         </activity>
         <activity
             android:name=".markdown.MarkdownActivity"
-            android:parentActivityName=".MainActivity"
             android:exported="false"
-            android:theme="@style/Theme.MagiskModuleManager">
-        </activity>
+            android:parentActivityName=".MainActivity"
+            android:theme="@style/Theme.MagiskModuleManager"></activity>
         <activity
             android:name=".androidacy.AndroidacyActivity"
-            android:parentActivityName=".MainActivity"
             android:exported="false"
+            android:parentActivityName=".MainActivity"
             android:theme="@style/Theme.MagiskModuleManager">
             <intent-filter>
                 <action android:name="${applicationId}.intent.action.OPEN_ANDROIDACY_INTERNAL" />
             </intent-filter>
         </activity>
-        <activity android:name="com.mikepenz.aboutlibraries.ui.LibsActivity"
-            tools:node="remove"/>
+        <activity
+            android:name="com.mikepenz.aboutlibraries.ui.LibsActivity"
+            tools:node="remove" />
+
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
             android:exported="false"
             tools:node="merge">
-            <meta-data android:name="androidx.emoji2.text.EmojiCompatInitializer"
+            <meta-data
+                android:name="androidx.emoji2.text.EmojiCompatInitializer"
                 tools:node="remove" />
-            <meta-data android:name="androidx.work.WorkManagerInitializer"
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
                 tools:node="remove" />
         </provider>
+        <meta-data
+            android:name="io.sentry.dsn"
+            android:value="https://ba5cb5ef513b423cbd54a2a8457113b1@sentry.androidacy.com/7" />
+        <!-- Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.
+           We recommend adjusting this value in production. -->
+        <meta-data
+            android:name="io.sentry.traces.sample-rate"
+            android:value="1.0" />
+        <!-- Enable user interaction tracing to capture transactions for various UI events (such as clicks or scrolls). -->
+        <meta-data
+            android:name="io.sentry.traces.user-interaction.enable"
+            android:value="true" />
     </application>
 </manifest>

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

@@ -37,6 +37,7 @@
 
 import eightbitlab.com.blurview.BlurView;
 import eightbitlab.com.blurview.RenderScriptBlur;
+import io.sentry.android.core.SentryAndroid;
 
 public class MainActivity extends FoxActivity implements SwipeRefreshLayout.OnRefreshListener,
         SearchView.OnQueryTextListener, SearchView.OnCloseListener,

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

@@ -27,6 +27,8 @@
 import com.fox2code.rosettax.LanguageSwitcher;
 import com.topjohnwu.superuser.Shell;
 
+import java.io.IOException;
+import java.io.Writer;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -42,13 +44,17 @@
 import io.noties.markwon.syntax.SyntaxHighlightPlugin;
 import io.noties.prism4j.Prism4j;
 import io.noties.prism4j.annotations.PrismBundle;
+import io.sentry.JsonObjectWriter;
+import io.sentry.NoOpLogger;
+import io.sentry.android.core.SentryAndroid;
 
 @PrismBundle(
         includeAll = true,
         grammarLocatorClassName = ".Prism4jGrammarLocator"
 )
 public class MainApplication extends FoxApplication
         implements androidx.work.Configuration.Provider {
+    private static final String TAG = "MainApplication";
     private static final String timeFormatString = "dd MMM yyyy"; // Example: 13 july 2001
     private static Locale timeFormatLocale =
             Resources.getSystem().getConfiguration().locale;
@@ -168,6 +174,11 @@ public static void setHasGottenRootAccess(boolean bool) {
         getSharedPreferences().edit().putBoolean("has_root_access", bool).apply();
     }
 
+    public static boolean isCrashReportingEnabled() {
+        return getSharedPreferences().getBoolean(
+                "crash_reporting", BuildConfig.DEFAULT_ENABLE_CRASH_REPORTING);
+    }
+
     public static SharedPreferences getBootSharedPreferences() {
         return bootSharedPreferences;
     }
@@ -341,6 +352,57 @@ 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)
+            // status bar and notifications (even if notification shade is pulled down)
+
+            // In the possibility you find this library sending anything listed above,
+            // 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);
+            // 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) -> {
+                if (BuildConfig.DEBUG) { // Debug sentry events for debug.
+                    StringBuilder stringBuilder = new StringBuilder("Sentry report debug: ");
+                    try {
+                        event.serialize(new JsonObjectWriter(new Writer() {
+                            @Override
+                            public void write(char[] cbuf) {
+                                stringBuilder.append(cbuf);
+                            }
+
+                            @Override
+                            public void write(char[] chars, int i, int i1) {
+                                stringBuilder.append(chars, i, i1);
+                            }
+
+                            @Override
+                            public void write(String str, int off, int len) {
+                                stringBuilder.append(str, off, len);
+                            }
+
+                            @Override
+                            public void flush() {}
+
+                            @Override
+                            public void close() {}
+                        }, 4), NoOpLogger.getInstance());
+                    } catch (IOException ignored) {}
+                    Log.i(TAG, stringBuilder.toString());
+                }
+                // Check saved preferences to see if the user has opted out of crash reporting.
+                // If the user has opted out, return null.
+                if (isCrashReportingEnabled()) {
+                    Log.i(TAG, "Relayed sentry report according to user preference");
+                    return event;
+                } else {
+                    Log.i(TAG, "Blocked sentry report according to user preference");
+                    return null;
+                }
+            });
+        });
     }
 
     @Override