diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index aca45c0d86..b7436d4837 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1014.apk +apkFileName: com.discord-1015.apk compressionType: false doNotCompress: - arsc @@ -184,5 +184,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1014' - versionName: 10.1.4 + versionCode: '1015' + versionName: 10.1.5 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 61659f3eb4..5ba9fac3d8 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! # -#Tue Dec 24 00:57:40 UTC 2019 -version_name=10.1.4 +#Thu Dec 26 03:41:17 UTC 2019 +version_name=10.1.5 package_name=com.discord -build_id=8cdff188-8102-4e0b-9ea5-4471e4313731 -version_code=1014 +build_id=bcba7d0b-0d53-4c70-957b-081a39684339 +version_code=1015 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index e787696dd0..16a6378a38 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_dark.png b/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_dark.png index d189134c0f..9b0e63b6ae 100644 Binary files a/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_dark.png and b/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_dark.png differ diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 84d42a1125..4cebdbf2a5 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1021,7 +1021,7 @@ ONE MORE THING {fixed} Unable to sync cloud saves OR Collapse Category - 8cdff188-8102-4e0b-9ea5-4471e4313731 + bcba7d0b-0d53-4c70-957b-081a39684339 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 92e527b95b..bfcfbc3ccc 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -36,11 +36,11 @@ .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1014" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1015" -.field public static final VERSION_CODE:I = 0x3f6 +.field public static final VERSION_CODE:I = 0x3f7 -.field public static final VERSION_NAME:Ljava/lang/String; = "10.1.4" +.field public static final VERSION_NAME:Ljava/lang/String; = "10.1.5" # direct methods diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index b21ca95dd8..3104bdbb05 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, 0x3f6 + const/16 v0, 0x3f7 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 a1de6d4016..0b97e4e86c 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/1014" + const-string v4, "Discord-Android/1015" 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, 0x3f6 + const/16 v2, 0x3f7 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -201,7 +201,7 @@ const/4 v1, 0x3 - const-string v2, "10.1.4" + const-string v2, "10.1.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 2e69a1fed3..4690338af5 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/1014" + const-string v0, "Discord-Android/1015" return-object v0 .end method diff --git a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$3.smali b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$3.smali index 600ce356c0..cee22c7bb8 100644 --- a/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$3.smali +++ b/com.discord/smali/com/discord/utilities/streams/StreamContextService$getForUser$1$3.smali @@ -87,13 +87,11 @@ move-object v1, p3 - if-nez p1, :cond_0 + if-eqz p1, :cond_6 - const/4 v1, 0x0 + if-nez p4, :cond_0 - move-object v9, v1 - - goto/16 :goto_5 + goto :goto_5 :cond_0 const/4 v2, 0x0 @@ -200,23 +198,25 @@ iget-object v2, v0, Lcom/discord/utilities/streams/StreamContextService$getForUser$1$3;->$stream:Lcom/discord/models/domain/ModelApplicationStream; - const-string v1, "user" - - move-object v6, p4 - - invoke-static {p4, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - move-object v1, v9 move-object v3, p1 move-object v4, p2 + move-object v6, p4 + move-object v7, p5 invoke-direct/range {v1 .. v8}, Lcom/discord/utilities/streams/StreamContext;->(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/models/domain/ModelGuild;Lcom/discord/stores/StoreApplicationStreamPreviews$StreamPreview;Lcom/discord/utilities/streams/StreamContext$Joinability;Lcom/discord/models/domain/ModelUser;Ljava/lang/String;Z)V + goto :goto_6 + + :cond_6 :goto_5 + const/4 v9, 0x0 + + :goto_6 return-object v9 .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 c22cba2b45..a20bec528b 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, "10.1.4" + const-string v3, "10.1.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 05b69f54d5..828d552286 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1663,7 +1663,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 10.1.4 (1014)" + const-string v0, " - 10.1.5 (1015)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;