Fix empty androidacy client id and bundle cronet

Fdroid apparently won't let us attempt to use cronet from gms because something something proprietary AAAAAAAAAAAAAAAAAAAAAAAAAAA

The scream is the two hours I spent resolving the 15189759875195791 conflicts that resulted from the change.

Also, when ANDROIDACY_CLIENT_ID is empty, do not allow the user to enable Androidacy repo and instead show a message suggesting to download official builds. May have to reword for fdroid

Oh, and now no internet actually means no internet and it'll properly notify when repos fail to update.

Signed-off-by: androidacy-user <opensource@androidacy.com>

Author: androidacy-user

README.md

@@ -158,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

@@ -9,6 +9,17 @@ android {
     namespace "com.fox2code.mmm"
     compileSdk 33
     buildToolsVersion '30.0.3'
+    signingConfigs {
+        release {
+            // Everything comes from local.properties
+            Properties properties = new Properties()
+            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"
@@ -17,13 +28,15 @@ android {
         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'
@@ -42,19 +55,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 (an empty string
             // - won't work, but it's better than failing to build)
             if (project.rootProject.file('androidacy.properties').exists()) {
                 properties.load(project.rootProject.file('androidacy.properties').newDataInputStream())
             } else {
-                properties.setProperty('client_id', '""')
+                properties.setProperty('client_id', '')
             }
             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 {
@@ -82,7 +102,7 @@ android {
             if (project.rootProject.file('androidacy.properties').exists()) {
                 properties.load(project.rootProject.file('androidacy.properties').newDataInputStream())
             } else {
-                properties.setProperty('client_id', '""')
+                properties.setProperty('client_id', '')
             }
             buildConfigField("String", "ANDROIDACY_CLIENT_ID", properties.getProperty('client_id'))
         }
@@ -160,7 +180,7 @@ sentry {
         // as Gradle will resolve it to the latest version.
         //
         // Defaults to the latest published sentry version.
-        sentryVersion = '6.8.0'
+        sentryVersion = '6.9.2'
     }
 }
 
@@ -198,26 +218,29 @@ 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'
-    implementation 'com.google.net.cronet:cronet-okhttp:0.1.0'
+    // 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.8.0'
-        defaultImplementation 'io.sentry:sentry-android-fragment:6.8.0'
-        defaultImplementation 'io.sentry:sentry-android-okhttp:6.8.0'
-        defaultImplementation 'io.sentry:sentry-android-core:6.8.0'
-        defaultImplementation 'io.sentry:sentry-android-ndk:6.8.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.android.gms:play-services-cronet:18.0.1'
+    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"
 

app/libs/arm64-v8a.jar

@@ -187,6 +187,11 @@
     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
@@ -196,4 +201,22 @@
 -dontwarn me.weishu.reflection.Reflection
 -dontwarn org.lsposed.hiddenapibypass.HiddenApiBypass
 -dontwarn rikka.core.res.ResourcesCompatLayoutInflaterListener
--dontwarn rikka.core.util.ResourceUtils
+-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

app/libs/armeabi-v7a.jar

@@ -22,7 +22,6 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SearchView;
 import androidx.cardview.widget.CardView;
 import androidx.core.app.NotificationManagerCompat;
@@ -207,6 +206,8 @@ public void commonNext() {
                 NotificationType.NEED_CAPTCHA_ANDROIDACY.autoAdd(moduleViewListBuilder);
                 if (!NotificationType.NO_INTERNET.shouldRemove()) {
                     moduleViewListBuilder.addNotification(NotificationType.NO_INTERNET);
+                } else if (!NotificationType.REPO_UPDATE_FAILED.shouldRemove()) {
+                    moduleViewListBuilder.addNotification(NotificationType.REPO_UPDATE_FAILED);
                 } else {
                     // Compatibility data still needs to be updated
                     AppUpdateManager appUpdateManager = AppUpdateManager.getAppUpdateManager();
@@ -406,10 +407,10 @@ public void onRefresh() {
             } else {
                 // Compatibility data still needs to be updated
                 AppUpdateManager appUpdateManager = AppUpdateManager.getAppUpdateManager();
-                noodleDebug.replace("Check App Update");
+                // noodleDebug.replace("Check App Update");
                 if (BuildConfig.ENABLE_AUTO_UPDATER && appUpdateManager.checkUpdate(true))
                     moduleViewListBuilder.addNotification(NotificationType.UPDATE_AVAILABLE);
-                noodleDebug.replace("Check Json Update");
+                // noodleDebug.replace("Check Json Update");
                 if (max != 0) {
                     int current = 0;
                     noodleDebug.push("");
@@ -429,7 +430,7 @@ public void onRefresh() {
                     noodleDebug.pop();
                 }
             }
-            noodleDebug.replace("Apply");
+            // noodleDebug.replace("Apply");
             runOnUiThread(() -> {
                 this.progressIndicator.setVisibility(View.GONE);
                 this.swipeRefreshLayout.setRefreshing(false);
@@ -441,8 +442,8 @@ public void onRefresh() {
             RepoManager.getINSTANCE().updateEnabledStates();
             RepoManager.getINSTANCE().runAfterUpdate(moduleViewListBuilder::appendRemoteModules);
             this.moduleViewListBuilder.applyTo(moduleList, moduleViewAdapter);
-            noodleDebug.pop();
-            noodleDebug.unbind();
+            // noodleDebug.pop();
+            // noodleDebug.unbind();
         }, "Repo update thread").start();
     }