Rewrite FlashZip in Kotlin

2025-09-06 06:36:58 +00:00 · 2019-05-03 04:42:57 -04:00
parent 8b7144c986
commit a0cfce7cbc
6 changed files with 100 additions and 108 deletions
@@ -1,85 +0,0 @@
-package com.topjohnwu.magisk.tasks;
-
-import android.net.Uri;
-
-import com.topjohnwu.magisk.App;
-import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.utils.Utils;
-import com.topjohnwu.magisk.utils.ZipUtilsKt;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.superuser.internal.UiThreadHandler;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-
-public abstract class FlashZip {
-
-    private Uri mUri;
-    private File tmpFile;
-    private List<String> console, logs;
-
-    public FlashZip(Uri uri, List<String> out, List<String> err) {
-        mUri = uri;
-        console = out;
-        logs = err;
-        tmpFile = new File(App.self.getCacheDir(), "install.zip");
-    }
-
-    private boolean unzipAndCheck() throws IOException {
-        ZipUtilsKt.unzip(tmpFile, tmpFile.getParentFile(), "META-INF/com/google/android", true);
-        return Shell.su("grep -q '#MAGISK' " + new File(tmpFile.getParentFile(), "updater-script"))
-                .exec().isSuccess();
-    }
-
-    private boolean flash() throws IOException {
-        console.add("- Copying zip to temp directory");
-        try (InputStream in = App.self.getContentResolver().openInputStream(mUri);
-             OutputStream out = new BufferedOutputStream(new FileOutputStream(tmpFile))) {
-            if (in == null) throw new FileNotFoundException();
-            InputStream buf= new BufferedInputStream(in);
-            ShellUtils.pump(buf, out);
-        } catch (FileNotFoundException e) {
-            console.add("! Invalid Uri");
-            throw e;
-        } catch (IOException e) {
-            console.add("! Cannot copy to cache");
-            throw e;
-        }
-        try {
-            if (!unzipAndCheck()) {
-                console.add("! This zip is not a Magisk Module!");
-                return false;
-            }
-        } catch (IOException e) {
-            console.add("! Unzip error");
-            throw e;
-        }
-        console.add("- Installing " + Utils.getNameFromUri(App.self, mUri));
-        return Shell.su("cd " + tmpFile.getParent(),
-                "BOOTMODE=true sh update-binary dummy 1 " + tmpFile)
-                .to(console, logs)
-                .exec().isSuccess();
-    }
-
-    public void exec() {
-        App.THREAD_POOL.execute(() -> {
-            boolean success = false;
-            try {
-                success = flash();
-            } catch (IOException ignored) {}
-            Shell.su("cd /", "rm -rf " + tmpFile.getParent() + " " + Const.TMP_FOLDER_PATH).submit();
-            boolean finalSuccess = success;
-            UiThreadHandler.run(() -> onResult(finalSuccess));
-        });
-    }
-
-    protected abstract void onResult(boolean success);
-}
@@ -0,0 +1,73 @@
+package com.topjohnwu.magisk.tasks
+
+import android.net.Uri
+
+import com.topjohnwu.magisk.App
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.utils.*
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.internal.UiThreadHandler
+
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.IOException
+
+abstract class FlashZip(private val mUri: Uri,
+                        private val console: MutableList<String>,
+                        private val logs: MutableList<String>) {
+
+    private val tmpFile: File = File(App.self.cacheDir, "install.zip")
+
+    @Throws(IOException::class)
+    private fun unzipAndCheck(): Boolean {
+        unzip(tmpFile, tmpFile.parentFile!!, "META-INF/com/google/android", true)
+        return Shell.su("grep -q '#MAGISK' ${File(tmpFile.parentFile, "updater-script")}")
+                .exec().isSuccess
+    }
+
+    @Throws(IOException::class)
+    private fun flash(): Boolean {
+        console.add("- Copying zip to temp directory")
+        try {
+            App.self.readUri(mUri).use { input ->
+                tmpFile.outputStream().use { out -> input.copyTo(out) }
+            }
+        } catch (e: FileNotFoundException) {
+            console.add("! Invalid Uri")
+            throw e
+        } catch (e: IOException) {
+            console.add("! Cannot copy to cache")
+            throw e
+        }
+
+        try {
+            if (!unzipAndCheck()) {
+                console.add("! This zip is not a Magisk Module!")
+                return false
+            }
+        } catch (e: IOException) {
+            console.add("! Unzip error")
+            throw e
+        }
+
+        console.add("- Installing ${mUri.fileName}")
+        return Shell.su("cd " + tmpFile.parent!!,
+                "BOOTMODE=true sh update-binary dummy 1 $tmpFile")
+                .to(console, logs)
+                .exec().isSuccess
+    }
+
+    fun exec() {
+        App.THREAD_POOL.execute {
+            val success = try {
+                flash()
+            } catch (e: IOException) {
+                false
+            }
+            Shell.su("cd /", "rm -rf ${tmpFile.parent} ${Const.TMP_FOLDER_PATH}").submit()
+            UiThreadHandler.run { onResult(success) }
+        }
+    }
+
+    protected abstract fun onResult(success: Boolean)
+}