Merge branch 'Fox2Code:master' into master

Author: OrStudio

DEVELOPERS.md

@@ -27,6 +27,33 @@ it is a check that verify that the module is declaring the minimum required to
 allow the app to show your module to the user without hurting his experience.  
 Filling all basic Magisk properties is often enough to not get filtered out by it.
 
+## Custom Repo format
+
+Note: This feature is for `0.6.0` version that is not released yet.
+
+`last_update` fields uses unix millis.
+
+Json format is
+```json
+{
+  "name": "Repo name",
+  "website": "repo website",
+  "support": "optional support url",
+  "donate": "optional support url", 
+  "submitModule": "optional submit module URL",
+  "last_update": 0,
+  "modules": [
+    {
+      "id": "module id",
+      "last_update": 0,
+      "notes_url": "notes url",
+      "prop_url": "module.prop url",
+      "zip_url": "module.zip url"
+    }
+  ]
+}
+```
+
 ## Properties
 
 In addition to the following required magisk properties

README.md

@@ -1,9 +1,28 @@
 # Fox's Magisk Module Manager
 
+## Fox Module contest
+
+If you publish a modules using ANSI color styling or FoxMMM extensions
+(see [`DEVELOPERS.md`](DEVELOPERS.md)) you can enter the contest to win 20€ via PayPal.
+
+The winning module will also be displayed on this spot for at least 2 weeks.
+
+Note: The module install script must **not** be obfuscated and 
+be published on a repo supported by FoxMMM to be able to participate.
+
+The winner will be selected at the end of this month (July).  
+(Don't forget to join telegram to be sure I don't miss your module when selecting the winner)
+
 ## Join us on Telegram! 
 
 [![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)
 
+## Screenshots
+
+Main activity:  
+[<img src="screenshot-dark.jpg" width="250"/>](screenshot-dark.jpg)
+[<img src="screenshot-light.jpg" width="250"/>](screenshot-light.jpg)
+
 ## What is this? 
 
 The official Magisk is dropping support to download online modules...  
@@ -59,28 +78,13 @@ Support:
 
 [![Telegram Group](https://img.shields.io/endpoint?color=neon&style=flat&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fandroidacy_discussions)](https://telegram.dog/androidacy_discussions)
 
-#### [https://github.com/Magisk-Modules-Repo](https://github.com/Magisk-Modules-Repo)  
-- No longer accept new modules or receive update to existing modules
-- May be shut down at any moment
-- Official app dropped support for it
-- No longer supported by Fox's mmm
-
-As the main repo may shutting down due to the main app no longer supporting it, stopped 
-accepting new modules, and also no longer receive updates since the 21 December 2021.
-
 If a module is in multiple repos, the manager will just pick the most up to date version 
-of the module, allowing developers to switch repo at their own pace if they want to.
+of the module, if a module is in multiple repos it will just use first registered repo.
 
 Note: If you or a friend uploaded a module and it doesn't appear in your module 
 list you can disable the low quality filter in the app settings.  
 Go to the [developer documentation](DEVELOPERS.md) for more info.
 
-## Screenshots
-
-Main activity:  
-[<img src="screenshot-dark.jpg" width="250"/>](screenshot-dark.jpg)
-[<img src="screenshot-light.jpg" width="250"/>](screenshot-light.jpg)
-
 ## For developers
 
 The manager can read new meta keys to allow modules to customize their own entry
@@ -100,8 +104,7 @@ For more information please check the [developer documentation](DEVELOPERS.md)
 See [`app/src/main/res/values/strings.xml`](https://github.com/Fox2Code/FoxMagiskModuleManager/blob/master/app/src/main/res/values/strings.xml)
 and [`app/src/main/res/values/arrays.xml`](https://github.com/Fox2Code/FoxMagiskModuleManager/blob/master/app/src/main/res/values/arrays.xml)
 
-If your language is right to left you should make a copy of [`app/src/main/res/values/bools.xml`](https://github.com/Fox2Code/FoxMagiskModuleManager/blob/master/app/src/main/res/values/bools.xml)
-and set `lang_support_rtl` to `true`.
+If your language is right to left don't forget to set `lang_support_rtl` to `true`.
 
 Translators are not expected to have any previous coding experience.
 

app/build.gradle

@@ -4,14 +4,14 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.fox2code.mmm"
         minSdk 21
-        targetSdk 32
-        versionCode 43
-        versionName "0.5.0"
+        targetSdk 33
+        versionCode 50
+        versionName "0.6.0-dev1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -36,8 +36,8 @@ android {
             buildConfigField "boolean", "ENABLE_AUTO_UPDATER", "true"
             buildConfigField(
                 "java.util.List<String>",
-                "DISABLED_REPOS",
-                "java.util.Arrays.asList()",
+                "ENABLED_REPOS",
+                "java.util.Arrays.asList(\"magisk_alt_repo\", \"dg_magisk_repo\", \"androidacy_repo\")",
             )
         }
 
@@ -54,8 +54,8 @@ android {
             // F-Droid flavor.
             buildConfigField(
                 "java.util.List<String>",
-                "DISABLED_REPOS",
-                "java.util.Arrays.asList(\"androidacy_repo\")",
+                "ENABLED_REPOS",
+                "java.util.Arrays.asList(\"magisk_alt_repo\")",
             )
         }
     }
@@ -80,26 +80,28 @@ configurations {
 
 dependencies {
     // UI
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'androidx.emoji2:emoji2:1.1.0'
     implementation 'androidx.emoji2:emoji2-views-helper:1.1.0'
     implementation 'androidx.preference:preference:1.2.0'
     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 'com.google.android.material:material:1.6.0'
+    implementation 'com.google.android.material:material:1.6.1'
     implementation "com.mikepenz:aboutlibraries:${latestAboutLibsRelease}"
     implementation "dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0"
-    implementation "dev.rikka.rikkax.insets:insets:1.2.0"
+    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.0.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.2'
+    implementation 'com.github.Fox2Code:RosettaX:1.0.8'
     implementation 'com.github.Fox2Code:AndroidANSI:1.0.1'
 
     // Markdown
@@ -110,9 +112,6 @@ dependencies {
     annotationProcessor "io.noties:prism4j-bundler:2.0.0"
     implementation "com.caverock:androidsvg:1.4"
 
-    // Utils for compat (Needs to be outsourced ASAP)
-    // compileOnly "org.robolectric:android-all:11-robolectric-6757853"
-
     // Test
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- WebView offline webpage support -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!-- Make sure of the module active state by checking enabled modules on boot -->
+    <!-- Check if there is modules updates on boot -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <!-- Open config apps for applications -->
     <uses-permission-sdk-23 android:name="android.permission.QUERY_ALL_PACKAGES" />
@@ -33,8 +33,9 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:usesCleartextTraffic="false"
         tools:targetApi="s"
-        tools:replace="android:supportsRtl">
-        <receiver android:name="com.fox2code.mmm.manager.ModuleBootReceive"
+        tools:replace="android:supportsRtl"
+        tools:ignore="ManifestResource">
+        <receiver android:name="com.fox2code.mmm.background.BackgroundBootListener"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -94,6 +95,8 @@
             tools:node="merge">
             <meta-data android:name="androidx.emoji2.text.EmojiCompatInitializer"
                 tools:node="remove" />
+            <meta-data android:name="androidx.work.WorkManagerInitializer"
+                tools:node="remove" />
         </provider>
     </application>
 </manifest>

app/src/main/java/android/os/SystemProperties.java

@@ -4,6 +4,9 @@
 
 import com.topjohnwu.superuser.ShellUtils;
 
+/**
+ * I will probably outsource this to a separate library later
+ */
 @Keep
 public class SystemProperties {
     @Keep
@@ -13,4 +16,15 @@ public static String get(String key) {
             prop = prop.substring(0, prop.length() - 1).trim();
         return prop;
     }
+
+    @Keep
+    public static int getInt(String key, int def) {
+        try {
+            String value = get(key);
+            if (value.isEmpty()) return def;
+            return Integer.parseInt(value);
+        } catch (Exception e) {
+            return def;
+        }
+    }
 }