Restore is always allowed

MRepoApp · Feb 12, 2024 · 74f775f · 74f775f
1 parent 01202de
commit 74f775f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/app/src/main/kotlin/com/sanmer/mrepo/provider/ProviderCompat.kt b/app/src/main/kotlin/com/sanmer/mrepo/provider/ProviderCompat.kt
@@ -6,7 +6,6 @@ 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.impl.Platform
 import dev.sanmer.mrepo.compat.stub.IFileManager
 import dev.sanmer.mrepo.compat.stub.IModuleManager
 import dev.sanmer.mrepo.compat.stub.IProvider
@@ -23,7 +22,6 @@ object ProviderCompat {
 
     val moduleManager: IModuleManager get() = mProvider.moduleManager
     val fileManager: IFileManager get() = mProvider.fileManager
-    val isKsu: Boolean get() = mProvider.platform == Platform.KERNELSU
 
     var isAlive by mutableStateOf(false)
         private set

diff --git a/app/src/main/kotlin/com/sanmer/mrepo/ui/screens/modules/ModulesList.kt b/app/src/main/kotlin/com/sanmer/mrepo/ui/screens/modules/ModulesList.kt
@@ -37,7 +37,6 @@ fun ModulesList(
     list: List<LocalModule>,
     state: LazyListState,
     isProviderAlive: Boolean,
-    isProviderKsu: Boolean,
     getUiState: @Composable (LocalModule) -> LocalUiState,
     getVersionItem: @Composable (LocalModule) -> VersionItem?,
     getProgress: @Composable (VersionItem?) -> Float,
@@ -58,7 +57,6 @@ fun ModulesList(
             ModuleItem(
                 module = module,
                 isProviderAlive = isProviderAlive,
-                isProviderKsu = isProviderKsu,
                 getUiState = getUiState,
                 getVersionItem = getVersionItem,
                 getProgress = getProgress,
@@ -77,7 +75,6 @@ fun ModulesList(
 fun ModuleItem(
     module: LocalModule,
     isProviderAlive: Boolean,
-    isProviderKsu: Boolean,
     getUiState: @Composable (LocalModule) -> LocalUiState,
     getVersionItem: @Composable (LocalModule) -> VersionItem?,
     getProgress: @Composable (VersionItem?) -> Float,
@@ -127,10 +124,7 @@ fun ModuleItem(
 
             RemoveOrRestore(
                 module = module,
-                enabled = when (module.state) {
-                    State.REMOVE -> isProviderAlive && !isProviderKsu
-                    else -> isProviderAlive
-                },
+                enabled = isProviderAlive,
                 onClick = uiState.change
             )
         }

diff --git a/app/src/main/kotlin/com/sanmer/mrepo/ui/screens/modules/ModulesScreen.kt b/app/src/main/kotlin/com/sanmer/mrepo/ui/screens/modules/ModulesScreen.kt
@@ -154,7 +154,6 @@ fun ModulesScreen(
                 list = list,
                 state = listState,
                 isProviderAlive = viewModel.isProviderAlive,
-                isProviderKsu = viewModel.isProviderKsu,
                 getUiState = { viewModel.rememberUiState(it) },
                 getVersionItem = { viewModel.getVersionItem(it) },
                 getProgress = { viewModel.getProgress(it) },

diff --git a/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/ModulesViewModel.kt b/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/ModulesViewModel.kt
@@ -49,11 +49,6 @@ class ModulesViewModel @Inject constructor(
 ) : ViewModel() {
     val isProviderAlive get() = ProviderCompat.isAlive
 
-    val isProviderKsu get() = when {
-        isProviderAlive -> ProviderCompat.isKsu
-        else -> false
-    }
-
     private val modulesMenu get() = userPreferencesRepository.data
         .map { it.modulesMenu }
 
@@ -212,11 +207,9 @@ class ModulesViewModel @Inject constructor(
                 alpha = 0.5f,
                 decoration = TextDecoration.LineThrough,
                 change = {
-                    if (!ProviderCompat.isKsu) {
-                        opsTasks.add(module.id)
-                        ProviderCompat.moduleManager
-                            .enable(module.id, opsCallback)
-                    }
+                    opsTasks.add(module.id)
+                    ProviderCompat.moduleManager
+                        .enable(module.id, opsCallback)
                 }
             )