chore: Rename service correctly

ReVanced · Jan 15, 2024 · 64b1808 · 64b1808
1 parent ff4d8bf
commit 64b1808
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/revanced-library/src/androidMain/aidl/app/revanced/library/IRootService.aidl b/revanced-library/src/androidMain/aidl/app/revanced/library/IRootService.aidl
diff --git a/...n/aidl/app/revanced/library/installation/command/ILocalShellCommandRunnerRootService.aidl b/...n/aidl/app/revanced/library/installation/command/ILocalShellCommandRunnerRootService.aidl
@@ -0,0 +1,5 @@
+package app.revanced.library.installation.command;
+
+interface ILocalShellCommandRunnerRootService {
+    IBinder getFileSystemService();
+}
diff --git a/...c/androidMain/kotlin/app/revanced/library/installation/command/LocalShellCommandRunner.kt b/...c/androidMain/kotlin/app/revanced/library/installation/command/LocalShellCommandRunner.kt
@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.IBinder
-import app.revanced.library.IRootService
 import com.topjohnwu.superuser.Shell
 import com.topjohnwu.superuser.internal.BuilderImpl
 import com.topjohnwu.superuser.ipc.RootService
@@ -65,10 +64,8 @@ class LocalShellCommandRunner(
     }
 
     override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-        val ipc = IRootService.Stub.asInterface(service)
-        val binder = ipc.fileSystemService
-
-        fileSystemManager = FileSystemManager.getRemote(binder)
+        val ipc = ILocalShellCommandRunnerRootService.Stub.asInterface(service)
+        fileSystemManager = FileSystemManager.getRemote(ipc.fileSystemService)
 
         logger.info("LocalShellCommandRunner service is ready")
 

diff --git a/...in/kotlin/app/revanced/library/installation/command/LocalShellCommandRunnerRootService.kt b/...in/kotlin/app/revanced/library/installation/command/LocalShellCommandRunnerRootService.kt
@@ -1,15 +1,14 @@
 package app.revanced.library.installation.command
 
 import android.content.Intent
-import app.revanced.library.IRootService
 import com.topjohnwu.superuser.ipc.RootService
 import com.topjohnwu.superuser.nio.FileSystemManager
 
 /**
  * The [RootService] for the [LocalShellCommandRunner].
  */
 internal class LocalShellCommandRunnerRootService : RootService() {
-    override fun onBind(intent: Intent) = object : IRootService.Stub() {
+    override fun onBind(intent: Intent) = object : ILocalShellCommandRunnerRootService.Stub() {
         override fun getFileSystemService() =
             FileSystemManager.getService()
     }