From e57a76790f2070609737714efc16fd52d31fea82 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Tue, 10 May 2022 22:12:40 +0300 Subject: [PATCH] Added another cringe feature --- .../main/java/ru/vtosters/lite/audio/gcm/GCMFix.java | 9 ++++++--- .../java/ru/vtosters/lite/utils/Preferences.java | 9 +++++++++ smali/res/xml/preferences_activity.xml | 10 ++++++++++ smali/res/xml/preferences_debug.xml | 5 ----- .../appevents/internal/AppEventUtility.smali | 5 +++++ .../vtosters/lite/audio/player/PlayerService$a.smali | 4 +++- .../vtosters/lite/audio/player/PlayerService.smali | 12 +++++++++--- .../com/facebook/internal/Utility.smali | 10 ++++++++++ .../com/facebook/soloader/SysUtil.smali | 5 +++++ .../com/vk/pushes/PushSubscriber.smali | 4 +++- smali/smali_classes3/com/vk/t/Vigo.smali | 5 +++++ smali/smali_classes3/com/vk/utils/AppUtils.smali | 4 +++- .../com/vtosters/lite/NetworkStateReceiver.smali | 8 ++++++-- smali/smali_classes3/ru/mail/voip2/LibLoader2.smali | 5 +++++ .../com/google/android/gms/iid/a.smali | 5 +++++ smali/smali_classes4/com/google/firebase/iid/o.smali | 8 ++++++++ smali/smali_classes4/com/vk/about/holders1.smali | 4 +++- .../com/vk/common/cache/SerializerCache$a.smali | 4 +++- .../com/vk/core/network/NetworkUserAgent.smali | 4 +++- smali/smali_classes4/com/vk/stickers/Stickers.smali | 4 +++- .../com/vk/stickers/storage/StickersStorage.smali | 8 ++++++-- smali/smali_classes4/ru/mail/libverify/utils/n.smali | 9 +++++++++ smali/smali_classes4/ru/mail/voip2/VoipImpl2.smali | 4 ++++ .../com/google/android/gms/clearcut/a.smali | 5 +++++ .../google/android/youtube/player/internal/aa.smali | 5 +++++ 25 files changed, 133 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/audio/gcm/GCMFix.java b/app/src/main/java/ru/vtosters/lite/audio/gcm/GCMFix.java index 43cf777e1..b2a9b5893 100644 --- a/app/src/main/java/ru/vtosters/lite/audio/gcm/GCMFix.java +++ b/app/src/main/java/ru/vtosters/lite/audio/gcm/GCMFix.java @@ -1,5 +1,8 @@ package ru.vtosters.lite.audio.gcm; +import static ru.vtosters.lite.utils.Preferences.VKVersion; +import static ru.vtosters.lite.utils.Preferences.VKVersionBuild; + import android.os.Build; import android.util.Base64; @@ -108,7 +111,7 @@ public class GCMFix { params.add("X-X-subscription=841415684880"); } params.add("X-X-subtype=841415684880"); - params.add("X-app_ver=3439"); + params.add("X-app_ver=" + VKVersionBuild()); params.add("X-kid=|ID|" + rid + "|"); params.add("X-osv=30"); params.add("X-sig=" + sig); @@ -129,12 +132,12 @@ public class GCMFix { if (!del) { params.add("X-gmp_app_id=1:841415684880:android:632f429381141121"); } - params.add("X-app_ver_name=5.29"); + params.add("X-app_ver_name=" + VKVersion()); params.add("app=com.vkontakte.android"); params.add("sender=841415684880"); params.add("device=" + androidId); params.add("cert=48761eef50ee53afc4cc9c5f10e6bde7f8f5b82f"); - params.add("app_ver=3439"); + params.add("app_ver=" + VKVersionBuild()); params.add("gcm_ver=11949470"); } 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 8a20893bb..b4c8e25c8 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -317,6 +317,15 @@ public class Preferences { return !string.isEmpty() ? string : "5.29"; } + public static int VKVersionBuild() { + String string = getPreferences().getString("vkversionbuild", ""); + return !string.isEmpty() ? Integer.parseInt(string) : 3439; + } + + public static long VKVersionBuildLong() { + return (long) VKVersionBuild(); + } + public static String getLocale() { String string = getPreferences().getString("lang_value", ""); if (string.equals("system")) { diff --git a/smali/res/xml/preferences_activity.xml b/smali/res/xml/preferences_activity.xml index cdca0f97e..bbcf46a67 100644 --- a/smali/res/xml/preferences_activity.xml +++ b/smali/res/xml/preferences_activity.xml @@ -76,5 +76,15 @@ android:key="benchmark" android:summary="@string/benchapisummary" android:title="@string/benchapi" /> + + \ No newline at end of file diff --git a/smali/res/xml/preferences_debug.xml b/smali/res/xml/preferences_debug.xml index 65f8ef069..e01e6426e 100644 --- a/smali/res/xml/preferences_debug.xml +++ b/smali/res/xml/preferences_debug.xml @@ -10,11 +10,6 @@ android:key="devmenu" android:title="Показывать пункт дебага в настройках" /> - versionName:Ljava/lang/String; + + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersion()Ljava/lang/String; + + move-result-object v0 + :try_end_0 .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0 diff --git a/smali/smali_classes2/com/vtosters/lite/audio/player/PlayerService$a.smali b/smali/smali_classes2/com/vtosters/lite/audio/player/PlayerService$a.smali index d900872d0..095bf1c26 100644 --- a/smali/smali_classes2/com/vtosters/lite/audio/player/PlayerService$a.smali +++ b/smali/smali_classes2/com/vtosters/lite/audio/player/PlayerService$a.smali @@ -190,7 +190,9 @@ const-string v2, "music_build_version" - const/16 v3, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v3 .line 809 invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; diff --git a/smali/smali_classes2/com/vtosters/lite/audio/player/PlayerService.smali b/smali/smali_classes2/com/vtosters/lite/audio/player/PlayerService.smali index fd1a2f6cd..16944fdfd 100644 --- a/smali/smali_classes2/com/vtosters/lite/audio/player/PlayerService.smali +++ b/smali/smali_classes2/com/vtosters/lite/audio/player/PlayerService.smali @@ -376,7 +376,9 @@ const-string v5, "music_build_version" - const/16 v6, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v6 .line 745 invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1142,7 +1144,9 @@ const-string v2, "music_build_version" - const/16 v3, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v3 .line 579 invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -2499,7 +2503,9 @@ const-string v0, "music_build_version" - const/16 v1, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v1 .line 394 invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; diff --git a/smali/smali_classes3/com/facebook/internal/Utility.smali b/smali/smali_classes3/com/facebook/internal/Utility.smali index a85a36bdc..ded5e9319 100644 --- a/smali/smali_classes3/com/facebook/internal/Utility.smali +++ b/smali/smali_classes3/com/facebook/internal/Utility.smali @@ -1404,12 +1404,22 @@ .line 720 iget v6, v5, Landroid/content/pm/PackageInfo;->versionCode:I + + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v6 + :try_end_0 .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0 .line 721 :try_start_1 iget-object v4, v5, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String; + + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersion()Ljava/lang/String; + + move-result-object v4 + :try_end_1 .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_1 .. :try_end_1} :catch_1 diff --git a/smali/smali_classes3/com/facebook/soloader/SysUtil.smali b/smali/smali_classes3/com/facebook/soloader/SysUtil.smali index b6279a330..7b43ad34e 100644 --- a/smali/smali_classes3/com/facebook/soloader/SysUtil.smali +++ b/smali/smali_classes3/com/facebook/soloader/SysUtil.smali @@ -423,6 +423,11 @@ .line 213 iget p0, p0, Landroid/content/pm/PackageInfo;->versionCode:I + + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result p0 + :try_end_0 .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0 .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0 diff --git a/smali/smali_classes3/com/vk/pushes/PushSubscriber.smali b/smali/smali_classes3/com/vk/pushes/PushSubscriber.smali index d1286027b..bcdc6ca5f 100644 --- a/smali/smali_classes3/com/vk/pushes/PushSubscriber.smali +++ b/smali/smali_classes3/com/vk/pushes/PushSubscriber.smali @@ -339,7 +339,9 @@ move-result v5 - const/16 v6, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v6 invoke-direct {p0}, Lcom/vk/pushes/PushSubscriber;->a()Ljava/lang/String; diff --git a/smali/smali_classes3/com/vk/t/Vigo.smali b/smali/smali_classes3/com/vk/t/Vigo.smali index 910d10e9c..bda9ede06 100644 --- a/smali/smali_classes3/com/vk/t/Vigo.smali +++ b/smali/smali_classes3/com/vk/t/Vigo.smali @@ -3665,6 +3665,11 @@ .line 1303 iget v1, v1, Landroid/content/pm/PackageInfo;->versionCode:I + + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v1 + :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 diff --git a/smali/smali_classes3/com/vk/utils/AppUtils.smali b/smali/smali_classes3/com/vk/utils/AppUtils.smali index 9140fc093..990baff9c 100644 --- a/smali/smali_classes3/com/vk/utils/AppUtils.smali +++ b/smali/smali_classes3/com/vk/utils/AppUtils.smali @@ -552,7 +552,9 @@ .method private final c()V .locals 8 - const/16 v0, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v0 .line 159 invoke-static {v0}, Ljava/lang/Integer;->toString(I)Ljava/lang/String; diff --git a/smali/smali_classes3/com/vtosters/lite/NetworkStateReceiver.smali b/smali/smali_classes3/com/vtosters/lite/NetworkStateReceiver.smali index b688ef295..06b6a7c2c 100644 --- a/smali/smali_classes3/com/vtosters/lite/NetworkStateReceiver.smali +++ b/smali/smali_classes3/com/vtosters/lite/NetworkStateReceiver.smali @@ -292,7 +292,9 @@ :try_start_0 new-instance v0, Lcom/vk/api/internal/InternalGetNotifications; - const/16 v1, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v1 invoke-static {}, Lcom/vtosters/lite/data/Analytics;->e()Ljava/lang/String; @@ -425,7 +427,9 @@ :try_start_0 new-instance v0, Lcom/vk/api/internal/InternalGetUserNotifications; - const/16 v4, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v4 .line 260 invoke-static {}, Lcom/vtosters/lite/data/Analytics;->e()Ljava/lang/String; diff --git a/smali/smali_classes3/ru/mail/voip2/LibLoader2.smali b/smali/smali_classes3/ru/mail/voip2/LibLoader2.smali index 2242b9297..9c5222703 100644 --- a/smali/smali_classes3/ru/mail/voip2/LibLoader2.smali +++ b/smali/smali_classes3/ru/mail/voip2/LibLoader2.smali @@ -34,6 +34,11 @@ .line 23 iget v1, v1, Landroid/content/pm/PackageInfo;->versionCode:I + + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v1 + :try_end_0 .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0 diff --git a/smali/smali_classes4/com/google/android/gms/iid/a.smali b/smali/smali_classes4/com/google/android/gms/iid/a.smali index bebacb8b7..15e384011 100644 --- a/smali/smali_classes4/com/google/android/gms/iid/a.smali +++ b/smali/smali_classes4/com/google/android/gms/iid/a.smali @@ -96,6 +96,11 @@ move-result-object p0 iget p0, p0, Landroid/content/pm/PackageInfo;->versionCode:I + + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result p0 + :try_end_0 .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0 diff --git a/smali/smali_classes4/com/google/firebase/iid/o.smali b/smali/smali_classes4/com/google/firebase/iid/o.smali index ed898bf77..aff5070de 100644 --- a/smali/smali_classes4/com/google/firebase/iid/o.smali +++ b/smali/smali_classes4/com/google/firebase/iid/o.smali @@ -272,6 +272,10 @@ .line 66 iget v1, v0, Landroid/content/pm/PackageInfo;->versionCode:I + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v1 + invoke-static {v1}, Ljava/lang/Integer;->toString(I)Ljava/lang/String; move-result-object v1 @@ -281,6 +285,10 @@ .line 67 iget-object v0, v0, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersion()Ljava/lang/String; + + move-result-object v0 + iput-object v0, p0, Lcom/google/firebase/iid/o;->c:Ljava/lang/String; :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 diff --git a/smali/smali_classes4/com/vk/about/holders1.smali b/smali/smali_classes4/com/vk/about/holders1.smali index a9dce8f20..f9c8a703f 100644 --- a/smali/smali_classes4/com/vk/about/holders1.smali +++ b/smali/smali_classes4/com/vk/about/holders1.smali @@ -47,7 +47,9 @@ aput-object v2, v1, v3 - const/16 v2, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v2 .line 39 invoke-static {v2}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; diff --git a/smali/smali_classes4/com/vk/common/cache/SerializerCache$a.smali b/smali/smali_classes4/com/vk/common/cache/SerializerCache$a.smali index a9b93c8f9..8c1c9d2e8 100644 --- a/smali/smali_classes4/com/vk/common/cache/SerializerCache$a.smali +++ b/smali/smali_classes4/com/vk/common/cache/SerializerCache$a.smali @@ -26,7 +26,9 @@ const/4 v1, 0x0 - const/16 v2, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v2 .line 117 invoke-direct {p0, p1, v0, v1, v2}, Landroid/database/sqlite/SQLiteOpenHelper;->(Landroid/content/Context;Ljava/lang/String;Landroid/database/sqlite/SQLiteDatabase$CursorFactory;I)V diff --git a/smali/smali_classes4/com/vk/core/network/NetworkUserAgent.smali b/smali/smali_classes4/com/vk/core/network/NetworkUserAgent.smali index 967f0ca71..7242ae5d3 100644 --- a/smali/smali_classes4/com/vk/core/network/NetworkUserAgent.smali +++ b/smali/smali_classes4/com/vk/core/network/NetworkUserAgent.smali @@ -43,7 +43,9 @@ aput-object v0, v4, v5 - const/16 v6, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v6 .line 26 invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; diff --git a/smali/smali_classes4/com/vk/stickers/Stickers.smali b/smali/smali_classes4/com/vk/stickers/Stickers.smali index 5307a57a5..85d30bd66 100644 --- a/smali/smali_classes4/com/vk/stickers/Stickers.smali +++ b/smali/smali_classes4/com/vk/stickers/Stickers.smali @@ -569,7 +569,9 @@ move-result-wide v0 - const-wide/16 v2, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuildLong()J + + move-result-wide v2 cmp-long v4, v0, v2 diff --git a/smali/smali_classes4/com/vk/stickers/storage/StickersStorage.smali b/smali/smali_classes4/com/vk/stickers/storage/StickersStorage.smali index fb7b2cc2a..a214f25a7 100644 --- a/smali/smali_classes4/com/vk/stickers/storage/StickersStorage.smali +++ b/smali/smali_classes4/com/vk/stickers/storage/StickersStorage.smali @@ -126,7 +126,9 @@ long-to-int v0, v0 - const/16 v1, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v1 if-eq v0, v1, :cond_0 @@ -161,7 +163,9 @@ iget-object v1, p0, Lcom/vk/stickers/storage/StickersStorage;->b:Ljava/lang/String; - const/16 v2, 0xd6f + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result v2 int-to-long v2, v2 diff --git a/smali/smali_classes4/ru/mail/libverify/utils/n.smali b/smali/smali_classes4/ru/mail/libverify/utils/n.smali index dffb8d916..9f21ca9c2 100644 --- a/smali/smali_classes4/ru/mail/libverify/utils/n.smali +++ b/smali/smali_classes4/ru/mail/libverify/utils/n.smali @@ -48,6 +48,11 @@ move-result-object p0 iget p0, p0, Landroid/content/pm/PackageInfo;->versionCode:I + + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result p0 + :try_end_0 .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0 @@ -701,6 +706,10 @@ iget-object p0, p0, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersion()Ljava/lang/String; + + move-result p0 + invoke-static {p0}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z move-result v0 diff --git a/smali/smali_classes4/ru/mail/voip2/VoipImpl2.smali b/smali/smali_classes4/ru/mail/voip2/VoipImpl2.smali index 18b4f776d..e98abe352 100644 --- a/smali/smali_classes4/ru/mail/voip2/VoipImpl2.smali +++ b/smali/smali_classes4/ru/mail/voip2/VoipImpl2.smali @@ -519,6 +519,10 @@ iget p1, p1, Landroid/content/pm/PackageInfo;->versionCode:I + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result p1 + invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; diff --git a/smali/smali_classes5/com/google/android/gms/clearcut/a.smali b/smali/smali_classes5/com/google/android/gms/clearcut/a.smali index b2783640f..14d9d061e 100644 --- a/smali/smali_classes5/com/google/android/gms/clearcut/a.smali +++ b/smali/smali_classes5/com/google/android/gms/clearcut/a.smali @@ -222,6 +222,11 @@ move-result-object p0 iget p0, p0, Landroid/content/pm/PackageInfo;->versionCode:I + + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersionBuild()I + + move-result p0 + :try_end_0 .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0 diff --git a/smali/smali_classes7/com/google/android/youtube/player/internal/aa.smali b/smali/smali_classes7/com/google/android/youtube/player/internal/aa.smali index af3b74e0b..f9ab4a887 100644 --- a/smali/smali_classes7/com/google/android/youtube/player/internal/aa.smali +++ b/smali/smali_classes7/com/google/android/youtube/player/internal/aa.smali @@ -293,6 +293,11 @@ move-result-object p0 iget-object p0, p0, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String; + + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersion()Ljava/lang/String; + + move-result-object p0 + :try_end_0 .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0