fix reboot button :|

MMRLApp · Oct 12, 2024 · 04a639a · 04a639a
1 parent 680920c
commit 04a639a
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 74 deletions.
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/Compat.kt b/app/src/main/kotlin/com/dergoogler/mmrl/Compat.kt
@@ -7,7 +7,6 @@ import com.dergoogler.mmrl.datastore.WorkingMode
 import dev.dergoogler.mmrl.compat.ServiceManagerCompat
 import dev.dergoogler.mmrl.compat.stub.IFileManager
 import dev.dergoogler.mmrl.compat.stub.IModuleManager
-import dev.dergoogler.mmrl.compat.stub.IPowerManager
 import dev.dergoogler.mmrl.compat.stub.IServiceManager
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -27,7 +26,6 @@ object Compat {
 
     val moduleManager: IModuleManager get() = mService.moduleManager
     val fileManager: IFileManager get() = mService.fileManager
-    val powerManager: IPowerManager get() = mService.powerManager
 
     private fun state(): Boolean {
         isAlive = mServiceOrNull != null

diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/InstallViewModel.kt b/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/InstallViewModel.kt
@@ -9,6 +9,7 @@ import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.dergoogler.mmrl.Compat
+import com.dergoogler.mmrl.Compat.moduleManager
 import com.dergoogler.mmrl.app.Event
 import com.dergoogler.mmrl.compat.MediaStoreCompat.copyToDir
 import com.dergoogler.mmrl.compat.MediaStoreCompat.getPathForUri
@@ -18,7 +19,6 @@ import com.dergoogler.mmrl.repository.UserPreferencesRepository
 import com.dergoogler.mmrl.utils.extensions.tmpDir
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dev.dergoogler.mmrl.compat.content.State
-import dev.dergoogler.mmrl.compat.delegate.PowerManagerDelegate
 import dev.dergoogler.mmrl.compat.stub.IInstallCallback
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
@@ -46,11 +46,12 @@ class InstallViewModel @Inject constructor(
     }
 
     fun reboot() {
-        PowerManagerDelegate(Compat.powerManager).apply {
+        with(moduleManager) {
             reboot()
         }
     }
 
+
     suspend fun writeLogsTo(context: Context, uri: Uri) = withContext(Dispatchers.IO) {
         runCatching {
             val cr = context.contentResolver
@@ -126,6 +127,7 @@ class InstallViewModel @Inject constructor(
                     deleteBySu(zipPath)
                 }
             }
+
             override fun onFailure() {
                 event = Event.FAILED
             }

diff --git a/compat/src/main/aidl/dev/dergoogler/mmrl/compat/stub/IModuleManager.aidl b/compat/src/main/aidl/dev/dergoogler/mmrl/compat/stub/IModuleManager.aidl
@@ -11,6 +11,7 @@ interface IModuleManager {
     List<LocalModule> getModules();
     LocalModule getModuleById(String id);
     LocalModule getModuleInfo(String zipPath);
+    oneway void reboot();
     oneway void enable(String id, IModuleOpsCallback callback);
     oneway void disable(String id, IModuleOpsCallback callback);
     oneway void remove(String id, IModuleOpsCallback callback);

diff --git a/compat/src/main/aidl/dev/dergoogler/mmrl/compat/stub/IPowerManager.aidl b/compat/src/main/aidl/dev/dergoogler/mmrl/compat/stub/IPowerManager.aidl
diff --git a/compat/src/main/aidl/dev/dergoogler/mmrl/compat/stub/IServiceManager.aidl b/compat/src/main/aidl/dev/dergoogler/mmrl/compat/stub/IServiceManager.aidl
@@ -2,7 +2,6 @@ package dev.dergoogler.mmrl.compat.stub;
 
 import dev.dergoogler.mmrl.compat.stub.IFileManager;
 import dev.dergoogler.mmrl.compat.stub.IModuleManager;
-import dev.dergoogler.mmrl.compat.stub.IPowerManager;
 
 interface IServiceManager {
     int getUid() = 0;
@@ -11,7 +10,6 @@ interface IServiceManager {
     String currentPlatform() = 3;
     IModuleManager getModuleManager() = 4;
     IFileManager getFileManager() = 5;
-    IPowerManager getPowerManager() = 6;
 
     void destroy() = 16777114; // Only for Shizuku
 }
diff --git a/compat/src/main/kotlin/dev/dergoogler/mmrl/compat/delegate/PowerManagerDelegate.kt b/compat/src/main/kotlin/dev/dergoogler/mmrl/compat/delegate/PowerManagerDelegate.kt
diff --git a/compat/src/main/kotlin/dev/dergoogler/mmrl/compat/impl/BaseModuleManagerImpl.kt b/compat/src/main/kotlin/dev/dergoogler/mmrl/compat/impl/BaseModuleManagerImpl.kt
@@ -40,6 +40,10 @@ internal abstract class BaseModuleManagerImpl(
         return mVersionCode
     }
 
+    override fun reboot() {
+        "svc power reboot || reboot".exec()
+    }
+
     override fun getModules() = modulesDir.listFiles()
         .orEmpty()
         .mapNotNull { dir ->

diff --git a/compat/src/main/kotlin/dev/dergoogler/mmrl/compat/impl/PowerManagerImpl.kt b/compat/src/main/kotlin/dev/dergoogler/mmrl/compat/impl/PowerManagerImpl.kt
diff --git a/compat/src/main/kotlin/dev/dergoogler/mmrl/compat/impl/ServiceManagerImpl.kt b/compat/src/main/kotlin/dev/dergoogler/mmrl/compat/impl/ServiceManagerImpl.kt
@@ -9,7 +9,6 @@ import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.ShellUtils
 import dev.dergoogler.mmrl.compat.stub.IFileManager
 import dev.dergoogler.mmrl.compat.stub.IModuleManager
-import dev.dergoogler.mmrl.compat.stub.IPowerManager
 import dev.dergoogler.mmrl.compat.stub.IServiceManager
 import kotlin.system.exitProcess
 
@@ -40,14 +39,6 @@ internal class ServiceManagerImpl : IServiceManager.Stub() {
         FileManagerImpl()
     }
 
-    private val powerManager by lazy {
-        PowerManagerImpl(
-            IPowerManager.Stub.asInterface(
-                ServiceManager.getService(Context.POWER_SERVICE)
-            )
-        )
-    }
-
     override fun getUid(): Int {
         return Os.getuid()
     }
@@ -72,10 +63,6 @@ internal class ServiceManagerImpl : IServiceManager.Stub() {
         return fileManager
     }
 
-    override fun getPowerManager(): IPowerManager {
-        return powerManager
-    }
-
     override fun destroy() {
         exitProcess(0)
     }