code cleanup

Signed-off-by: androidacy-user <opensource@androidacy.com>

Author: androidacy-user

app/src/main/kotlin/com/fox2code/mmm/installer/InstallerActivity.kt

@@ -51,6 +51,7 @@ import com.fox2code.mmm.utils.io.net.Http
 import com.fox2code.mmm.utils.sentry.SentryBreadcrumb
 import com.fox2code.mmm.utils.sentry.SentryMain
 import com.google.android.material.bottomnavigation.BottomNavigationItemView
+import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.topjohnwu.superuser.CallbackList
@@ -162,7 +163,8 @@ class InstallerActivity : FoxActivity() {
         val horizontalScroller = findViewById<View>(R.id.install_horizontal_scroller)
         var installTerminal: RecyclerView
         progressIndicator = findViewById(R.id.progress_bar)
-        rebootFloatingButton = findViewById(R.id.install_terminal_reboot_fab)
+        val bottomNavigationView = findViewById<BottomNavigationView>(R.id.bottom_navigation)
+        rebootFloatingButton = bottomNavigationView.findViewById(R.id.install_terminal_reboot_fab)
         cancelFloatingButton = findViewById(R.id.back_installer)
         val rbtBtn = rebootFloatingButton
         val cnlBtn = cancelFloatingButton

app/src/main/kotlin/com/fox2code/mmm/manager/ModuleManager.kt

@@ -61,24 +61,24 @@ class ModuleManager private constructor() : SyncManager() {
         if (BuildConfig.DEBUG) Timber.d("Scan")
         val modulesList = StringBuilder()
         if (modules != null) {
+            val db = Room.databaseBuilder(
+                MainApplication.INSTANCE!!,
+                ModuleListCacheDatabase::class.java,
+                "ModuleListCache.db"
+            ).allowMainThreadQueries().build()
             for (module in modules) {
                 if (!SuFile("/data/adb/modules/$module").isDirectory) continue  // Ignore non directory files inside modules folder
                 var moduleInfo = moduleInfos[module]
                 // next, merge the module info with a record from ModuleListCache room db if it exists
                 // initialize modulelistcache db
-                val db = Room.databaseBuilder(
-                    MainApplication.INSTANCE!!,
-                    ModuleListCacheDatabase::class.java,
-                    "ModuleListCache"
-                ).allowMainThreadQueries().build()
                 // get module info from cache
                 val moduleListCacheDao: ModuleListCacheDao = db.moduleListCacheDao()
-                Timber.d("Found cache for %s", module)
                 // get module info from cache
                 if (moduleInfo == null) {
                     moduleInfo = LocalModuleInfo(module)
                 }
                 if (moduleListCacheDao.exists(module)) {
+                    Timber.d("Found cache for %s", module)
                     val moduleListCache: ModuleListCache = moduleListCacheDao.getByCodename(module)
                     moduleInfo.name =
                         if (moduleListCache.name != "") moduleListCache.name else module
@@ -135,6 +135,7 @@ class ModuleManager private constructor() : SyncManager() {
                 modulesList.append(moduleInfo.id).append(":").append(moduleInfo.versionCode)
                     .append(",")
             }
+            db.close()
         }
         if (modulesList.isNotEmpty()) {
             modulesList.deleteCharAt(modulesList.length - 1)

app/src/main/kotlin/com/fox2code/mmm/module/ActionButtonType.kt

@@ -112,23 +112,20 @@ enum class ActionButtonType {
                 moduleHolder.repoModule?.moduleInfo?.name
             }
             TrackHelper.track().event("view_update_install", name).with(INSTANCE!!.getTracker())
-            // if icon is reinstall, we need to uninstall first - warn the user but don't proceed
+            // if text is reinstall, we need to uninstall first - warn the user but don't proceed
             if (moduleHolder.moduleInfo != null) {
-                // get icon of the button
-                val icon = button.chipIcon
-                if (icon != null && icon.constantState != null) {
-                    val reinstallIcon =
-                        button.context.getDrawable(R.drawable.ic_baseline_refresh_24)
-                    if (reinstallIcon != null && reinstallIcon.constantState != null) {
-                        if (icon.constantState == reinstallIcon.constantState) {
-                            MaterialAlertDialogBuilder(button.context)
-                                .setTitle(R.string.reinstall)
-                                .setMessage(R.string.reinstall_warning)
-                                .setPositiveButton(R.string.reinstall, null)
-                                .show()
-                            return
-                        }
-                    }
+                // get the text
+                val text = button.text
+                // if the text is reinstall, warn the user
+                if (text == button.context.getString(R.string.reinstall)) {
+                    val builder = MaterialAlertDialogBuilder(button.context)
+                    builder.setTitle(R.string.reinstall)
+                        .setMessage(R.string.reinstall_warning)
+                        .setCancelable(true)
+                        // ok button that does nothing
+                        .setPositiveButton(R.string.ok, null)
+                        .show()
+                    return
                 }
             }
             val updateZipUrl = moduleHolder.updateZipUrl ?: return

app/src/main/kotlin/com/fox2code/mmm/repo/RepoManager.kt

@@ -234,7 +234,7 @@ class RepoManager private constructor(mainApplication: MainApplication) : SyncMa
                 }
                 if (BuildConfig.DEBUG) Timber.d("Finishing: %s", repoUpdaters[i]!!.repoData.name)
                 isLastUpdateSuccess = repoUpdaters[i]!!.finish()
-                if (!isLastUpdateSuccess) {
+                if (!isLastUpdateSuccess || modules.isEmpty()) {
                     Timber.e("Failed to update %s", repoUpdaters[i]!!.repoData.name)
                     // Show snackbar on main looper and add some bottom padding
                     val context: Activity? = MainApplication.INSTANCE!!.lastCompatActivity

app/src/main/kotlin/com/fox2code/mmm/repo/RepoUpdater.kt

@@ -145,7 +145,7 @@ class RepoUpdater(repoData2: RepoData) {
                     // this.indexRaw is the raw index file (json)
                     val modules = JSONObject(String(indexRaw!!, StandardCharsets.UTF_8))
                     // androidacy repo uses "data" key, others should use "modules" key. Both are JSONArrays
-                    val modulesArray: JSONArray = if (repoData.name == "Androidacy Modules Repo") {
+                    val modulesArray: JSONArray = if (repoData.preferenceId == "androidacy_repo") {
                         // get modules from "data" key. This is a JSONArray so we need to convert it to a JSONObject
                         modules.getJSONArray("data")
                     } else {
@@ -154,7 +154,13 @@ class RepoUpdater(repoData2: RepoData) {
                     }
                     val moduleListCacheDao = db.moduleListCacheDao()
                     moduleListCacheDao.deleteByRepoId(repoData.preferenceId!!)
-                    // iterate over modules. pls don't hate me for this, its ugly but it works
+                    if (modulesArray.length() == 0) {
+                        Timber.w("No modules were found in the index file for %s", repoData.preferenceId)
+                        Timber.d("Finished updating database for %s in %dms", repoData.preferenceId, System.currentTimeMillis() - startTime)
+                        success.set(false)
+                        return@Thread
+                    }
+                    // iterate over modules
                     for (n in 0 until modulesArray.length()) {
                         // get module
                         val module = modulesArray.getJSONObject(n)