fix: biometric auth lifecycle, Samsung SDK 35 root process crashes, bump version to 114236

Author: matsuzaka-yuki

app/src/main/AndroidManifest.xml

@@ -149,7 +149,7 @@
             android:exported="false" />
 
         <provider
-            android:name="androidx.core.content.FileProvider"
+            android:name=".util.SafeFileProvider"
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/java/me/bmax/apatch/APatchApp.kt

@@ -354,9 +354,12 @@ class APApplication : Application(), Thread.UncaughtExceptionHandler, ImageLoade
 
     override fun onCreate() {
         super.onCreate()
+        apApp = this
+        if (Application.getProcessName().endsWith(":root") || Application.getProcessName().endsWith(":webui")) {
+            return
+        }
         bypassHiddenApiRestrictions()
         Log.d(TAG, "APApplication onCreate started")
-        apApp = this
 
         val isArm64 = Build.SUPPORTED_ABIS.any { it == "arm64-v8a" }
         Log.d(TAG, "Device architecture check: isArm64=$isArm64, supported ABIs=${Build.SUPPORTED_ABIS.joinToString(", ")}")

app/src/main/java/me/bmax/apatch/ui/MainActivity.kt

@@ -237,6 +237,9 @@ class MainActivity : AppCompatActivity() {
     private var installUris: ArrayList<Uri>? = null
     private lateinit var permissionHandler: PermissionRequestHandler
     private val isLocked = mutableStateOf(false)
+    private var isAuthenticated = false
+    private var biometricPromptShowing = false
+    private var startupSoundPlayed = false
     private var pendingActionModuleId by mutableStateOf<String?>(null)
     private var pendingScriptId by mutableStateOf<String?>(null)
 
@@ -368,6 +371,17 @@ class MainActivity : AppCompatActivity() {
         // 初始化权限处理器
         permissionHandler = PermissionRequestHandler(this)
 
+        setupUI()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        showBiometricPromptIfNeeded()
+    }
+
+    private fun showBiometricPromptIfNeeded() {
+        if (isAuthenticated || biometricPromptShowing) return
+
         val prefs = APApplication.sharedPreferences
         val biometricLogin = prefs.getBoolean("biometric_login", false)
         val biometricManager = androidx.biometric.BiometricManager.from(this)
@@ -379,21 +393,34 @@ class MainActivity : AppCompatActivity() {
         val isShareIntent = intent.action == Intent.ACTION_SEND || intent.action == Intent.ACTION_SEND_MULTIPLE
         if (biometricLogin && canAuthenticate && !isShareIntent) {
             isLocked.value = true
+            biometricPromptShowing = true
             val biometricPrompt = androidx.biometric.BiometricPrompt(
                 this,
                 androidx.core.content.ContextCompat.getMainExecutor(this),
                 object : androidx.biometric.BiometricPrompt.AuthenticationCallback() {
                     override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
                         super.onAuthenticationError(errorCode, errString)
-                        showToast(this@MainActivity, errString.toString())
-                        finishAndRemoveTask()
+                        biometricPromptShowing = false
+                        if (errorCode == androidx.biometric.BiometricPrompt.ERROR_USER_CANCELED) {
+                            finishAndRemoveTask()
+                        } else {
+                            Handler(Looper.getMainLooper()).postDelayed({
+                                if (!isAuthenticated && !biometricPromptShowing) {
+                                    showBiometricPromptIfNeeded()
+                                }
+                            }, 300)
+                        }
                     }
 
                     override fun onAuthenticationSucceeded(result: androidx.biometric.BiometricPrompt.AuthenticationResult) {
                         super.onAuthenticationSucceeded(result)
                         isLocked.value = false
-                        // Play startup sound after biometric auth success
-                        me.bmax.apatch.util.SoundEffectManager.playStartup(this@MainActivity)
+                        isAuthenticated = true
+                        biometricPromptShowing = false
+                        if (!startupSoundPlayed) {
+                            startupSoundPlayed = true
+                            me.bmax.apatch.util.SoundEffectManager.playStartup(this@MainActivity)
+                        }
                     }
                 })
             val promptInfo = androidx.biometric.BiometricPrompt.PromptInfo.Builder()
@@ -402,11 +429,14 @@ class MainActivity : AppCompatActivity() {
                 .setAllowedAuthenticators(androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG or androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL)
                 .build()
             biometricPrompt.authenticate(promptInfo)
-        } else {
-            // Play startup sound directly if no biometric auth needed
-            me.bmax.apatch.util.SoundEffectManager.playStartup(this)
+        } else if (!biometricLogin || !canAuthenticate || isShareIntent) {
+            isAuthenticated = true
+            isLocked.value = false
+            if (!startupSoundPlayed) {
+                startupSoundPlayed = true
+                me.bmax.apatch.util.SoundEffectManager.playStartup(this)
+            }
         }
-        setupUI()
     }
 
     private fun setupUI() {

app/src/main/java/me/bmax/apatch/util/SafeFileProvider.kt

@@ -0,0 +1,52 @@
+package me.bmax.apatch.util
+
+import android.app.Application
+import android.database.Cursor
+import android.database.MatrixCursor
+import android.net.Uri
+import android.os.ParcelFileDescriptor
+import androidx.core.content.FileProvider
+
+class SafeFileProvider : FileProvider() {
+    private var shouldInit = false
+
+    override fun onCreate(): Boolean {
+        val processName = Application.getProcessName()
+        shouldInit = !processName.endsWith(":root") && !processName.endsWith(":webui")
+        if (!shouldInit) return false
+        return try {
+            super.onCreate()
+        } catch (e: Exception) {
+            false
+        }
+    }
+
+    override fun query(uri: Uri, projection: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, sortOrder: String?): Cursor {
+        if (!shouldInit) return MatrixCursor(emptyArray())
+        return try {
+            super.query(uri, projection, selection, selectionArgs, sortOrder)
+        } catch (e: Exception) {
+            MatrixCursor(emptyArray())
+        }
+    }
+
+    override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor {
+        if (!shouldInit) throw java.io.FileNotFoundException("Not available in this process")
+        return try {
+            super.openFile(uri, mode) ?: throw java.io.FileNotFoundException("Null result")
+        } catch (e: java.io.FileNotFoundException) {
+            throw e
+        } catch (e: Exception) {
+            throw java.io.FileNotFoundException(e.message)
+        }
+    }
+
+    override fun getType(uri: Uri): String? {
+        if (!shouldInit) return null
+        return try {
+            super.getType(uri)
+        } catch (e: Exception) {
+            null
+        }
+    }
+}

app/src/main/java/me/bmax/apatch/util/ui/ToastExt.kt

@@ -16,7 +16,7 @@ private const val TAG = "SafeToast"
 fun showToast(context: Context, message: String) {
     try {
         Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
-    } catch (e: SecurityException) {
+    } catch (e: Exception) {
         Log.w(TAG, "System toast unavailable, using fallback: $message", e)
         showFallbackToast(context, message)
     }

build.gradle.kts

@@ -34,7 +34,7 @@ fun getGitDescribe(): String {
 }
 
 fun getVersionCode(): Int {
-    return 114235
+    return 114236
 }
 
 fun getbranch(): String {