diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 06612f8a52..16f0ec2a7b 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1045.apk +apkFileName: com.discord-1046.apk compressionType: false doNotCompress: - arsc @@ -190,5 +190,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1045' - versionName: '11.4' + versionCode: '1046' + versionName: '11.5' diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 86495e6dbb..f10ae09aac 100644 --- a/com.discord/assets/crashlytics-build.properties +++ b/com.discord/assets/crashlytics-build.properties @@ -3,9 +3,9 @@ # #Do NOT modify, delete, or commit to source control! # -#Sat Feb 29 04:59:37 UTC 2020 -version_name=11.4 +#Sat Feb 29 19:25:27 UTC 2020 +version_name=11.5 package_name=com.discord -build_id=1ee9f684-7ed0-43ac-9f01-7dc57c512d1e -version_code=1045 +build_id=e26ad91d-880c-4db3-ad60-1491332f6af0 +version_code=1046 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index ca16260359..ca5772ee63 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 6e8346f013..e433058de3 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1006,7 +1006,7 @@ ONE MORE THING {fixed} OR Collapse Collapse Category - 1ee9f684-7ed0-43ac-9f01-7dc57c512d1e + e26ad91d-880c-4db3-ad60-1491332f6af0 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 574af70fe2..855fd5d4c0 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -38,11 +38,11 @@ .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1045" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1046" -.field public static final VERSION_CODE:I = 0x415 +.field public static final VERSION_CODE:I = 0x416 -.field public static final VERSION_NAME:Ljava/lang/String; = "11.4" +.field public static final VERSION_NAME:Ljava/lang/String; = "11.5" # direct methods diff --git a/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty$Size.smali b/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty$Size.smali index 944380e71b..a6ddcb2b5e 100644 --- a/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty$Size.smali +++ b/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty$Size.smali @@ -44,7 +44,7 @@ value = { "(", "Ljava/util/List<", - "Ljava/lang/Integer;", + "Ljava/lang/Long;", ">;)V" } .end annotation @@ -71,13 +71,11 @@ move-result-object v4 - check-cast v4, Ljava/lang/Integer; + check-cast v4, Ljava/lang/Long; - invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I + invoke-virtual {v4}, Ljava/lang/Long;->longValue()J - move-result v4 - - int-to-long v4, v4 + move-result-wide v4 goto :goto_0 @@ -95,13 +93,11 @@ move-result-object p1 - check-cast p1, Ljava/lang/Integer; + check-cast p1, Ljava/lang/Long; - invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J - move-result p1 - - int-to-long v0, p1 + move-result-wide v0 :cond_1 iput-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:J @@ -112,7 +108,7 @@ # virtual methods .method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V - .locals 5 + .locals 4 .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/IOException; @@ -131,8 +127,6 @@ const/4 v3, 0x1 - const/4 v4, 0x0 - if-eq v1, v2, :cond_1 const v2, 0x432bbd79 @@ -172,6 +166,8 @@ const/4 v0, -0x1 :goto_1 + const-wide/16 v1, 0x0 + if-eqz v0, :cond_4 if-eq v0, v3, :cond_3 @@ -181,22 +177,18 @@ goto :goto_2 :cond_3 - invoke-virtual {p1, v4}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I + invoke-virtual {p1, v1, v2}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J - move-result p1 - - int-to-long v0, p1 + move-result-wide v0 iput-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:J goto :goto_2 :cond_4 - invoke-virtual {p1, v4}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I + invoke-virtual {p1, v1, v2}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J - move-result p1 - - int-to-long v0, p1 + move-result-wide v0 iput-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:J diff --git a/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali b/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali index 96deb9a239..757df90fe4 100644 --- a/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali +++ b/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali @@ -42,21 +42,21 @@ return-void .end method -.method public static synthetic a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Integer; - .locals 1 +.method public static synthetic a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Long; + .locals 2 .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/IOException; } .end annotation - const/4 v0, -0x1 + const-wide/16 v0, -0x1 - invoke-virtual {p0, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I + invoke-virtual {p0, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J - move-result p0 + move-result-wide v0 - invoke-static {p0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object p0 diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 20609401ad..c80f12e906 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, 0x415 + const/16 v0, 0x416 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 f1ce87cdf4..26df0c8aaf 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali @@ -177,7 +177,7 @@ const-string v3, "browser_user_agent" - const-string v4, "Discord-Android/1045" + const-string v4, "Discord-Android/1046" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V @@ -185,7 +185,7 @@ const/4 v1, 0x2 - const/16 v2, 0x415 + const/16 v2, 0x416 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -201,7 +201,7 @@ const/4 v1, 0x3 - const-string v2, "11.4" + const-string v2, "11.5" const-string v3, "" 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 e8e2ee5cd6..6dece01272 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/1045" + const-string v0, "Discord-Android/1046" return-object v0 .end method diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 6f55712a24..ab8fd849d4 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -492,7 +492,7 @@ new-array v1, v2, [Ljava/lang/Object; - const-string v3, "11.4" + const-string v3, "11.5" aput-object v3, v1, v4 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali index f8333ffa98..5d2d499627 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1653,7 +1653,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 11.4 (1045)" + const-string v0, " - 11.5 (1046)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/e/a/c/a/f1/a.smali b/com.discord/smali/e/a/c/a/f1/a.smali index e781606cbe..be069ab6ba 100644 --- a/com.discord/smali/e/a/c/a/f1/a.smali +++ b/com.discord/smali/e/a/c/a/f1/a.smali @@ -28,7 +28,7 @@ iget-object v0, p0, Le/a/c/a/f1/a;->a:Lcom/discord/models/domain/Model$JsonReader; - invoke-static {v0}, Lcom/discord/models/domain/activity/ModelActivityParty;->a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Integer; + invoke-static {v0}, Lcom/discord/models/domain/activity/ModelActivityParty;->a(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Long; move-result-object v0