diff --git a/.github/workflows/build_apk.yml b/.github/workflows/build_apk.yml
index 77c1a3c..206e768 100644
--- a/.github/workflows/build_apk.yml
+++ b/.github/workflows/build_apk.yml
@@ -24,19 +24,19 @@ jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
 
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: checkout codes
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
       with:
         fetch-depth: '0' # 0 indicates all history, this is needed for git revision
 
     - name: Set up JDK
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v6
       with:
         distribution: 'temurin'
         java-version: '17'
@@ -48,7 +48,7 @@ jobs:
       run: ./gradlew assembleRelease --stacktrace
 
     - name: Upload APK to artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: TouchHelper
         path: ./app/build/outputs/apk/
@@ -65,7 +65,7 @@ jobs:
         echo "release_name=$(($(git rev-list HEAD --count) + 100))" >> $GITHUB_OUTPUT
 
     - name: Create Release and Upload APK
-      uses: softprops/action-gh-release@v2
+      uses: softprops/action-gh-release@v3
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
diff --git a/app/build.gradle b/app/build.gradle
index 5adf81e..3bc67c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ def appVersion = getDate()
 
 android {
     namespace "com.zfdang.touchhelper"
-    compileSdkVersion 35
+    compileSdkVersion 36
 
     buildFeatures {
         buildConfig true
@@ -23,7 +23,7 @@ android {
     defaultConfig {
         applicationId "com.zfdang.touchhelper"
         minSdkVersion 26
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode gitVersion
         versionName appVersion
 
@@ -81,21 +81,25 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
-    implementation 'androidx.navigation:navigation-fragment:2.1.0'
-    implementation 'androidx.navigation:navigation-ui:2.1.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.activity:activity:1.9.3'
+    implementation 'androidx.fragment:fragment:1.8.5'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.navigation:navigation-fragment:2.8.5'
+    implementation 'androidx.navigation:navigation-ui:2.8.5'
+    // lifecycle-extensions is discontinued; ViewModel / LiveData ship as separate artifacts
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.8.7'
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.8.7'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.14.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.11.0'
 
     // https://developer.android.com/jetpack/androidx/releases/preference?hl=zh-cn
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.preference:preference:1.2.1'
 
     // https://mvnrepository.com/artifact/com.belerweb/pinyin4j
     implementation group: 'com.belerweb', name: 'pinyin4j', version: '2.5.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e28d34d..7fd28d4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
-
+    <!--
+        Package visibility (API 30+): the service needs the list of launchable apps to build its
+        working list / whitelist, and the list of input methods to ignore their windows. Both are
+        resolved through these queries, so QUERY_ALL_PACKAGES is not needed.
+        Overlays are TYPE_ACCESSIBILITY_OVERLAY windows of the accessibility service, which need
+        no SYSTEM_ALERT_WINDOW; the battery page is opened via
+        ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS, which needs no permission either.
+    -->
     <queries>
         <intent>
             <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.HOME" />
+        </intent>
+        <intent>
+            <action android:name="android.view.InputMethod" />
         </intent>
     </queries>
 
@@ -20,7 +30,6 @@
         android:label="@string/app_name"
         android:roundIcon="@drawable/ic_touch_helper_icon"
         android:supportsRtl="true"
-        android:persistent="true"
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
diff --git a/app/src/main/java/com/zfdang/touchhelper/MainActivity.java b/app/src/main/java/com/zfdang/touchhelper/MainActivity.java
index 02027f6..c3dec82 100644
--- a/app/src/main/java/com/zfdang/touchhelper/MainActivity.java
+++ b/app/src/main/java/com/zfdang/touchhelper/MainActivity.java
@@ -5,6 +5,7 @@
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import androidx.navigation.ui.AppBarConfiguration;
@@ -16,6 +17,9 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        // the window has no ActionBar (edge-to-edge friendly); this toolbar acts as one
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
         BottomNavigationView navView = findViewById(R.id.nav_view);
 
         // Passing each menu ID as a set of Ids because each
diff --git a/app/src/main/java/com/zfdang/touchhelper/Settings.java b/app/src/main/java/com/zfdang/touchhelper/Settings.java
index 7a99a4d..065d0aa 100644
--- a/app/src/main/java/com/zfdang/touchhelper/Settings.java
+++ b/app/src/main/java/com/zfdang/touchhelper/Settings.java
@@ -46,6 +46,7 @@ private void initSettings() {
 
         // init all settings from SharedPreferences
         bSkipAdNotification = mPreference.getBoolean(SKIP_AD_NOTIFICATION, true);
+        bDisclosureAccepted = mPreference.getBoolean(ACCESSIBILITY_DISCLOSURE_ACCEPTED, false);
 
         // initial duration of skip ad process
         iSkipAdDuration = mPreference.getInt(SKIP_AD_DURATION, 4);
@@ -108,6 +109,21 @@ private static Set<String> querySystemLauncherPackages() {
         return pkgSystems;
     }
 
+    // has the user confirmed the in-app disclosure about what the accessibility service reads?
+    // Google Play requires this consent before the service may process screen content, so the
+    // service stays idle until it is recorded (also for users who enabled the service before
+    // the disclosure existed).
+    private static final String ACCESSIBILITY_DISCLOSURE_ACCEPTED = "ACCESSIBILITY_DISCLOSURE_ACCEPTED";
+    private volatile boolean bDisclosureAccepted;
+    public boolean isDisclosureAccepted() {
+        return bDisclosureAccepted;
+    }
+    public void setDisclosureAccepted(boolean accepted) {
+        bDisclosureAccepted = accepted;
+        mEditor.putBoolean(ACCESSIBILITY_DISCLOSURE_ACCEPTED, accepted);
+        mEditor.apply();
+    }
+
     // notification on skip ads?
     private static final String SKIP_AD_NOTIFICATION = "SKIP_AD_NOTIFICATION";
     private boolean bSkipAdNotification;
diff --git a/app/src/main/java/com/zfdang/touchhelper/TouchHelperServiceImpl.java b/app/src/main/java/com/zfdang/touchhelper/TouchHelperServiceImpl.java
index 4d1f32e..77cc05f 100644
--- a/app/src/main/java/com/zfdang/touchhelper/TouchHelperServiceImpl.java
+++ b/app/src/main/java/com/zfdang/touchhelper/TouchHelperServiceImpl.java
@@ -352,6 +352,12 @@ private void InstallReceiverAndHandler() {
     // 1. TYPE_WINDOW_STATE_CHANGED, 判断packageName和activityName,决定是否开始跳过检测; 然后使用三种方法去尝试跳过
     // 2. TYPE_WINDOW_CONTENT_CHANGED, 使用两种方法去尝试跳过
     public void onAccessibilityEvent(AccessibilityEvent event) {
+        if (!mSetting.isDisclosureAccepted()) {
+            // no screen content is read or clicked until the user has confirmed the in-app
+            // disclosure; tell them once per process where to do that
+            remindDisclosureOnce();
+            return;
+        }
         if (BuildConfig.DEBUG) {
             Log.d(TAG, AccessibilityEvent.eventTypeToString(event.getEventType()) + " - " + event.getPackageName() + " - " + event.getClassName() + "; ");
             Log.d(TAG, "    currentPackageName = " + currentPackageName + "  currentActivityName = " + currentActivityName);
@@ -501,6 +507,14 @@ public void run() {
         }
     }
 
+    private boolean disclosureReminderShown;
+
+    private void remindDisclosureOnce() {
+        if (disclosureReminderShown || receiverHandler == null) return;
+        disclosureReminderShown = true;
+        receiverHandler.post(() -> Toast.makeText(service, R.string.accessibility_disclosure_reminder, Toast.LENGTH_LONG).show());
+    }
+
     public void onUnbind(Intent intent) {
         try {
             stopSkipAdProcessInner();
diff --git a/app/src/main/java/com/zfdang/touchhelper/ui/about/AboutFragment.java b/app/src/main/java/com/zfdang/touchhelper/ui/about/AboutFragment.java
index 6129bc0..a1bffd6 100644
--- a/app/src/main/java/com/zfdang/touchhelper/ui/about/AboutFragment.java
+++ b/app/src/main/java/com/zfdang/touchhelper/ui/about/AboutFragment.java
@@ -11,9 +11,8 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.pm.PackageInfoCompat;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
 
 import com.zfdang.touchhelper.R;
 
@@ -28,12 +27,12 @@ public View onCreateView(@NonNull LayoutInflater inflater,
         TextView tvVersion = root.findViewById(R.id.textView_version);
 
         String versionName = "unknown";
-        int versionCode = 0;
+        long versionCode = 0;
         PackageManager pm = getActivity().getPackageManager();
         try {
             PackageInfo pi = pm.getPackageInfo(getActivity().getPackageName(), 0);
             versionName = pi.versionName;
-            versionCode = pi.versionCode;
+            versionCode = PackageInfoCompat.getLongVersionCode(pi);
             // generate about_content with version from manifest
         } catch (PackageManager.NameNotFoundException e) {
             Log.e(TAG, "showInfoDialog: " + Log.getStackTraceString(e));
diff --git a/app/src/main/java/com/zfdang/touchhelper/ui/home/HomeFragment.java b/app/src/main/java/com/zfdang/touchhelper/ui/home/HomeFragment.java
index 7ddfc6d..5f07590 100644
--- a/app/src/main/java/com/zfdang/touchhelper/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/zfdang/touchhelper/ui/home/HomeFragment.java
@@ -1,9 +1,7 @@
 package com.zfdang.touchhelper.ui.home;
 
-import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -11,27 +9,20 @@
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.provider.Settings;
-import android.text.method.Touch;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
 
-import androidx.annotation.LongDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.MediatorLiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProvider;
 
 import com.zfdang.touchhelper.R;
 import com.zfdang.touchhelper.TouchHelperService;
@@ -44,8 +35,7 @@ public class HomeFragment extends Fragment {
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
-        homeViewModel =
-                ViewModelProviders.of(this).get(HomeViewModel.class);
+        homeViewModel = new ViewModelProvider(this).get(HomeViewModel.class);
         View root = inflater.inflate(R.layout.fragment_home, container, false);
 
         final Drawable drawableYes = ContextCompat.getDrawable(getContext(), R.drawable.ic_right);
@@ -79,14 +69,7 @@ public void onChanged(Boolean aBoolean) {
 
         // set listener for buttons
         final ImageButton btAccessibilityPermission = root.findViewById(R.id.button_accessibility_permission);
-        btAccessibilityPermission.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent_abs = new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS);
-                intent_abs.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(intent_abs);
-            }
-        });
+        btAccessibilityPermission.setOnClickListener(v -> showAccessibilityDisclosure());
 
         final ImageButton btPowerPermission = root.findViewById(R.id.button_power_permission);
         btPowerPermission.setOnClickListener(new View.OnClickListener() {
@@ -116,16 +99,59 @@ public void onClick(View v) {
     public void onResume() {
         checkServiceStatus();
         super.onResume();
+        // the service was enabled from the system settings (or before the disclosure existed)
+        // but the user has not confirmed the disclosure yet: it stays idle until they do
+        if (TouchHelperService.isServiceRunning()
+                && !com.zfdang.touchhelper.Settings.getInstance().isDisclosureAccepted()) {
+            showAccessibilityDisclosure();
+        }
     }
 
-    public void checkServiceStatus(){
+    @Override
+    public void onPause() {
+        if (disclosureDialog != null && disclosureDialog.isShowing()) {
+            disclosureDialog.dismiss();
+        }
+        super.onPause();
+    }
+
+    /**
+     * Google Play requires a prominent in-app disclosure before an app sends the user to enable
+     * an accessibility service that is not an assistive tool: what the service reads, what it
+     * does with it, and that nothing leaves the device.
+     */
+    private void showAccessibilityDisclosure() {
+        if (com.zfdang.touchhelper.Settings.getInstance().isDisclosureAccepted()) {
+            openAccessibilitySettings();
+            return;
+        }
+        if (disclosureDialog != null && disclosureDialog.isShowing()) {
+            return;
+        }
+        final boolean serviceRunning = TouchHelperService.isServiceRunning();
+        disclosureDialog = new AlertDialog.Builder(requireContext())
+                .setTitle(R.string.accessibility_disclosure_title)
+                .setMessage(R.string.accessibility_disclosure_message)
+                .setPositiveButton(serviceRunning ? R.string.accessibility_disclosure_agree_only : R.string.accessibility_disclosure_agree,
+                        (dialog, which) -> {
+                            com.zfdang.touchhelper.Settings.getInstance().setDisclosureAccepted(true);
+                            if (!serviceRunning) {
+                                openAccessibilitySettings();
+                            }
+                        })
+                .setNegativeButton(R.string.accessibility_disclosure_cancel, null)
+                .show();
+    }
 
-        // detect the app storage permission
-        boolean bAppPermission =
-                ContextCompat.checkSelfPermission(getContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
-        MutableLiveData<Boolean> liveData = homeViewModel.getAppPermission();
-        liveData.setValue(bAppPermission);
+    private AlertDialog disclosureDialog;
 
+    private void openAccessibilitySettings() {
+        Intent intent = new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+    }
+
+    public void checkServiceStatus(){
         // detect the accessibility permission
         MutableLiveData<Boolean> accessibility = homeViewModel.getAccessibilityPermission();
         accessibility.setValue(TouchHelperService.isServiceRunning());
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2a6a189..ca89df4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,28 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="@dimen/navigation_view_padding_top">
+    android:fitsSystemWindows="true">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="0dp"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@android:color/white"
+        android:theme="@style/AppTheme.Toolbar"
+        app:titleTextColor="@android:color/black"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/toolbar_divider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="#1F000000"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/nav_view"
@@ -22,12 +43,12 @@
         android:id="@+id/nav_host_fragment"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         app:defaultNavHost="true"
         app:layout_constraintBottom_toTopOf="@id/nav_view"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar_divider"
         app:navGraph="@navigation/mobile_navigation" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a641426..02d4637 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,6 +3,4 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
 
-    <dimen name="navigation_view_padding_top">0dp</dimen>
-
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3fa0dcc..6543d5b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,4 +29,10 @@
     <string name="about_copyright">Copyright © 2022 Zhengfa Dang</string>
 
     <string name="app_version">版本: %s (%d)</string>
+    <string name="accessibility_disclosure_title">开启无障碍服务前请了解</string>
+    <string name="accessibility_disclosure_message">\"开屏跳过\"通过安卓无障碍服务读取当前屏幕上的界面内容（控件文字、描述和位置），用于识别并自动点击开屏广告的\"跳过\"按钮。\n\n· 自动识别时，这些内容只在本机内存中即时比对，不保存。\n· 当您使用\"添加程序的跳过方法\"时，您所选控件的文字、描述和坐标会作为规则保存在本机的应用数据中，可在设置中查看或删除。\n· 当您使用\"复制窗口控件\"时，当前窗口的控件信息会按您的操作复制到系统剪贴板。\n\n本程序不申请网络权限，不会收集或上传任何数据。同意后即可开启无障碍服务；未同意前服务不会读取任何界面内容。</string>
+    <string name="accessibility_disclosure_agree">同意并前往设置</string>
+    <string name="accessibility_disclosure_agree_only">同意</string>
+    <string name="accessibility_disclosure_reminder">开屏跳过：请打开应用并确认无障碍服务说明后，跳过功能才会开始工作</string>
+    <string name="accessibility_disclosure_cancel">取消</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fac9291..9abd15b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,10 +1,17 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <!-- light system bars: white status bar with dark icons, matching the white toolbar -->
+        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
+    <!-- white toolbar with dark title text -->
+    <style name="AppTheme.Toolbar" parent="ThemeOverlay.AppCompat.Light" />
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/accessibility_service_config.xml b/app/src/main/res/xml/accessibility_service_config.xml
index 93cd576..164cf32 100644
--- a/app/src/main/res/xml/accessibility_service_config.xml
+++ b/app/src/main/res/xml/accessibility_service_config.xml
@@ -5,6 +5,7 @@
     android:accessibilityFlags="flagRetrieveInteractiveWindows|flagReportViewIds|flagIncludeNotImportantViews"
     android:canPerformGestures="true"
     android:canRetrieveWindowContent="true"
+    android:isAccessibilityTool="false"
     android:description="@string/touch_helper_service_description"
     android:notificationTimeout="50"
     android:settingsActivity="com.zfdang.touchhelper.MainActivity" />
\ No newline at end of file
diff --git a/app/src/test/java/com/zfdang/touchhelper/TouchHelperServiceImplTest.java b/app/src/test/java/com/zfdang/touchhelper/TouchHelperServiceImplTest.java
index 258549a..d8b2ae0 100644
--- a/app/src/test/java/com/zfdang/touchhelper/TouchHelperServiceImplTest.java
+++ b/app/src/test/java/com/zfdang/touchhelper/TouchHelperServiceImplTest.java
@@ -85,6 +85,8 @@ public android.content.res.Resources getResources() {
     @Before
     public void setUp() throws Exception {
         service = Robolectric.setupService(RootService.class);
+        // the in-app disclosure has been confirmed for all tests but the ones about it
+        Settings.getInstance().setDisclosureAccepted(true);
         service.onServiceConnected();
         impl = (TouchHelperServiceImpl) getFrom(TouchHelperService.class, service, "serviceImpl");
         assertNotNull(impl);
@@ -1025,6 +1027,44 @@ public void warmStart_ofAnUnhandledAppDoesNothing() throws Exception {
         assertEquals(0, service.rootReads);
     }
 
+    // ------------------------------------------------------------------ disclosure gate
+
+    @Test
+    public void service_staysIdleUntilTheDisclosureIsAccepted() throws Exception {
+        Settings.getInstance().setDisclosureAccepted(false);
+        AtomicInteger clicks = new AtomicInteger();
+        service.activeRoot = keywordTree(new AtomicInteger(), clicks);
+        impl.onAccessibilityEvent(stateChanged(AD_PKG, AD_ACTIVITY));
+        assertFalse("no skip-ad process without consent", skipAdRunning());
+        assertEquals("the screen is not read without consent", 0, service.rootReads);
+        impl.onAccessibilityEvent(contentChanged(AD_PKG, keywordTree(new AtomicInteger(), clicks)));
+        awaitExecutor();
+        assertEquals(0, clicks.get());
+        shadowOf(Looper.getMainLooper()).idle();
+        assertEquals("the user is told once where to confirm", 1,
+                org.robolectric.shadows.ShadowToast.shownToastCount());
+
+        // consent recorded: the very next event is handled
+        Settings.getInstance().setDisclosureAccepted(true);
+        impl.onAccessibilityEvent(stateChanged(AD_PKG, AD_ACTIVITY));
+        assertTrue(skipAdRunning());
+        awaitExecutor();
+        assertEquals(1, clicks.get());
+    }
+
+    @Test
+    public void disclosureConsent_isPersisted() throws Exception {
+        Settings settings = Settings.getInstance();
+        // the singleton keeps the SharedPreferences it was created with; read through it
+        android.content.SharedPreferences prefs = (android.content.SharedPreferences) get(settings, "mPreference");
+        settings.setDisclosureAccepted(false);
+        assertFalse(settings.isDisclosureAccepted());
+        assertFalse(prefs.getBoolean("ACCESSIBILITY_DISCLOSURE_ACCEPTED", true));
+        settings.setDisclosureAccepted(true);
+        assertTrue(settings.isDisclosureAccepted());
+        assertTrue(prefs.getBoolean("ACCESSIBILITY_DISCLOSURE_ACCEPTED", false));
+    }
+
     @Test
     public void onUnbind_shutsDownWorkerAndStopsProcess() throws Exception {
         startSkipAdProcess();
diff --git a/build.gradle b/build.gradle
index f88d0d4..c7c1780 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.android.tools.build:gradle:8.9.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
index 57a0af7..52bb027 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,12 +16,10 @@ org.gradle.jvmargs=-Xmx2048m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false
 
 # Keystore credentials (DO NOT commit real values to version control)
 # Set these in local.properties or as environment variables
 KEYSTORE_PASSWORD=touchhelper
 KEY_ALIAS=touchhelper
-KEY_PASSWORD=touchhelper
-# Robolectric pulls in bcprov (Java 21 bytecode) which Jetifier cannot rewrite; it needs no rewriting anyway
-android.jetifier.ignorelist=bcprov
+KEY_PASSWORD=touchhelper
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1cebe8b..45e6ead 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip