From 7215d525d033ba551f45a1f8977dbf253c0fc64b Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Fri, 17 Jul 2026 12:00:27 +0800
Subject: [PATCH] =?UTF-8?q?build:=20DialerAccessibilityService=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7kotlin=E8=87=B32.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                  | 1 +
 app/src/main/AndroidManifest.xml                            | 2 +-
 .../AccessibilityServiceHelper.java                         | 6 +++---
 .../DialerAccessibilityService.java                         | 2 +-
 .../dialer/fragment/dialog/contact/call/CallFragment.java   | 5 ++---
 build.gradle                                                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename app/src/main/java/com/ttstd/dialer/{utils => accessibility}/AccessibilityServiceHelper.java (92%)
 rename app/src/main/java/com/ttstd/dialer/{service => accessibility}/DialerAccessibilityService.java (99%)

diff --git a/.gitignore b/.gitignore
index ef58d03..3684a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 .cxx
 /.idea/
 /config.gradle
+/.kotlin/
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 149c8ef..264cf34 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -143,7 +143,7 @@
             android:exported="false" />
 
         <service
-            android:name=".service.DialerAccessibilityService"
+            android:name=".accessibility.DialerAccessibilityService"
             android:exported="true"
             android:label="@string/accessibility_service_label"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
diff --git a/app/src/main/java/com/ttstd/dialer/utils/AccessibilityServiceHelper.java b/app/src/main/java/com/ttstd/dialer/accessibility/AccessibilityServiceHelper.java
similarity index 92%
rename from app/src/main/java/com/ttstd/dialer/utils/AccessibilityServiceHelper.java
rename to app/src/main/java/com/ttstd/dialer/accessibility/AccessibilityServiceHelper.java
index 7ac9f58..3427ce6 100644
--- a/app/src/main/java/com/ttstd/dialer/utils/AccessibilityServiceHelper.java
+++ b/app/src/main/java/com/ttstd/dialer/accessibility/AccessibilityServiceHelper.java
@@ -1,4 +1,4 @@
-package com.ttstd.dialer.utils;
+package com.ttstd.dialer.accessibility;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.content.ComponentName;
@@ -8,7 +8,7 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
 
-import com.ttstd.dialer.service.DialerAccessibilityService;
+import com.ttstd.dialer.utils.Logger;
 
 import java.util.List;
 
@@ -53,7 +53,7 @@ public class AccessibilityServiceHelper {
         try {
             Intent intent = new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // 通常从应用上下文启动时需要此标志
-            String str = context.getPackageName() + "/com.ttstd.dialer.service." + DialerAccessibilityService.class.getCanonicalName();
+            String str = context.getPackageName() + "/" + DialerAccessibilityService.class.getName();
             Bundle bundle = new Bundle();
             bundle.putString(":settings:fragment_args_key", str);
             intent.putExtra(":settings:fragment_args_key", str);
diff --git a/app/src/main/java/com/ttstd/dialer/service/DialerAccessibilityService.java b/app/src/main/java/com/ttstd/dialer/accessibility/DialerAccessibilityService.java
similarity index 99%
rename from app/src/main/java/com/ttstd/dialer/service/DialerAccessibilityService.java
rename to app/src/main/java/com/ttstd/dialer/accessibility/DialerAccessibilityService.java
index d37643c..78562a0 100644
--- a/app/src/main/java/com/ttstd/dialer/service/DialerAccessibilityService.java
+++ b/app/src/main/java/com/ttstd/dialer/accessibility/DialerAccessibilityService.java
@@ -1,4 +1,4 @@
-package com.ttstd.dialer.service;
+package com.ttstd.dialer.accessibility;
 
 import android.accessibilityservice.AccessibilityService;
 import android.accessibilityservice.GestureDescription;
diff --git a/app/src/main/java/com/ttstd/dialer/fragment/dialog/contact/call/CallFragment.java b/app/src/main/java/com/ttstd/dialer/fragment/dialog/contact/call/CallFragment.java
index 5e58031..a18f56e 100644
--- a/app/src/main/java/com/ttstd/dialer/fragment/dialog/contact/call/CallFragment.java
+++ b/app/src/main/java/com/ttstd/dialer/fragment/dialog/contact/call/CallFragment.java
@@ -1,7 +1,6 @@
 package com.ttstd.dialer.fragment.dialog.contact.call;
 
 import android.Manifest;
-import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
@@ -25,8 +24,8 @@ import com.ttstd.dialer.R;
 import com.ttstd.dialer.base.mvvm.fragment.BaseMvvmDialogFragment;
 import com.ttstd.dialer.databinding.DialogFragmentContactCallBinding;
 import com.ttstd.dialer.db.contact.ContactInfo;
-import com.ttstd.dialer.service.DialerAccessibilityService;
-import com.ttstd.dialer.utils.AccessibilityServiceHelper;
+import com.ttstd.dialer.accessibility.DialerAccessibilityService;
+import com.ttstd.dialer.accessibility.AccessibilityServiceHelper;
 import com.ttstd.dialer.utils.ApkUtils;
 import com.ttstd.dialer.utils.Logger;
 
diff --git a/build.gradle b/build.gradle
index 56464ff..354dd3a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 apply from: "config.gradle"
 
 buildscript {
-    ext.kotlin_version = '2.3.21'
+    ext.kotlin_version = '2.4.0'
 
     repositories {
         google()