From 6002eaf0cfb8d00d1cc4c8e2c74cb8b5d3e1e38d Mon Sep 17 00:00:00 2001
From: min <minish@riseup.net>
Date: Fri, 10 Oct 2025 00:34:08 -0400
Subject: [PATCH] stricter accessibility settings restriction

---
 .../java/rip/min/digica/service/DigicaService.kt     | 12 +++++-------
 .../main/res/xml/accessibility_service_config.xml    |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/rip/min/digica/service/DigicaService.kt b/app/src/main/java/rip/min/digica/service/DigicaService.kt
index b6a31e2..11824e5 100644
--- a/app/src/main/java/rip/min/digica/service/DigicaService.kt
+++ b/app/src/main/java/rip/min/digica/service/DigicaService.kt
@@ -91,12 +91,10 @@ class DigicaService : AccessibilityService() {
                     && className == "android.app.AlertDialog"
                     && event.text.getOrNull(0) == appLabel
 
-            // Is user trying to disable the service?
-            val attemptingDisableService = pkgName == "com.android.settings"
-                    && (className == "android.app.AlertDialog"
-                    || className == "androidx.appcompat.app.AlertDialog")
-                    && event.text.size == 3
-                    && event.text[0].contains(serviceLabel)
+            // Is user entering the accessibility service page?
+            val attemptingServicePage = pkgName == "com.android.settings"
+                    && className == "com.android.settings.SubSettings"
+                    && event.text.getOrNull(0) == serviceLabel
 
             // Is user trying to go on a banned app?
             val usingApp = pkgName == "com.zhiliaoapp.musically"
@@ -104,7 +102,7 @@ class DigicaService : AccessibilityService() {
                     || pkgName == "app.revanced.android.youtube"
 
             val attempting = (attemptingUninstall
-                    || attemptingDisableService
+                    || attemptingServicePage
                     || attemptingForceStop
                     || usingApp)
 
diff --git a/app/src/main/res/xml/accessibility_service_config.xml b/app/src/main/res/xml/accessibility_service_config.xml
index 5276bf5..7b9b555 100644
--- a/app/src/main/res/xml/accessibility_service_config.xml
+++ b/app/src/main/res/xml/accessibility_service_config.xml
@@ -1,7 +1,7 @@
 <accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:description="@string/accessibility_service_description"
-    android:accessibilityEventTypes="typeWindowStateChanged|typeViewClicked"
+    android:accessibilityEventTypes="typeWindowStateChanged"
     android:accessibilityFlags="flagDefault"
     android:accessibilityFeedbackType="feedbackGeneric"
     android:notificationTimeout="0"