From 4794754de8641e5c8246c160f5f54355df6e578d Mon Sep 17 00:00:00 2001 From: root Date: Mon, 16 Nov 2020 20:04:11 +0000 Subject: [PATCH] Changes of com.discord v1336 --- com.discord/apktool.yml | 6 ++--- com.discord/original/AndroidManifest.xml | Bin 40692 -> 40692 bytes com.discord/res/values/strings.xml | 2 +- .../smali/com/discord/BuildConfig.smali | 6 ++--- .../smali/com/discord/app/AppLog.smali | 2 +- .../discord/models/domain/ModelUser$Me.smali | 24 +++++++++++++++--- .../discord/stores/StoreClientVersion.smali | 2 +- .../analytics/AnalyticSuperProperties.smali | 6 ++--- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../textprocessing/DiscordParser.smali | 6 ++--- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- .../widgets/settings/WidgetSettings.smali | 2 +- 12 files changed, 39 insertions(+), 21 deletions(-) diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index d528150f8c..d49cdd283f 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1335.apk +apkFileName: com.discord-1336.apk compressionType: false doNotCompress: - resources.arsc @@ -82,5 +82,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1335' - versionName: '48.14' + versionCode: '1336' + versionName: '48.15' diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 5fcee827ed2c3932faf3c8cac3598cb658293a5f..6d82f18d84fdeac158e6507e95a2e457b2c52365 100644 GIT binary patch delta 23 fcmeyem+8x1rVVen7)>|7?wAgIxwmkv>g<}cz delta 23 fcmeyem+8x1rVVen7)>_6?G~aCNwmkv>g-{9e diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 9f6aa838b7..4e47bc905e 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1206,7 +1206,7 @@ We’re here to make a good impression." Presets Select a color Transparency - 3a7a773ddd254c2887a0cf4b516d0f85 + d551d039c7ea45a3a061e5d6ac47e6ac Coming Soon Search Animated GIFs on the Web Text to search for diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 74f8586094..519dfc9852 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -42,11 +42,11 @@ .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1335" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1336" -.field public static final VERSION_CODE:I = 0x537 +.field public static final VERSION_CODE:I = 0x538 -.field public static final VERSION_NAME:Ljava/lang/String; = "48.14" +.field public static final VERSION_NAME:Ljava/lang/String; = "48.15" # direct methods diff --git a/com.discord/smali/com/discord/app/AppLog.smali b/com.discord/smali/com/discord/app/AppLog.smali index 81f85bb0d1..2501d87f3b 100644 --- a/com.discord/smali/com/discord/app/AppLog.smali +++ b/com.discord/smali/com/discord/app/AppLog.smali @@ -393,7 +393,7 @@ sget-object v0, Lcom/discord/utilities/buildutils/BuildUtils;->INSTANCE:Lcom/discord/utilities/buildutils/BuildUtils; - const-string v1, "48.14" + const-string v1, "48.15" invoke-virtual {v0, v1}, Lcom/discord/utilities/buildutils/BuildUtils;->isValidBuildVersionName(Ljava/lang/String;)Z diff --git a/com.discord/smali/com/discord/models/domain/ModelUser$Me.smali b/com.discord/smali/com/discord/models/domain/ModelUser$Me.smali index 006019983d..e6b38c9ccc 100644 --- a/com.discord/smali/com/discord/models/domain/ModelUser$Me.smali +++ b/com.discord/smali/com/discord/models/domain/ModelUser$Me.smali @@ -56,18 +56,30 @@ .end method .method public constructor ()V - .locals 0 + .locals 1 invoke-direct {p0}, Lcom/discord/models/domain/ModelUser;->()V + new-instance v0, Lcom/discord/models/domain/NullableField; + + invoke-direct {v0}, Lcom/discord/models/domain/NullableField;->()V + + iput-object v0, p0, Lcom/discord/models/domain/ModelUser$Me;->phone:Lcom/discord/models/domain/NullableField; + return-void .end method .method public constructor (I)V - .locals 0 + .locals 1 invoke-direct {p0}, Lcom/discord/models/domain/ModelUser;->()V + new-instance v0, Lcom/discord/models/domain/NullableField; + + invoke-direct {v0}, Lcom/discord/models/domain/NullableField;->()V + + iput-object v0, p0, Lcom/discord/models/domain/ModelUser$Me;->phone:Lcom/discord/models/domain/NullableField; + invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object p1 @@ -78,10 +90,16 @@ .end method .method public constructor (Ljava/lang/String;)V - .locals 0 + .locals 1 invoke-direct {p0}, Lcom/discord/models/domain/ModelUser;->()V + new-instance v0, Lcom/discord/models/domain/NullableField; + + invoke-direct {v0}, Lcom/discord/models/domain/NullableField;->()V + + iput-object v0, p0, Lcom/discord/models/domain/ModelUser$Me;->phone:Lcom/discord/models/domain/NullableField; + iput-object p1, p0, Lcom/discord/models/domain/ModelUser;->username:Ljava/lang/String; return-void diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 939272d1d2..59dcddb85a 100644 --- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali +++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali @@ -28,7 +28,7 @@ invoke-direct {p0}, Lcom/discord/stores/Store;->()V - const/16 v0, 0x537 + const/16 v0, 0x538 iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index fce60eb866..aa16b90cf4 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali @@ -173,7 +173,7 @@ const-string v3, "browser_user_agent" - const-string v4, "Discord-Android/1335" + const-string v4, "Discord-Android/1336" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V @@ -181,7 +181,7 @@ const/4 v1, 0x2 - const/16 v2, 0x537 + const/16 v2, 0x538 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -201,7 +201,7 @@ const-string v3, "client_version" - const-string v4, "48.14" + const-string v4, "48.15" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali index 45179f49a6..d3abebd379 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali @@ -159,7 +159,7 @@ .method public getUserAgent()Ljava/lang/String; .locals 1 - const-string v0, "Discord-Android/1335" + const-string v0, "Discord-Android/1336" return-object v0 .end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/DiscordParser.smali b/com.discord/smali/com/discord/utilities/textprocessing/DiscordParser.smali index bbe26efc86..07eaa6d09e 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/DiscordParser.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/DiscordParser.smali @@ -83,11 +83,11 @@ invoke-static {v1, v1, v0, v2, v3}, Lcom/discord/utilities/textprocessing/Parsers;->createParser$default(ZZZILjava/lang/Object;)Lcom/discord/simpleast/core/parser/Parser; - move-result-object v1 + move-result-object v2 - sput-object v1, Lcom/discord/utilities/textprocessing/DiscordParser;->MASKED_LINK_PARSER:Lcom/discord/simpleast/core/parser/Parser; + sput-object v2, Lcom/discord/utilities/textprocessing/DiscordParser;->MASKED_LINK_PARSER:Lcom/discord/simpleast/core/parser/Parser; - invoke-static {v0, v0, v0}, Lcom/discord/utilities/textprocessing/Parsers;->createParser(ZZZ)Lcom/discord/simpleast/core/parser/Parser; + invoke-static {v0, v1, v0}, Lcom/discord/utilities/textprocessing/Parsers;->createParser(ZZZ)Lcom/discord/simpleast/core/parser/Parser; move-result-object v0 diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 854b1b9ca9..6b5c0564d8 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -446,7 +446,7 @@ new-array v2, v0, [Ljava/lang/Object; - const-string v4, "48.14" + const-string v4, "48.15" aput-object v4, v2, v3 diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali index fb447411b5..36a6b7bbc3 100644 --- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali @@ -1870,7 +1870,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 48.14 (1335)" + const-string v0, " - 48.15 (1336)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;