Fix: Root detection - explicitly build su shell, better root check with id command

Author: risunCode

app/src/main/java/com/appcontrolx/App.kt

@@ -15,14 +15,30 @@ class App : Application() {
         private const val TAG = "AppControlX"
 
         init {
-            // Configure libsu
+            // Configure libsu for root shell
             Shell.enableVerboseLogging = BuildConfig.DEBUG
             Shell.setDefaultBuilder(
                 Shell.Builder.create()
-                    .setFlags(Shell.FLAG_REDIRECT_STDERR)
-                    .setTimeout(30) // Increase timeout for slow devices
+                    .setFlags(Shell.FLAG_REDIRECT_STDERR or Shell.FLAG_NON_ROOT_SHELL)
+                    .setTimeout(30)
             )
         }
+        
+        /**
+         * Get root shell - call this to request su permission
+         */
+        fun getRootShell(): Shell? {
+            return try {
+                val shell = Shell.Builder.create()
+                    .setFlags(Shell.FLAG_REDIRECT_STDERR)
+                    .setTimeout(30)
+                    .build("su")
+                if (shell.isRoot) shell else null
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to get root shell", e)
+                null
+            }
+        }
     }
 
     override fun onCreate() {

app/src/main/java/com/appcontrolx/executor/RootExecutor.kt

@@ -58,13 +58,17 @@ class RootExecutor : CommandExecutor {
         }
 
         return try {
-            // Ensure shell is ready
-            val shell = Shell.getShell()
+            // Build su shell and execute command
+            val shell = Shell.Builder.create()
+                .setFlags(Shell.FLAG_REDIRECT_STDERR)
+                .setTimeout(30)
+                .build("su")
+            
             if (!shell.isRoot) {
-                return Result.failure(Exception("Root access not available"))
+                return Result.failure(Exception("Root access not available - su denied"))
             }
 
-            val result = Shell.cmd(command).exec()
+            val result = shell.newJob().add(command).exec()
             if (result.isSuccess) {
                 Result.success(result.out.joinToString("\n"))
             } else {
@@ -84,7 +88,20 @@ class RootExecutor : CommandExecutor {
         }
 
         return try {
-            val result = Shell.cmd(*commands.toTypedArray()).exec()
+            // Build su shell
+            val shell = Shell.Builder.create()
+                .setFlags(Shell.FLAG_REDIRECT_STDERR)
+                .setTimeout(30)
+                .build("su")
+            
+            if (!shell.isRoot) {
+                return Result.failure(Exception("Root access not available - su denied"))
+            }
+            
+            val job = shell.newJob()
+            commands.forEach { job.add(it) }
+            val result = job.exec()
+            
             if (result.isSuccess) {
                 Result.success(Unit)
             } else {

app/src/main/java/com/appcontrolx/service/PermissionBridge.kt

@@ -64,16 +64,27 @@ class PermissionBridge(private val context: Context? = null) {
      */
     fun checkRootNow(): Boolean {
         return try {
-            // Get shell instance - this will trigger root request if needed
-            val shell = Shell.getShell()
+            // Try to get root shell by executing su
+            val result = Shell.cmd("id").exec()
 
-            // Check if shell is root
-            if (shell.isRoot) {
-                return true
+            if (result.isSuccess) {
+                val output = result.out.joinToString("\n")
+                // Check if we're running as root (uid=0)
+                if (output.contains("uid=0")) {
+                    android.util.Log.d("PermissionBridge", "Root confirmed: $output")
+                    return true
+                }
             }
 
-            // Fallback check
-            Shell.isAppGrantedRoot() == true
+            // Alternative: try su directly
+            val suResult = Shell.Builder.create()
+                .setFlags(Shell.FLAG_REDIRECT_STDERR)
+                .setTimeout(30)
+                .build("su")
+            
+            val isRoot = suResult.isRoot
+            android.util.Log.d("PermissionBridge", "Su shell isRoot: $isRoot")
+            isRoot
         } catch (e: Exception) {
             android.util.Log.e("PermissionBridge", "Root check failed", e)
             false