fix lock screen orientation issues

- Implement `setUninstallBlocked` in `DeviceAdmin` to programmatically prevent app uninstallation when anti-uninstall is enabled
- Update `PasswordOverlayActivity` to handle configuration changes (orientation, screen size) without finishing the activity
- Fix logic in `PasswordOverlayScreen.kt` to prevent the lock screen from dismissing during configuration changes
- Refactor `AppLockAccessibilityService` to improve detection of device admin settings pages and simplify deactivation checks
- Remove redundant `ADMIN_CONFIG_CLASSES` and simplify exclusion logic in `ExperimentalAppLockService`
- Add logging for orientation changes in `PasswordOverlayScreen`

Author: PranavPurwar

app/src/main/AndroidManifest.xml

@@ -55,6 +55,7 @@
 
         <activity
             android:name=".features.lockscreen.ui.PasswordOverlayActivity"
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
             android:excludeFromRecents="true"
             android:exported="false"
             android:taskAffinity=""

app/src/main/java/dev/pranav/applock/core/broadcast/DeviceAdmin.kt

@@ -1,6 +1,7 @@
 package dev.pranav.applock.core.broadcast
 
 import android.app.admin.DeviceAdminReceiver
+import android.content.ComponentName
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
@@ -16,6 +17,10 @@ class DeviceAdmin : DeviceAdminReceiver() {
         context.getSharedPreferences("app_lock_settings", Context.MODE_PRIVATE).edit {
             putBoolean("anti_uninstall", true)
         }
+
+        val component = ComponentName(context, DeviceAdmin::class.java)
+
+        getManager(context).setUninstallBlocked(component, context.packageName, true)
     }
 
     override fun onDisabled(context: Context, intent: android.content.Intent) {

app/src/main/java/dev/pranav/applock/features/lockscreen/ui/PasswordOverlayScreen.kt

@@ -1,6 +1,7 @@
 package dev.pranav.applock.features.lockscreen.ui
 
 import android.content.Context
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
@@ -107,6 +108,10 @@ class PasswordOverlayActivity : FragmentActivity() {
         }
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        Log.d(TAG, "Configuration changed - orientation: ${newConfig.orientation}")
+    }
 
     private fun setupWindow() {
         window.addFlags(
@@ -285,7 +290,7 @@ class PasswordOverlayActivity : FragmentActivity() {
 
     override fun onPause() {
         super.onPause()
-        if (!isBiometricPromptShowingLocal && !movedToBackground) {
+        if (!isChangingConfigurations() && !isBiometricPromptShowingLocal && !movedToBackground) {
             AppLockManager.isLockScreenShown.set(false)
             AppLockManager.reportBiometricAuthFinished()
             finish()
@@ -301,7 +306,7 @@ class PasswordOverlayActivity : FragmentActivity() {
         super.onStop()
         movedToBackground = true
         AppLockManager.isLockScreenShown.set(false)
-        if (!isFinishing && !isDestroyed) {
+        if (!isChangingConfigurations() && !isFinishing && !isDestroyed) {
             AppLockManager.reportBiometricAuthFinished()
             finish()
         }

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

@@ -22,7 +22,6 @@ import dev.pranav.applock.data.repository.AppLockRepository
 import dev.pranav.applock.data.repository.BackendImplementation
 import dev.pranav.applock.features.lockscreen.ui.PasswordOverlayActivity
 import dev.pranav.applock.services.AppLockConstants.ACCESSIBILITY_SETTINGS_CLASSES
-import dev.pranav.applock.services.AppLockConstants.ADMIN_CONFIG_CLASSES
 import dev.pranav.applock.services.AppLockConstants.EXCLUDED_APPS
 import rikka.shizuku.Shizuku
 
@@ -112,15 +111,10 @@ class AppLockAccessibilityService : AccessibilityService() {
     }
 
     private fun handleAccessibilityEvent(event: AccessibilityEvent) {
-        // Check for device admin deactivation (anti-uninstall feature)
         if (appLockRepository.isAntiUninstallEnabled() &&
             event.packageName == DEVICE_ADMIN_SETTINGS_PACKAGE
         ) {
-            try {
-                checkForDeviceAdminDeactivation(event)
-            } catch (e: Exception) {
-                logError("Error checking device admin deactivation", e)
-            }
+            checkForDeviceAdminDeactivation(event)
         }
 
         // Early return if protection is disabled or service is not running
@@ -372,8 +366,6 @@ class AppLockAccessibilityService : AccessibilityService() {
     }
 
     private fun checkForDeviceAdminDeactivation(event: AccessibilityEvent) {
-        val rootNode = rootInActiveWindow ?: return
-
         Log.d(TAG, "Checking for device admin deactivation for event: $event")
 
         // Check if user is trying to deactivate the accessibility service
@@ -385,10 +377,12 @@ class AppLockAccessibilityService : AccessibilityService() {
 
         // Check if on device admin page and our app is visible
         val isDeviceAdminPage = isDeviceAdminPage(event)
-        val isOurAppVisible = findNodeWithTextContaining(rootNode, "App Lock") != null ||
-                findNodeWithTextContaining(rootNode, "AppLock") != null
+        //val isOurAppVisible = findNodeWithTextContaining(rootNode, "App Lock") != null ||
+        //        findNodeWithTextContaining(rootNode, "AppLock") != null
 
-        if (!isDeviceAdminPage || !isOurAppVisible) {
+        LogUtils.d(TAG, "User is on device admin page: $isDeviceAdminPage, $event")
+
+        if (!isDeviceAdminPage) {
             return
         }
 
@@ -404,7 +398,6 @@ class AppLockAccessibilityService : AccessibilityService() {
             event.packageName == "com.google.android.packageinstaller" && event.className == "android.app.AlertDialog" && event.text.toString()
                 .lowercase().contains("App Lock")
 
-
         return isAccessibilitySettings || isSubSettings || isAlertDialog
     }
 
@@ -423,8 +416,9 @@ class AppLockAccessibilityService : AccessibilityService() {
         val hasDeviceAdminDescription = event.contentDescription?.toString()?.lowercase()
             ?.contains("Device admin app") == true &&
                 event.className == "android.widget.FrameLayout"
+
         val isAdminConfigClass =
-            event.className!!.endsWith("DeviceAdminAdd") || event.className in ADMIN_CONFIG_CLASSES
+            event.className!!.contains("DeviceAdminAdd") || event.className!!.contains("DeviceAdminSettings")
 
         return hasDeviceAdminDescription || isAdminConfigClass
     }

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

@@ -32,11 +32,6 @@ object AppLockConstants {
         "com.google.android.webview"
     )
 
-    val ADMIN_CONFIG_CLASSES = setOf(
-        "com.android.settings.deviceadmin.DeviceAdminSettings"
-    )
-    // com.android.settings.spa.SpaActivity
-
     val ACCESSIBILITY_SETTINGS_CLASSES = setOf(
         "com.android.settings.accessibility.AccessibilitySettings",
         "com.android.settings.accessibility.AccessibilityMenuActivity",

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

@@ -159,9 +159,7 @@ class ExperimentalAppLockService : Service() {
             if (event.eventType != UsageEvents.Event.ACTIVITY_RESUMED) continue
             if (event.className == "dev.pranav.applock.features.lockscreen.ui.PasswordOverlayActivity") continue
 
-            if (event.className in AppLockConstants.KNOWN_RECENTS_CLASSES ||
-                event.className in AppLockConstants.ADMIN_CONFIG_CLASSES ||
-                event.className in AppLockConstants.ACCESSIBILITY_SETTINGS_CLASSES
+            if (event.className in AppLockConstants.KNOWN_RECENTS_CLASSES
             ) {
                 continue
             }