Add ServiceManagerCompat

- Optimize `impl`
MRepoApp · May 22, 2024 · fb695cb · fb695cb
1 parent 0fa0608
commit fb695cb
Show file tree

Hide file tree

Showing 21 changed files with 285 additions and 374 deletions.
diff --git a/...com/sanmer/mrepo/compat/ProviderCompat.kt → ...rc/main/kotlin/com/sanmer/mrepo/Compat.kt b/...com/sanmer/mrepo/compat/ProviderCompat.kt → ...rc/main/kotlin/com/sanmer/mrepo/Compat.kt
@@ -1,21 +1,18 @@
-package com.sanmer.mrepo.compat
+package com.sanmer.mrepo
 
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import com.sanmer.mrepo.datastore.WorkingMode
-import dev.sanmer.mrepo.compat.ShizukuProvider
-import dev.sanmer.mrepo.compat.SuProvider
+import dev.sanmer.mrepo.compat.ServiceManagerCompat
 import dev.sanmer.mrepo.compat.stub.IFileManager
 import dev.sanmer.mrepo.compat.stub.IModuleManager
 import dev.sanmer.mrepo.compat.stub.IServiceManager
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.withContext
 import timber.log.Timber
 
-object ProviderCompat {
+object Compat {
     private var mServiceOrNull: IServiceManager? = null
     private val mService get() = checkNotNull(mServiceOrNull) {
         "IServiceManager haven't been received"
@@ -37,15 +34,12 @@ object ProviderCompat {
         return alive
     }
 
-    suspend fun init(mode: WorkingMode) = withContext(Dispatchers.Main) {
-        if (isAlive) {
-            return@withContext true
-        }
-
-        try {
+    suspend fun init(mode: WorkingMode) = when {
+        isAlive -> true
+        else -> try {
             mServiceOrNull = when (mode) {
-                WorkingMode.MODE_SHIZUKU -> ShizukuProvider.launch()
-                WorkingMode.MODE_ROOT -> SuProvider.launch()
+                WorkingMode.MODE_SHIZUKU -> ServiceManagerCompat.fromShizuku()
+                WorkingMode.MODE_ROOT -> ServiceManagerCompat.fromLibSu()
                 else -> null
             }
 
@@ -57,7 +51,7 @@ object ProviderCompat {
         }
     }
 
-    fun <T> get(fallback: T, block: ProviderCompat.() -> T): T {
+    fun <T> get(fallback: T, block: Compat.() -> T): T {
         return when {
             isAlive -> block(this)
             else -> fallback

diff --git a/app/src/main/kotlin/com/sanmer/mrepo/repository/ModulesRepository.kt b/app/src/main/kotlin/com/sanmer/mrepo/repository/ModulesRepository.kt
@@ -1,6 +1,6 @@
 package com.sanmer.mrepo.repository
 
-import com.sanmer.mrepo.compat.ProviderCompat
+import com.sanmer.mrepo.Compat
 import com.sanmer.mrepo.database.entity.Repo
 import com.sanmer.mrepo.network.runRequest
 import com.sanmer.mrepo.stub.IRepoManager
@@ -15,15 +15,15 @@ class ModulesRepository @Inject constructor(
     private val localRepository: LocalRepository,
 ) {
     suspend fun getLocalAll() = withContext(Dispatchers.IO) {
-        with(ProviderCompat.moduleManager.modules) {
+        with(Compat.moduleManager.modules) {
             localRepository.deleteLocalAll()
             localRepository.insertLocal(this)
             localRepository.clearUpdatableTag(map { it.id })
         }
     }
 
     suspend fun getLocal(id: String) = withContext(Dispatchers.IO) {
-        val module = ProviderCompat.moduleManager.getModuleById(id)
+        val module = Compat.moduleManager.getModuleById(id)
         localRepository.insertLocal(module)
     }
 

diff --git a/app/src/main/kotlin/com/sanmer/mrepo/ui/activity/InstallActivity.kt b/app/src/main/kotlin/com/sanmer/mrepo/ui/activity/InstallActivity.kt
@@ -13,7 +13,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
-import com.sanmer.mrepo.compat.ProviderCompat
+import com.sanmer.mrepo.Compat
 import com.sanmer.mrepo.repository.UserPreferencesRepository
 import com.sanmer.mrepo.ui.providable.LocalUserPreferences
 import com.sanmer.mrepo.ui.theme.AppTheme
@@ -49,11 +49,11 @@ class InstallActivity : ComponentActivity() {
             }
 
             LaunchedEffect(userPreferences) {
-                ProviderCompat.init(preferences.workingMode)
+                Compat.init(preferences.workingMode)
             }
 
-            LaunchedEffect(ProviderCompat.isAlive) {
-                if (ProviderCompat.isAlive) {
+            LaunchedEffect(Compat.isAlive) {
+                if (Compat.isAlive) {
                     initModule(intent)
                 }
             }

diff --git a/app/src/main/kotlin/com/sanmer/mrepo/ui/activity/MainActivity.kt b/app/src/main/kotlin/com/sanmer/mrepo/ui/activity/MainActivity.kt
@@ -15,8 +15,8 @@ import androidx.compose.runtime.setValue
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import com.sanmer.mrepo.Compat
 import com.sanmer.mrepo.app.Const
-import com.sanmer.mrepo.compat.ProviderCompat
 import com.sanmer.mrepo.database.entity.Repo.Companion.toRepo
 import com.sanmer.mrepo.datastore.WorkingMode
 import com.sanmer.mrepo.network.NetworkUtils
@@ -60,7 +60,7 @@ class MainActivity : ComponentActivity() {
                     localRepository.insertRepo(Const.DEMO_REPO_URL.toRepo())
                 }
 
-                ProviderCompat.init(preferences.workingMode)
+                Compat.init(preferences.workingMode)
                 NetworkUtils.setEnableDoh(preferences.useDoh)
                 setInstallActivityEnabled(preferences.isRoot)
             }

diff --git a/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/InstallViewModel.kt b/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/InstallViewModel.kt
@@ -8,14 +8,16 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.sanmer.mrepo.Compat
 import com.sanmer.mrepo.app.Event
 import com.sanmer.mrepo.compat.MediaStoreCompat.copyToDir
 import com.sanmer.mrepo.compat.MediaStoreCompat.getPathForUri
-import com.sanmer.mrepo.compat.ProviderCompat
-import com.sanmer.mrepo.repository.ModulesRepository
+import com.sanmer.mrepo.model.local.LocalModule
+import com.sanmer.mrepo.repository.LocalRepository
 import com.sanmer.mrepo.repository.UserPreferencesRepository
 import com.sanmer.mrepo.utils.extensions.tmpDir
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dev.sanmer.mrepo.compat.content.State
 import dev.sanmer.mrepo.compat.stub.IInstallCallback
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
@@ -28,7 +30,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class InstallViewModel @Inject constructor(
-    private val modulesRepository: ModulesRepository,
+    private val localRepository: LocalRepository,
     private val userPreferencesRepository: UserPreferencesRepository,
 ) : ViewModel() {
     val logs = mutableListOf<String>()
@@ -57,7 +59,7 @@ class InstallViewModel @Inject constructor(
         val path = context.getPathForUri(uri)
         Timber.d("path = $path")
 
-        ProviderCompat.moduleManager
+        Compat.moduleManager
             .getModuleInfo(path)?.let {
                 Timber.d("module = $it")
                 install(path)
@@ -74,7 +76,7 @@ class InstallViewModel @Inject constructor(
             }
         }
 
-        ProviderCompat.moduleManager
+        Compat.moduleManager
             .getModuleInfo(tmpFile.path)?.let {
                 Timber.d("module = $it")
                 install(tmpFile.path)
@@ -101,9 +103,9 @@ class InstallViewModel @Inject constructor(
                 logs.add(msg)
             }
 
-            override fun onSuccess(id: String) {
+            override fun onSuccess(module: LocalModule?) {
                 event = Event.SUCCEEDED
-                getLocal(id)
+                module?.let(::insertLocal)
 
                 if (deleteZipFile) {
                     deleteBySu(zipPath)
@@ -115,18 +117,20 @@ class InstallViewModel @Inject constructor(
         }
 
         console.add("- Installing ${zipFile.name}")
-        ProviderCompat.moduleManager.install(zipPath, callback)
+        Compat.moduleManager.install(zipPath, callback)
     }
 
-    private fun getLocal(id: String) {
+    private fun insertLocal(module: LocalModule) {
         viewModelScope.launch {
-            modulesRepository.getLocal(id)
+            localRepository.insertLocal(
+                module.copy(state = State.UPDATE)
+            )
         }
     }
 
     private fun deleteBySu(zipPath: String) {
         runCatching {
-            ProviderCompat.fileManager.deleteOnExit(zipPath)
+            Compat.fileManager.deleteOnExit(zipPath)
         }.onFailure {
             Timber.e(it)
         }.onSuccess {

diff --git a/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/ModuleViewModel.kt b/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/ModuleViewModel.kt
@@ -11,7 +11,7 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewModelScope
-import com.sanmer.mrepo.compat.ProviderCompat
+import com.sanmer.mrepo.Compat
 import com.sanmer.mrepo.database.entity.Repo
 import com.sanmer.mrepo.database.entity.Repo.Companion.toRepo
 import com.sanmer.mrepo.model.json.UpdateJson
@@ -37,7 +37,7 @@ class ModuleViewModel @Inject constructor(
     private val userPreferencesRepository: UserPreferencesRepository,
     savedStateHandle: SavedStateHandle
 ) : ViewModel() {
-    val isProviderAlive get() = ProviderCompat.isAlive
+    val isProviderAlive get() = Compat.isAlive
 
     private val moduleId = getModuleId(savedStateHandle)
     var online: OnlineModule by mutableStateOf(OnlineModule.example())

diff --git a/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/ModulesViewModel.kt b/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/ModulesViewModel.kt
@@ -13,7 +13,7 @@ import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewModelScope
-import com.sanmer.mrepo.compat.ProviderCompat
+import com.sanmer.mrepo.Compat
 import com.sanmer.mrepo.datastore.modules.ModulesMenuCompat
 import com.sanmer.mrepo.datastore.repository.Option
 import com.sanmer.mrepo.model.json.UpdateJson
@@ -45,7 +45,7 @@ class ModulesViewModel @Inject constructor(
     private val modulesRepository: ModulesRepository,
     private val userPreferencesRepository: UserPreferencesRepository,
 ) : ViewModel() {
-    val isProviderAlive get() = ProviderCompat.isAlive
+    val isProviderAlive get() = Compat.isAlive
 
     private val modulesMenu get() = userPreferencesRepository.data
         .map { it.modulesMenu }
@@ -86,7 +86,7 @@ class ModulesViewModel @Inject constructor(
     }
 
     private fun providerObserver() {
-        ProviderCompat.isAliveFlow
+        Compat.isAliveFlow
             .onEach {
                 if (it) getLocalAll()
 
@@ -182,12 +182,12 @@ class ModulesViewModel @Inject constructor(
             isOpsRunning = opsTasks.contains(module.id),
             toggle = {
                 opsTasks.add(module.id)
-                ProviderCompat.moduleManager
+                Compat.moduleManager
                     .disable(module.id, opsCallback)
             },
             change = {
                 opsTasks.add(module.id)
-                ProviderCompat.moduleManager
+                Compat.moduleManager
                     .remove(module.id, opsCallback)
             }
         )
@@ -196,12 +196,12 @@ class ModulesViewModel @Inject constructor(
             isOpsRunning = opsTasks.contains(module.id),
             toggle = {
                 opsTasks.add(module.id)
-                ProviderCompat.moduleManager
+                Compat.moduleManager
                     .enable(module.id, opsCallback)
             },
             change = {
                 opsTasks.add(module.id)
-                ProviderCompat.moduleManager
+                Compat.moduleManager
                     .remove(module.id, opsCallback)
             }
         )
@@ -211,7 +211,7 @@ class ModulesViewModel @Inject constructor(
             toggle = {},
             change = {
                 opsTasks.add(module.id)
-                ProviderCompat.moduleManager
+                Compat.moduleManager
                     .enable(module.id, opsCallback)
             }
         )

diff --git a/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/SettingsViewModel.kt b/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/SettingsViewModel.kt
@@ -2,7 +2,7 @@ package com.sanmer.mrepo.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.sanmer.mrepo.compat.ProviderCompat
+import com.sanmer.mrepo.Compat
 import com.sanmer.mrepo.datastore.DarkMode
 import com.sanmer.mrepo.datastore.WorkingMode
 import com.sanmer.mrepo.repository.UserPreferencesRepository
@@ -16,9 +16,9 @@ import javax.inject.Inject
 class SettingsViewModel @Inject constructor(
     private val userPreferencesRepository: UserPreferencesRepository
 ) : ViewModel() {
-    val isProviderAlive get() = ProviderCompat.isAlive
+    val isProviderAlive get() = Compat.isAlive
 
-    val version get() = ProviderCompat.get("") {
+    val version get() = Compat.get("") {
         with(moduleManager) { "$version (${versionCode})" }
     }
 

diff --git a/compat/src/main/aidl/dev/sanmer/mrepo/compat/stub/IInstallCallback.aidl b/compat/src/main/aidl/dev/sanmer/mrepo/compat/stub/IInstallCallback.aidl
@@ -1,8 +1,10 @@
 package dev.sanmer.mrepo.compat.stub;
 
+import dev.sanmer.mrepo.compat.content.LocalModule;
+
 interface IInstallCallback {
     void onStdout(String msg);
     void onStderr(String msg);
-    void onSuccess(String id);
+    void onSuccess(in LocalModule module);
     void onFailure();
 }
diff --git a/compat/src/main/kotlin/dev/sanmer/mrepo/compat/Const.kt b/compat/src/main/kotlin/dev/sanmer/mrepo/compat/Const.kt