added drop db of renaming

app/src/main/java/ru/vtosters/hooks/GmsHook.java

@@ -11,37 +11,37 @@ import com.vtosters.lite.R;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class GmsHook {
-    private static final String[] spoofPackages = {"com.mgoogle", "app.revanced"};
-    private static final String currentGms;
+    private static final boolean needToSpoof = !isGmsInstalled() && (isFakeGmsInstalled() || isFakeGms2Installed());
 
-    static {
-        currentGms = getSpoofPackagePrefix();
-    }
-
-    private static boolean isPackageInstalled(String packageName) {
+    public static boolean isGmsInstalled() {
         try {
-            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo(packageName, 0);
+            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("com.google.android.gms", 0);
             return true;
         } catch (Exception unused) {
             return false;
         }
-    }
+    } // Google Market Services check
 
-    public static boolean isGmsInstalled() {
-        return isPackageInstalled("com.google.android.gms");
-    }
+    public static boolean isFakeGmsInstalled() {
+        try {
+            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("com.mgoogle.android.gms", 0);
+            return true;
+        } catch (Exception unused) {
+            return false;
+        }
+    } // Microg Google Market Services check
 
-    public static boolean isSpoofPackageInstalled(String packageName) {
-        return isPackageInstalled(packageName + ".android.gms");
-    }
+    public static boolean isFakeGms2Installed() {
+        try {
+            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("app.revanced.android.gms", 0);
+            return true;
+        } catch (Exception unused) {
+            return false;
+        }
+    } // Microg Google Market Services check
 
     public static boolean isAnyServicesInstalled() {
-        for (String packageName : spoofPackages) {
-            if (isSpoofPackageInstalled(packageName)) {
-                return true;
-            }
-        }
-        return false;
+        return isGmsInstalled() || isFakeGmsInstalled() || isFakeGms2Installed();
     }
 
     public static void fixGapps() {
@@ -52,10 +52,10 @@ public class GmsHook {
                 notificationManager.createNotificationChannel(new NotificationChannel("audio_playback_channel", AndroidUtils.getResources().getString(R.string.audio_message_play_error), NotificationManager.IMPORTANCE_LOW));
             }
         }
-    }
+    } // Music channels fix
 
     public static String replaceGMSPackage(String str) {
-        return shouldSpoof() ? str.replaceAll("com.google", currentGms) : str;
+        return needToSpoof ? str.replaceAll("com.google", (isFakeGms2Installed() ? "app.revanced" : "com.mgoogle")) : str;
     }
 
     public static String getFirebaseInstanceIdReceiver() {
@@ -63,37 +63,6 @@ public class GmsHook {
     }
 
     public static Class getFirebaseInstanceIdReceiverClass() {
-        return getSpoofFirebaseInstanceIdReceiverClass();
+        return needToSpoof ? (isFakeGms2Installed() ? FirebaseInstanceIdReceiver3.class : FirebaseInstanceIdReceiver2.class) : FirebaseInstanceIdReceiver.class;
     }
-
-    public static String getCurrentGms() {
-        return currentGms;
-    }
-
-    private static boolean shouldSpoof() {
-        return !isGmsInstalled() && (isSpoofPackageInstalled("com.mgoogle") || isSpoofPackageInstalled("app.revanced"));
-    }
-
-    private static String getSpoofPackagePrefix() {
-        for (String packageName : spoofPackages) {
-            if (isSpoofPackageInstalled(packageName)) {
-                return packageName;
-            }
-        }
-        return "com.google";
-    }
-
-    private static Class getSpoofFirebaseInstanceIdReceiverClass() {
-        switch (currentGms) {
-            case "com.mgoogle" -> {
-                return FirebaseInstanceIdReceiver2.class;
-            }
-            case "app.revanced" -> {
-                return FirebaseInstanceIdReceiver3.class;
-            }
-            default -> {
-                return FirebaseInstanceIdReceiver.class;
-            }
-        }
-    }
-}
+}

app/src/main/java/ru/vtosters/hooks/music/injectors/CatalogJsonInjector.java

@@ -48,7 +48,7 @@ public class CatalogJsonInjector {
                     fetchCatalogId("https://vk.com/audio?section=albums", oldItems);
                 }
 
-                if (Preferences.sendMusicMetrics() && Preferences.getBoolValue("playStatCatalog", false)) {
+                if (Preferences.sendMusicMetrics() && Preferences.getBoolValue("playStatsCatalog", false)) {
                     fetchCatalogId("https://vk.com/audio?section=recent", oldItems);
                 }
 

app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java

@@ -115,7 +115,7 @@ public class Device {
                 + "- Manufacturer: " + this.manufacturerName + "\n"
                 + "- Brand: " + this.brandName + "\n"
                 + "- Model: " + this.modelName + "\n"
-                + (isMIUI() || isHyperOs() ? "- Miui/HyperOS Version Code: " + this.MiuiUiVersionCode + "\n" + "- Miui/HyperOS Version Name: " + this.MiuiUiVersionName + "\n" : "")
+                + (isMIUI() ? "- Miui Version Code: " + this.MiuiUiVersionCode + "\n" + "- Miui Version Name: " + this.MiuiUiVersionName + "\n" : "")
                 + (isSamsung() ? "- OneUi Major Version: " + this.OneUiMajorVersion + "\n" + "- OneUi Minor Version: " + this.OneUiMinorVersion + "\n" : "")
                 + (hasMiuiIncrCode() ? "- Miui Version Incremental Code: " + this.MiuiIncrementalCode + "\n" : "")
                 + (isEMUI() ? "- Emui Version: " + this.EmuiVersion : "");

app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java

@@ -56,7 +56,7 @@ public class OEMDetector {
     }
 
     public static boolean isOEM() {
-        return isMIUI() || isEMUI() || isFlyme() || isZenUI() || isSamsung() || isVivo() || isOneUi() || isHyperOs();
+        return isMIUI() || isEMUI() || isFlyme() || isZenUI() || isSamsung() || isVivo() || isOneUi();
     }
 
     public static boolean isMIUI() {
@@ -68,15 +68,6 @@ public class OEMDetector {
         }
     }
 
-    public static boolean isHyperOs() {
-        try {
-            int miuiVer = Integer.parseInt(getMiuiUiVersionCode()); // cuz hyperos gives 816 and etc
-            return miuiVer > 14 && isMIUI();
-        } catch (Exception unused) {
-            return false;
-        }
-    }
-
     public static boolean isIntentResolved(Context ctx, Intent intent) {
         return (intent != null && ctx.getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null);
     }
@@ -133,6 +124,7 @@ public class OEMDetector {
         try {
             return (String) getPropMtd.invoke(null, prop);
         } catch (Throwable e) {
+            e.printStackTrace();
             return null;
         }
     }

app/src/main/java/ru/vtosters/lite/ui/dialogs/InstallGMS.java

@@ -10,7 +10,7 @@ import ru.vtosters.lite.utils.NavigatorUtils;
 
 public class InstallGMS {
     public static void alert(final Activity activity) {
-        if (!GmsHook.isAnyServicesInstalled() && !GmsHook.isGmsInstalled() && Preferences.getBoolValue("showAlertGms", true)) {
+        if (!GmsHook.isAnyServicesInstalled() && Preferences.getBoolValue("showAlertGms", true)) {
             new VkAlertDialog.Builder(activity)
                     .setTitle(activity.getString(R.string.warning))
                     .setMessage(activity.getString(R.string.gmsissuesumm))

app/src/main/java/ru/vtosters/lite/ui/fragments/MusicFragment.java

@@ -221,13 +221,13 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
 
         PreferenceFragmentUtils.addMaterialSwitchPreference(
                 getPreferenceScreen(),
-                "playStatCatalog",
+                "playStatsCatalog",
                 "Список истории прослушиваний",
                 "Показывать вкладку истории прослушиваний в музыкальном разделе\n\nОтключение ускорит открытие музыкального раздела при медленном интернете",
                 null,
                 false,
                 (preference, o) -> {
-                    Preferences.getPreferences().edit().putBoolean("playStatCatalog", (boolean) o).apply();
+                    Preferences.getPreferences().edit().putBoolean("playStatsCatalog", (boolean) o).apply();
                     return true;
                 }
         ).setVisible(Preferences.sendMusicMetrics() && !getBoolValue("useOldAppVer", false));
@@ -348,7 +348,7 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
                 null,
                 true,
                 (preference, o) -> {
-                    Preferences.getPreferences().edit().putBoolean("playlistsCatalogs", (boolean) o).apply();
+                    Preferences.getPreferences().edit().putBoolean("playStatsCatalog", (boolean) o).apply();
                     return true;
                 }
         ).setVisible(!getBoolValue("useOldAppVer", false));

app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java

@@ -60,12 +60,12 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("microgsettings").setVisible(GmsHook.isAnyServicesInstalled() && !GmsHook.isGmsInstalled());
+        findPreference("microgsettings").setVisible(GmsHook.isFakeGmsInstalled() && !GmsHook.isGmsInstalled());
 
         findPreference("microgsettings").setOnPreferenceClickListener(preference -> {
             try {
                 Intent intent = new Intent(Intent.ACTION_MAIN);
-                intent.setComponent(new ComponentName(GmsHook.getCurrentGms() + ".android.gms", "org.microg.gms.ui.SettingsActivity"));
+                intent.setComponent(new ComponentName((GmsHook.isFakeGms2Installed() ? "app.revanced.android.gms" : "com.mgoogle.android.gms"), "org.microg.gms.ui.SettingsActivity"));
                 startActivity(intent);
             } catch (Exception e) {
                 e.printStackTrace();

app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java

@@ -13,8 +13,6 @@ import ru.vtosters.lite.ui.PreferenceFragmentUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.VersionReader;
 
-import static ru.vtosters.hooks.GmsHook.isSpoofPackageInstalled;
-
 public class SystemInfo extends TrackedMaterialPreferenceToolbarFragment {
 
     @Override
@@ -48,11 +46,11 @@ public class SystemInfo extends TrackedMaterialPreferenceToolbarFragment {
         boolean isZenUI = OEMDetector.isZenUI();
         boolean isEMUI = OEMDetector.isEMUI();
         boolean hasMiuiIncrCode = OEMDetector.hasMiuiIncrCode();
-        boolean isHyperOS = OEMDetector.isHyperOs();
 
         boolean hasGMS = GmsHook.isGmsInstalled();
-        boolean hasVancedMicroG = GmsHook.isAnyServicesInstalled();
-        String GMSPackageName = hasGMS ? "com.google.android.gms" : hasVancedMicroG ? GmsHook.getCurrentGms() + ".android.gms" : "no gms or microg";
+        boolean hasVancedMicroG = GmsHook.isFakeGmsInstalled();
+        boolean hasReVancedMicroG = GmsHook.isFakeGms2Installed();
+        String GMSPackageName = hasGMS ? "com.google.android.gms" : hasVancedMicroG ? "com.mgoogle.android.gms" : hasReVancedMicroG ? "app.revanced.android.gms" : "no gms or microg";
 
         boolean isValidSignature = Preferences.isValidSignature();
         boolean isTablet = AndroidUtils.isTablet();
@@ -106,7 +104,9 @@ public class SystemInfo extends TrackedMaterialPreferenceToolbarFragment {
 
         PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isInstalledGoogleGMS", "Value: " + hasGMS, 0, null);
 
-        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isInstalledMicroG", "Value: " + hasVancedMicroG, 0, null);
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isInstalledVancedMicroG", "Value: " + hasVancedMicroG, 0, null);
+
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isInstalledReVancedMicroG", "Value: " + hasReVancedMicroG, 0, null);
 
         PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "Product Name", productName, 0, preference -> {
             ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", productName));
@@ -194,8 +194,6 @@ public class SystemInfo extends TrackedMaterialPreferenceToolbarFragment {
 
         PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isMiui", "Value: " + isMiui, 0, null);
 
-        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isHyperOS", "Value: " + isHyperOS, 0, null);
-
         PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isEMUI", "Value: " + isEMUI, 0, null);
 
         PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isFlyme", "Value: " + isFlyme, 0, null);

app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java

@@ -108,7 +108,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
         boolean isLinksUnverified = AndroidUtils.isLinksUnverified(requireActivity());
         boolean isDozingAvailable = Build.VERSION.SDK_INT >= 23 && !manager.isIgnoringBatteryOptimizations(AndroidUtils.getPackageName());
         boolean areNotificationsDisabled = !AndroidUtils.areNotificationsEnabled() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-        boolean isGMSNotInstalled = !GmsHook.isAnyServicesInstalled() && !GmsHook.isGmsInstalled();
+        boolean isGMSNotInstalled = !GmsHook.isAnyServicesInstalled();
 
         if (AccountManagerUtils.isLogin()) {
             Preference accountSwitcher = PreferenceFragmentUtils.addPreference(
@@ -584,7 +584,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
                 }
         );
 
-        if (Build.VERSION.SDK_INT >= 33 && (!OEMDetector.isMIUI() || OEMDetector.isHyperOs())) {
+        if (Build.VERSION.SDK_INT >= 33 && !OEMDetector.isMIUI()) {
             PreferenceFragmentUtils.addPreference(
                     getPreferenceScreen(),
                     "",

smali/smali_classes2/com/vk/dto/newsfeed/Owner.smali

@@ -390,8 +390,6 @@
 .method public static final b(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/Owner;
     .locals 1
 
-    invoke-static {p0}, Lru/vtosters/hooks/RenameHook;->injectIntoJsonGroup(Lorg/json/JSONObject;)V
-
     sget-object v0, Lcom/vk/dto/newsfeed/Owner;->h:Lcom/vk/dto/newsfeed/Owner$b;
 
     invoke-virtual {v0, p0}, Lcom/vk/dto/newsfeed/Owner$b;->b(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/Owner;
@@ -404,8 +402,6 @@
 .method public static final c(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/Owner;
     .locals 1
 
-    invoke-static {p0}, Lru/vtosters/hooks/RenameHook;->injectIntoJson(Lorg/json/JSONObject;)V
-
     sget-object v0, Lcom/vk/dto/newsfeed/Owner;->h:Lcom/vk/dto/newsfeed/Owner$b;
 
     invoke-virtual {v0, p0}, Lcom/vk/dto/newsfeed/Owner$b;->c(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/Owner;