Removed events from modules / replaced with retrofit/rx

app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt

@@ -6,7 +6,6 @@ import android.text.TextUtils
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.topjohnwu.magisk.*
-import com.topjohnwu.magisk.tasks.CheckUpdates
 import com.topjohnwu.magisk.tasks.UpdateRepos
 import com.topjohnwu.magisk.utils.LocaleManager
 import com.topjohnwu.magisk.utils.Utils
@@ -59,7 +58,7 @@ open class SplashActivity : AppCompatActivity() {
 
         // Schedule periodic update checks
         Utils.scheduleUpdateCheck()
-        CheckUpdates.check()
+        //CheckUpdates.check()
 
         // Setup shortcuts
         Shortcuts.setup(this)

app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt

@@ -10,28 +10,22 @@ import com.skoumal.teanity.util.DiffObservableList
 import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.data.database.RepoDatabaseHelper
-import com.topjohnwu.magisk.model.entity.OldModule
-import com.topjohnwu.magisk.model.entity.Repo
+import com.topjohnwu.magisk.data.repository.ModuleRepository
 import com.topjohnwu.magisk.model.entity.recycler.ModuleRvItem
 import com.topjohnwu.magisk.model.entity.recycler.RepoRvItem
 import com.topjohnwu.magisk.model.entity.recycler.SectionRvItem
 import com.topjohnwu.magisk.model.events.InstallModuleEvent
 import com.topjohnwu.magisk.model.events.OpenChangelogEvent
 import com.topjohnwu.magisk.model.events.OpenFilePickerEvent
-import com.topjohnwu.magisk.tasks.UpdateRepos
 import com.topjohnwu.magisk.ui.base.MagiskViewModel
-import com.topjohnwu.magisk.utils.Event
-import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.utils.toSingle
 import com.topjohnwu.magisk.utils.update
-import io.reactivex.Single
 import io.reactivex.disposables.Disposable
 import me.tatarka.bindingcollectionadapter2.OnItemBind
 
 class ModuleViewModel(
-    private val repoDatabase: RepoDatabaseHelper,
-    private val resources: Resources
+    private val resources: Resources,
+    private val moduleRepo: ModuleRepository
 ) : MagiskViewModel() {
 
     val query = KObservableField("")
@@ -52,36 +46,15 @@ class ModuleViewModel(
             queryDisposable?.dispose()
             queryDisposable = query()
         }
-        Event.register(this)
         refresh()
     }
 
-    override fun getListeningEvents(): IntArray {
-        return intArrayOf(Event.MODULE_LOAD_DONE, Event.REPO_LOAD_DONE)
-    }
-
-    override fun onEvent(event: Int) = when (event) {
-        Event.MODULE_LOAD_DONE -> updateModules(Event.getResult(event))
-        Event.REPO_LOAD_DONE -> updateRepos()
-        else -> Unit
-    }
-
     fun fabPressed() = OpenFilePickerEvent().publish()
     fun repoPressed(item: RepoRvItem) = OpenChangelogEvent(item.item).publish()
     fun downloadPressed(item: RepoRvItem) = InstallModuleEvent(item.item).publish()
 
     fun refresh() {
-        state = State.LOADING
-        Utils.loadModules(true)
-        UpdateRepos().exec(true)
-    }
-
-    private fun updateModules(result: Map<String, OldModule>) = result.values
-        .map { ModuleRvItem(it) }
-        .let { itemsInstalled.update(it) }
-
-    internal fun updateRepos() {
-        Single.fromCallable { repoDatabase.repoCursor.toList { Repo(it) } }
+        moduleRepo.fetchModules()
             .flattenAsFlowable { it }
             .map { RepoRvItem(it) }
             .toList()
@@ -89,7 +62,13 @@ class ModuleViewModel(
             .flatMap { queryRaw() }
             .applyViewModel(this)
             .subscribeK { itemsRemote.update(it.first, it.second) }
-            .add()
+
+        moduleRepo.fetchInstalledModules()
+            .flattenAsFlowable { it }
+            .map { ModuleRvItem(it) }
+            .toList()
+            .map { it to itemsInstalled.calculateDiff(it) }
+            .subscribeK { itemsInstalled.update(it.first, it.second) }
     }
 
     private fun query() = queryRaw()

app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt

@@ -56,7 +56,7 @@ class ReposFragment : MagiskFragment<ModuleViewModel, FragmentReposBinding>(),
                     Config.get<Int>(Config.Key.REPO_ORDER)!!
                 ) { d, which ->
                     Config.set(Config.Key.REPO_ORDER, which)
-                    viewModel.updateRepos()
+                    viewModel.refresh()
                     d.dismiss()
                 }.show()
         }

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.java

@@ -12,7 +12,6 @@ import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.tasks.CheckUpdates;
 import com.topjohnwu.magisk.ui.base.BasePreferenceFragment;
 import com.topjohnwu.magisk.utils.DownloadApp;
 import com.topjohnwu.magisk.utils.Event;
@@ -218,7 +217,7 @@ public class SettingsFragment extends BasePreferenceFragment {
                 break;
             case Config.Key.UPDATE_CHANNEL:
             case Config.Key.CUSTOM_CHANNEL:
-                CheckUpdates.check();
+                //CheckUpdates.check();
                 break;
             case Config.Key.CHECK_UPDATES:
                 Utils.scheduleUpdateCheck();