Migrate Magisk Modules to Kotlin

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

@@ -10,16 +10,13 @@ import android.content.res.Resources
 import android.net.Uri
 import android.os.Environment
 import android.widget.Toast
-import androidx.annotation.WorkerThread
 import androidx.work.*
 import com.topjohnwu.magisk.*
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.model.entity.OldModule
 import com.topjohnwu.magisk.model.update.UpdateCheckService
 import com.topjohnwu.net.Networking
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.internal.UiThreadHandler
-import com.topjohnwu.superuser.io.SuFile
 import java.io.File
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -70,19 +67,6 @@ object Utils {
         return info.loadLabel(pm).toString()
     }
 
-    @WorkerThread
-    fun loadModulesLeanback(): Map<String, OldModule> {
-        val moduleMap = ValueSortedMap<String, OldModule>()
-        val path = SuFile(Const.MAGISK_PATH)
-        val modules = path.listFiles { _, name -> name != "lost+found" && name != ".core" }
-        for (file in modules!!) {
-            if (file.isFile) continue
-            val module = OldModule(Const.MAGISK_PATH + "/" + file.name)
-            moduleMap[module.id] = module
-        }
-        return moduleMap
-    }
-
     fun showSuperUser(): Boolean {
         return Shell.rootAccess() && (Const.USER_ID == 0
                 || Config.suMultiuserMode != Config.Value.MULTIUSER_MODE_OWNER_MANAGED)

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

@@ -7,6 +7,7 @@ import android.content.pm.ComponentInfo
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.*
+import android.database.Cursor
 import android.net.Uri
 import android.provider.OpenableColumns
 import com.topjohnwu.magisk.App
@@ -104,3 +105,9 @@ fun String.toFile() = File(this)
 fun Intent.chooser(title: String = "Pick an app") = Intent.createChooser(this, title)
 
 fun Context.cachedFile(name: String) = File(cacheDir, name)
+
+fun <Result> Cursor.toList(transformer: (Cursor) -> Result): List<Result> {
+    val out = mutableListOf<Result>()
+    while (moveToNext()) out.add(transformer(this))
+    return out
+}