From a52abaf16724f0fa52639be89fda6155eaf0632d Mon Sep 17 00:00:00 2001
From: Markus Probst <markustieger@gmail.com>
Date: Mon, 9 Jun 2025 19:09:30 +0200
Subject: [PATCH] Support Shizuku alongside Sui

---
 app/build.gradle                              |  1 +
 app/src/main/AndroidManifest.xml              | 10 +++++-
 .../files/provider/root/RootFileService.kt    |  4 +--
 ...ncher.kt => ShizukuFileServiceLauncher.kt} | 31 +++++++------------
 4 files changed, 24 insertions(+), 22 deletions(-)
 rename app/src/main/java/me/zhanghai/android/files/provider/root/{SuiFileServiceLauncher.kt => ShizukuFileServiceLauncher.kt} (88%)

diff --git a/app/build.gradle b/app/build.gradle
index 2790b82a2..c2707daaa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,6 +186,7 @@ dependencies {
     implementation 'dev.chrisbanes:insetter-ktx:0.3.1'
     implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.3'
     implementation 'dev.rikka.shizuku:api:13.1.5'
+    implementation 'dev.rikka.shizuku:provider:13.1.5'
     implementation ('eu.agno3.jcifs:jcifs-ng:2.1.10') {
         exclude group: 'org.bouncycastle', module: 'bcprov-jdk18on'
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 82f842efc..a222adfbe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
     <!-- Shizuku requires API 23. -->
-    <uses-sdk tools:overrideLibrary="rikka.shizuku.aidl,rikka.shizuku.api,rikka.shizuku.shared" />
+    <uses-sdk tools:overrideLibrary="rikka.shizuku.aidl,rikka.shizuku.api,rikka.shizuku.shared,rikka.shizuku.provider" />
 
     <!--
       ~ Samsung DeX requires explicitly setting android:resizeableActivity="true" for the app to be
@@ -389,6 +389,14 @@
             android:exported="false"
             android:grantUriPermissions="true" />
 
+	<provider
+            android:name="rikka.shizuku.ShizukuProvider"
+            android:authorities="${applicationId}.shizuku"
+            android:multiprocess="false"
+            android:enabled="true"
+            android:exported="true"
+            android:permission="android.permission.INTERACT_ACROSS_USERS_FULL" />
+
         <receiver android:name="me.zhanghai.android.files.filejob.FileJobReceiver" />
 
         <receiver android:name="me.zhanghai.android.files.ftpserver.FtpServerReceiver" />
diff --git a/app/src/main/java/me/zhanghai/android/files/provider/root/RootFileService.kt b/app/src/main/java/me/zhanghai/android/files/provider/root/RootFileService.kt
index 45100761b..645ffd3e1 100644
--- a/app/src/main/java/me/zhanghai/android/files/provider/root/RootFileService.kt
+++ b/app/src/main/java/me/zhanghai/android/files/provider/root/RootFileService.kt
@@ -22,8 +22,8 @@ lateinit var rootContext: Context private set
 
 object RootFileService : RemoteFileService(
     RemoteInterface {
-        if (SuiFileServiceLauncher.isSuiAvailable()) {
-            SuiFileServiceLauncher.launchService()
+        if (ShizukuFileServiceLauncher.isShizukuAvailable()) {
+            ShizukuFileServiceLauncher.launchService()
         } else {
             LibSuFileServiceLauncher.launchService()
         }
diff --git a/app/src/main/java/me/zhanghai/android/files/provider/root/SuiFileServiceLauncher.kt b/app/src/main/java/me/zhanghai/android/files/provider/root/ShizukuFileServiceLauncher.kt
similarity index 88%
rename from app/src/main/java/me/zhanghai/android/files/provider/root/SuiFileServiceLauncher.kt
rename to app/src/main/java/me/zhanghai/android/files/provider/root/ShizukuFileServiceLauncher.kt
index a8a779001..666403fb9 100644
--- a/app/src/main/java/me/zhanghai/android/files/provider/root/SuiFileServiceLauncher.kt
+++ b/app/src/main/java/me/zhanghai/android/files/provider/root/ShizukuFileServiceLauncher.kt
@@ -23,26 +23,19 @@ import me.zhanghai.android.files.provider.remote.IRemoteFileService
 import me.zhanghai.android.files.provider.remote.RemoteFileServiceInterface
 import me.zhanghai.android.files.provider.remote.RemoteFileSystemException
 import rikka.shizuku.Shizuku
-import rikka.sui.Sui
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
-object SuiFileServiceLauncher {
+object ShizukuFileServiceLauncher {
     private val lock = Any()
 
-    private var isSuiIntialized = false
-
     @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.M)
-    fun isSuiAvailable(): Boolean {
+    fun isShizukuAvailable(): Boolean {
         synchronized(lock) {
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
                 return false
             }
-            if (!isSuiIntialized) {
-                Sui.init(application.packageName)
-                isSuiIntialized = true
-            }
-            return Sui.isSui()
+	    return Shizuku.pingBinder()
         }
     }
 
@@ -50,8 +43,8 @@ object SuiFileServiceLauncher {
     @Throws(RemoteFileSystemException::class)
     fun launchService(): IRemoteFileService {
         synchronized(lock) {
-            if (!isSuiAvailable()) {
-                throw RemoteFileSystemException("Sui isn't available")
+            if (!isShizukuAvailable()) {
+                throw RemoteFileSystemException("Shizuku isn't available")
             }
             if (Shizuku.checkSelfPermission() != PackageManager.PERMISSION_GRANTED) {
                 val granted = try {
@@ -78,7 +71,7 @@ object SuiFileServiceLauncher {
                     throw RemoteFileSystemException(e)
                 }
                 if (!granted) {
-                    throw RemoteFileSystemException("Sui permission isn't granted")
+                    throw RemoteFileSystemException("Shizuku permission isn't granted")
                 }
             }
             return try {
@@ -87,11 +80,11 @@ object SuiFileServiceLauncher {
                         withTimeout(RootFileService.TIMEOUT_MILLIS) {
                             suspendCancellableCoroutine { continuation ->
                                 val serviceArgs = Shizuku.UserServiceArgs(
-                                    ComponentName(application, SuiFileServiceInterface::class.java)
+                                    ComponentName(application, ShizukuFileServiceInterface::class.java)
                                 )
                                     .debuggable(BuildConfig.DEBUG)
                                     .daemon(false)
-                                    .processNameSuffix("sui")
+                                    .processNameSuffix("shizuku")
                                     .version(BuildConfig.VERSION_CODE)
                                 val connection = object : ServiceConnection {
                                     override fun onServiceConnected(
@@ -107,7 +100,7 @@ object SuiFileServiceLauncher {
                                         if (continuation.isActive) {
                                             continuation.resumeWithException(
                                                 RemoteFileSystemException(
-                                                    "Sui service disconnected"
+                                                    "Shizuku service disconnected"
                                                 )
                                             )
                                         }
@@ -116,7 +109,7 @@ object SuiFileServiceLauncher {
                                     override fun onBindingDied(name: ComponentName) {
                                         if (continuation.isActive) {
                                             continuation.resumeWithException(
-                                                RemoteFileSystemException("Sui binding died")
+                                                RemoteFileSystemException("Shizuku binding died")
                                             )
                                         }
                                     }
@@ -124,7 +117,7 @@ object SuiFileServiceLauncher {
                                     override fun onNullBinding(name: ComponentName) {
                                         if (continuation.isActive) {
                                             continuation.resumeWithException(
-                                                RemoteFileSystemException("Sui binding is null")
+                                                RemoteFileSystemException("Shizuku binding is null")
                                             )
                                         }
                                     }
@@ -148,7 +141,7 @@ object SuiFileServiceLauncher {
 
 @Keep
 @RequiresApi(Build.VERSION_CODES.M)
-class SuiFileServiceInterface : RemoteFileServiceInterface() {
+class ShizukuFileServiceInterface : RemoteFileServiceInterface() {
     init {
         RootFileService.main()
     }