From 1894bd3faeb09a9252eb2a83fa430b4c259fb0d2 Mon Sep 17 00:00:00 2001 From: kooritea Date: Fri, 6 Nov 2020 10:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94hook=20gcmservice?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../fcmfix/xposed/ReconnectManagerFix.java | 69 ++++++++++++------- 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 496e72b..e7779d2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.kooritea.fcmfix" minSdkVersion 27 targetSdkVersion 29 - versionCode 3 - versionName "0.0.3" + versionCode 4 + versionName "0.0.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/kooritea/fcmfix/xposed/ReconnectManagerFix.java b/app/src/main/java/com/kooritea/fcmfix/xposed/ReconnectManagerFix.java index e1a1b8a..635a3c9 100644 --- a/app/src/main/java/com/kooritea/fcmfix/xposed/ReconnectManagerFix.java +++ b/app/src/main/java/com/kooritea/fcmfix/xposed/ReconnectManagerFix.java @@ -34,6 +34,7 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; +import java.lang.reflect.Method; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -50,6 +51,7 @@ public class ReconnectManagerFix extends XposedModule { private Class GcmChimeraService; + private String GcmChimeraServiceLogMethodName; public ReconnectManagerFix(XC_LoadPackage.LoadPackageParam loadPackageParam) { @@ -59,33 +61,44 @@ public ReconnectManagerFix(XC_LoadPackage.LoadPackageParam loadPackageParam) { private void startHookGcmServiceStart() { this.GcmChimeraService = XposedHelpers.findClass("com.google.android.gms.gcm.GcmChimeraService", loadPackageParam.classLoader); - XposedHelpers.findAndHookMethod(XposedHelpers.findClass("com.google.android.gms.gcm.GcmChimeraService", loadPackageParam.classLoader), "onCreate", new XC_MethodHook() { - @Override - protected void afterHookedMethod(final MethodHookParam param) throws Throwable { - IntentFilter intentFilter = new IntentFilter(); - intentFilter.addAction("com.kooritea.fcmfix.log"); - AndroidAppHelper.currentApplication().getApplicationContext().registerReceiver(logBroadcastReceive, intentFilter); - if (AndroidAppHelper.currentApplication().getApplicationContext().getSystemService(UserManager.class).isUserUnlocked()) { - try { - startHook(); - printLog("ReconnectManagerFixStartHook 完成"); - } catch (Exception e) { - printLog("ReconnectManagerFixStartHook 初始化失败: " + e.getMessage()); + try{ + for(Method method : this.GcmChimeraService.getMethods()){ + if(method.getParameterTypes().length == 2){ + if(method.getParameterTypes()[0] == String.class && method.getParameterTypes()[1] == Object[].class){ + this.GcmChimeraServiceLogMethodName = method.getName(); + break; } - } else { - IntentFilter userUnlockIntentFilter = new IntentFilter(); - userUnlockIntentFilter.addAction(Intent.ACTION_USER_UNLOCKED); - AndroidAppHelper.currentApplication().getApplicationContext().registerReceiver(unlockBroadcastReceive, userUnlockIntentFilter); } } - }); - XposedHelpers.findAndHookMethod(XposedHelpers.findClass("com.google.android.gms.gcm.GcmChimeraService", loadPackageParam.classLoader), "onDestroy", new XC_MethodHook() { - @Override - protected void beforeHookedMethod(final MethodHookParam param) throws Throwable { - AndroidAppHelper.currentApplication().getApplicationContext().unregisterReceiver(logBroadcastReceive); - } - }); - + XposedHelpers.findAndHookMethod(this.GcmChimeraService, "onCreate", new XC_MethodHook() { + @Override + protected void afterHookedMethod(final MethodHookParam param) throws Throwable { + IntentFilter intentFilter = new IntentFilter(); + intentFilter.addAction("com.kooritea.fcmfix.log"); + AndroidAppHelper.currentApplication().getApplicationContext().registerReceiver(logBroadcastReceive, intentFilter); + if (AndroidAppHelper.currentApplication().getApplicationContext().getSystemService(UserManager.class).isUserUnlocked()) { + try { + startHook(); + printLog("ReconnectManagerFixStartHook 完成"); + } catch (Exception e) { + printLog("ReconnectManagerFixStartHook 初始化失败: " + e.getMessage()); + } + } else { + IntentFilter userUnlockIntentFilter = new IntentFilter(); + userUnlockIntentFilter.addAction(Intent.ACTION_USER_UNLOCKED); + AndroidAppHelper.currentApplication().getApplicationContext().registerReceiver(unlockBroadcastReceive, userUnlockIntentFilter); + } + } + }); + XposedHelpers.findAndHookMethod(this.GcmChimeraService, "onDestroy", new XC_MethodHook() { + @Override + protected void beforeHookedMethod(final MethodHookParam param) throws Throwable { + AndroidAppHelper.currentApplication().getApplicationContext().unregisterReceiver(logBroadcastReceive); + } + }); + }catch (Exception e){ + XposedBridge.log("GcmChimeraService hook 失败"); + } } private void startHook() throws Exception { @@ -184,7 +197,11 @@ private void createFcmfixChannel(NotificationManager notificationManager) { public void onReceive(Context context, Intent intent) { String action = intent.getAction(); if ("com.kooritea.fcmfix.log".equals(action)) { - XposedHelpers.callStaticMethod(GcmChimeraService, "a", new Class[]{String.class, Object[].class}, "[fcmfix] " + intent.getStringExtra("text"), null); + try{ + XposedHelpers.callStaticMethod(GcmChimeraService,GcmChimeraServiceLogMethodName , new Class[]{String.class, Object[].class}, "[fcmfix] " + intent.getStringExtra("text"), null); + }catch (Exception e){ + XposedBridge.log("输出日志到fcm失败： "+"[fcmfix] " + intent.getStringExtra("text")); + } } } }; @@ -193,7 +210,7 @@ public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) { String action = intent.getAction(); if (Intent.ACTION_USER_UNLOCKED.equals(action)) { - printLog("UserUnlock Broadcast"); + printLog("User Device Unlock Broadcast"); try { startHook(); printLog("ReconnectManagerFixStartHook 完成");