Rewrite FlashZip in Kotlin

app/src/main/java/com/topjohnwu/magisk/utils/Utils.java

@@ -58,24 +58,6 @@ public class Utils {
         return getPrefsInt(prefs, key, 0);
     }
 
-    public static String getNameFromUri(Context context, Uri uri) {
-        String name = null;
-        try (Cursor c = context.getContentResolver().query(uri, null, null, null, null)) {
-            if (c != null) {
-                int nameIndex = c.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-                if (nameIndex != -1) {
-                    c.moveToFirst();
-                    name = c.getString(nameIndex);
-                }
-            }
-        }
-        if (name == null) {
-            int idx = uri.getPath().lastIndexOf('/');
-            name = uri.getPath().substring(idx + 1);
-        }
-        return name;
-    }
-
     public static int dpInPx(int dp) {
         float scale = App.self.getResources().getDisplayMetrics().density;
         return (int) (dp * scale + 0.5);

app/src/main/java/com/topjohnwu/magisk/utils/XAndroid.kt

@@ -6,6 +6,10 @@ import android.content.pm.ComponentInfo
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.*
+import android.net.Uri
+import android.provider.OpenableColumns
+import com.topjohnwu.magisk.App
+import java.io.FileNotFoundException
 
 val PackageInfo.processes
     get() = activities?.processNames.orEmpty() +
@@ -38,6 +42,22 @@ val ApplicationInfo.packageInfo: PackageInfo?
         }
     }
 
+val Uri.fileName: String get() {
+    var name: String? = null
+    App.self.contentResolver.query(this, null, null, null, null)?.use { c ->
+        val nameIndex = c.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+        if (nameIndex != -1) {
+            c.moveToFirst()
+            name = c.getString(nameIndex)
+        }
+    }
+    if (name == null && path != null) {
+        val idx = path!!.lastIndexOf('/')
+        name = path!!.substring(idx + 1)
+    }
+    return name.orEmpty()
+}
+
 fun PackageManager.activities(packageName: String) =
     getPackageInfo(packageName, GET_ACTIVITIES)
 
@@ -51,3 +71,6 @@ fun PackageManager.providers(packageName: String) =
     getPackageInfo(packageName, GET_PROVIDERS).providers
 
 fun Context.rawResource(id: Int) = resources.openRawResource(id)
+
+fun Context.readUri(uri: Uri) = contentResolver.openInputStream(uri) ?: throw FileNotFoundException()
+

app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.kt

@@ -9,7 +9,6 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 
 @Throws(IOException::class)
-@JvmOverloads
 fun unzip(zip: File, folder: File, path: String = "", junkPath: Boolean = false) {
     zip.inputStream().buffered().use {
         unzip(it, folder, path, junkPath)