Merge pull request #230 from Androidacy/master

Huge changes/update

Author: androidacy-user

.gitignore

@@ -9,3 +9,4 @@
 .cxx
 local.properties
 sentry.properties
+androidacy.properties

README.md

@@ -1,6 +1,9 @@
 # Fox's Magisk Module Manager
 
-## Important
+<details>
+<summary>
+  Important news
+</summary>
 
 I have health problems that made me work slow on everything.
 I don't like sharing my health problmes but it has been to much recently for me to keep it for myself.
@@ -50,6 +53,8 @@ at least you won't be hurting peoples with mental/health issues by faking having
 I'll probably delete this section once my health would be gotten better, or at 
 least good enough for me to not be stuck on my bed at least once a day because of pain.
 
+</details>
+
 ## Community
 
 [![Telegram Group](https://img.shields.io/endpoint?color=neon&style=flat&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2FFox2Code_Chat)](https://telegram.dog/Fox2Code_Chat)
@@ -94,9 +99,9 @@ and download and install the latest `.apk` on your device.
 ## Repositories Available
 
 
-The app currently use these three repo as it's module sources, with it's benefits and drawback:  
+The app currently use these two repos as module sources, each with their own benefits and drawback:  
 (Note: Each module repo can be disabled in the settings of the app)  
-(Note²: I do not own or monitor any of the repo, **download at your own risk**)
+(Note²: I do not own or actively monitor any of the repos or modules, **download at your own risk**)
 
 #### [https://github.com/Magisk-Modules-Alt-Repo](https://github.com/Magisk-Modules-Alt-Repo)  
 - Accepting new modules [here](https://github.com/Magisk-Modules-Alt-Repo/submission)
@@ -112,6 +117,7 @@ Support:
 - Modules downloadable easily outside the app
 - Officially supported by Fox's mmm
 - Contains ads to help cover server costs
+- Added features like module reviews, automatic VirusTotal scans, and more
 
 Support:
 
@@ -152,6 +158,13 @@ If your language is right to left don't forget to set `lang_support_rtl` to `tru
 
 Translators are not expected to have any previous coding experience.
 
+## License
+See [LICENSE](LICENCE). Library licenses can be found in the licenses section of the app.
+
+Cronet is licensed under the Apache License, Version 2.0. Static libraries are licensed under 
+the BSD license. See [LICENSE](https://chromium.googlesource.com/chromium/src/+/master/LICENSE) 
+for more information. Libraries were built using the microg build script which can be found [here](https://github.com/microg/cronet-build).
+
 ## I want to add my own repo
 
 To add you own repo to Fox's mmm it need to follow theses conditions:

app/build.gradle

@@ -1,36 +1,53 @@
 plugins {
     // Gradle doesn't allow conditionally enabling/disabling plugins
-    id "io.sentry.android.gradle" version "3.1.5"
+    id "io.sentry.android.gradle" version "3.3.0"
     id 'com.android.application'
     id 'com.mikepenz.aboutlibraries.plugin'
 }
 
 android {
     namespace "com.fox2code.mmm"
     compileSdk 33
+    buildToolsVersion '30.0.3'
+    signingConfigs {
+        release {
+            // Everything comes from local.properties
+            Properties properties = new Properties()
+            if (project.rootProject.file('local.properties').exists()) {
+                properties.load(project.rootProject.file('local.properties').newDataInputStream())
+                storeFile file(properties.getProperty('keystore.file'))
+                storePassword properties.getProperty('keystore.password')
+                keyAlias 'key0'
+                keyPassword properties.getProperty('keystore.password')
+            }
+        }
+    }
 
     defaultConfig {
         applicationId "com.fox2code.mmm"
         minSdk 21
         targetSdk 33
-        versionCode 59
-        versionName "0.6.7"
+        versionCode 60
+        versionName "0.6.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        signingConfig signingConfigs.release
     }
 
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
+'proguard-rules.pro'
         }
         debug {
             applicationIdSuffix '.debug'
             debuggable true
+
             // ONLY FOR TESTING SENTRY
             // minifyEnabled true
             // shrinkResources true
-            // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),'proguard-rules.pro'
         }
     }
 
@@ -40,9 +57,26 @@ android {
             dimension "type"
             buildConfigField "boolean", "ENABLE_AUTO_UPDATER", "true"
             buildConfigField "boolean", "DEFAULT_ENABLE_CRASH_REPORTING", "true"
-            buildConfigField("java.util.List<String>",
-                    "ENABLED_REPOS",
-                    "java.util.Arrays.asList(\"magisk_alt_repo\", \"androidacy_repo\")",)
+            // Get the androidacy client ID from the androidacy.properties
+            Properties properties = new Properties()
+            // If androidacy.properties doesn't exist, use the default client ID which is heavily
+            // rate limited to 30 requests per minute
+            if (project.rootProject.file('androidacy.properties').exists()) {
+                properties.load(project.rootProject.file('androidacy.properties').newDataInputStream())
+            } else {
+                properties.setProperty('client_id', '"5KYccdYxWB2RxMq5FTbkWisXi2dS6yFN9R7RVlFCG98FRdz6Mf5ojY2fyJCUlXJZ"')
+            }
+            buildConfigField("String", "ANDROIDACY_CLIENT_ID", properties.getProperty('client_id'))
+            // If client ID is empty, disable androidacy
+            if (properties.getProperty('client_id').isEmpty()) {
+                buildConfigField("java.util.List<String>",
+                        "ENABLED_REPOS", "java.util.Arrays.asList(\"magisk_alt_repo\")")
+            } else {
+                buildConfigField("java.util.List<String>",
+                        "ENABLED_REPOS",
+                        "java.util.Arrays.asList(\"magisk_alt_repo\", \"androidacy_repo\")",)
+            }
+
         }
 
         fdroid {
@@ -62,6 +96,17 @@ android {
             buildConfigField("java.util.List<String>",
                     "ENABLED_REPOS",
                     "java.util.Arrays.asList(\"magisk_alt_repo\")",)
+
+            // Get the androidacy client ID from the androidacy.properties
+            Properties properties = new Properties()
+            // If androidacy.properties doesn't exist, use the default client ID which is limited
+            // to 50 requests per minute
+            if (project.rootProject.file('androidacy.properties').exists()) {
+                properties.load(project.rootProject.file('androidacy.properties').newDataInputStream())
+            } else {
+                properties.setProperty('client_id', '"dQ1p7X8bF14PVJ7wAU6ORVjPB2IeTinsuAZ8Uos6tQiyUdUyIjSyZSmN54QBbaTy"')
+            }
+            buildConfigField("String", "ANDROIDACY_CLIENT_ID", properties.getProperty('client_id'))
         }
     }
 
@@ -137,7 +182,7 @@ sentry {
         // as Gradle will resolve it to the latest version.
         //
         // Defaults to the latest published sentry version.
-        sentryVersion = '6.5.0'
+        sentryVersion = '6.9.2'
     }
 }
 
@@ -175,31 +220,35 @@ dependencies {
     implementation 'androidx.work:work-runtime:2.7.1'
     implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:5.0.0-alpha.10'
     implementation 'com.squareup.okhttp3:okhttp-brotli:5.0.0-alpha.10'
+    // Chromium cronet from microG
+    implementation fileTree(dir: 'libs', include: '*.jar')
+    // Force prefer our own version of Cronet
     implementation 'com.github.topjohnwu.libsu:io:5.0.1'
     implementation 'com.github.Fox2Code:RosettaX:1.0.9'
     implementation 'com.github.Fox2Code:AndroidANSI:1.0.1'
 
     if (hasSentryConfig) {
         // Error reporting
-        defaultImplementation 'io.sentry:sentry-android:6.5.0'
-        defaultImplementation 'io.sentry:sentry-android-fragment:6.5.0'
-        defaultImplementation 'io.sentry:sentry-android-okhttp:6.5.0'
-        defaultImplementation 'io.sentry:sentry-android-core:6.5.0'
-        defaultImplementation 'io.sentry:sentry-android-ndk:6.5.0'
+        defaultImplementation 'io.sentry:sentry-android:6.9.2'
+        defaultImplementation 'io.sentry:sentry-android-fragment:6.9.2'
+        defaultImplementation 'io.sentry:sentry-android-okhttp:6.9.2'
+        defaultImplementation 'io.sentry:sentry-android-core:6.9.2'
+        defaultImplementation 'io.sentry:sentry-android-ndk:6.9.2'
     }
 
     // Markdown
     implementation "io.noties.markwon:core:4.6.2"
     implementation "io.noties.markwon:html:4.6.2"
     implementation "io.noties.markwon:image:4.6.2"
     implementation "io.noties.markwon:syntax-highlight:4.6.2"
+    implementation 'com.google.net.cronet:cronet-okhttp:0.1.0'
+    // Ignore all org.chromium.net dependencies
     annotationProcessor "io.noties:prism4j-bundler:2.0.0"
     implementation "com.caverock:androidsvg:1.4"
 
     // Test
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
 }
 
 if (hasSentryConfig) {

app/libs/arm64-v8a.jar

@@ -50,7 +50,7 @@
     static void enableDebugLogging(boolean);
 }
 -assumevalues class androidx.loader.app.LoaderManagerImpl {
-    static boolean DEBUG return false;
+    static boolean DEBUG;
 }
 
 # This is just some proguard rules testes, might do a separate lib after
@@ -186,3 +186,37 @@
     int getSafeInsetTop();
     android.graphics.Insets getWaterfallInsets();
 }
+
+# Keep all of Cronet API and google's internal classes
+-keep class org.chromium.net.** { *; }
+-keep class org.chromium.** { *; }
+-keep class com.google.** { *; }
+
+# Silence some warnings
+-dontwarn android.os.SystemProperties
+-dontwarn android.view.ThreadedRenderer
+-dontwarn cyanogenmod.providers.CMSettings$Secure
+-dontwarn lineageos.providers.LineageSettings$System
+-dontwarn lineageos.style.StyleInterface
+-dontwarn me.weishu.reflection.Reflection
+-dontwarn org.lsposed.hiddenapibypass.HiddenApiBypass
+-dontwarn rikka.core.res.ResourcesCompatLayoutInflaterListener
+-dontwarn rikka.core.util.ResourceUtils
+-dontwarn com.afollestad.materialdialogs.MaterialDialog
+-dontwarn com.afollestad.materialdialogs.WhichButton
+-dontwarn com.afollestad.materialdialogs.actions.DialogActionExtKt
+-dontwarn com.afollestad.materialdialogs.callbacks.DialogCallbackExtKt
+-dontwarn com.afollestad.materialdialogs.internal.button.DialogActionButton
+-dontwarn com.afollestad.materialdialogs.internal.button.DialogActionButtonLayout
+-dontwarn com.afollestad.materialdialogs.internal.main.DialogLayout
+-dontwarn com.afollestad.materialdialogs.internal.main.DialogTitleLayout
+-dontwarn com.afollestad.materialdialogs.internal.message.DialogContentLayout
+-dontwarn com.oracle.svm.core.annotate.AutomaticFeature
+-dontwarn com.oracle.svm.core.annotate.Delete
+-dontwarn com.oracle.svm.core.annotate.Substitute
+-dontwarn com.oracle.svm.core.annotate.TargetClass
+-dontwarn com.oracle.svm.core.configure.ResourcesRegistry
+-dontwarn javax.lang.model.element.Modifier
+-dontwarn org.graalvm.nativeimage.ImageSingletons
+-dontwarn org.graalvm.nativeimage.hosted.Feature$BeforeAnalysisAccess
+-dontwarn org.graalvm.nativeimage.hosted.Feature