调整了系统hooker延迟工作的实现方式

Author: kooritea

README.md

@@ -1,4 +1,4 @@
-# fcmfix(Android 10以上14以下 )(Android 14?)
+# fcmfix(Android 10-15 )
 
 [![Android CI](https://github.com/kooritea/fcmfix/workflows/Android%20CI/badge.svg)](https://github.com/kooritea/fcmfix/actions)
 

app/src/main/java/com/kooritea/fcmfix/XposedMain.java

@@ -1,9 +1,6 @@
 package com.kooritea.fcmfix;
 
 import android.annotation.SuppressLint;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
 
 import com.kooritea.fcmfix.xposed.AutoStartFix;
 import com.kooritea.fcmfix.xposed.BroadcastFix;
@@ -28,20 +25,28 @@ public void handleLoadPackage(final XC_LoadPackage.LoadPackageParam loadPackageP
             return;
         }
         if(loadPackageParam.packageName.equals("android")){
-            new Handler(Looper.getMainLooper()).postDelayed(() -> {
-                XposedModule.staticLoadPackageParam = loadPackageParam;
-                XposedBridge.log("[fcmfix] start hook com.android.server.am.ActivityManagerService");
-                new BroadcastFix(loadPackageParam);
+            XposedModule.isBootComplete = false;
+            XposedModule.staticLoadPackageParam = loadPackageParam;
+            new Thread(() -> {
+                try {
+                    Thread.sleep(60000);
+                    XposedModule.isBootComplete = true;
+                    XposedBridge.log("[fcmfix] isBootComplete");
+                } catch (Exception e) {
+                    XposedBridge.log("[fcmfix] "+e.getMessage());
+                }
+            }).start();
+            XposedBridge.log("[fcmfix] start hook com.android.server.am.ActivityManagerService");
+            new BroadcastFix(loadPackageParam);
 
-                XposedBridge.log("[fcmfix] start hook com.android.server.notification.NotificationManagerServiceInjector");
-                new MiuiLocalNotificationFix(loadPackageParam);
+            XposedBridge.log("[fcmfix] start hook com.android.server.notification.NotificationManagerServiceInjector");
+            new MiuiLocalNotificationFix(loadPackageParam);
 
-                XposedBridge.log("[fcmfix] com.android.server.am.BroadcastQueueInjector.checkApplicationAutoStart");
-                new AutoStartFix(loadPackageParam);
+            XposedBridge.log("[fcmfix] com.android.server.am.BroadcastQueueInjector.checkApplicationAutoStart");
+            new AutoStartFix(loadPackageParam);
 
-                XposedBridge.log("[fcmfix] com.android.server.notification.NotificationManagerService");
-                new KeepNotification(loadPackageParam);
-            }, 60000);
+            XposedBridge.log("[fcmfix] com.android.server.notification.NotificationManagerService");
+            new KeepNotification(loadPackageParam);
         }
 
         if(loadPackageParam.packageName.equals("com.google.android.gms") && loadPackageParam.isFirstApplication){

app/src/main/java/com/kooritea/fcmfix/xposed/BroadcastFix.java

@@ -26,10 +26,6 @@ public class BroadcastFix extends XposedModule {
 
     public BroadcastFix(XC_LoadPackage.LoadPackageParam loadPackageParam) {
         super(loadPackageParam);
-    }
-
-    @Override
-    protected void onCanReadConfig() {
         try{
             this.startHookBroadcastIntentLocked();
         }catch (Exception e) {
@@ -152,6 +148,9 @@ protected void startHookBroadcastIntentLocked(){
             XposedBridge.hookMethod(targetMethod,new XC_MethodHook() {
                 @Override
                 protected void beforeHookedMethod(MethodHookParam methodHookParam) {
+                    if(!isBootComplete){
+                        return;
+                    }
                     Intent intent = (Intent) methodHookParam.args[finalIntent_args_index];
                     if(intent != null && intent.getPackage() != null && intent.getFlags() != Intent.FLAG_INCLUDE_STOPPED_PACKAGES && isFCMIntent(intent)){
                         String target;
@@ -210,6 +209,9 @@ protected void startHookScheduleResultTo(){
         XposedBridge.hookMethod(method,new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam methodHookParam) {
+                if(!isBootComplete){
+                    return;
+                }
                 if(methodHookParam.args[0] == null || XposedHelpers.getObjectField(methodHookParam.args[0],"resultTo") == null || XposedHelpers.getObjectField(methodHookParam.args[0],"intent") == null || XposedHelpers.getObjectField(methodHookParam.args[0],"resultCode") == null){
                     return;
                 }

app/src/main/java/com/kooritea/fcmfix/xposed/KeepNotification.java

@@ -13,17 +13,13 @@ public class KeepNotification extends XposedModule{
 
     public KeepNotification(XC_LoadPackage.LoadPackageParam loadPackageParam) {
         super(loadPackageParam);
-    }
-
-    @Override
-    protected void onCanReadConfig() {
         try {
             this.startHook();
         } catch (XposedHelpers.ClassNotFoundError | NoSuchMethodError e) {
             printLog("No Such Method com.android.server.notification.NotificationManagerService.cancelAllNotificationsInt");
         }
     }
-
+    
     protected void startHook() throws NoSuchMethodError, XposedHelpers.ClassNotFoundError {
         Class<?> clazz = XposedHelpers.findClass("com.android.server.notification.NotificationManagerService",loadPackageParam.classLoader);
         final Method[] declareMethods = clazz.getDeclaredMethods();
@@ -79,6 +75,9 @@ protected void startHook() throws NoSuchMethodError, XposedHelpers.ClassNotFound
             XposedBridge.hookMethod(targetMethod,new XC_MethodHook() {
                 @Override
                 protected void beforeHookedMethod(MethodHookParam param) {
+                    if(!isBootComplete){
+                        return;
+                    }
                     if(getBooleanConfig("disableAutoCleanNotification",false) && targetIsAllow((String) param.args[finalPkg_args_index])){
                         int reason = (int)param.args[finalReason_args_index];
                         if(reason == NotificationListenerService.REASON_PACKAGE_CHANGED){

app/src/main/java/com/kooritea/fcmfix/xposed/XposedModule.java

@@ -39,6 +39,7 @@ public abstract class XposedModule {
     protected static Context context = null;
     private static final ArrayList<XposedModule> instances = new ArrayList<>();
     private static Boolean isInitReceiver = false;
+    public static Boolean isBootComplete = true;
     private static Thread loadConfigThread = null;
 
     protected XposedModule(final XC_LoadPackage.LoadPackageParam loadPackageParam) {