diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 8cbdb222f5..c00799eac0 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1080.apk
+apkFileName: com.discord-1081.apk
compressionType: false
doNotCompress:
- arsc
@@ -190,5 +190,5 @@ usesFramework:
tag: null
version: 2.4.1-197d46-SNAPSHOT
versionInfo:
- versionCode: '1080'
- versionName: '15.3'
+ versionCode: '1081'
+ versionName: '15.4'
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index a2738cd65c..75f512f466 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!
#
-#Thu Mar 26 22:32:21 UTC 2020
-version_name=15.3
+#Fri Mar 27 17:36:24 UTC 2020
+version_name=15.4
package_name=com.discord
-build_id=850735d9-0c06-46a2-a116-ba790db7e8b7
-version_code=1080
+build_id=3488a2da-50e4-4777-b103-b38df7b02bf3
+version_code=1081
app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 5240990a1c..bb36d51a40 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-ldpi/img_wumpus_playing_with_friends.png b/com.discord/res/drawable-ldpi/img_wumpus_playing_with_friends.png
index f8f8451afc..b324ecb705 100644
Binary files a/com.discord/res/drawable-ldpi/img_wumpus_playing_with_friends.png and b/com.discord/res/drawable-ldpi/img_wumpus_playing_with_friends.png differ
diff --git a/com.discord/res/values-lt/plurals.xml b/com.discord/res/values-lt/plurals.xml
index c6733e4a2d..8af9b6af5f 100644
--- a/com.discord/res/values-lt/plurals.xml
+++ b/com.discord/res/values-lt/plurals.xml
@@ -11,8 +11,20 @@
- %s žmonės
- - d.
- - d.
+ - d
+ - d
+
+
+ - val
+ - val
+
+
+ - min
+ - min
+
+
+ - sek
+ - sek
- %s min
diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml
index caf80d7544..511e7ffeda 100644
--- a/com.discord/res/values-lt/strings.xml
+++ b/com.discord/res/values-lt/strings.xml
@@ -92,6 +92,9 @@
Ieškoti naudotojų ir kanalų
%1$s
Prieš %1$s %2$s
+ Prieš %1$s %2$s
+ Prieš %1$s %2$s
+ Prieš %1$s %2$s
%1$s – %2$sd.
%1$s – %2$sval.
%1$s – %2$smin.
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index acab230f28..af302f7c8a 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -1039,7 +1039,7 @@ Fixes and Updates {fixed}
OR
Collapse
Collapse Category
- 850735d9-0c06-46a2-a116-ba790db7e8b7
+ 3488a2da-50e4-4777-b103-b38df7b02bf3
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 1be2bf29c6..2f6b1eeb5b 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/1080"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1081"
-.field public static final VERSION_CODE:I = 0x438
+.field public static final VERSION_CODE:I = 0x439
-.field public static final VERSION_NAME:Ljava/lang/String; = "15.3"
+.field public static final VERSION_NAME:Ljava/lang/String; = "15.4"
# direct methods
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index ac807bb779..c6d37cfd7f 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, 0x438
+ const/16 v0, 0x439
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 65edd453a2..ee558180fc 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/1080"
+ const-string v4, "Discord-Android/1081"
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, 0x438
+ const/16 v2, 0x439
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -201,7 +201,7 @@
const/4 v1, 0x3
- const-string v2, "15.3"
+ const-string v2, "15.4"
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 c78226c2d4..4d63500743 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/1080"
+ const-string v0, "Discord-Android/1081"
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali
index 17ce8e5bab..fe80b219ac 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali
@@ -70,7 +70,7 @@
# virtual methods
.method public final call(Ljava/util/Map;Ljava/lang/Long;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/channels/list/WidgetChannelListModel;
- .locals 15
+ .locals 16
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -144,57 +144,57 @@
move-result v4
- const/4 v5, 0x1
+ const/4 v5, 0x0
const/4 v6, 0x0
+ const/4 v7, 0x1
+
if-eqz v4, :cond_5
invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
move-result-object v4
- move-object v8, v4
+ move-object v9, v4
- check-cast v8, Lcom/discord/models/domain/ModelChannel;
+ check-cast v9, Lcom/discord/models/domain/ModelChannel;
const-string v4, "presences"
invoke-static {v0, v4}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
+ invoke-virtual {v9}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
move-result-object v4
- const/4 v7, 0x0
-
if-eqz v4, :cond_0
invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
- move-result-wide v9
+ move-result-wide v10
- invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v4
goto :goto_1
:cond_0
- move-object v4, v7
+ move-object v4, v6
:goto_1
invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object v4
- move-object v9, v4
+ move-object v10, v4
- check-cast v9, Lcom/discord/models/domain/ModelPresence;
+ check-cast v10, Lcom/discord/models/domain/ModelPresence;
- invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getId()J
+ invoke-virtual {v9}, Lcom/discord/models/domain/ModelChannel;->getId()J
- move-result-wide v10
+ move-result-wide v11
if-nez p2, :cond_1
@@ -203,32 +203,32 @@
:cond_1
invoke-virtual/range {p2 .. p2}, Ljava/lang/Long;->longValue()J
- move-result-wide v12
+ move-result-wide v13
- cmp-long v4, v10, v12
+ cmp-long v4, v11, v13
if-nez v4, :cond_2
- const/4 v10, 0x1
+ const/4 v11, 0x1
goto :goto_3
:cond_2
:goto_2
- const/4 v10, 0x0
+ const/4 v11, 0x0
:goto_3
- invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getId()J
+ invoke-virtual {v9}, Lcom/discord/models/domain/ModelChannel;->getId()J
- move-result-wide v4
+ move-result-wide v7
- invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v4
- move-object/from16 v13, p6
+ move-object/from16 v14, p6
- invoke-interface {v13, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {v14, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object v4
@@ -238,21 +238,21 @@
invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I
- move-result v6
+ move-result v5
- move v11, v6
+ move v12, v5
goto :goto_4
:cond_3
- const/4 v11, 0x0
+ const/4 v12, 0x0
:goto_4
const-string v4, "applicationStreams"
invoke-static {v2, v4}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
+ invoke-virtual {v9}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser;
move-result-object v4
@@ -264,18 +264,18 @@
invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-result-object v7
+ move-result-object v6
:cond_4
- invoke-interface {v2, v7}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+ invoke-interface {v2, v6}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
- move-result v12
+ move-result v13
new-instance v4, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
- move-object v7, v4
+ move-object v8, v4
- invoke-direct/range {v7 .. v12}, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;ZIZ)V
+ invoke-direct/range {v8 .. v13}, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;ZIZ)V
invoke-interface {v3, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
@@ -284,6 +284,8 @@
:cond_5
new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemFriends;
+ const-wide/16 v1, 0x0
+
if-nez p2, :cond_6
goto :goto_5
@@ -291,70 +293,68 @@
:cond_6
invoke-virtual/range {p2 .. p2}, Ljava/lang/Long;->longValue()J
- move-result-wide v1
+ move-result-wide v8
- const-wide/16 v7, 0x0
-
- cmp-long v4, v1, v7
+ cmp-long v4, v8, v1
if-nez v4, :cond_7
- const/4 v1, 0x1
+ const/4 v4, 0x1
goto :goto_6
:cond_7
:goto_5
- const/4 v1, 0x0
+ const/4 v4, 0x0
:goto_6
- const-string v2, "pendingFriendCount"
+ const-string v8, "pendingFriendCount"
- move-object/from16 v4, p5
+ move-object/from16 v9, p5
- invoke-static {v4, v2}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v9, v8}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
invoke-virtual/range {p5 .. p5}, Ljava/lang/Integer;->intValue()I
- move-result v2
+ move-result v8
- invoke-direct {v0, v1, v2}, Lcom/discord/widgets/channels/list/items/ChannelListItemFriends;->(ZI)V
+ invoke-direct {v0, v4, v8}, Lcom/discord/widgets/channels/list/items/ChannelListItemFriends;->(ZI)V
- new-instance v1, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;
+ new-instance v4, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;
- const-wide/16 v7, 0x0
+ const-wide/16 v8, 0x0
- const v2, 0x7f120529
+ const v10, 0x7f120529
- const/4 v4, 0x0
+ const/4 v11, 0x0
- const-wide/16 v9, 0x0
+ const-wide/16 v12, 0x0
- move-object/from16 p1, v1
+ move-object/from16 p1, v4
- move-wide/from16 p2, v7
+ move-wide/from16 p2, v8
- move/from16 p4, v2
+ move/from16 p4, v10
- move/from16 p5, v4
+ move/from16 p5, v11
- move-wide/from16 p6, v9
+ move-wide/from16 p6, v12
invoke-direct/range {p1 .. p7}, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;->(JIZJ)V
- sget-object v2, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;
+ sget-object v8, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;
- invoke-virtual {v2}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;->getTabsFeatureFlag()Lcom/discord/widgets/tabs/TabsFeatureFlag;
+ invoke-virtual {v8}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;->getTabsFeatureFlag()Lcom/discord/widgets/tabs/TabsFeatureFlag;
- move-result-object v2
+ move-result-object v8
- invoke-virtual {v2}, Lcom/discord/widgets/tabs/TabsFeatureFlag;->isEnabled()Z
+ invoke-virtual {v8}, Lcom/discord/widgets/tabs/TabsFeatureFlag;->isEnabled()Z
- move-result v2
+ move-result v8
- if-eqz v2, :cond_8
+ if-eqz v8, :cond_8
- invoke-static {v1}, Le/k/a/c/e/p/g;->listOf(Ljava/lang/Object;)Ljava/util/List;
+ invoke-static {v4}, Le/k/a/c/e/p/g;->listOf(Ljava/lang/Object;)Ljava/util/List;
move-result-object v0
@@ -362,46 +362,50 @@
move-result-object v0
- sget-object v1, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->INSTANCE:Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
+ new-instance v4, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
- invoke-static {v0, v1}, Lw/q/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+ invoke-direct {v4, v1, v2, v7, v6}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->(JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ invoke-static {v0, v4}, Lw/q/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
move-result-object v0
:goto_7
- move-object v9, v0
+ move-object v10, v0
goto :goto_8
:cond_8
invoke-interface {v3}, Ljava/util/List;->isEmpty()Z
- move-result v2
+ move-result v8
- if-eqz v2, :cond_9
+ if-eqz v8, :cond_9
invoke-static {v0}, Le/k/a/c/e/p/g;->listOf(Ljava/lang/Object;)Ljava/util/List;
move-result-object v0
- sget-object v1, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->INSTANCE:Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
+ new-instance v4, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
- invoke-static {v0, v1}, Lw/q/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+ invoke-direct {v4, v1, v2, v7, v6}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->(JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ invoke-static {v0, v4}, Lw/q/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
move-result-object v0
goto :goto_7
:cond_9
- const/4 v2, 0x2
+ const/4 v8, 0x2
- new-array v2, v2, [Lcom/discord/widgets/channels/list/items/ChannelListItem;
+ new-array v8, v8, [Lcom/discord/widgets/channels/list/items/ChannelListItem;
- aput-object v0, v2, v6
+ aput-object v0, v8, v5
- aput-object v1, v2, v5
+ aput-object v4, v8, v7
- invoke-static {v2}, Le/k/a/c/e/p/g;->listOf([Ljava/lang/Object;)Ljava/util/List;
+ invoke-static {v8}, Le/k/a/c/e/p/g;->listOf([Ljava/lang/Object;)Ljava/util/List;
move-result-object v0
@@ -409,9 +413,11 @@
move-result-object v0
- sget-object v1, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->INSTANCE:Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
+ new-instance v4, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
- invoke-static {v0, v1}, Lw/q/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
+ invoke-direct {v4, v1, v2, v7, v6}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->(JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ invoke-static {v0, v4}, Lw/q/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
move-result-object v0
@@ -436,29 +442,29 @@
if-eqz v0, :cond_a
- const/4 v12, 0x1
+ const/4 v13, 0x1
goto :goto_9
:cond_a
- const/4 v12, 0x0
+ const/4 v13, 0x0
:goto_9
new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
- const/4 v8, 0x0
-
- const/4 v10, 0x0
+ const/4 v9, 0x0
const/4 v11, 0x0
- const/16 v13, 0xc
+ const/4 v12, 0x0
- const/4 v14, 0x0
+ const/16 v14, 0xc
- move-object v7, v0
+ const/4 v15, 0x0
- invoke-direct/range {v7 .. v14}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ move-object v8, v0
+
+ invoke-direct/range {v8 .. v15}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
index d53a0651d0..2271a94068 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
@@ -98,149 +98,153 @@
}
.end annotation
- sget-object v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;
+ move-object v0, p0
- move-object v13, p0
+ sget-object v1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;
- iget-wide v1, v13, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1;->$selectedGuildId:J
+ iget-wide v2, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1;->$selectedGuildId:J
- const-string v3, "guildChannelsInfo"
+ const-string v4, "guildChannelsInfo"
move-object/from16 v14, p1
- invoke-static {v14, v3}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v14, v4}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const-string v3, "guildChannels"
+ const-string v4, "guildChannels"
- move-object/from16 v4, p2
+ move-object/from16 v5, p2
- invoke-static {v4, v3}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v5, v4}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const-string v3, "selectedChannelId"
+ const-string v4, "selectedChannelId"
- move-object/from16 v5, p3
+ move-object/from16 v6, p3
- invoke-static {v5, v3}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v6, v4}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
invoke-virtual/range {p3 .. p3}, Ljava/lang/Long;->longValue()J
- move-result-wide v5
+ move-result-wide v6
- const-string v3, "selectedVoiceChannelId"
+ const-string v4, "selectedVoiceChannelId"
- move-object/from16 v7, p4
+ move-object/from16 v8, p4
- invoke-static {v7, v3}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v8, v4}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
invoke-virtual/range {p4 .. p4}, Ljava/lang/Long;->longValue()J
- move-result-wide v7
+ move-result-wide v8
- const-string v3, "voiceStates"
+ const-string v4, "voiceStates"
- move-object/from16 v9, p5
+ move-object/from16 v10, p5
- invoke-static {v9, v3}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v10, v4}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const-string v3, "mentionCounts"
+ const-string v4, "mentionCounts"
- move-object/from16 v10, p6
+ move-object/from16 v11, p6
- invoke-static {v10, v3}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v11, v4}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const-string v3, "unreadChannelIds"
+ const-string v4, "unreadChannelIds"
- move-object/from16 v11, p7
+ move-object/from16 v12, p7
- invoke-static {v11, v3}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v12, v4}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const-string v3, "collapsedCategories"
+ const-string v4, "collapsedCategories"
- move-object/from16 v12, p8
+ move-object/from16 v13, p8
- invoke-static {v12, v3}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v13, v4}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- move-object/from16 v3, p1
+ move-object/from16 v4, p1
- invoke-static/range {v0 .. v12}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;->access$guildListBuilder(Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;JLcom/discord/utilities/channel/GuildChannelsInfo;Ljava/util/Map;JJLjava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;)Ljava/util/List;
-
- move-result-object v0
-
- sget-object v1, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->INSTANCE:Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
-
- invoke-static {v0, v1}, Lw/q/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
-
- move-result-object v0
-
- invoke-virtual/range {p9 .. p9}, Lcom/discord/stores/StoreNux$NuxState;->getPremiumGuildHintGuildId()Ljava/lang/Long;
+ invoke-static/range {v1 .. v13}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;->access$guildListBuilder(Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;JLcom/discord/utilities/channel/GuildChannelsInfo;Ljava/util/Map;JJLjava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;)Ljava/util/List;
move-result-object v1
- if-eqz v1, :cond_1
+ new-instance v2, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
- invoke-virtual/range {p9 .. p9}, Lcom/discord/stores/StoreNux$NuxState;->getPremiumGuildHintGuildId()Ljava/lang/Long;
+ iget-wide v3, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1;->$selectedGuildId:J
+
+ invoke-direct {v2, v3, v4}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->(J)V
+
+ invoke-static {v1, v2}, Lw/q/l;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List;
move-result-object v1
- invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/channel/GuildChannelsInfo;->getGuild()Lcom/discord/models/domain/ModelGuild;
+ invoke-virtual/range {p9 .. p9}, Lcom/discord/stores/StoreNux$NuxState;->getPremiumGuildHintGuildId()Ljava/lang/Long;
move-result-object v2
- if-eqz v2, :cond_0
+ if-eqz v2, :cond_1
- invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getId()J
-
- move-result-wide v2
-
- invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-virtual/range {p9 .. p9}, Lcom/discord/stores/StoreNux$NuxState;->getPremiumGuildHintGuildId()Ljava/lang/Long;
move-result-object v2
- goto :goto_0
-
- :cond_0
- const/4 v2, 0x0
-
- :goto_0
- invoke-static {v1, v2}, Lw/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result v1
-
- if-eqz v1, :cond_1
-
- const/4 v1, 0x1
-
- goto :goto_1
-
- :cond_1
- const/4 v1, 0x0
-
- :goto_1
- new-instance v2, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
-
invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/channel/GuildChannelsInfo;->getGuild()Lcom/discord/models/domain/ModelGuild;
move-result-object v3
- const/4 v4, 0x1
+ if-eqz v3, :cond_0
- const/4 v5, 0x0
+ invoke-virtual {v3}, Lcom/discord/models/domain/ModelGuild;->getId()J
- move-object/from16 p1, v2
+ move-result-wide v3
- move-object/from16 p2, v3
+ invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-object/from16 p3, v0
+ move-result-object v3
- move/from16 p4, v4
+ goto :goto_0
- move/from16 p5, v1
+ :cond_0
+ const/4 v3, 0x0
- move/from16 p6, v5
+ :goto_0
+ invoke-static {v2, v3}, Lw/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result v2
+
+ if-eqz v2, :cond_1
+
+ const/4 v2, 0x1
+
+ goto :goto_1
+
+ :cond_1
+ const/4 v2, 0x0
+
+ :goto_1
+ new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/channel/GuildChannelsInfo;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v4
+
+ const/4 v5, 0x1
+
+ const/4 v6, 0x0
+
+ move-object/from16 p1, v3
+
+ move-object/from16 p2, v4
+
+ move-object/from16 p3, v1
+
+ move/from16 p4, v5
+
+ move/from16 p5, v2
+
+ move/from16 p6, v6
invoke-direct/range {p1 .. p6}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZZ)V
- return-object v2
+ return-object v3
.end method
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali
deleted file mode 100644
index dba5f28a4c..0000000000
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali
+++ /dev/null
@@ -1,87 +0,0 @@
-.class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;
-.super Ljava/lang/Object;
-.source "WidgetChannelsList.kt"
-
-# interfaces
-.implements Landroid/view/View$OnClickListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/widgets/channels/list/WidgetChannelsList;->configureUI(Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic $guild:Lcom/discord/models/domain/ModelGuild;
-
-.field public final synthetic this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
-
-
-# direct methods
-.method public constructor (Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V
- .locals 0
-
- iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
-
- iput-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->$guild:Lcom/discord/models/domain/ModelGuild;
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public final onClick(Landroid/view/View;)V
- .locals 9
-
- iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
-
- invoke-static {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$ackPremiumGuildHint(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
-
- sget-object v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2;->Companion:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;
-
- iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
-
- invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
-
- move-result-object v1
-
- const-string p1, "requireFragmentManager()"
-
- invoke-static {v1, p1}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->$guild:Lcom/discord/models/domain/ModelGuild;
-
- if-eqz p1, :cond_0
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
-
- move-result-wide v2
-
- goto :goto_0
-
- :cond_0
- const-wide/16 v2, 0x0
-
- :goto_0
- move-wide v3, v2
-
- const-wide/16 v5, 0x0
-
- const/16 v7, 0x8
-
- const/4 v8, 0x0
-
- const/4 v2, 0x1
-
- invoke-static/range {v0 .. v8}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;->show$default(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;Landroidx/fragment/app/FragmentManager;ZJJILjava/lang/Object;)V
-
- return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali
index f5bedffd4b..caee1d7650 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali
@@ -1,9 +1,9 @@
.class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;
-.super Lw/u/b/k;
+.super Ljava/lang/Object;
.source "WidgetChannelsList.kt"
# interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Landroid/view/View$OnClickListener;
# annotations
@@ -16,123 +16,72 @@
name = null
.end annotation
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "Lw/u/b/k;",
- "Lkotlin/jvm/functions/Function1<",
- "Ljava/lang/Float;",
- "Lkotlin/Unit;",
- ">;"
- }
-.end annotation
-
# instance fields
.field public final synthetic $guild:Lcom/discord/models/domain/ModelGuild;
-.field public final synthetic $hasBanner:Z
-
-.field public final synthetic $list:Lcom/discord/widgets/channels/list/WidgetChannelListModel;
-
.field public final synthetic this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
# direct methods
-.method public constructor (Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;Lcom/discord/widgets/channels/list/WidgetChannelListModel;Z)V
+.method public constructor (Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V
.locals 0
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
iput-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$guild:Lcom/discord/models/domain/ModelGuild;
- iput-object p3, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$list:Lcom/discord/widgets/channels/list/WidgetChannelListModel;
-
- iput-boolean p4, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$hasBanner:Z
-
- const/4 p1, 0x1
-
- invoke-direct {p0, p1}, Lw/u/b/k;->(I)V
+ invoke-direct {p0}, Ljava/lang/Object;->()V
return-void
.end method
# virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
-
- check-cast p1, Ljava/lang/Number;
-
- invoke-virtual {p1}, Ljava/lang/Number;->floatValue()F
-
- move-result p1
-
- invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->invoke(F)V
-
- sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
- return-object p1
-.end method
-
-.method public final invoke(F)V
- .locals 2
-
- iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
-
- invoke-static {v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$getChannelsBanner$p(Lcom/discord/widgets/channels/list/WidgetChannelsList;)Lcom/facebook/drawee/view/SimpleDraweeView;
-
- move-result-object v0
-
- const/high16 v1, 0x3f800000 # 1.0f
-
- sub-float/2addr v1, p1
-
- invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setAlpha(F)V
+.method public final onClick(Landroid/view/View;)V
+ .locals 9
iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
- invoke-static {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$getAppBarLayout$p(Lcom/discord/widgets/channels/list/WidgetChannelsList;)Lcom/discord/views/CustomAppBarLayout;
+ invoke-static {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$ackPremiumGuildHint(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
- move-result-object p1
-
- invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->a()Z
-
- move-result p1
-
- iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
-
- invoke-static {v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$isCollapsed$p(Lcom/discord/widgets/channels/list/WidgetChannelsList;)Z
-
- move-result v0
-
- if-eq v0, p1, :cond_0
-
- iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
-
- invoke-static {v0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$setCollapsed$p(Lcom/discord/widgets/channels/list/WidgetChannelsList;Z)V
+ sget-object v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2;->Companion:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;
iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
- iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$guild:Lcom/discord/models/domain/ModelGuild;
+ invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
- invoke-static {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$isCollapsed$p(Lcom/discord/widgets/channels/list/WidgetChannelsList;)Z
+ move-result-object v1
- move-result v1
+ const-string p1, "requireFragmentManager()"
- invoke-static {p1, v0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$configureHeaderIcons(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;Z)V
+ invoke-static {v1, p1}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+ iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$guild:Lcom/discord/models/domain/ModelGuild;
- iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$list:Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+ if-eqz p1, :cond_0
- invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->getSelectedGuild()Lcom/discord/models/domain/ModelGuild;
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
- move-result-object v0
+ move-result-wide v2
- iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$hasBanner:Z
-
- invoke-static {p1, v0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$configureHeaderColors(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;Z)V
+ goto :goto_0
:cond_0
+ const-wide/16 v2, 0x0
+
+ :goto_0
+ move-wide v3, v2
+
+ const-wide/16 v5, 0x0
+
+ const/16 v7, 0x8
+
+ const/4 v8, 0x0
+
+ const/4 v2, 0x1
+
+ invoke-static/range {v0 .. v8}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;->show$default(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;Landroidx/fragment/app/FragmentManager;ZJJILjava/lang/Object;)V
+
return-void
.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$3.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$3.smali
new file mode 100644
index 0000000000..6a8d68b58e
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$3.smali
@@ -0,0 +1,138 @@
+.class public final Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;
+.super Lw/u/b/k;
+.source "WidgetChannelsList.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/widgets/channels/list/WidgetChannelsList;->configureUI(Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lw/u/b/k;",
+ "Lkotlin/jvm/functions/Function1<",
+ "Ljava/lang/Float;",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $guild:Lcom/discord/models/domain/ModelGuild;
+
+.field public final synthetic $hasBanner:Z
+
+.field public final synthetic $list:Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+
+.field public final synthetic this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+
+
+# direct methods
+.method public constructor (Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;Lcom/discord/widgets/channels/list/WidgetChannelListModel;Z)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+
+ iput-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->$guild:Lcom/discord/models/domain/ModelGuild;
+
+ iput-object p3, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->$list:Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+
+ iput-boolean p4, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->$hasBanner:Z
+
+ const/4 p1, 0x1
+
+ invoke-direct {p0, p1}, Lw/u/b/k;->(I)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Ljava/lang/Number;
+
+ invoke-virtual {p1}, Ljava/lang/Number;->floatValue()F
+
+ move-result p1
+
+ invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->invoke(F)V
+
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object p1
+.end method
+
+.method public final invoke(F)V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+
+ invoke-static {v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$getChannelsBanner$p(Lcom/discord/widgets/channels/list/WidgetChannelsList;)Lcom/facebook/drawee/view/SimpleDraweeView;
+
+ move-result-object v0
+
+ const/high16 v1, 0x3f800000 # 1.0f
+
+ sub-float/2addr v1, p1
+
+ invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setAlpha(F)V
+
+ iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+
+ invoke-static {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$getAppBarLayout$p(Lcom/discord/widgets/channels/list/WidgetChannelsList;)Lcom/discord/views/CustomAppBarLayout;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->a()Z
+
+ move-result p1
+
+ iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+
+ invoke-static {v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$isCollapsed$p(Lcom/discord/widgets/channels/list/WidgetChannelsList;)Z
+
+ move-result v0
+
+ if-eq v0, p1, :cond_0
+
+ iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+
+ invoke-static {v0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$setCollapsed$p(Lcom/discord/widgets/channels/list/WidgetChannelsList;Z)V
+
+ iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+
+ iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->$guild:Lcom/discord/models/domain/ModelGuild;
+
+ invoke-static {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$isCollapsed$p(Lcom/discord/widgets/channels/list/WidgetChannelsList;)Z
+
+ move-result v1
+
+ invoke-static {p1, v0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$configureHeaderIcons(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;Z)V
+
+ iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+
+ iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->$list:Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+
+ invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->getSelectedGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v0
+
+ iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->$hasBanner:Z
+
+ invoke-static {p1, v0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$configureHeaderColors(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;Z)V
+
+ :cond_0
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
index 4a4b2f4f45..cc156cdd87 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
@@ -1127,7 +1127,9 @@
xor-int/2addr v5, v3
- if-eqz v5, :cond_7
+ const-string v6, "adapter"
+
+ if-eqz v5, :cond_8
if-eqz v2, :cond_5
@@ -1154,9 +1156,9 @@
invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
- move-result-wide v5
+ move-result-wide v8
- invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v5
@@ -1168,10 +1170,32 @@
:goto_5
iput-object v5, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->selectedGuildId:Ljava/lang/Long;
- :cond_7
+ iget-object v5, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->selectedGuildId:Ljava/lang/Long;
+
+ if-eqz v5, :cond_8
+
+ invoke-virtual {v5}, Ljava/lang/Number;->longValue()J
+
+ move-result-wide v8
+
iget-object v5, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
- if-eqz v5, :cond_10
+ if-eqz v5, :cond_7
+
+ invoke-virtual {v5, v8, v9}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->setSelectedGuildId(J)V
+
+ goto :goto_6
+
+ :cond_7
+ invoke-static {v6}, Lw/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+ throw v1
+
+ :cond_8
+ :goto_6
+ iget-object v5, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
+
+ if-eqz v5, :cond_11
invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->getItems()Ljava/util/List;
@@ -1187,16 +1211,16 @@
move-result v6
- if-eqz v6, :cond_8
+ if-eqz v6, :cond_9
const/4 v6, 0x0
- goto :goto_6
+ goto :goto_7
- :cond_8
+ :cond_9
const/16 v6, 0x8
- :goto_6
+ :goto_7
invoke-virtual {v5, v6}, Lcom/google/android/material/appbar/CollapsingToolbarLayout;->setVisibility(I)V
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsSearchToolbar()Landroid/view/View;
@@ -1209,16 +1233,16 @@
xor-int/2addr v6, v3
- if-eqz v6, :cond_9
+ if-eqz v6, :cond_a
const/4 v6, 0x0
- goto :goto_7
+ goto :goto_8
- :cond_9
+ :cond_a
const/16 v6, 0x8
- :goto_7
+ :goto_8
invoke-virtual {v5, v6}, Landroid/view/View;->setVisibility(I)V
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsSearch()Landroid/view/View;
@@ -1231,25 +1255,25 @@
xor-int/2addr v3, v6
- if-eqz v3, :cond_a
+ if-eqz v3, :cond_b
const/4 v3, 0x0
- goto :goto_8
+ goto :goto_9
- :cond_a
+ :cond_b
const/16 v3, 0x8
- :goto_8
+ :goto_9
invoke-virtual {v5, v3}, Landroid/view/View;->setVisibility(I)V
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView;
move-result-object v3
- new-instance v5, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;
+ new-instance v5, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;
- invoke-direct {v5, p0, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V
+ invoke-direct {v5, p0, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V
invoke-virtual {v3, v5}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
@@ -1257,13 +1281,13 @@
move-result-object v3
- if-eqz v0, :cond_b
+ if-eqz v0, :cond_c
invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
move-result-object v1
- :cond_b
+ :cond_c
invoke-virtual {v3, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
invoke-direct {p0, v0, v4}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->configureHeaderIcons(Lcom/discord/models/domain/ModelGuild;Z)V
@@ -1272,22 +1296,6 @@
move-result-object v1
- if-eqz v2, :cond_c
-
- const/4 v3, 0x0
-
- goto :goto_9
-
- :cond_c
- const/16 v3, 0x8
-
- :goto_9
- invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
-
- invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChanneslBannerForeground()Landroid/widget/FrameLayout;
-
- move-result-object v1
-
if-eqz v2, :cond_d
const/4 v3, 0x0
@@ -1300,8 +1308,24 @@
:goto_a
invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
+ invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChanneslBannerForeground()Landroid/widget/FrameLayout;
+
+ move-result-object v1
+
if-eqz v2, :cond_e
+ const/4 v3, 0x0
+
+ goto :goto_b
+
+ :cond_e
+ const/16 v3, 0x8
+
+ :goto_b
+ invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V
+
+ if-eqz v2, :cond_f
+
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
move-result-object v1
@@ -1328,14 +1352,14 @@
invoke-virtual {v1, v3}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
- :cond_e
+ :cond_f
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
move-result-object v1
- new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;
+ new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;
- invoke-direct {v3, p0, v0, p1, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;Lcom/discord/widgets/channels/list/WidgetChannelListModel;Z)V
+ invoke-direct {v3, p0, v0, p1, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$3;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;Lcom/discord/widgets/channels/list/WidgetChannelListModel;Z)V
invoke-virtual {v1, v3}, Lcom/discord/views/CustomAppBarLayout;->setOnPercentCollapsedCallback(Lkotlin/jvm/functions/Function1;)V
@@ -1347,22 +1371,20 @@
move-result p1
- if-eqz p1, :cond_f
+ if-eqz p1, :cond_10
- goto :goto_b
+ goto :goto_c
- :cond_f
+ :cond_10
const/16 v4, 0x8
- :goto_b
+ :goto_c
invoke-virtual {v0, v4}, Landroid/view/View;->setVisibility(I)V
return-void
- :cond_10
- const-string p1, "adapter"
-
- invoke-static {p1}, Lw/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+ :cond_11
+ invoke-static {v6}, Lw/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
throw v1
.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
index 88ce7ebab2..c1e89bc316 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
@@ -109,6 +109,8 @@
.end annotation
.end field
+.field public selectedGuildId:J
+
# direct methods
.method public constructor (Landroidx/recyclerview/widget/RecyclerView;)V
@@ -276,8 +278,16 @@
return-object v0
.end method
+.method public final getSelectedGuildId()J
+ .locals 2
+
+ iget-wide v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->selectedGuildId:J
+
+ return-wide v0
+.end method
+
.method public final handleBottomNavHeight(I)V
- .locals 1
+ .locals 3
iput p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->bottomNavHeight:I
@@ -285,7 +295,11 @@
move-result-object p1
- sget-object v0, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->INSTANCE:Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
+ new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
+
+ iget-wide v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->selectedGuildId:J
+
+ invoke-direct {v0, v1, v2}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->(J)V
invoke-interface {p1, v0}, Ljava/util/List;->lastIndexOf(Ljava/lang/Object;)I
@@ -635,3 +649,11 @@
throw p1
.end method
+
+.method public final setSelectedGuildId(J)V
+ .locals 0
+
+ iput-wide p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->selectedGuildId:J
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem.smali
index 96be6c66f8..43d4ce084e 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem.smali
@@ -6,37 +6,78 @@
.implements Lcom/discord/widgets/channels/list/items/ChannelListItem;
-# static fields
-.field public static final INSTANCE:Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
+# instance fields
+.field public final guildId:J
# direct methods
-.method public static constructor ()V
- .locals 1
+.method public constructor ()V
+ .locals 4
- new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
+ const-wide/16 v0, 0x0
- invoke-direct {v0}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->()V
+ const/4 v2, 0x1
- sput-object v0, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->INSTANCE:Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;
+ const/4 v3, 0x0
+
+ invoke-direct {p0, v0, v1, v2, v3}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->(JILkotlin/jvm/internal/DefaultConstructorMarker;)V
return-void
.end method
-.method public constructor ()V
+.method public constructor (J)V
.locals 0
invoke-direct {p0}, Ljava/lang/Object;->()V
+ iput-wide p1, p0, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->guildId:J
+
+ return-void
+.end method
+
+.method public synthetic constructor (JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ .locals 0
+
+ and-int/lit8 p3, p3, 0x1
+
+ if-eqz p3, :cond_0
+
+ const-wide/16 p1, 0x0
+
+ :cond_0
+ invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->(J)V
+
return-void
.end method
# virtual methods
-.method public getKey()Ljava/lang/String;
- .locals 1
+.method public final getGuildId()J
+ .locals 2
- invoke-static {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItem$DefaultImpls;->getKey(Lcom/discord/widgets/channels/list/items/ChannelListItem;)Ljava/lang/String;
+ iget-wide v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->guildId:J
+
+ return-wide v0
+.end method
+
+.method public getKey()Ljava/lang/String;
+ .locals 3
+
+ new-instance v0, Ljava/lang/StringBuilder;
+
+ invoke-direct {v0}, Ljava/lang/StringBuilder;->()V
+
+ invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->getType()I
+
+ move-result v1
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+
+ iget-wide v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListBottomNavSpaceItem;->guildId:J
+
+ invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+ invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
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 28db84226c..812b0e1ffb 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, "15.3"
+ const-string v3, "15.4"
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 2705525eaf..35514985d9 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -1987,7 +1987,7 @@
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string v0, " - 15.3 (1080)"
+ const-string v0, " - 15.4 (1081)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;