From 6522098e7448c0dbc967e098f2982ca4b09b5fd3 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 27 Mar 2020 20:23:18 +0100 Subject: [PATCH] Changes of com.discord v1081 --- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 34484 -> 34484 bytes .../img_wumpus_playing_with_friends.png | Bin 19049 -> 19050 bytes com.discord/res/values-lt/plurals.xml | 16 +- com.discord/res/values-lt/strings.xml | 3 + com.discord/res/values/strings.xml | 2 +- .../smali/com/discord/BuildConfig.smali | 6 +- .../discord/stores/StoreClientVersion.smali | 2 +- .../analytics/AnalyticSuperProperties.smali | 6 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- ...el$Companion$getPrivateChannelList$1.smali | 172 +++++++++--------- ...panion$getSelectedGuildChannelList$1.smali | 164 +++++++++-------- .../WidgetChannelsList$configureUI$1.smali | 87 --------- .../WidgetChannelsList$configureUI$2.smali | 115 ++++-------- .../WidgetChannelsList$configureUI$3.smali | 138 ++++++++++++++ .../channels/list/WidgetChannelsList.smali | 118 +++++++----- .../list/WidgetChannelsListAdapter.smali | 26 ++- .../items/ChannelListBottomNavSpaceItem.smali | 63 +++++-- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- .../widgets/settings/WidgetSettings.smali | 2 +- 21 files changed, 524 insertions(+), 414 deletions(-) delete mode 100644 com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali create mode 100644 com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$3.smali 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 5240990a1c6bd07ddf52a48e728a46547b8fbc2e..bb36d51a40feef5befd5c370d26f29efe33882b7 100644 GIT binary patch delta 23 ecmdne%e1AJX+sw$qsiuO&R$bS%gvJZv)ut{jR-FQ delta 23 ecmdne%e1AJX+sw$qw(f$&R$bSi_Mbuv)ut{dI&85 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 f8f8451afc7c02e6921501ab74665b6c49659da9..b324ecb705a5085212c76643a6d881a108c27e11 100644 GIT binary patch literal 19050 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 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;