1.6.4.5

Move settings to a dialog
AbdurazaaqMohammed · Aug 19, 2024 · 90b16d5 · 90b16d5
1 parent 5891170
commit 90b16d5
Show file tree

Hide file tree

Showing 9 changed files with 424 additions and 420 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,8 +10,8 @@ android {
         applicationId = "com.abdurazaaqmohammed.AntiSplit"
         minSdk = 4
         targetSdk = 35
-        versionCode = 27
-        versionName = "1.6.4.4"
+        versionCode = 28
+        versionName = "1.6.4.5"
         multiDexEnabled = true
     }
 

diff --git a/app/src/main/java/com/abdurazaaqmohammed/AntiSplit/main/DeviceSpecsUtil.java b/app/src/main/java/com/abdurazaaqmohammed/AntiSplit/main/DeviceSpecsUtil.java
@@ -51,6 +51,7 @@ public List<String> getListOfSplits(Uri splitAPKUri) throws IOException {
             boolean couldNotRead = !file.canRead();
             if(couldNotRead) FileUtils.copyFile(FileUtils.getInputStream(splitAPKUri, context), file = new File(context.getCacheDir(), file.getName()));
             Enumeration<ZipArchiveEntry> entries = (zipFile = new ZipFile(file)).getEntries();
+            // Do not close this ZipFile it could be used later in merger
             while (entries.hasMoreElements()) {
                 String name = entries.nextElement().getName();
                 if (name.endsWith(".apk")) splits.add(name);

diff --git a/app/src/main/java/com/abdurazaaqmohammed/AntiSplit/main/MainActivity.java b/app/src/main/java/com/abdurazaaqmohammed/AntiSplit/main/MainActivity.java
diff --git a/app/src/main/java/com/reandroid/apkeditor/merge/Merger.java b/app/src/main/java/com/reandroid/apkeditor/merge/Merger.java
@@ -109,6 +109,7 @@ private static void extractZipFile(ZipFile zf, boolean checkSplits, List<String>
                 }
             } else logMessage(MainActivity.rss.getString(R.string.skipping) + name + MainActivity.rss.getString(R.string.not_apk));
         }
+        zf.close();
     }
 
     public static void run(Uri in, File cacheDir, Uri out, Context context, List<String> splits, boolean signApk, boolean revanced) throws Exception {

diff --git a/app/src/main/res/layout-v14/activity_main.xml b/app/src/main/res/layout-v14/activity_main.xml
diff --git a/app/src/main/res/layout-v14/dialog_settings.xml b/app/src/main/res/layout-v14/dialog_settings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/linear2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:orientation="vertical">
+
+        <Button
+            android:id="@+id/changeTextColor"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/change_text_color" />
+
+        <Button
+            android:id="@+id/changeBgColor"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/change_background_color" />
+
+    </LinearLayout>
+
+    <Switch
+        android:id="@+id/logToggle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:text="@string/enable_logs" />
+
+    <Switch
+        android:id="@+id/ask"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:text="@string/ask" />
+
+    <Switch
+        android:id="@+id/showDialogToggle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:text="@string/show_dialog" />
+
+    <Switch
+        android:id="@+id/selectSplitsForDeviceToggle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:text="@string/automatically_select" />
+
+    <Switch
+        android:id="@+id/signToggle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:text="@string/sign_apk" />
+
+    <Switch
+        android:id="@+id/revancedToggle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:text="@string/fix" />
+
+    <Switch
+        android:id="@+id/updateToggle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:text="@string/auto_update" />
+
+    <Button
+        android:id="@+id/checkUpdateNow"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="@string/check_update_now" />
+
+    <Button
+        android:id="@+id/langPicker"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="@string/lang" />
+
+</LinearLayout>
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 } else logMessage(MainActivity.rss.getString(R.string.skipping) + name + MainActivity.rss.getString(R.string.not_apk));
             }
+            zf.close();
         }
         public static void run(Uri in, File cacheDir, Uri out, Context context, List<String> splits, boolean signApk, boolean revanced) throws Exception {
@@ Expand Down @@