v2.13.9

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,8 +26,8 @@ If applicable, add screenshots to help explain your problem.
 **Device info(please complete the following information):**
  - Device: [e.g. iPhone6]
  - OS: [ROM and version, ie Havoc-OS 4.12]
- - App Version [e.g. 22]
- - User Agent [e.g. Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36]
+ - App Version: [e.g. 22]
+ - User Agent: [e.g. Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/build-debug.yml

@@ -76,28 +76,28 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: MMRL-default-arm64-v8a-debug
-          path: ${{ github.workspace }}/Android/app/build/outputs/apk/default/debug/*-default-arm64-v8a-debug.apk
+          path: ${{ github.workspace }}/Android/app/build/outputs/apk/default/debug/*-default-arm64-v8a-debug-*-*.apk
 
       - name: Upload MMRL-default-armeabi-v7a-debug
         uses: actions/upload-artifact@v3
         with:
           name: MMRL-default-armeabi-v7a-debug
-          path: ${{ github.workspace }}/Android/app/build/outputs/apk/default/debug/*-default-armeabi-v7a-debug.apk
+          path: ${{ github.workspace }}/Android/app/build/outputs/apk/default/debug/*-default-armeabi-v7a-debug-*-*.apk
 
       - name: Upload MMRL-default-universal-debug
         uses: actions/upload-artifact@v3
         with:
           name: MMRL-default-universal-debug
-          path: ${{ github.workspace }}/Android/app/build/outputs/apk/default/debug/*-default-universal-debug.apk
+          path: ${{ github.workspace }}/Android/app/build/outputs/apk/default/debug/*-default-universal-debug-*-*.apk
 
       - name: Upload MMRL-default-x86-debug
         uses: actions/upload-artifact@v3
         with:
           name: MMRL-default-x86-debug
-          path: ${{ github.workspace }}/Android/app/build/outputs/apk/default/debug/*-default-x86-debug.apk
+          path: ${{ github.workspace }}/Android/app/build/outputs/apk/default/debug/*-default-x86-debug-*-*.apk
 
       - name: Upload MMRL-default-x86_64-debug
         uses: actions/upload-artifact@v3
         with:
           name: MMRL-default-x86_64-debug
-          path: ${{ github.workspace }}/Android/app/build/outputs/apk/default/debug/*-default-x86_64-debug.apk
+          path: ${{ github.workspace }}/Android/app/build/outputs/apk/default/debug/*-default-x86_64-debug-*-*.apk

Android/app/build.gradle

@@ -17,15 +17,6 @@ android {
         targetSdk pkg.config.target_sdk
         versionName pkg.config.version_name
         versionCode pkg.config.version_code
-        externalNativeBuild {
-            cmake {
-                cppFlags "-llog"
-                arguments "-DANDROID_STL=c++_shared"
-            }
-        }
-        ndk {
-            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
-        }
     }
 
     splits {
@@ -37,13 +28,18 @@ android {
         }
     }
 
+    applicationVariants.configureEach { variant ->
+        variant.outputs.configureEach { output ->
+            outputFileName = outputFileName.replace(".apk", "-${variant.versionName}-${variant.versionCode}.apk").replace("-unsigned", "")
+        }
+    }
+
     buildTypes {
         release {
             resValue "string", "app_name", "${app_name}"
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             multiDexEnabled true
-            // project.tasks.preBuild.dependsOn("webProd")
         }
         debug {
             resValue "string", "app_name", "${app_name} Debug"
@@ -52,22 +48,13 @@ android {
             minifyEnabled false
             multiDexEnabled false
             applicationIdSuffix '.debug'
-            // project.tasks.preBuild.dependsOn("webDev")
-        }
-    }
-    externalNativeBuild {
-        cmake {
-            path = file("src/main/cpp/CMakeLists.txt")
         }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     packagingOptions {
-        jniLibs {
-            keepDebugSymbols += ['*/armeabi/*.so', '*/armeabi-v7a/*.so', '*/arm64-v8a/*.so', '*/mips/*.so', '*/mips64/*.so', '*/x86/*.so', '*/x86_64/*.so']
-        }
         resources {
             excludes += ['META-INF/DEPENDENCIES.txt', 'META-INF/DEPENDENCIES', 'META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/MANIFEST.MF', 'META-INF/NOTICE', 'META-INF/NOTICE.txt', 'META-INF/ASL2.0']
         }
@@ -89,11 +76,16 @@ repositories {
 
 dependencies {
     implementation "androidx.browser:browser:1.7.0"
+    implementation "androidx.appcompat:appcompat:1.6.1"
+    implementation 'androidx.core:core:1.13.0-alpha04'
+    implementation 'androidx.webkit:webkit:1.9.0'
+
     implementation "com.github.topjohnwu.libsu:core:5.2.1"
     implementation "com.github.topjohnwu.libsu:io:5.2.1"
-    implementation "androidx.appcompat:appcompat:1.6.1"
+
     implementation 'org.apache.cordova:framework:12.0.1'
-    implementation 'androidx.webkit:webkit:1.9.0'
+
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 }
 
 configurations.implementation.setCanBeResolved(true)

Android/app/default/debug/output-metadata.json

@@ -11,61 +11,61 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 171,
-      "versionName": "1.7.1",
-      "outputFile": "app-default-universal-debug.apk"
+      "versionCode": 2139,
+      "versionName": "2.13.9_alpha-7",
+      "outputFile": "app-default-universal-debug-2.13.9_alpha-7-2139.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "armeabi-v7a"
+          "value": "x86"
         }
       ],
       "attributes": [],
-      "versionCode": 171,
-      "versionName": "1.7.1",
-      "outputFile": "app-default-armeabi-v7a-debug.apk"
+      "versionCode": 2139,
+      "versionName": "2.13.9_alpha-7",
+      "outputFile": "app-default-x86-debug-2.13.9_alpha-7-2139.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86"
+          "value": "x86_64"
         }
       ],
       "attributes": [],
-      "versionCode": 171,
-      "versionName": "1.7.1",
-      "outputFile": "app-default-x86-debug.apk"
+      "versionCode": 2139,
+      "versionName": "2.13.9_alpha-7",
+      "outputFile": "app-default-x86_64-debug-2.13.9_alpha-7-2139.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "arm64-v8a"
+          "value": "armeabi-v7a"
         }
       ],
       "attributes": [],
-      "versionCode": 171,
-      "versionName": "1.7.1",
-      "outputFile": "app-default-arm64-v8a-debug.apk"
+      "versionCode": 2139,
+      "versionName": "2.13.9_alpha-7",
+      "outputFile": "app-default-armeabi-v7a-debug-2.13.9_alpha-7-2139.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86_64"
+          "value": "arm64-v8a"
         }
       ],
       "attributes": [],
-      "versionCode": 171,
-      "versionName": "1.7.1",
-      "outputFile": "app-default-x86_64-debug.apk"
+      "versionCode": 2139,
+      "versionName": "2.13.9_alpha-7",
+      "outputFile": "app-default-arm64-v8a-debug-2.13.9_alpha-7-2139.apk"
     }
   ],
   "elementType": "File"

Android/app/default/release/output-metadata.json

@@ -11,9 +11,9 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 1139,
-      "versionName": "1.13.9",
-      "outputFile": "app-default-universal-release.apk"
+      "versionCode": 2139,
+      "versionName": "2.13.9_alpha-7",
+      "outputFile": "app-default-universal-release-2.13.9_alpha-7-2139.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -24,35 +24,35 @@
         }
       ],
       "attributes": [],
-      "versionCode": 1139,
-      "versionName": "1.13.9",
-      "outputFile": "app-default-x86-release.apk"
+      "versionCode": 2139,
+      "versionName": "2.13.9_alpha-7",
+      "outputFile": "app-default-x86-release-2.13.9_alpha-7-2139.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86_64"
+          "value": "armeabi-v7a"
         }
       ],
       "attributes": [],
-      "versionCode": 1139,
-      "versionName": "1.13.9",
-      "outputFile": "app-default-x86_64-release.apk"
+      "versionCode": 2139,
+      "versionName": "2.13.9_alpha-7",
+      "outputFile": "app-default-armeabi-v7a-release-2.13.9_alpha-7-2139.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "armeabi-v7a"
+          "value": "x86_64"
         }
       ],
       "attributes": [],
-      "versionCode": 1139,
-      "versionName": "1.13.9",
-      "outputFile": "app-default-armeabi-v7a-release.apk"
+      "versionCode": 2139,
+      "versionName": "2.13.9_alpha-7",
+      "outputFile": "app-default-x86_64-release-2.13.9_alpha-7-2139.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -63,9 +63,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 1139,
-      "versionName": "1.13.9",
-      "outputFile": "app-default-arm64-v8a-release.apk"
+      "versionCode": 2139,
+      "versionName": "2.13.9_alpha-7",
+      "outputFile": "app-default-arm64-v8a-release-2.13.9_alpha-7-2139.apk"
     }
   ],
   "elementType": "File"

Android/app/src/main/AndroidManifest.xml

@@ -5,11 +5,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32"
-        tools:ignore="ScopedStorage" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
 
     <queries>
         <package android:name="com.topjohnwu.magisk" />
@@ -24,13 +19,15 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/AppTheme"
+        android:theme="@style/AppTheme.SplashScreen"
         tools:ignore="GoogleAppIndexingWarning"
         tools:targetApi="q">
         <activity
             android:name="com.dergoogler.mmrl.MainActivity"
             android:configChanges="orientation|screenSize"
-            android:exported="true">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true"
+            tools:ignore="Instantiatable">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />