improve logging and fix configuration change issue

Author: PranavPurwar

app/src/main/java/dev/pranav/applock/services/AppLockAccessibilityService.kt

@@ -169,8 +169,8 @@ class AppLockAccessibilityService : AccessibilityService() {
                 recentsOpen = true
             }
 
-            isHomeScreenTransition(event) -> {
-                Log.d(TAG, "Transitioning to home screen")
+            isHomeScreenTransition(event) && recentsOpen -> {
+                Log.d(TAG, "Transitioning to home screen from recents")
                 recentsOpen = false
                 clearTemporarilyUnlockedAppIfNeeded()
             }
@@ -247,6 +247,12 @@ class AppLockAccessibilityService : AccessibilityService() {
     }
 
     private fun processPackageLocking(packageName: String, event: AccessibilityEvent) {
+        // Check for grace period first
+        if (AppLockManager.checkAndRestoreRecentlyLeftApp(packageName)) {
+            // If restored, we don't need to do anything else, it's efficiently unlocked
+            // But we continue to letting the logic flow, checkAndLockApp will handle "temporarilyUnlocked" check
+        }
+
         val currentForegroundPackage = packageName
         val triggeringPackage = lastForegroundPackage
         lastForegroundPackage = currentForegroundPackage
@@ -264,8 +270,9 @@ class AppLockAccessibilityService : AccessibilityService() {
         ) {
             Log.d(
                 TAG,
-                "Switched from unlocked app $unlockedApp to $currentForegroundPackage. clearing temporary unlock."
+                "Switched from unlocked app $unlockedApp to $currentForegroundPackage. Setting grace period tracking."
             )
+            AppLockManager.setRecentlyLeftApp(unlockedApp)
             AppLockManager.clearTemporarilyUnlockedApp()
         }
 

app/src/main/java/dev/pranav/applock/services/AppLockManager.kt

@@ -25,7 +25,10 @@ object AppLockConstants {
         "com.android.intentresolver",
         "com.google.android.permissioncontroller",
         "android.uid.system:1000",
-        "com.google.android.googlequicksearchbox"
+        "com.google.android.googlequicksearchbox",
+        "android",
+        "com.google.android.gms",
+        "com.google.android.webview"
     )
 
     val ADMIN_CONFIG_CLASSES = setOf(
@@ -66,6 +69,36 @@ object AppLockManager {
     val isLockScreenShown = AtomicBoolean(false)
     var currentBiometricState: Any? = null
 
+    // Grace period tracking
+    private var recentlyLeftApp: String = ""
+    private var recentlyLeftTime: Long = 0L
+    private const val GRACE_PERIOD_MS = 300L
+
+    fun setRecentlyLeftApp(packageName: String) {
+        recentlyLeftApp = packageName
+        recentlyLeftTime = System.currentTimeMillis()
+        Log.d(TAG, "Left app $packageName at $recentlyLeftTime")
+    }
+
+    fun checkAndRestoreRecentlyLeftApp(packageName: String): Boolean {
+        // If we are returning to the same app we just left within the grace period
+        if (packageName == recentlyLeftApp && packageName.isNotEmpty()) {
+            val elapsed = System.currentTimeMillis() - recentlyLeftTime
+            if (elapsed <= GRACE_PERIOD_MS) {
+                Log.d(TAG, "Restoring unlock state for $packageName (elapsed: ${elapsed}ms)")
+                temporarilyUnlockedApp = packageName
+                // Clear the tracking so it doesn't trigger again inappropriately
+                recentlyLeftApp = ""
+                recentlyLeftTime = 0L
+                return true
+            } else {
+                Log.d(TAG, "Grace period expired for $packageName (elapsed: ${elapsed}ms)")
+                recentlyLeftApp = "" // Expired
+            }
+        }
+        return false
+    }
+
     private val serviceRestartAttempts = ConcurrentHashMap<String, Int>()
     private val lastRestartTime = ConcurrentHashMap<String, Long>()