diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index d4ae422b7e..8beef73c53 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1241.apk
+apkFileName: com.discord-1242.apk
compressionType: false
doNotCompress:
- resources.arsc
@@ -3106,5 +3106,5 @@ usesFramework:
tag: null
version: 2.4.2-83a459-SNAPSHOT
versionInfo:
- versionCode: '1241'
- versionName: '36.1'
+ versionCode: '1242'
+ versionName: '36.2'
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 636722e026..9ecef5086d 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-mdpi/asset_nux_navigation_channels.png b/com.discord/res/drawable-mdpi/asset_nux_navigation_channels.png
index bcda1db74b..7ddaed970f 100644
Binary files a/com.discord/res/drawable-mdpi/asset_nux_navigation_channels.png and b/com.discord/res/drawable-mdpi/asset_nux_navigation_channels.png differ
diff --git a/com.discord/res/drawable-xhdpi/img_boost_activated.png b/com.discord/res/drawable-xhdpi/img_boost_activated.png
index 257278776d..d9871985ee 100644
Binary files a/com.discord/res/drawable-xhdpi/img_boost_activated.png and b/com.discord/res/drawable-xhdpi/img_boost_activated.png differ
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 25af6b11c9..33b8b06e15 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -1130,7 +1130,7 @@ We’re here to make a good impression."
Presets
Select a color
Transparency
- ee974ef684f149fa9326fca81ad62326
+ 7ad70c99eefc4478a886281cf9a82db3
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 4e8647866b..3f93acfbe1 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/1241"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1242"
-.field public static final VERSION_CODE:I = 0x4d9
+.field public static final VERSION_CODE:I = 0x4da
-.field public static final VERSION_NAME:Ljava/lang/String; = "36.1"
+.field public static final VERSION_NAME:Ljava/lang/String; = "36.2"
# direct methods
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index 4c90087d74..bac158a4c4 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, 0x4d9
+ const/16 v0, 0x4da
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 6e353175c9..4d1db6b7dd 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/1241"
+ const-string v4, "Discord-Android/1242"
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, 0x4d9
+ const/16 v2, 0x4da
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -205,7 +205,7 @@
const-string v3, "client_version"
- const-string v4, "36.1"
+ const-string v4, "36.2"
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 a5b753ea48..afc5d87a99 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/1241"
+ const-string v0, "Discord-Android/1242"
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 99dfcb5576..d06dbb64ae 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -480,7 +480,7 @@
new-array v1, v2, [Ljava/lang/Object;
- const-string v3, "36.1"
+ const-string v3, "36.2"
aput-object v3, v1, v5
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion.smali
index 2f7da1cde9..0ee46dade4 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$Companion.smali
@@ -174,7 +174,7 @@
.end method
.method private final create(Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;
- .locals 6
+ .locals 5
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -253,58 +253,58 @@
invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
- move-result-object v1
+ move-result-object p2
:cond_2
:goto_1
- invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+ invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
- move-result v2
+ move-result v1
- if-eqz v2, :cond_4
+ if-eqz v1, :cond_4
- invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+ invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v1
+
+ move-object v2, v1
+
+ check-cast v2, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem;
+
+ sget-object v3, Lcom/discord/models/domain/ModelGuildIntegration;->SUPPORTED_TYPES:[Ljava/lang/String;
+
+ const-string v4, "ModelGuildIntegration.SUPPORTED_TYPES"
+
+ invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-virtual {v2}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem;->getIntegration()Lcom/discord/models/domain/ModelGuildIntegration;
move-result-object v2
- move-object v3, v2
+ if-eqz v2, :cond_3
- check-cast v3, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem;
+ invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildIntegration;->getType()Ljava/lang/String;
- sget-object v4, Lcom/discord/models/domain/ModelGuildIntegration;->SUPPORTED_TYPES:[Ljava/lang/String;
-
- const-string v5, "ModelGuildIntegration.SUPPORTED_TYPES"
-
- invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {v3}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model$IntegrationItem;->getIntegration()Lcom/discord/models/domain/ModelGuildIntegration;
-
- move-result-object v3
-
- if-eqz v3, :cond_3
-
- invoke-virtual {v3}, Lcom/discord/models/domain/ModelGuildIntegration;->getType()Ljava/lang/String;
-
- move-result-object v3
+ move-result-object v2
goto :goto_2
:cond_3
- move-object v3, v0
+ move-object v2, v0
:goto_2
- invoke-static {v4, v3}, Lf/n/a/k/a;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z
+ invoke-static {v3, v2}, Lf/n/a/k/a;->contains([Ljava/lang/Object;Ljava/lang/Object;)Z
- move-result v3
+ move-result v2
- if-eqz v3, :cond_2
+ if-eqz v2, :cond_2
- invoke-interface {p1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+ invoke-interface {p1, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
goto :goto_1
:cond_4
- new-instance p1, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;
+ new-instance p2, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;
invoke-virtual {p3}, Lcom/discord/models/domain/ModelGuild;->getId()J
@@ -318,9 +318,9 @@
invoke-static {p3, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-direct {p1, v0, v1, p3, p2}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->(JLjava/lang/String;Ljava/util/List;)V
+ invoke-direct {p2, v0, v1, p3, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations$Model;->(JLjava/lang/String;Ljava/util/List;)V
- return-object p1
+ return-object p2
:cond_5
:goto_3
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 ed1c0b4358..a522c928b4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali
@@ -1981,7 +1981,7 @@
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string v0, " - 36.1 (1241)"
+ const-string v0, " - 36.2 (1242)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;