From 6cac613f70d1cb21642076b6002ee724f9040184 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Thu, 20 Apr 2023 18:24:29 +0300 Subject: [PATCH] fixed microg pushes --- .../java/ru/vtosters/lite/utils/GmsUtils.java | 22 +++++-------------- .../ru/vtosters/lite/utils/Preferences.java | 1 - smali/AndroidManifest.xml | 1 - smali/res/xml/preferences_debug.xml | 4 ---- .../google/android/gms/common/stats/b.smali | 4 ++-- .../android/gms/dynamite/DynamiteModule.smali | 4 ++++ .../android/gms/internal/clearcut/zzy.smali | 8 +++++++ .../android/gms/internal/phenotype/zzf.smali | 8 +++++++ .../com/google/android/gms/phenotype/a.smali | 4 ++++ smali/smali/com/google/firebase/iid/q.smali | 4 ++++ 10 files changed, 35 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/utils/GmsUtils.java b/app/src/main/java/ru/vtosters/lite/utils/GmsUtils.java index 9b8b3a043..d70256d3a 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/GmsUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/GmsUtils.java @@ -15,7 +15,7 @@ public class GmsUtils { public static boolean isGmsInstalled() { try { AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("com.google.android.gms", 0); - return !Preferences.getBoolValue("forceMicrogUsage", false); + return true; } catch (Exception unused) { return false; } @@ -44,33 +44,21 @@ public class GmsUtils { } } // Music channels fix - public static void applyGMSReceiver() { - int flagSpoofed = needToSpoof ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED; - int flagOrig = !needToSpoof ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED; - - ComponentName spoofed = new ComponentName(AndroidUtils.getGlobalContext(), FirebaseInstanceIdReceiver2.class); - ComponentName orig = new ComponentName(AndroidUtils.getGlobalContext(), FirebaseInstanceIdReceiver.class); - - if (isComponentEnabled(orig) && needToSpoof || isComponentEnabled(spoofed) && !needToSpoof) { - setComponentEnabled(spoofed, flagSpoofed); - setComponentEnabled(orig, flagOrig); - } - } - private static boolean isComponentEnabled(ComponentName componentName) { - return AndroidUtils.getGlobalContext().getPackageManager().getComponentEnabledSetting(componentName) == PackageManager.COMPONENT_ENABLED_STATE_ENABLED; + return AndroidUtils.getGlobalContext().getPackageManager().getComponentEnabledSetting(componentName) == PackageManager.COMPONENT_ENABLED_STATE_ENABLED || AndroidUtils.getGlobalContext().getPackageManager().getComponentEnabledSetting(componentName) == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT; } private static void setComponentEnabled(ComponentName componentName, int newState) { AndroidUtils.getGlobalContext().getPackageManager().setComponentEnabledSetting(componentName, newState, PackageManager.DONT_KILL_APP); + AndroidUtils.getGlobalContext().getPackageManager().setComponentEnabledSetting(componentName, newState, PackageManager.DONT_KILL_APP); } public static String replaceGMSPackage(String str) { - return needToSpoof ? str.replace("com.google", "com.mgoogle") : str; + return needToSpoof ? str.replaceAll("com.google", "com.mgoogle") : str; } public static String getFirebaseInstanceIdReceiver() { - return "com.google.firebase.iid.FirebaseInstanceIdReceiver" + (needToSpoof ? "2" : ""); + return getFirebaseInstanceIdReceiverClass().getName(); } public static Class getFirebaseInstanceIdReceiverClass() { diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index 7f07c6d1f..1cfd9737a 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -29,7 +29,6 @@ public class Preferences { StrictMode.setThreadPolicy(policy); GmsUtils.fixGapps(); - GmsUtils.applyGMSReceiver(); setProxy(); setupFilters(); VTVerifications.load(application); diff --git a/smali/AndroidManifest.xml b/smali/AndroidManifest.xml index d2853ace2..da3ffe004 100644 --- a/smali/AndroidManifest.xml +++ b/smali/AndroidManifest.xml @@ -2310,7 +2310,6 @@ diff --git a/smali/res/xml/preferences_debug.xml b/smali/res/xml/preferences_debug.xml index e5bce1080..a684b6dbc 100644 --- a/smali/res/xml/preferences_debug.xml +++ b/smali/res/xml/preferences_debug.xml @@ -17,10 +17,6 @@ android:entryValues="@array/animations_values" android:key="anim_rtrn_type" android:title="@string/franimation"/> - replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; - move-result-object v1 + move-result-object v2 invoke-direct {v0, v1, v2}, Landroid/content/ComponentName;->(Ljava/lang/String;Ljava/lang/String;)V diff --git a/smali/smali/com/google/android/gms/dynamite/DynamiteModule.smali b/smali/smali/com/google/android/gms/dynamite/DynamiteModule.smali index 803d0f00b..af385fc15 100644 --- a/smali/smali/com/google/android/gms/dynamite/DynamiteModule.smali +++ b/smali/smali/com/google/android/gms/dynamite/DynamiteModule.smali @@ -1975,6 +1975,10 @@ const-string p2, "content://com.google.android.gms.chimera/" + invoke-static {p2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + + move-result-object p2 + invoke-virtual {v2, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/smali/smali/com/google/android/gms/internal/clearcut/zzy.smali b/smali/smali/com/google/android/gms/internal/clearcut/zzy.smali index 630b9ee3c..4882e3eef 100644 --- a/smali/smali/com/google/android/gms/internal/clearcut/zzy.smali +++ b/smali/smali/com/google/android/gms/internal/clearcut/zzy.smali @@ -81,6 +81,10 @@ const-string v0, "content://com.google.android.gsf.gservices" + invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; move-result-object v0 @@ -89,6 +93,10 @@ const-string v0, "content://com.google.android.gsf.gservices/prefix" + invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/internal/phenotype/zzf.smali b/smali/smali/com/google/android/gms/internal/phenotype/zzf.smali index a5adbb9d2..e5e088446 100644 --- a/smali/smali/com/google/android/gms/internal/phenotype/zzf.smali +++ b/smali/smali/com/google/android/gms/internal/phenotype/zzf.smali @@ -81,6 +81,10 @@ const-string v0, "content://com.google.android.gsf.gservices" + invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; move-result-object v0 @@ -89,6 +93,10 @@ const-string v0, "content://com.google.android.gsf.gservices/prefix" + invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/phenotype/a.smali b/smali/smali/com/google/android/gms/phenotype/a.smali index e9b0d3012..5e5212cf2 100644 --- a/smali/smali/com/google/android/gms/phenotype/a.smali +++ b/smali/smali/com/google/android/gms/phenotype/a.smali @@ -75,6 +75,10 @@ const-string v1, "content://com.google.android.gms.phenotype/" + invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v1 + if-eqz v0, :cond_0 invoke-virtual {v1, p0}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; diff --git a/smali/smali/com/google/firebase/iid/q.smali b/smali/smali/com/google/firebase/iid/q.smali index 1cf1c14a3..eb2203e83 100644 --- a/smali/smali/com/google/firebase/iid/q.smali +++ b/smali/smali/com/google/firebase/iid/q.smali @@ -234,6 +234,10 @@ const-string v1, "com.google.android.c2dm.intent.REGISTRATION" + invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v1 + .line 12 invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z