fix issue of accessibility service not being shown as enabled

Author: modelorona

app/src/main/java/com/ah/taplock/MainActivity.kt

@@ -5,15 +5,19 @@ import android.appwidget.AppWidgetManager
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.database.ContentObserver
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.drawable.Icon
 import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.os.PowerManager
 import android.provider.Settings
 import android.util.Log
 import android.widget.Toast
+import android.view.accessibility.AccessibilityManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
@@ -530,6 +534,36 @@ fun TapLockScreen() {
 
     DisposableEffect(Unit) {
         val lifecycleOwner = context as ComponentActivity
+        val accessibilityManager =
+            context.getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager
+
+        val refreshAccessibilityState = {
+            isAccessibilityEnabled = isAccessibilityEnabled(context)
+        }
+
+        val accessibilityObserver =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                val listener =
+                    AccessibilityManager.AccessibilityServicesStateChangeListener {
+                        refreshAccessibilityState()
+                    }
+                accessibilityManager.addAccessibilityServicesStateChangeListener(listener)
+                listener
+            } else {
+                val observer = object : ContentObserver(Handler(Looper.getMainLooper())) {
+                    override fun onChange(selfChange: Boolean) {
+                        refreshAccessibilityState()
+                    }
+                }
+                context.contentResolver.registerContentObserver(
+                    Settings.Secure.getUriFor(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES),
+                    false,
+                    observer
+                )
+                observer
+            }
+        refreshAccessibilityState()
+
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_RESUME) {
                 isAccessibilityEnabled = isAccessibilityEnabled(context)
@@ -600,6 +634,13 @@ fun TapLockScreen() {
         }
         lifecycleOwner.lifecycle.addObserver(observer)
         onDispose {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                accessibilityManager.removeAccessibilityServicesStateChangeListener(
+                    accessibilityObserver as AccessibilityManager.AccessibilityServicesStateChangeListener
+                )
+            } else {
+                context.contentResolver.unregisterContentObserver(accessibilityObserver as ContentObserver)
+            }
             lifecycleOwner.lifecycle.removeObserver(observer)
         }
     }

app/src/main/java/com/ah/taplock/Utils.kt

@@ -1,13 +1,19 @@
 package com.ah.taplock
 
+import android.accessibilityservice.AccessibilityServiceInfo
+import android.content.ComponentName
 import android.content.Context
-import android.provider.Settings
+import android.view.accessibility.AccessibilityManager
 
 fun isAccessibilityEnabled(context: Context): Boolean {
-    val enabledServices = Settings.Secure.getString(
-        context.contentResolver,
-        Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES
-    )
-    val serviceName = "${context.packageName}/${TapLockAccessibilityService::class.java.name}"
-    return enabledServices?.contains(serviceName) == true
-}
+    val accessibilityManager =
+        context.getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager
+    val serviceComponent = ComponentName(context, TapLockAccessibilityService::class.java)
+
+    return accessibilityManager
+        .getEnabledAccessibilityServiceList(AccessibilityServiceInfo.FEEDBACK_ALL_MASK)
+        .any { serviceInfo ->
+            val resolveInfo = serviceInfo.resolveInfo.serviceInfo
+            ComponentName(resolveInfo.packageName, resolveInfo.name) == serviceComponent
+        }
+}