Fix: Root/su detection - remove FLAG_MOUNT_MASTER, increase timeout, better shell check

Author: risunCode

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

@@ -15,11 +15,12 @@ class App : Application() {
         private const val TAG = "AppControlX"
 
         init {
+            // Configure libsu
             Shell.enableVerboseLogging = BuildConfig.DEBUG
             Shell.setDefaultBuilder(
                 Shell.Builder.create()
-                    .setFlags(Shell.FLAG_MOUNT_MASTER)
-                    .setTimeout(10)
+                    .setFlags(Shell.FLAG_REDIRECT_STDERR)
+                    .setTimeout(30) // Increase timeout for slow devices
             )
         }
     }

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

@@ -58,11 +58,18 @@ class RootExecutor : CommandExecutor {
         }
 
         return try {
+            // Ensure shell is ready
+            val shell = Shell.getShell()
+            if (!shell.isRoot) {
+                return Result.failure(Exception("Root access not available"))
+            }
+            
             val result = Shell.cmd(command).exec()
             if (result.isSuccess) {
                 Result.success(result.out.joinToString("\n"))
             } else {
-                Result.failure(Exception(result.err.joinToString("\n")))
+                val error = result.err.joinToString("\n").ifEmpty { "Command failed" }
+                Result.failure(Exception(error))
             }
         } catch (e: Exception) {
             Result.failure(e)

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

@@ -65,11 +65,17 @@ class PermissionBridge(private val context: Context? = null) {
     fun checkRootNow(): Boolean {
         return try {
             // Get shell instance - this will trigger root request if needed
-            Shell.getShell()
+            val shell = Shell.getShell()
 
-            // Check if root was granted
+            // Check if shell is root
+            if (shell.isRoot) {
+                return true
+            }
+            
+            // Fallback check
             Shell.isAppGrantedRoot() == true
         } catch (e: Exception) {
+            android.util.Log.e("PermissionBridge", "Root check failed", e)
             false
         }
     }