Android version broken

DerGoogler · Jun 11, 2022 · 090ef78 · 090ef78
1 parent dc2b61a
commit 090ef78
Show file tree

Hide file tree

Showing 13 changed files with 66 additions and 64 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.github.node-gradle.node'
 
 android {
-    compileSdk 33
+    compileSdk 32
 
     defaultConfig {
         applicationId 'com.dergoogler.mmrl'
         minSdk 26
-        targetSdk 33
+        targetSdk 32
         versionName "1.4.0@alpha-3"
         versionCode "140".toInteger()
     }

diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml
@@ -11,12 +11,13 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
-        android:allowBackup="false"
+        android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning"
+        tools:targetApi="33">
         <activity
             android:name="com.dergoogler.mmrl.MainActivity"
             android:configChanges="orientation|screenSize"

diff --git a/Android/app/src/main/java/com/dergoogler/component/ModuleView.java b/Android/app/src/main/java/com/dergoogler/component/ModuleView.java
@@ -15,21 +15,11 @@
 import android.webkit.WebView;
 import android.widget.Toast;
 
-import androidx.annotation.Keep;
-
-import com.dergoogler.core.BuildConfigNative;
-import com.dergoogler.core.BuildNative;
-import com.dergoogler.core.FileSystemNative;
-import com.dergoogler.core.OSNative;
-import com.dergoogler.core.SharedPreferencesNative;
-import com.dergoogler.core.ShellNative;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.util.Map;
 
-@Keep
 public class ModuleView extends WebView {
     private final WebSettings webSettings;
     private final Context ctx;

diff --git a/Android/app/src/main/java/com/dergoogler/core/BuildNative.java b/Android/app/src/main/java/com/dergoogler/core/BuildNative.java
@@ -14,11 +14,7 @@ public Object VERSION() {
         class retn {
             @JavascriptInterface
             public String SECURITY_PATCH() {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    return Build.VERSION.SECURITY_PATCH;
-                } else {
-                    return "Unsupported";
-                }
+                return VERSION.SECURITY_PATCH;
             }
 
             @JavascriptInterface

diff --git a/Android/app/src/main/java/com/dergoogler/core/OSNative.java b/Android/app/src/main/java/com/dergoogler/core/OSNative.java
@@ -89,7 +89,6 @@ public void requestStoargePermission() {
             ((Activity) this.ctx).requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1000);
         }
     }
-    // Others
 
     @JavascriptInterface
     public void open(String link) {

diff --git a/Android/app/src/main/java/com/dergoogler/mmrl/Page.java b/Android/app/src/main/java/com/dergoogler/mmrl/Page.java
@@ -1,19 +1,13 @@
 package com.dergoogler.mmrl;
 
 import android.content.Context;
-import android.util.Log;
 
-import com.dergoogler.component.ModuleView;
 import com.dergoogler.core.FileSystemNative;
 
-import java.io.InputStream;
-
 public class Page {
     private final FileSystemNative fs;
-    private final Context ctx;
 
     public Page(Context ctx) {
-        this.ctx = ctx;
         this.fs = new FileSystemNative(ctx);
     }
 
@@ -27,21 +21,19 @@ private String loadCss() {
     }
 
     public String load() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("<!DOCTYPE html>");
-        sb.append("<html>");
-        sb.append("<head>");
-        sb.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"bundle/vendor.bundle.css\"/>");
-        sb.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"bundle/app.bundle.css\"/>");
-        sb.append("<meta charset=\"utf-8\" />");
-        sb.append("</head>");
-        sb.append("<body>");
-        sb.append("<app></app>");
-        sb.append("<script src=\"bundle/vendor.bundle.js\"></script>");
-        sb.append("<script src=\"bundle/app.bundle.js\"></script>");
-        sb.append("<script>const styles = `").append(this.loadCss()).append("`;const styleSheet = document.createElement(\"style\");styleSheet.innerText = styles; document.head.appendChild(styleSheet)</script>");
-        sb.append("</body>");
-        sb.append("</html>");
-        return sb.toString();
+        return "<!DOCTYPE html>" +
+                "<html>" +
+                "<head>" +
+                "<link rel=\"stylesheet\" type=\"text/css\" href=\"bundle/vendor.bundle.css\"/>" +
+                "<link rel=\"stylesheet\" type=\"text/css\" href=\"bundle/app.bundle.css\"/>" +
+                "<meta charset=\"utf-8\" />" +
+                "</head>" +
+                "<body>" +
+                "<app></app>" +
+                "<script src=\"bundle/vendor.bundle.js\"></script>" +
+                "<script src=\"bundle/app.bundle.js\"></script>" +
+                "<script>const styles = `" + this.loadCss() + "`;const styleSheet = document.createElement(\"style\");styleSheet.innerText = styles; document.head.appendChild(styleSheet)</script>" +
+                "</body>" +
+                "</html>";
     }
 }
diff --git a/Android/app/src/main/res/xml/data_extraction_rules.xml b/Android/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!--
+        TODO: Use <include> and <exclude> to control what is backed up.
+        The domain can be file, database, sharedpref, external or root.
+        Examples:
+
+        <include domain="file" path="file_to_include"/>
+        <exclude domain="file" path="file_to_exclude"/>
+        <include domain="file" path="include_folder"/>
+        <exclude domain="file" path="include_folder/file_to_exclude"/>
+        <exclude domain="file" path="exclude_folder"/>
+        <include domain="file" path="exclude_folder/file_to_include"/>
+
+        <include domain="sharedpref" path="include_shared_pref1.xml"/>
+        <include domain="database" path="db_name/file_to_include"/>
+        <exclude domain="database" path="db_name/include_folder/file_to_exclude"/>
+        <include domain="external" path="file_to_include"/>
+        <exclude domain="external" path="file_to_exclude"/>
+        <include domain="root" path="file_to_include"/>
+        <exclude domain="root" path="file_to_exclude"/>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
diff --git a/Android/build.gradle b/Android/build.gradle
@@ -18,8 +18,3 @@ allprojects {
         google()
     }
 }
-
-task makedev(type:Exec) {
-    workingDir './../Website'
-    commandLine 'make dev'
-}
diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 13 08:15:32 CEST 2020
+#Sat Jun 11 19:47:22 CEST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/Website/src/activitys/MainApplication.tsx b/Website/src/activitys/MainApplication.tsx
@@ -37,7 +37,7 @@ class MainApplication extends AppCompatActivity<Props> {
         <div
           className="center"
           onClick={() => {
-            ons.notification.toast("My gf left me ... :(");
+            ons.notification.toast("My gf left me ... :(", { timeout: 1000, animation: "fall" });
           }}
         >
           Magisk Module Repo Loader

diff --git a/Website/src/activitys/fragments/ExploreModuleFragment.tsx b/Website/src/activitys/fragments/ExploreModuleFragment.tsx
@@ -1,12 +1,13 @@
 import { Component, LegacyRef } from "react";
-import { Button, Page, SearchInput, ProgressCircular } from "react-onsenui";
+import { Button, SearchInput, ProgressCircular } from "react-onsenui";
 import axios from "axios";
 import { toast } from "react-toastify";
 import ExploreModule from "@Components/ExploreModule";
 import SharedPreferences from "@Native/SharedPreferences";
 import { PushProps } from "@Activitys/MainActivity";
 import { SearchRounded } from "@mui/icons-material";
 import { os } from "@Native/os";
+import ons from "onsenui";
 
 interface Props {
   pushPage(...arg: any): PushProps;
@@ -39,15 +40,7 @@ class ExploreModuleFragment extends Component<Props, States> {
   public componentDidMount = () => {
     const moduels = os.getSchemeParam("module");
     if (moduels != (null || undefined || "")) {
-      toast.info("Please wait 2 seconds after the loading screen is gone", {
-        position: "top-center",
-        autoClose: 1500,
-        hideProgressBar: true,
-        closeOnClick: true,
-        pauseOnHover: true,
-        draggable: true,
-        progress: undefined,
-      });
+      ons.notification.toast("Please wait 2 seconds after the loading screen is gone", { timeout: 2000, animation: "fall" });
     }
 
     setTimeout(() => {
@@ -128,7 +121,6 @@ class ExploreModuleFragment extends Component<Props, States> {
             }}
           >
             <SearchInput
-              // @ts-ignore
               placeholder={"Search modules"}
               ref={this.searchBar}
               style={{

diff --git a/Website/src/index.tsx b/Website/src/index.tsx
@@ -56,8 +56,8 @@ class Bootloader {
       os.requestStoargePermission();
     }
 
-    // Prevent context menu on Android browsers.
-    if (os.isAndroid || isMobile) window.addEventListener("contextmenu", (e: Event) => e.preventDefault());
+    // Prevent context menu on browsers.
+    window.addEventListener("contextmenu", (e: Event) => e.preventDefault());
 
     this.log.i("Selecting platform: Android");
     ons.platform.select("android");

diff --git a/Website/src/typings/declaration.d.ts b/Website/src/typings/declaration.d.ts
@@ -476,6 +476,7 @@ declare module "react-onsenui" {
 
   export class SearchInput extends Component<
     {
+      placeholder?: string
       modifier?: string | undefined;
       disabled?: boolean | undefined;
       onChange?(e: Event): void;