fix: #271 Button remap overriding volume button triggers in camera

Author: sameerasw

app/src/main/java/com/sameerasw/essentials/services/handlers/AppFlowHandler.kt

@@ -29,6 +29,8 @@ class AppFlowHandler(
     // App Lock State
     private var lockingPackage: String? = null
     private var lastLockRequestTime: Long = 0
+    var currentPackage: String? = null
+        private set
 
     // App Automation State
     private val activeAppAutomationIds = mutableSetOf<String>()
@@ -49,6 +51,8 @@ class AppFlowHandler(
         val prefs = context.getSharedPreferences("essentials_prefs", Context.MODE_PRIVATE)
         val useUsageAccess = prefs.getBoolean("use_usage_access", false)
 
+        currentPackage = packageName
+
         if (packageName != context.packageName && packageName != lockingPackage) {
             lockingPackage = null
         }
@@ -228,4 +232,26 @@ class AppFlowHandler(
             }
         }
     }
+
+    fun isCameraApp(packageName: String? = currentPackage): Boolean {
+        if (packageName == null) return false
+
+        // Known camera packages
+        val cameraPackages = listOf(
+            "com.google.android.GoogleCamera",
+            "com.android.camera",
+            "com.sec.android.app.camera",
+            "com.huawei.camera",
+            "com.oneplus.camera",
+            "com.oppo.camera",
+            "com.miui.camera",
+            "com.sonyericsson.android.camera",
+            "com.sonymobile.android.camera"
+        )
+        if (cameraPackages.any { packageName.startsWith(it) }) return true
+
+        if (packageName.lowercase().contains("camera")) return true
+
+        return false
+    }
 }

app/src/main/java/com/sameerasw/essentials/services/tiles/ScreenOffAccessibilityService.kt

@@ -173,12 +173,17 @@ class ScreenOffAccessibilityService : AccessibilityService(), SensorEventListene
     override fun onAccessibilityEvent(event: AccessibilityEvent?) {
         if (event == null) return
 
-        securityHandler.onAccessibilityEvent(event)
-
         if (event.eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
             val packageName = event.packageName?.toString() ?: return
             appFlowHandler.onPackageChanged(packageName)
         }
+
+        // Bypass security scanning for camera apps to avoid performance interference
+        if (appFlowHandler.isCameraApp()) {
+            return
+        }
+
+        securityHandler.onAccessibilityEvent(event)
     }
 
     override fun onInterrupt() {}
@@ -197,7 +202,15 @@ class ScreenOffAccessibilityService : AccessibilityService(), SensorEventListene
 
     override fun onKeyEvent(event: KeyEvent): Boolean {
         val keyCode = event.keyCode
-        if (keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+        val isVolumeKey = keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
+
+        if (isVolumeKey) {
+            // Bypass logic for Camera apps to resolve conflicts with shutter/zoom functions
+            val foregroundPackage = rootInActiveWindow?.packageName?.toString() ?: appFlowHandler.currentPackage
+            if (appFlowHandler.isCameraApp(foregroundPackage)) {
+                return false
+            }
+
             val powerManager = getSystemService(POWER_SERVICE) as android.os.PowerManager
             if (!powerManager.isInteractive && event.action == KeyEvent.ACTION_DOWN) {
                 triggerAmbientGlanceVolume(keyCode)