From 76f3152ff3d608a6765b49b69a4e212597bef375 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 18 May 2019 03:21:29 +0200 Subject: [PATCH] Changes of com.discord v900 --- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 27772 -> 27772 bytes .../ic_guild_badge_premium_tier_1.xml | 6 + .../ic_guild_badge_premium_tier_1_banner.xml | 8 + .../ic_guild_badge_premium_tier_2.xml | 13 + .../ic_guild_badge_premium_tier_2_banner.xml | 19 + .../ic_guild_badge_premium_tier_3.xml | 11 + .../ic_guild_badge_premium_tier_3_banner.xml | 15 + .../ic_guild_nitro_progress.xml | 6 + .../ic_guild_nitro_progress_banner.xml | 6 + .../ic_partnered_badge.xml | 6 + .../ic_partnered_badge_banner.xml | 6 + .../ic_user_premium_guild_subscription.xml | 6 + .../drawable-anydpi-v21/ic_verified_badge.xml | 6 + .../ic_verified_badge_banner.xml | 6 + .../drawable-anydpi-v24/ic_verified_check.xml | 6 - .../ic_verified_check_brand.xml | 6 - .../ic_guild_badge_premium_tier_1.png | Bin 0 -> 736 bytes .../ic_guild_badge_premium_tier_1_banner.png | Bin 0 -> 784 bytes .../ic_guild_badge_premium_tier_2.png | Bin 0 -> 754 bytes .../ic_guild_badge_premium_tier_2_banner.png | Bin 0 -> 894 bytes .../ic_guild_badge_premium_tier_3.png | Bin 0 -> 799 bytes .../ic_guild_badge_premium_tier_3_banner.png | Bin 0 -> 804 bytes .../drawable-hdpi/ic_guild_nitro_progress.png | Bin 0 -> 719 bytes .../ic_guild_nitro_progress_banner.png | Bin 0 -> 722 bytes .../res/drawable-hdpi/ic_partnered_badge.png | Bin 0 -> 899 bytes .../ic_partnered_badge_banner.png | Bin 0 -> 864 bytes .../ic_user_premium_guild_subscription.png | Bin 0 -> 371 bytes .../res/drawable-hdpi/ic_verified_badge.png | Bin 0 -> 820 bytes .../ic_verified_badge_banner.png | Bin 0 -> 818 bytes .../res/drawable-hdpi/ic_verified_check.png | Bin 590 -> 0 bytes .../drawable-hdpi/ic_verified_check_brand.png | Bin 602 -> 0 bytes .../ic_guild_badge_premium_tier_1.png | Bin 0 -> 415 bytes .../ic_guild_badge_premium_tier_1_banner.png | Bin 0 -> 459 bytes .../ic_guild_badge_premium_tier_2.png | Bin 0 -> 468 bytes .../ic_guild_badge_premium_tier_2_banner.png | Bin 0 -> 518 bytes .../ic_guild_badge_premium_tier_3.png | Bin 0 -> 459 bytes .../ic_guild_badge_premium_tier_3_banner.png | Bin 0 -> 468 bytes .../drawable-ldpi/ic_guild_nitro_progress.png | Bin 0 -> 407 bytes .../ic_guild_nitro_progress_banner.png | Bin 0 -> 397 bytes .../res/drawable-ldpi/ic_partnered_badge.png | Bin 0 -> 474 bytes .../ic_partnered_badge_banner.png | Bin 0 -> 477 bytes .../ic_user_premium_guild_subscription.png | Bin 0 -> 290 bytes .../res/drawable-ldpi/ic_verified_badge.png | Bin 0 -> 444 bytes .../ic_verified_badge_banner.png | Bin 0 -> 456 bytes .../res/drawable-ldpi/ic_verified_check.png | Bin 331 -> 0 bytes .../drawable-ldpi/ic_verified_check_brand.png | Bin 343 -> 0 bytes .../img_quick_switcher_empty_light_theme.png | Bin 4418 -> 4417 bytes .../ic_guild_badge_premium_tier_1.png | Bin 0 -> 459 bytes .../ic_guild_badge_premium_tier_1_banner.png | Bin 0 -> 513 bytes .../ic_guild_badge_premium_tier_2.png | Bin 0 -> 494 bytes .../ic_guild_badge_premium_tier_2_banner.png | Bin 0 -> 634 bytes .../ic_guild_badge_premium_tier_3.png | Bin 0 -> 526 bytes .../ic_guild_badge_premium_tier_3_banner.png | Bin 0 -> 551 bytes .../drawable-mdpi/ic_guild_nitro_progress.png | Bin 0 -> 454 bytes .../ic_guild_nitro_progress_banner.png | Bin 0 -> 452 bytes .../res/drawable-mdpi/ic_partnered_badge.png | Bin 0 -> 643 bytes .../ic_partnered_badge_banner.png | Bin 0 -> 640 bytes .../ic_user_premium_guild_subscription.png | Bin 0 -> 327 bytes .../res/drawable-mdpi/ic_verified_badge.png | Bin 0 -> 585 bytes .../ic_verified_badge_banner.png | Bin 0 -> 602 bytes .../res/drawable-mdpi/ic_verified_check.png | Bin 429 -> 0 bytes .../drawable-mdpi/ic_verified_check_brand.png | Bin 443 -> 0 bytes .../ic_guild_badge_premium_tier_1.png | Bin 0 -> 784 bytes .../ic_guild_badge_premium_tier_1_banner.png | Bin 0 -> 827 bytes .../ic_guild_badge_premium_tier_2.png | Bin 0 -> 900 bytes .../ic_guild_badge_premium_tier_2_banner.png | Bin 0 -> 1078 bytes .../ic_guild_badge_premium_tier_3.png | Bin 0 -> 869 bytes .../ic_guild_badge_premium_tier_3_banner.png | Bin 0 -> 882 bytes .../ic_guild_nitro_progress.png | Bin 0 -> 759 bytes .../ic_guild_nitro_progress_banner.png | Bin 0 -> 806 bytes .../res/drawable-xhdpi/ic_partnered_badge.png | Bin 0 -> 1147 bytes .../ic_partnered_badge_banner.png | Bin 0 -> 1118 bytes .../ic_user_premium_guild_subscription.png | Bin 0 -> 384 bytes .../res/drawable-xhdpi/ic_verified_badge.png | Bin 0 -> 1066 bytes .../ic_verified_badge_banner.png | Bin 0 -> 1055 bytes .../res/drawable-xhdpi/ic_verified_check.png | Bin 752 -> 0 bytes .../ic_verified_check_brand.png | Bin 780 -> 0 bytes .../ic_guild_badge_premium_tier_1.png | Bin 0 -> 1214 bytes .../ic_guild_badge_premium_tier_1_banner.png | Bin 0 -> 1276 bytes .../ic_guild_badge_premium_tier_2.png | Bin 0 -> 1259 bytes .../ic_guild_badge_premium_tier_2_banner.png | Bin 0 -> 1553 bytes .../ic_guild_badge_premium_tier_3.png | Bin 0 -> 1311 bytes .../ic_guild_badge_premium_tier_3_banner.png | Bin 0 -> 1362 bytes .../ic_guild_nitro_progress.png | Bin 0 -> 1190 bytes .../ic_guild_nitro_progress_banner.png | Bin 0 -> 1209 bytes .../drawable-xxhdpi/ic_partnered_badge.png | Bin 0 -> 1616 bytes .../ic_partnered_badge_banner.png | Bin 0 -> 1583 bytes .../ic_user_premium_guild_subscription.png | Bin 0 -> 535 bytes .../res/drawable-xxhdpi/ic_verified_badge.png | Bin 0 -> 1468 bytes .../ic_verified_badge_banner.png | Bin 0 -> 1466 bytes .../res/drawable-xxhdpi/ic_verified_check.png | Bin 1022 -> 0 bytes .../ic_verified_check_brand.png | Bin 1026 -> 0 bytes .../ic_guild_badge_premium_tier_1.png | Bin 0 -> 1542 bytes .../ic_guild_badge_premium_tier_1_banner.png | Bin 0 -> 1615 bytes .../ic_guild_badge_premium_tier_2.png | Bin 0 -> 1629 bytes .../ic_guild_badge_premium_tier_2_banner.png | Bin 0 -> 2002 bytes .../ic_guild_badge_premium_tier_3.png | Bin 0 -> 1668 bytes .../ic_guild_badge_premium_tier_3_banner.png | Bin 0 -> 1732 bytes .../ic_guild_nitro_progress.png | Bin 0 -> 1533 bytes .../ic_guild_nitro_progress_banner.png | Bin 0 -> 1545 bytes .../drawable-xxxhdpi/ic_partnered_badge.png | Bin 0 -> 2138 bytes .../ic_partnered_badge_banner.png | Bin 0 -> 2095 bytes .../ic_user_premium_guild_subscription.png | Bin 0 -> 555 bytes .../drawable-xxxhdpi/ic_verified_badge.png | Bin 0 -> 1928 bytes .../ic_verified_badge_banner.png | Bin 0 -> 1925 bytes .../drawable-xxxhdpi/ic_verified_check.png | Bin 1383 -> 0 bytes .../ic_verified_check_brand.png | Bin 1397 -> 0 bytes .../layout-v17/widget_guild_invite_info.xml | 4 +- .../widget_guild_invite_info.xml | 4 +- .../widget_guild_invite_info.xml | 4 +- .../res/layout/widget_guild_invite_info.xml | 4 +- com.discord/res/values/plurals.xml | 26 +- com.discord/res/values/public.xml | 5515 +++++++++-------- com.discord/res/values/strings.xml | 26 +- .../smali/androidx/appcompat/R$drawable.smali | 28 +- .../smali/androidx/appcompat/R$string.smali | 4 +- .../asynclayoutinflater/R$drawable.smali | 24 +- .../asynclayoutinflater/R$string.smali | 2 +- .../smali/androidx/browser/R$drawable.smali | 24 +- .../smali/androidx/browser/R$string.smali | 2 +- .../coordinatorlayout/R$drawable.smali | 24 +- .../androidx/coordinatorlayout/R$string.smali | 2 +- .../smali/androidx/core/R$drawable.smali | 24 +- .../smali/androidx/core/R$string.smali | 2 +- .../androidx/customview/R$drawable.smali | 24 +- .../smali/androidx/customview/R$string.smali | 2 +- .../androidx/drawerlayout/R$drawable.smali | 24 +- .../androidx/drawerlayout/R$string.smali | 2 +- .../smali/androidx/fragment/R$drawable.smali | 24 +- .../smali/androidx/fragment/R$string.smali | 2 +- .../androidx/legacy/coreui/R$drawable.smali | 24 +- .../androidx/legacy/coreui/R$string.smali | 2 +- .../legacy/coreutils/R$drawable.smali | 24 +- .../androidx/legacy/coreutils/R$string.smali | 2 +- .../androidx/legacy/v13/R$drawable.smali | 24 +- .../smali/androidx/legacy/v13/R$string.smali | 2 +- .../smali/androidx/legacy/v4/R$drawable.smali | 24 +- .../smali/androidx/legacy/v4/R$string.smali | 2 +- .../lifecycle/extensions/R$drawable.smali | 24 +- .../lifecycle/extensions/R$string.smali | 2 +- .../smali/androidx/loader/R$drawable.smali | 24 +- .../smali/androidx/loader/R$string.smali | 2 +- .../smali/androidx/media/R$drawable.smali | 24 +- .../smali/androidx/media/R$string.smali | 2 +- .../androidx/recyclerview/R$drawable.smali | 24 +- .../androidx/recyclerview/R$string.smali | 2 +- .../smali/androidx/room/R$drawable.smali | 24 +- .../smali/androidx/room/R$string.smali | 2 +- .../slidingpanelayout/R$drawable.smali | 24 +- .../androidx/slidingpanelayout/R$string.smali | 2 +- .../swiperefreshlayout/R$drawable.smali | 24 +- .../swiperefreshlayout/R$string.smali | 2 +- .../androidx/transition/R$drawable.smali | 24 +- .../smali/androidx/transition/R$string.smali | 2 +- .../androidx/vectordrawable/R$drawable.smali | 24 +- .../androidx/vectordrawable/R$string.smali | 2 +- .../smali/androidx/viewpager/R$drawable.smali | 24 +- .../smali/androidx/viewpager/R$string.smali | 2 +- .../smali/androidx/work/R$drawable.smali | 24 +- .../smali/androidx/work/R$string.smali | 2 +- .../smali/androidx/work/ktx/R$drawable.smali | 24 +- .../smali/androidx/work/ktx/R$string.smali | 2 +- .../smali/com/discord/BuildConfig.smali | 6 +- com.discord/smali/com/discord/a/a.smali | 40 +- com.discord/smali/com/discord/a/c.smali | 62 +- .../smali/com/discord/app/AppFragment$b.smali | 2 +- .../smali/com/discord/app/AppFragment$c.smali | 2 +- com.discord/smali/com/discord/app/g.smali | 4 +- .../com/discord/gateway/R$drawable.smali | 40 +- .../smali/com/discord/gateway/R$string.smali | 48 +- .../discord/models/domain/ModelGuild.smali | 386 +- .../discord/models/domain/ModelMessage.smali | 8 + .../com/discord/restapi/R$drawable.smali | 40 +- .../smali/com/discord/restapi/R$string.smali | 48 +- ...MembersLazy$makeGroup$textResolver$1.smali | 4 +- .../stores/StoreChannelsSelected.smali | 52 +- .../discord/stores/StoreClientVersion.smali | 2 +- ...reMediaNotification$NotificationData.smali | 16 +- .../StoreMediaNotification$init$3.smali | 2 +- .../stores/StoreMessageAck$init$1$1.smali | 99 + .../stores/StoreMessageAck$init$1$2.smali | 123 + .../stores/StoreMessageAck$init$1.smali | 174 +- .../com/discord/stores/StoreMessageAck.smali | 52 +- ...toreMessagesLoader$jumpToMessage$6$1.smali | 91 - .../StoreMessagesLoader$jumpToMessage$6.smali | 12 +- .../StoreMessagesLoader$jumpToMessage$8.smali | 43 +- .../discord/stores/StoreMessagesLoader.smali | 76 +- .../stores/StoreNavigation$init$6.smali | 4 +- .../com/discord/stores/StoreNavigation.smali | 6 +- .../stores/StoreUserGuildSettings.smali | 4 +- .../discord/stores/StoreUserSettings.smali | 6 +- .../analytics/AnalyticSuperProperties.smali | 6 +- .../auditlogs/AuditLogChangeUtils.smali | 26 +- .../utilities/channel/ChannelUtils.smali | 4 +- .../com/discord/utilities/error/Error.smali | 4 +- .../utilities/fcm/NotificationData.smali | 20 +- .../utilities/fcm/NotificationRenderer.smali | 10 +- .../GameDetectionService$Companion.smali | 8 +- .../discord/utilities/icon/IconUtils.smali | 24 +- .../images/MGImages$requestAvatarCrop$1.smali | 2 +- .../utilities/intent/IntentUtils.smali | 2 +- .../utilities/notices/NoticeBuilders.smali | 10 +- .../discord/utilities/platform/Platform.smali | 18 +- .../PresenceUtils$getActivity$1.smali | 4 +- .../utilities/presence/PresenceUtils.smali | 26 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../discord/utilities/rest/SendUtils.smali | 12 +- .../strings/ContextSearchStringProvider.smali | 20 +- ...ulViews$FragmentOnBackPressedHandler.smali | 4 +- .../textprocessing/MessageUtils.smali | 12 +- ...oregroundService$NotificationBuilder.smali | 18 +- com.discord/smali/com/discord/utils/R$c.smali | 40 +- .../ActiveSubscriptionView$HeaderImage.smali | 6 +- .../discord/views/steps/StepsView$b$a.smali | 4 +- .../video/VideoCallParticipantView.smali | 4 +- .../WidgetAuthLogin$validationManager$2.smali | 4 +- .../widgets/auth/WidgetAuthLogin.smali | 4 +- .../discord/widgets/auth/WidgetAuthMfa.smali | 6 +- ...etAuthRegister$validationManager$2$1.smali | 2 +- ...dgetAuthRegister$validationManager$2.smali | 6 +- .../widgets/auth/WidgetAuthRegister.smali | 8 +- ...vite$configureOnPostRegistration$1$2.smali | 2 +- ...sterInvite$configureRegisterButton$2.smali | 4 +- .../auth/WidgetAuthRegisterInvite.smali | 10 +- .../WidgetChannelGroupDMSettings.smali | 6 +- .../channels/WidgetCreateChannel.smali | 18 +- ...dgetGroupInviteFriends$configureUI$1.smali | 2 +- .../WidgetGroupInviteFriends$setupFAB$1.smali | 2 +- .../channels/WidgetGroupInviteFriends.smali | 8 +- .../channels/WidgetTextChannelSettings.smali | 12 +- ...el$Companion$getPrivateChannelList$1.smali | 26 +- ...panion$getSelectedGuildChannelList$1.smali | 8 +- .../WidgetChannelListModel$Companion.smali | 2 +- .../list/WidgetChannelListModel.smali | 131 +- .../WidgetChannelsList$configureUI$2.smali | 14 +- .../channels/list/WidgetChannelsList.smali | 343 +- ...WidgetChannelsListAdapter$ItemHeader.smali | 4 +- .../WidgetChannelsListAdapter$ItemMFA.smali | 2 +- ...ChannelsListItemChannelActions$Model.smali | 2 +- ...WidgetChannelsListItemChannelActions.smali | 6 +- ...elMembersListViewHolderMember$bind$3.smali | 2 +- .../WidgetUrlActions$onViewCreated$3.smali | 2 +- .../WidgetChatDetached$Model$Companion.smali | 2 +- ...putAttachments$DiscordCameraFragment.smali | 2 +- ...achments$PermissionsEmptyListAdapter.smali | 2 +- .../input/WidgetChatInputAttachments.smali | 2 +- .../chat/input/WidgetChatInputModel.smali | 8 +- ...putSend$configureSendListeners$1$2$1.smali | 2 +- ...atInputSend$configureSendListeners$5.smali | 2 +- ...dgetChatInputEmojiAdapter$HeaderItem.smali | 62 +- .../emoji/WidgetChatInputEmojiPicker.smali | 8 +- .../widgets/chat/list/WidgetChatList$1.smali | 4 +- .../WidgetChatListActions$configureUI$8.smali | 2 +- .../chat/list/WidgetChatListActions.smali | 8 +- .../list/WidgetChatListAdapter$Data.smali | 3 + .../WidgetChatListAdapter$EmptyData.smali | 10 + ...hatListAdapter$ScrollToWithHighlight.smali | 288 +- ...WidgetChatListAdapterItemCallMessage.smali | 4 +- .../list/WidgetChatListAdapterItemGift.smali | 36 +- ...idgetChatListAdapterItemGuildWelcome.smali | 4 +- .../WidgetChatListAdapterItemInvite.smali | 4 +- ...getChatListAdapterItemListenTogether.smali | 4 +- .../list/WidgetChatListAdapterItemStart.smali | 2 +- ...ItemSystemMessage$getSystemMessage$1.smali | 368 +- ...dgetChatListAdapterItemSystemMessage.smali | 253 +- ...getChatListAdapterItemUploadProgress.smali | 4 +- ...$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs.smali | 86 + ...$$Lambda$dBW72U9y3fexk387210Jvq5gK5k.smali | 78 - .../chat/list/model/WidgetChatListModel.smali | 399 +- .../WidgetManageReactions.smali | 2 +- ...s$Model$zcPOgPNbjn37xwYeWHBryUPrv84.smali} | 50 +- .../WidgetChannelPinnedMessages$Model.smali | 253 +- .../chat/typing/WidgetChatTypingUsers.smali | 6 +- .../widgets/debugging/WidgetDebugging.smali | 2 +- .../widgets/debugging/WidgetFatalCrash.smali | 16 +- .../widgets/friends/WidgetFriendsAdd.smali | 2 +- .../widgets/friends/WidgetFriendsList.smali | 12 +- ...getFriendsListAdapter$ItemSuggestion.smali | 6 +- .../actions/WidgetGuildActionsSheet.smali | 4 +- .../guilds/create/WidgetGuildCreate.smali | 12 +- .../invite/WidgetGuildInviteShare.smali | 2 +- .../guilds/invite/WidgetInviteInfo.smali | 40 +- .../management/WidgetGuildManagement.smali | 2 +- .../main/WidgetMainHeaderManager.smali | 4 +- .../main/WidgetMainPanelNoChannels.smali | 4 +- ...getMedia$onViewBoundOrOnResume$1$1$1.smali | 2 +- ...getMedia$onViewBoundOrOnResume$1$1$2.smali | 2 +- .../discord/widgets/media/WidgetMedia.smali | 2 +- .../notice/WidgetNoticeDialog$Companion.smali | 2 +- .../widgets/search/WidgetSearch$Model.smali | 6 +- .../results/WidgetSearchResults$Model.smali | 12 +- ...hSuggestionsAdapter$FilterViewHolder.smali | 20 +- ...hSuggestionsAdapter$HeaderViewHolder.smali | 34 +- ...ewHolder$CategoryOverridesViewHolder.smali | 2 +- ...iewHolder$ChannelOverridesViewHolder.smali | 2 +- ...ficationsOverridesAdapter$ViewHolder.smali | 6 +- ...sChannelListAdapter$CategoryListItem.smali | 2 +- .../servers/WidgetServerNotifications.smali | 6 +- ...tServerNotificationsOverrideSelector.smali | 4 +- .../servers/WidgetServerSettings.smali | 2 +- .../servers/WidgetServerSettingsBans.smali | 6 +- .../WidgetServerSettingsChannels.smali | 2 +- .../WidgetServerSettingsEditMember.smali | 2 +- .../WidgetServerSettingsEditRole.smali | 8 +- ...mojis$Adapter$EmojiSectionViewHolder.smali | 4 +- ...ServerSettingsEmojis$Model$Companion.smali | 2 +- ...rverSettingsEmojis$showMediaPicker$1.smali | 4 +- .../servers/WidgetServerSettingsEmojis.smali | 2 +- .../WidgetServerSettingsEmojisEdit.smali | 4 +- ...ingsInstantInvitesActions$onResume$3.smali | 2 +- ...etServerSettingsIntegrationsListItem.smali | 4 +- .../WidgetServerSettingsModeration.smali | 6 +- ...SettingsOverview$configureBanner$1$2.smali | 4 +- ...erSettingsOverview$configureIcon$1$2.smali | 4 +- ...SettingsOverview$configureSplash$1$2.smali | 4 +- .../WidgetServerSettingsOverview.smali | 4 +- .../WidgetServerSettingsRolesList.smali | 4 +- ...ettingsRolesListAdapter$RoleListItem.smali | 4 +- ...rverSettingsSecurity$ToggleMfaDialog.smali | 4 +- .../WidgetServerSettingsSecurity.smali | 2 +- ...idgetServerSettingsTransferOwnership.smali | 2 +- .../WidgetServerSettingsVanityUrl.smali | 4 +- .../WidgetServerSettingsAuditLog.smali | 2 +- ...getServerSettingsAuditLogFilterSheet.smali | 4 +- .../widgets/settings/WidgetChangeLog.smali | 2 +- .../widgets/settings/WidgetSettings.smali | 6 +- .../settings/WidgetSettingsAppearance.smali | 4 +- .../settings/WidgetSettingsBehavior.smali | 6 +- .../settings/WidgetSettingsDeveloper.smali | 2 +- ...$configureUI$$inlined$apply$lambda$2.smali | 6 +- .../settings/WidgetSettingsGames.smali | 10 +- .../settings/WidgetSettingsLanguage.smali | 228 +- .../settings/WidgetSettingsMedia.smali | 4 +- .../WidgetSettingsNotifications.smali | 2 +- ...Privacy$configurePrivacyControls$1$1.smali | 8 +- ...Privacy$configureRequestDataButton$1.smali | 2 +- ...SettingsPrivacy$onRequestDataClick$1.smali | 4 +- ...SettingsPrivacy$onRequestDataClick$2.smali | 4 +- ...SettingsPrivacy$onRequestDataClick$4.smali | 4 +- .../settings/WidgetSettingsPrivacy.smali | 12 +- ...gsUserConnections$Adapter$ViewHolder.smali | 4 +- .../WidgetSettingsUserConnections.smali | 4 +- ...WidgetSettingsUserConnectionsAddXbox.smali | 6 +- .../settings/WidgetSettingsVoice.smali | 6 +- ...idgetDisableDeleteAccountDialog$Mode.smali | 12 +- .../account/WidgetEnableSMSBackupDialog.smali | 4 +- .../WidgetSettingsAccount$configureUI$4.smali | 2 +- ...idgetSettingsAccount$configureUI$6$1.smali | 4 +- ...ttingsAccount$showRemove2FAModal$1$1.smali | 2 +- .../account/WidgetSettingsAccount.smali | 14 +- ...r$BackupCodeViewHolder$onConfigure$1.smali | 2 +- ...sAccountBackupCodes$getBackupCodes$1.smali | 4 +- .../WidgetSettingsAccountBackupCodes.smali | 10 +- .../WidgetSettingsAccountChangePassword.smali | 4 +- ...getSettingsAccountEdit$configureUI$1.smali | 2 +- ...tingsAccountEdit$validationManager$2.smali | 6 +- .../account/WidgetSettingsAccountEdit.smali | 4 +- .../account/mfa/WidgetEnableMFADownload.smali | 2 +- .../account/mfa/WidgetEnableMFAKey.smali | 6 +- .../billing/WidgetSettingsBilling.smali | 2 +- .../nitro/WidgetCancelPremiumDialog.smali | 4 +- .../nitro/WidgetSettingsPremium.smali | 32 +- .../nitro/WidgetUpgradePremiumDialog.smali | 14 +- ...idgetIncomingShare$onSendClicked$3$2.smali | 2 +- .../widgets/share/WidgetIncomingShare.smali | 4 +- ...dgetStatus$Model$Companion$getNew$1.smali} | 43 +- ...ompanion$getNew$isUnreadValidObs$1$1.smali | 99 + ...ompanion$getNew$isUnreadValidObs$1$2.smali | 112 + ...ompanion$getNew$isUnreadValidObs$1$3.smali | 128 + ...ompanion$getNew$isUnreadValidObs$1$4.smali | 88 + ...$Companion$getNew$isUnreadValidObs$1.smali | 180 + .../status/WidgetStatus$Model$Companion.smali | 108 +- ...dgetStatus$sam$rx_functions_Func4$0.smali} | 16 +- .../discord/widgets/status/WidgetStatus.smali | 4 +- .../discord/widgets/tos/WidgetTosAccept.smali | 4 +- .../user/ViewHolderGameRichPresence.smali | 2 +- .../user/ViewHolderMusicRichPresence.smali | 8 +- .../user/ViewHolderPlatformRichPresence.smali | 4 +- .../user/ViewHolderUserRichPresence.smali | 6 +- .../widgets/user/WidgetPruneUsers.smali | 4 +- ...etUserMentions$Model$Companion$get$1.smali | 298 +- .../user/WidgetUserMentions$Model.smali | 396 +- ...UserMentions$WidgetUserMentionFilter.smali | 2 +- .../widgets/user/WidgetUserMentions.smali | 2 +- .../widgets/user/WidgetUserProfile.smali | 22 +- ...$Model$Badge$getBadgeClickListener$1.smali | 2 +- .../user/WidgetUserProfileHeader.smali | 60 +- .../widgets/user/WidgetUserProfileStrip.smali | 4 +- .../widgets/user/WidgetUserStatusSheet.smali | 20 +- .../account/WidgetUserAccountVerify.smali | 4 +- .../user/email/WidgetUserEmailUpdate.smali | 2 +- .../user/email/WidgetUserEmailVerify.smali | 4 +- .../user/search/ViewGlobalSearchItem.smali | 2 +- .../user/search/WidgetGlobalSearch.smali | 10 +- .../WidgetGlobalSearchModel$Companion.smali | 6 +- .../user/usersheet/WidgetUserSheet.smali | 30 +- ...WidgetCallFailed$sendFriendRequest$1.smali | 2 +- .../widgets/voice/call/WidgetCallFailed.smali | 2 +- .../voice/call/WidgetPrivateCall.smali | 2 +- .../call/WidgetPrivateCallControlsView.smali | 8 +- .../voice/call/WidgetVoiceCallIncoming.smali | 12 +- .../voice/call/WidgetVoiceCallInline.smali | 22 +- .../VoiceControlsView$configureUI$1.smali | 2 +- .../voice/fullscreen/VoiceControlsView.smali | 10 +- .../settings/WidgetVoiceChannelSettings.smali | 6 +- .../com/google/android/gms/base/R$b.smali | 34 +- .../com/google/android/gms/common/R$a.smali | 2 +- .../google/android/material/R$drawable.smali | 40 +- .../google/android/material/R$string.smali | 12 +- .../com/lytefast/flexinput/R$d.smali | 54 +- .../com/lytefast/flexinput/R$g.smali | 34 +- .../miguelgaeta/media_picker/R$drawable.smali | 52 +- .../miguelgaeta/media_picker/R$string.smali | 14 +- .../com/yalantis/ucrop/R$c.smali | 52 +- .../com/yalantis/ucrop/R$g.smali | 14 +- 417 files changed, 7657 insertions(+), 5830 deletions(-) create mode 100644 com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1_banner.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2_banner.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3_banner.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress_banner.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_partnered_badge.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_partnered_badge_banner.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_user_premium_guild_subscription.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_verified_badge.xml create mode 100644 com.discord/res/drawable-anydpi-v21/ic_verified_badge_banner.xml delete mode 100644 com.discord/res/drawable-anydpi-v24/ic_verified_check.xml delete mode 100644 com.discord/res/drawable-anydpi-v24/ic_verified_check_brand.xml create mode 100644 com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_1.png create mode 100644 com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_1_banner.png create mode 100644 com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_2.png create mode 100644 com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_2_banner.png create mode 100644 com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3.png create mode 100644 com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3_banner.png create mode 100644 com.discord/res/drawable-hdpi/ic_guild_nitro_progress.png create mode 100644 com.discord/res/drawable-hdpi/ic_guild_nitro_progress_banner.png create mode 100644 com.discord/res/drawable-hdpi/ic_partnered_badge.png create mode 100644 com.discord/res/drawable-hdpi/ic_partnered_badge_banner.png create mode 100644 com.discord/res/drawable-hdpi/ic_user_premium_guild_subscription.png create mode 100644 com.discord/res/drawable-hdpi/ic_verified_badge.png create mode 100644 com.discord/res/drawable-hdpi/ic_verified_badge_banner.png delete mode 100644 com.discord/res/drawable-hdpi/ic_verified_check.png delete mode 100644 com.discord/res/drawable-hdpi/ic_verified_check_brand.png create mode 100644 com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_1.png create mode 100644 com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_1_banner.png create mode 100644 com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_2.png create mode 100644 com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_2_banner.png create mode 100644 com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_3.png create mode 100644 com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_3_banner.png create mode 100644 com.discord/res/drawable-ldpi/ic_guild_nitro_progress.png create mode 100644 com.discord/res/drawable-ldpi/ic_guild_nitro_progress_banner.png create mode 100644 com.discord/res/drawable-ldpi/ic_partnered_badge.png create mode 100644 com.discord/res/drawable-ldpi/ic_partnered_badge_banner.png create mode 100644 com.discord/res/drawable-ldpi/ic_user_premium_guild_subscription.png create mode 100644 com.discord/res/drawable-ldpi/ic_verified_badge.png create mode 100644 com.discord/res/drawable-ldpi/ic_verified_badge_banner.png delete mode 100644 com.discord/res/drawable-ldpi/ic_verified_check.png delete mode 100644 com.discord/res/drawable-ldpi/ic_verified_check_brand.png create mode 100644 com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1.png create mode 100644 com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1_banner.png create mode 100644 com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_2.png create mode 100644 com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_2_banner.png create mode 100644 com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3.png create mode 100644 com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3_banner.png create mode 100644 com.discord/res/drawable-mdpi/ic_guild_nitro_progress.png create mode 100644 com.discord/res/drawable-mdpi/ic_guild_nitro_progress_banner.png create mode 100644 com.discord/res/drawable-mdpi/ic_partnered_badge.png create mode 100644 com.discord/res/drawable-mdpi/ic_partnered_badge_banner.png create mode 100644 com.discord/res/drawable-mdpi/ic_user_premium_guild_subscription.png create mode 100644 com.discord/res/drawable-mdpi/ic_verified_badge.png create mode 100644 com.discord/res/drawable-mdpi/ic_verified_badge_banner.png delete mode 100644 com.discord/res/drawable-mdpi/ic_verified_check.png delete mode 100644 com.discord/res/drawable-mdpi/ic_verified_check_brand.png create mode 100644 com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_1.png create mode 100644 com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_1_banner.png create mode 100644 com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_2.png create mode 100644 com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_2_banner.png create mode 100644 com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3.png create mode 100644 com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3_banner.png create mode 100644 com.discord/res/drawable-xhdpi/ic_guild_nitro_progress.png create mode 100644 com.discord/res/drawable-xhdpi/ic_guild_nitro_progress_banner.png create mode 100644 com.discord/res/drawable-xhdpi/ic_partnered_badge.png create mode 100644 com.discord/res/drawable-xhdpi/ic_partnered_badge_banner.png create mode 100644 com.discord/res/drawable-xhdpi/ic_user_premium_guild_subscription.png create mode 100644 com.discord/res/drawable-xhdpi/ic_verified_badge.png create mode 100644 com.discord/res/drawable-xhdpi/ic_verified_badge_banner.png delete mode 100644 com.discord/res/drawable-xhdpi/ic_verified_check.png delete mode 100644 com.discord/res/drawable-xhdpi/ic_verified_check_brand.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1_banner.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_2.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_2_banner.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_3.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_3_banner.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress_banner.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_partnered_badge.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_partnered_badge_banner.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_user_premium_guild_subscription.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_verified_badge.png create mode 100644 com.discord/res/drawable-xxhdpi/ic_verified_badge_banner.png delete mode 100644 com.discord/res/drawable-xxhdpi/ic_verified_check.png delete mode 100644 com.discord/res/drawable-xxhdpi/ic_verified_check_brand.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_1.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_1_banner.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2_banner.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_3.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_3_banner.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_guild_nitro_progress.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_guild_nitro_progress_banner.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_partnered_badge.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_partnered_badge_banner.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_user_premium_guild_subscription.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_verified_badge.png create mode 100644 com.discord/res/drawable-xxxhdpi/ic_verified_badge_banner.png delete mode 100644 com.discord/res/drawable-xxxhdpi/ic_verified_check.png delete mode 100644 com.discord/res/drawable-xxxhdpi/ic_verified_check_brand.png create mode 100644 com.discord/smali/com/discord/stores/StoreMessageAck$init$1$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreMessageAck$init$1$2.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6$1.smali create mode 100644 com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs.smali delete mode 100644 com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k.smali rename com.discord/smali/com/discord/widgets/chat/pins/{-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ.smali => -$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84.smali} (50%) rename com.discord/smali/com/discord/widgets/status/{WidgetStatus$Model$Companion$get$1.smali => WidgetStatus$Model$Companion$getNew$1.smali} (63%) create mode 100644 com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1.smali create mode 100644 com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2.smali create mode 100644 com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3.smali create mode 100644 com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4.smali create mode 100644 com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1.smali rename com.discord/smali/com/discord/widgets/status/{WidgetStatus$sam$rx_functions_Func3$0.smali => WidgetStatus$sam$rx_functions_Func4$0.smali} (55%) diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index ffb35067d4..35641e270a 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-899.apk +apkFileName: com.discord-900.apk compressionType: false doNotCompress: - arsc @@ -308,5 +308,5 @@ usesFramework: tag: null version: 2.4.1-cc194d-SNAPSHOT versionInfo: - versionCode: '899' - versionName: 8.9.9 + versionCode: '900' + versionName: 9.0.0 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index f1cfc7bf64..f2f6f90176 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 May 16 21:14:24 UTC 2019 -version_name=8.9.9 +#Sat May 18 00:12:05 UTC 2019 +version_name=9.0.0 package_name=com.discord -build_id=9ec31162-042b-4b7f-98cc-515f700a1ace -version_code=899 +build_id=ce62f3f4-37cc-4902-88d7-680c54d11b1e +version_code=900 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index e6d1e6a05370272a20ebc20b6c2864b3125c28cf..07dc80486f8050eea1a94b48cfdbd6ba05fd6538 100644 GIT binary patch delta 92 zcmex!gYnM|#tBy#JvLsgWD{g$uw-ChUM9Z75HBbEvUC2jlb2t=8#0KvJ%^*xYKJ&I6?0y7#L902QSbp#T5? diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1.xml new file mode 100644 index 0000000000..b3026162ca --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1_banner.xml new file mode 100644 index 0000000000..954f727548 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1_banner.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2.xml new file mode 100644 index 0000000000..11a335dd26 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2_banner.xml new file mode 100644 index 0000000000..d199dbccd8 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2_banner.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3.xml new file mode 100644 index 0000000000..2433183282 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3_banner.xml new file mode 100644 index 0000000000..ddd1c568d3 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3_banner.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress.xml new file mode 100644 index 0000000000..106fdf7a9b --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress_banner.xml new file mode 100644 index 0000000000..53a4df8089 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress_banner.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_partnered_badge.xml b/com.discord/res/drawable-anydpi-v21/ic_partnered_badge.xml new file mode 100644 index 0000000000..92f7e0c3f9 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_partnered_badge.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_partnered_badge_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_partnered_badge_banner.xml new file mode 100644 index 0000000000..d2b836af33 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_partnered_badge_banner.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_user_premium_guild_subscription.xml b/com.discord/res/drawable-anydpi-v21/ic_user_premium_guild_subscription.xml new file mode 100644 index 0000000000..82478a135c --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_user_premium_guild_subscription.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_verified_badge.xml b/com.discord/res/drawable-anydpi-v21/ic_verified_badge.xml new file mode 100644 index 0000000000..97d41dd95e --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_verified_badge.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v21/ic_verified_badge_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_verified_badge_banner.xml new file mode 100644 index 0000000000..87362ddeb9 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v21/ic_verified_badge_banner.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_verified_check.xml b/com.discord/res/drawable-anydpi-v24/ic_verified_check.xml deleted file mode 100644 index a3a6f15d34..0000000000 --- a/com.discord/res/drawable-anydpi-v24/ic_verified_check.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_verified_check_brand.xml b/com.discord/res/drawable-anydpi-v24/ic_verified_check_brand.xml deleted file mode 100644 index c9adafe16b..0000000000 --- a/com.discord/res/drawable-anydpi-v24/ic_verified_check_brand.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_1.png b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_1.png new file mode 100644 index 0000000000000000000000000000000000000000..ae122d2ae1f2e3cf81dc7a6a29a8ae2c515bfa85 GIT binary patch literal 736 zcmV<60w4W}P)H7nbaN{E~S;o*Bn6XbsXi z+zi4Yw~)!JT$2ynHeKk+`qO0j&V6%0!ajQ>I#vjj6CqkKvt|PYcaQ;X z+rn5w(QqIG8ri_$_p8BcTc}kT(5ej#p0!WUTR|be$$)O#z|71B3fa9Fh=z}3gI69r zE`%w9y0v^y1=Y*X#sNF2dYjFy4`PuQF9*_ofORiD}W~iAe{hW+0Iyg;YTv&<)XAfu`1XOsaV8Ks4NhGhh2xfS^J} zb=OUZbpr94wzNxf=s=kO&2p9wkWa!JMVeV!?cZ-~iABEe{7AZs7Yh4bynHp8OeUi5 z@Xb3F(5O&Nf>bsb5P*?ErD4Wjz9#XxZmC+!3cXU1Nvs7_R>(6FwKGMl|M?8kdy`TgV3$?e2-|b2IAXO`Rzxe&5jrP0}cm- z-7WCDUw_qL^;a^{Qu>^ZYnHTAA}Ams(&+<1;?&t7dGWPWms{`|Tv|B)d;1N1+{B{y Si_1p<0000SL(VIta9=-Wbc+rCi7fd|#BnLehFD4p435YQ<#)~HF0mTpcwf&%Lp|y6k zv`{Kw`4BNeff9tardB{JE6*k+OWoO>neHa~B%8F^*`43cyz{=#j36+m-xoN(SXlaA zSX%xOPbePI>pj@qMij*Zay0f}YWm~q#AJTqX}|xd;Dpe5sZ_43I^q9dEb$nf;==E> zwXZ+*ZSVn(04eW=<0_|K4aFbY3gdQ%4%ce69bO=e8m7{osoH%J;z4auquE@Z8^9L` zw;?donQW#xZdy^XxVoJh&ZO{euQzWDOv5t-&h8OC~!eW&OgoMWfgWp{}_qd=YKTH>hK)A^R1J&zw zE-2(TB2YFrKEngk5DyfxI}s>9HM3&&@RPomL>LlOXdr3|gw$dP6Aa52tiI;bm77{8 zJ$LV$wgc4F8{Jx4JY%NKt*srmTROHMCMci94O*bS7aq&0KpPsMMrnbQ&|r|5XkeTK zY9vX`svr;0E>S0eAowSNrHVTZw7gQ>6yB!N$$te1E>x@TvQHyJP0A8L8`D$7H+TLlV+Bj;`1-(xlK!eDxAKmG6pA}&%qU~`arKQU(% zcd)a2ZqROFMdkqAx-mKURCb-0C?!J&olzv~Y=oD=NG=z%o= O0000lC=;}kdsjDhKCF7((^99TXfrpOQ2~rlZnvJ18`IH$KhVckab%Sx3*r{}nY& zSRJ);%?1J?6x)y0F~FdUCghvTSFV9AIdtSWievu#`Sbt#_wOio@<0$E1*7mk|?fxEw`}V+dESz{V0W2@sp3$Z-s$ zM-n|BUu}P%*er_fD6$*_!TYJ!ghh4~nT`P^>dSZ>6g{2PHZjamWH|`2cm`Yf3wcpgI#|7FGKBppGMjj`{5u9BV?| z!3F}&Te7n@*?s)bC<7b~xzoT9YzG&r*o%$t0TBrbG#MiThEg?h`4JEjohEHF zlP1%oNgJC-n&J?DOBFieDW zBcs<=lBr@ky;gQOUCzEC)tUM+a=GsGgq2h;#}oPJQhaMrp*fEohG3#Xp|D5o6WmYQ z9ag1A-=@?UI^c8tm{e+YM<$aUmmCNpLLmw_lRqSmj{59Qxs1v~ZEogvRVvjDfYcyGE#3phQjN7 z55If=nRPOo-AVZuf~-*A`UiP|W?ZvwRv62B?2vn7)t2;xr5s4S-6fR_Whhj1VB^XcO< z%}A%vN?Q-)oAVz?d-zT)Pz_Yow-kk@=wSkZ{0o5<49fRW0jdUP8?!lPv_}PK)I@yv zYrdvkKcxawNEgR3Aaohs6*g;!NBu9*!ASazw~Az z!Dc_0+Eib&SWo-KaIU4L?U>n<{efjHkiBjA5q03e-e|nDT3R`3s^QT zC={56hif1hS`)GX*`QEhK(lUdh!Y4JK%psG4}}5)S`0_BoIttUR)rFw{ZJ?{AV?%m zpsE#^7wd@`C=?hFbi2Hr2SHe0xjl2i#7eRtqy=K2gu+0p9bJlTSIwYLZy0|nsz-y` z1lB~%dB+L8k*z3Hx-Loj{9%>ub~7+gr{qfY6-oPh@4P>a3dEb*=r0_Ut!zdP_JhT0 zw~{u8Gm%K{uvygaa`m}Gc}IksEh7vR)DNxRaI1dLfrY3hM2T4{ScK`qY07*qoM6N<$f(_b`7XSbN literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3.png new file mode 100644 index 0000000000000000000000000000000000000000..04a2f5e452fa7a61d9674f3b25ae054927dfd117 GIT binary patch literal 799 zcmV+)1K|9LP)pZaO)GHJ z&Gx~D^I_dEV}1n_8{5OSc?bx7^3PUGD_*_G{BPFgPDz#3P8r$YAaw21VdI zKld@wW-t{Xe%F^111X1Y+Vhpd7>2i(U-%mp2u}^KvYJ;Vazf-oP%i9EGJwHm4rEtmmWxAF4|WDzkNXpb#viP9#mJZ#+H3N?{0Sdw_=dzD=%U&Ki9qoU(b(YP+R_% zXp25M*Zt9I*#}}UO*VH7f2acW7W?A&%E>hWgLC)$qsM$B@kK*@lhGa(H02PGfXEEOQbbZ(@1=FHiCdv#k364e|e z@%uCHVlbgLq3vMxO&-uN)lGslt1}<~BZHE`jLv=zycxgLT-MEdylGGrm`P>X>lrHx zHSa8gBEjT&?IMmb2}Oeu@hl7IOA)shg(AXC#4rP>SJV@SP$Zb7{>Vz7D|d${+S4Nb z8c>B`_(b~Gdo34QK-SyseS96|tGa=lzzr@l#`ct7N}G;Z7Ra!iTBYlIR0A1^zn;o> zKk6;}Xlg!SabVhaQ}XWjKQ~zYmW;a*U8iH4C7P5d3RsA!e4t3QX&$h=cv^XzTgVw~ dT4?|K@dt1zr7W#8HRAvP002ovPDHLkV1fcVWkLV| literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3_banner.png b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..dee44cac7166ba531a03c0bcc701d4267de645ba GIT binary patch literal 804 zcmV+<1Ka$GP) zwj~zYQu|iKB9BGB6zZ_f?C#7ihyD`6YagGTo%zjgR+2bk%;UdaC~p4R+Af{M;)=`R zc3;$P<8U}G$l>Vl((>1xg~i;)n=$WIX%K;vA08exT14RcL^S>!C&de&cX#({Q5d=T@~3g#OU77_*sdP8i_v2XCTdrqY?T zw%=HZQfcQ;ayp&FvEAOb~bLkQhPKw~a!X2`X-G{T9OD^9!+-TKv3RWPJ7<1Z=_o}Xh15dD1cLH?!^;`2pPuBE2J@i(+fc0^HPYP{ z`{=|;wW>OuzH9xMfP4pkmZ|f&Ei^6LG8z&qpzvLAQXPmhh!=t45Fn23m{aXo!Q-V zLS%u++$0D}&1B~KN)A&f8c1pW!yx}OH95-!Xl8b9o?0^-&h}5cATsBm6F;f2)A=TX*h@l!CMZ-L5V}4qg%aFzm+n0qBz#tMzGRy>-uAONp0gPd-%~dgK zQ39AwZe7nGF+s=2KlsW$5+#5+ONOjK>gFzrdnf_SfBAu#F(^<%km&=1L>gqEBsKco>B1B0l#H(N-q(2_*lq`i z!+N$OClhM5>CriiFaF^RM59Ji*$B*^n9%W%)U-F=0F24AIxvOY$j41h`@*<-Mei0u zoU%_1z!(8$t{q*td@boOUh)Cl<-FG~1e!nJ3u&aST6?>@YWZ`7mBL8sTyyY9zH)98es~d76xV@EG>mF z$GM7aUlT9g)ty|4Z&|Wz{1rDrTL^b-J%&B1W42J}Z&poNP=D-iiq0ZNw^QWASG zy?zy#Hi6P2sig|lfvPFmG7#A$a9PFM2Ev*89CW(!Ys zRVhGl*B=rKNt@;R`-Q?dPB;Y@{;LawPYqvXF|Ufn1dE3#pZTA)0UYwChL0I8)J=(- z92Wev-QXC5zTFP0;$7tJ*)XxMx=^FJ5v@PnR0nkZ-2FP*gr!39Pt@hQGRkp}nWii@%>1FzDZrRc7T!r~AKWvDAdYNhx zNqLhI0%3SiahS@&QnX{g%2ms{qQ}dFQiU1pEdM>HvyjuyX;4})BCV~W7?V(XFwDLe zrWoT;nlOW8$Y};oRWDI@8cc9m=W! zf%UQ1BZN%mZ>3%8<^^&*Y8Kkx<8IIfg4a{{*N@h&-^`2$$R+UmH6!l+->Si)$Cy-s z?TRrG4@#_uC?VotxJisM2TERiTB46zsMDoBDBSgN1OJz>0R>}0KmY&$07*qoM6N<$ Ef;;<8xBvhE literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-hdpi/ic_partnered_badge.png b/com.discord/res/drawable-hdpi/ic_partnered_badge.png new file mode 100644 index 0000000000000000000000000000000000000000..c3ab0d085bf3b52a10ee93eade7a8b966d050a3e GIT binary patch literal 899 zcmV-}1AP36P)aBD*~3>#4(DeA=J^Iq8q`Fz?I zY|MbHjd@)aKweb~+cqlNJ+jtR3wBEJ%CbZk94rG&&MCv|XT;^&AgTLzf@-?ZWZ7VH zzCwi_rR(_{8;u>Ftk@*l@=M z77IUl`W&AjMLR0$#*P{SkcEXG#B6_-mr3-&BjVRvEU|q9gXCxW7qQ#>41Dw1x5&mP zVvb#$id$x2*zv&0Z|C{Tmc@{YvFJFNnvSnw4gUia^o2M8d-8OOrOIqeOTW2Ci=^l- zVeg3y-Lx!*4fEgHkA+zZ?4TgxgNKj&(-v5M^Y)!3F4z*{9l(OZm;NTz^WuTub)0@zaa Z_zP0Bjm3_8h=2e9002ovPDHLkV1i<(t+N0C literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-hdpi/ic_partnered_badge_banner.png b/com.discord/res/drawable-hdpi/ic_partnered_badge_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..e4e01342bda536ed6844fa31d71c163d7bf1a6ac GIT binary patch literal 864 zcmV-m1E2hfP)8cOQQL?spdowIF0d zKTH%oNfhG;`y3@>W>3?cvD9v&>ceb2!E})*W^bq)!Z%X%G*jB3S)yt~40JCxwn3b8 zRQ*eLfD~=S1>;}GwZR~)<6k>%CAR2;|AwinHqwSg=q?g555m-Jv3UD1T+2i?p0m#Z z5-|>7kF7z*wf*c5F{W0BAY__nuAC>ga(iU1Ndy4m)~F09zYRbM2@o%MK?B8P7K#NA zWK4HCy<4qO+K>z=D*9vJgibF!%~9o5fu5aNqepHUR5thg?B-nPxhHEfsEd+n>>Wb@ z$>cU@qm;^3I`_$O^Q4yIwy}CiSl47Y!uP)>{7{1G7{N;VA-*sVV6o*t+*OT|x2oc!MadFr?U{PB?pO>P*2c~}TIDWqLm`My-Zks7 z1uHM5{yOFzzhjD^;>fHO5zu6;;8+NoHI8FpHx%UIhoWQN+pi_Z_^ErQxN0NqL_mlM zcL2j`(4UzKU0AZXHN2qUs_FPThih~%vJ+Ml>^ZO*N2-2X6x6?siZn>ye=l(;uT=LE z#GiLpsbBY%_E(*Iwj#Od!~0#{sN>xzWWUFP6woN!*OeIz}b<(_YeR+dc1&YCn=Y ztwBp~15k2jHTf(|B##N%Ljm{I3Ea_q+*Hlpu&VX*7mm&X;^pLWST&AG?_)k58eVqw z{?+=`+U#NHo!JIV8Ye+#9~{`>*T(C|a2Fn|JgkJ@0Oc=hSz>n$WfxGYZU3Md5uZ#zGZL*}S1R7;h-%%7kEGB#z=>(ioN)&uMcMMcH5~lggl6Frui`K;(kq zqOf0`L6qDE(}l`n*z^Lzeyqgj98B5M1Pi%@N00Zg86|0HOwEB4yFx7#~Ug+>VMG+)V+_R@)wdgl)Fnj RB>eyY002ovPDHLkV1nZto16du literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-hdpi/ic_verified_badge.png b/com.discord/res/drawable-hdpi/ic_verified_badge.png new file mode 100644 index 0000000000000000000000000000000000000000..894e304f6d87849cad3a40f58c205760d2d58eb5 GIT binary patch literal 820 zcmV-41Izr0P)p=#kRX7r#vvhr!!I-@AE@p)P|e|hhy(=&S^$tmK!-dB z;{QnawSRDIc2H2X49H@zLon5xr-_67L!+zFEFv2F1xLrzBXmf?)D0z|fwL)a3qTomkpvLV${GCdUz=uBr z@oL}5ND({wg&d^XJe1nR6E4NJFvNxE%ycVAOC- zZDad?bg**G2J9ge5?ze1G^RKW#U^I{fA{_aieo@g2Z}avE8sHYnQ>QaEwSOccvNp#e*%ZJm7>j@h(jJGo7ia7a1|iS5Uy z@ZS9g7?ytd@)hjRkDorFh=bIIMkbQ%7+}CO6P@j&;?w@0J%8~(AplC$xkVMEI|f_z z0WKJWqwnL>xP0YWybc0odot3^Wt@#QVhYFRwjOYFp#x9|lGOnKcBk;vWyBSbpahMa z%|Ypih-L=qZEbLymq>#^S^vD*omNq*qFE%}!w{kGFyLd;prTmj_oP zADB#VI>;|L)`Z&aYC=^7sE=eHT*`4s{2$A y9i&il20IF939cbMU}&g7yHg;CJqJ0K6gvPV3IJ{V`kJo*0000sI5=b!9331S931=uIy83|DiS0GrMbIWB37taw3Dc4?Vu8| zLKS}$5iAn4z4xx3+Lo)0nv%peAm}rm*|5p3FLeC{p9<;zut?*LM&0i zaZy2eDwuvxC$h$#R-M5?W4ENDeyTG|zdzQE1%^aLGpP~ckb)>{eFF;K2Zrk) zZXHQMb6o+VFHg0=1QtQj&h)}NfrY!5XuOO^g>gu#1CPw?N~q{CxLT6YGzS5IYF?bEGX!nbV=LG3f$QqfVf3Q6D*)|&w;2DSU{Mk zv5VIXlD@j=qo?Hm`ef-dbYl;?ZuWw=FYof05>@)wapx^qNNu zX?@;6G{AVkjNMr#t?TKVpI%j5VpQYKW9a;qMN+E#alydW!4`&!AzI$YczEZdUU9)x zw`yeQy5ZAW@M#x}plTT&FjLRg+P3O$ZZ%jHSJBBj3~diQU`8gs63g0l!Q@dnRBK6Q z@X^4v2V&#V^TLk5oy+RPENr=8Al>1aP*VZzo76*SDTwlig|cl3J^{e_+v~aYwylCp zi&V8C?fevPKVEei18+0~_2z?>HkcRhiqW>7P6ExAk!2|^f3LO~-Kf@V(8`88#X)yq z1cx8uWON~L+NUn-Wd8GS;%k|lelUR`?IUbe-g8(BQXI$c zuh`qwy1;|cN(N4Q_OhS_5(3(p<`75zV@8Bo+n#v?z6etP{il)*1eq4Ss4~Y7`&1gb zvv*eI*#nyS4@TJh|25>(F!2s*W#I_#x!SK)z!}Z=df{afmRCK{xdY=;CyBq;cY z#vI3D(Q_gk1H-Q|qcnE2Z)BthX^sK5o@#Q9S- z(Nc;@O7uVt>9lqbsMsJS%2cRfX?RS^|D^OhY;xa2LqmCpb`VH0P}5^d9Fvfe{r~Zk zr~hBRdW}u~G|`C~R22XoQdwhRfDW9yxq_YIEJAgkvA@&&M5@&=_T5C*k_36hDC)WuT-15fxuE~Pz<@cVxZ}2aQRnT`MV+_)qv6BF9XD<0>KLFy>ajQk z1s8VSjHij^CEa&)K!$^GLDwyV!uC5VKns5pau5)|2Sp($v_N``J8wsW^pfq6g7)hQ zKtqpXT6FU{5src3*I2|h7x&y0AT3ilEyl2`%^X1 zQtTj75`9s}t#n#D2vlqk?I37QqS(^P{yYC0r`^LQ_dToODi6^P0x2%+y!Dt8$J9@` z`~T&epa0)}_=QFO_GzLMHK-~m?!0xL8jb;h^?P37h_YL|i3%lP$gHNdW8k>!RyV;? znQo4O;NN&FWKi)=N5_D1N&9UFJkfPK8K34;mp}gBa^N-9978bs7k1t-!KeAh&%a&g{xb|3uBkIviW zw02NY*UfO!`dYw7It?9kpQJPd4J8YZMr>^v5-k3WEr%7i-P9nf=K=CXNyja3NSeA` z4{8S!D$S7{4(ho;>PK*ztOoUNNow2^-3jQtHJz}7ZkN-o=L+&Av}nKEI(p`kqf!O{1D2K~p1Lt~CR zI5@E2Gyo(S5EA16RJ_cl!lyZ0adfB*g+r(qyR;57(lNOpeN|B9L>oQ9zo1Qh5-mh9-6`2XXlPhdk}VlcxR zS~}4UONWF{a7-||Efc5A{D1k%H4NK9Vjwv*@$aDI0&>k`3Jn6`{S5xWvF#Ka6daok zPCuX&i*C@vhmZdUg~!9i!edhYKYRY-f8WGu=mssv8EYU-*RJ3EfAsiCuwm$YlA<43 zGcH3g4GM{g#+KOdxdf|0h-?x)9X%F7hG8+}HYn}+1;?7;%)Fqy14&;$vh ziV{$2g=#tvEQgALUayB1Ex&z3;`|v%0RaIC0vN81j1_Wacin|GvO7y>fj!-tQ5v1yt!f64z%TX$eJ z5ae=@x8Vlu+Pi-?E<+Mhvj2z2q~J6R2mOOU+ z)c@GTOt2v^05j~|`AaAU?c0B73D}UGJNI^@+p>56q5swOtr)h0#6WV$;ODPj|3S%x z;oZCUe<(2s1n%6u_nzVSiBrcZHE7>~BP+q_2b5yb4azO5`2Xh*!m;1KfB&D6Q~dwH zp`$2X{xAc`rp|z32YcTpQPwV){M)#=-Zu?fV#DVWtOmid2`CSt z$0EoubVFXfdi@KO_BL(W5sNePg7OY1ZQuf5zkdC(9}p7bfMH-jNVGFh!Fz0)Hf`Ddf6lzcxD0*l8yu;D zFeo%O8J8jN-hcT2{rh*EhJjoLH^?tIIv$rH+4*JvD{7i>8irz!e@OInWXX=6iT^)- z`UExvq#4AA8P?F!iDD2iT=OBW35khDw`Jm#ng1_ex%NLPJ?}pV{Q2|ee?m$&SPUeG zrv5i5c`#s$YM4Q(nFar00K~>&(0`y~4ucFTr_>-&WHEr!0x;EXMmOl$^B4c4;?w^h zJ$@1#@F1_fdGq#v-^6JcX$ohog~z1)zjpm57=sK08S?naQ?Q{y;qjzJKeA!C41pLF z?Tm>2(CBb%i4A5LE<->#Ff`5vC7bvK$C~&D$F>6{Z=)NAX-MpKU`*8q2FB{(%)Fpt z0;u>qo=p4NH!@O$sG!=V^de1OD&u6AdjB>(`wJrZlROj2+F0000< KMNUMnLSTY* literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_2_banner.png b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_2_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..45cdadf46ff2f5ee07295eebf1e47daec9d661bc GIT binary patch literal 518 zcmV+h0{Q)kP)2#S z)vBecRLfK|JiaGrYhDoXC13KEyx+WaC`u+&ELZ3`I~SK%Z0jmklLhs~ThVsdgS$?w0B5Fy;Bo(Gzy6Nmt1b(&xgJV$HwLXuQk?v0o5A5Rt$%q zZ%O00u)H%Ft%BJ7OTgWLCT_OKa$f|B7CiMNKX3$mhF8>6zImBP$pAZ*FlL z^hJjxNeHe7C3n>C(53eZLy%CGgCLHb?mNmnZ{`0A=?tbp3hu)8&fY~lR9s$zLZJ}q z=vAGo|V1SfW)?*a*T9*aj@ZjWeQunH3ssx;!`9T`)kJVqkK2OA6q zpGFmm#+Eq^F8}}l07*qo IM6N<$f@yH(7XSbN literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_3.png new file mode 100644 index 0000000000000000000000000000000000000000..21ed1cc4a36b8f82819ee963f9c49b3b114497cc GIT binary patch literal 459 zcmV;+0W|)JP)EI(p`kqf!O{1D2K~p1Lt~CR zI5@E2Gyo(S5EA16RJ|GxMs=mssv8EYU-*K)4@Kbm>$e`r_|3Lj)RNzsq28J8iL28F~# zV@quKT!PggL^g?@jvk93!>|}~8(&OpMWZhxbtAR6qgc9ivFpC`29> zA}=XaJPgO(ApEPj-TnV|vNLlGVO~;r+uN6>B!@f$@xx=X$Z_H% zGl&F17%dcvb%N+Qo%yucY$GTDHV+)mh4}4Vmi(h=>?*-a&Upg_0F}yn!_>vAgm}%j zAaj@`P^Fy_WL7l?fu547G7|`f z11Jat5O}MihJxH@{@rH(K*t(D7HR?ytF|8go5pK&Ev5(E#1m<}YG7KYrcDZ{_k1^o zEq}KeffzvYiQ8)0ZGAE^1$D**X2?)Qfb~G~`8Nf6PZXVV=z{T22@p5awMOwGQ)`D4##@ecI@_X?EEimO^Pq4ObxgI0000< KMNUMnLSTX|bk30g literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-ldpi/ic_guild_nitro_progress.png b/com.discord/res/drawable-ldpi/ic_guild_nitro_progress.png new file mode 100644 index 0000000000000000000000000000000000000000..f9853db326fc3558a0574991a757c4d920249ec2 GIT binary patch literal 407 zcmV;I0cie-P)EJd+S)t{N~-sP_&-*xta{wR z!GQ&*0U${Q6%_}dt*dbwg22-i6jUrQy#h2qK}qd7HceJ`F8@s|Y;hTQALMO>LCR|J zxD4_35Bu*M6ouO`pd;`a1T#ckOZUIFo)K=tkPVVoR_#WXG%zy%?-LLKHUuUHGfdaO z6g}|MA%-Za2BX_zXkz)_*~1URc90lI4o&H!OEN-Zm;(u4p2002ovPDHLkV1f%6 Bp@9GZ literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-ldpi/ic_guild_nitro_progress_banner.png b/com.discord/res/drawable-ldpi/ic_guild_nitro_progress_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..f053efe702447b367e369601253b976561e7aa70 GIT binary patch literal 397 zcmV;80doF{P)EI(p`kqf!O{1D2K~p1Lt~CR zI5@E2Gyo(S5EA16RJE)Qe*MDU-O|T&_F_>Xa zZa(OSr9;9eI3^g~7CR@8|2lfc7`B7NKyql}-$BWR0myhvp+O+Lp8=fEC^sk_oPIzl z7Tq8XEqxTlzCls{)iian8MGW{tbsIX>lyvmH#W!0Cn@@oHRCb_OZ3M?V^f6BC0GqY zWRvLW=&=Yg42uD`fw=+V=nuJ#P<6JM`{EH#_ITo#B>A2jt4{}C@>HM91;>Z{DY(K12z7~ih+g^ zGz4Tj(2)5!4T0g{*mkTggL#FZ0a#pzVxV7ebUew1Kyg4wj05!z0{S@{CJ`Q!@_*ry z75}&I-21<~Zwg#PLrdrXE!%hf-?U}>|Jb}hm+(cyzQ9f3F?zmj3lV^IFYlIvsLfs)&aFkm^z zav)&ASpt9(7XjDZ23bl}nG_Hb?F`iL+%F_%G00}$kT`!(S^pLAFyBjEW+@bxw0s}F?q2WFUP{Vy7{*MD6Cu|7F z_V%~)@fZTZZExDKx(x0WLIz-Q9g2ZK8{)|@1d3lf(7>RMH`y==&)#?cXYT*{f8)6y z{~I@ahHEHY@#+7%GvEKOKK1>7;+zj~amS8#-Vj6DU#S42_B~AE(&OL%k-?e!zy233 z|AZp;?dQM$L6hD?4SRRnq2av%(4e=wVTQ!b`T$mV`^BIC?OVS5zxV17m=7|%cl($B z6Lx<6fAuNEqONUUki7S1Is+u+Ap#N8-h&l^6lX2`2sRAn!YA+kfW5ln#CI@%+TO1S zgF4==XK-kJZvfmzzx_XU`xl1SK(2@Cc@0kjK!29Q3lWU_x6Ave~iYjXx-@fW?5x1)ClKp-0fb To@*UB00000NkvXXu0mjfNIU8} literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-ldpi/ic_user_premium_guild_subscription.png b/com.discord/res/drawable-ldpi/ic_user_premium_guild_subscription.png new file mode 100644 index 0000000000000000000000000000000000000000..9c105f653b0b671c2e913087ccef14d99f20a7c0 GIT binary patch literal 290 zcmV+-0p0$IP)_5<@@%Rkd54O4f|7DB&kg?_h&Bky#xMw^dC(aYO_V{v*tiXf4PXpv0Qt|6 z4S}U@U^s>2H3%3R{>V{_Y#7WCY>5>sKu;$i!+07*qoM6N<$g5vXf9smFU literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-ldpi/ic_verified_badge.png b/com.discord/res/drawable-ldpi/ic_verified_badge.png new file mode 100644 index 0000000000000000000000000000000000000000..52a6e0d00662e5b3c1b63858c231504c73d7942a GIT binary patch literal 444 zcmV;t0Ym=+V=nuJ#P<6JM`{EH#_ITo#B>A2jt4{}C@>HM91;>Z{DY(K12z7~ih+g^ zGz4Tj(2)5!4T0g{*mkTggL#FZ0a#pzVxV7ebUZN{Ln9Oa2ZhI@hy{eiIFM}6_MLnG zU$}VXe{5nVc7uR^&L(6?TW8;Y5cvN6`~TF;0=T$eXpA?+HK8#oK!Nx83`t7Q`~T(3 zSFk~S6Q`le-wp^!5Mb~Rjoyt-Ba96Slgn4Gfekry#yNS z0LUpvmdwsC`~UdK)BiBAX8k5SX(>7!Z}f-9r2Ic|^34Bx_a9)S9kS99a+)D%5Qqcv zE6G_TB<3+Fe`3k?vFu!TAC8|sc2#IzEYIyD!60;a& mvu{Y8KPat$#6Zafn;rlW^b+mT(2$=10000IU+U7qnkjU?2uGG~DL^YPb)?|8d~s1PuY% zUes}GJ|08BxUlPHJ64w=dF4Ne7}cwVoj2o&(OA}d`+rIIZ4|MR_S+658+7#ihyOPp zeEnZL=`MDIiaKs)6EbApx~Km^;K$Fu|669yJ^%jy@85r53=+rT z_1Ewu05q{2S+Zl!ga0qz{QM6Cdyl`v9T8nO!|_IcW&fT3mv4Rk|K#NljI={mIzmn} z1PualKz=1PixhU=dJM{+7`eW<4f|PemH?o{MZk5pL6#C# yCIMaL48+fYF|rtBb79AAe^6QhiGh*}Ha!3;joHaR3Kb~;0000=BBzihNLn>;T{@=cH?|(u{HnMm*s<$E|MSz0eNi+oPDhCG#7WAlwdu!s9ng3_b zSwP4T5Ppx5#-M2itN^6x@sp?jw`|{q&kzvq#+rhWT?Nv-edk_$hM;d_B%5h(_} z$DKh#VjTQKW7dQ66%e1s&>R}Q8o*X8F6z8JJFDR;4^f&6+wZ6VHT45=by4Td z?LhiJ3huhOxVYn1b79xb_R_BV5?BoZ*#@=!KXLfxbF2mdoo+$AArOq!Rm8Yx;^IgD zd*?sI@1o+)Ths9wGI{Ca|Bs%3|6f1lE|U1|a#TZlZi)aUzLRDM#8nLq`&m$;8rfUR zx4!tlcK0g+hJf*Vj5G#KGhhWEO)ua4{D1iDdwhlflf$iUtSK1TRUpkr&ws#e2)ehZ z9{o@kkz&w$oLQu#{k8+pW$Qut3W!gmYX)YI-QaA}d24w=*DV90@?CM;O%0&t!*D}7 pZ=DAv6Y`6Z_Uj5DL+Ms-0RZda>Ug5$u>=4B002ovPDHLkV1hR|pKJgC diff --git a/com.discord/res/drawable-ldpi/img_quick_switcher_empty_light_theme.png b/com.discord/res/drawable-ldpi/img_quick_switcher_empty_light_theme.png index 09c2f558318a780d2d877c1de60f7894a7484b5d..21f2d7faf4cc48a6eacd78a9fa70985662ad66e5 100644 GIT binary patch delta 4281 zcmV;q5JvC9BEce%BpC=vL_t(|+U;CxY#i5h){p$~5C8Cw6fhc*JsE%1T4@D1LHrC9 zL`mhwb<{v@ZB$0n#BEhuQH@r0Rn!Fpq;ZT`FqHVE$Rf2O_x;}4o!8Fpy!Lf_zB_Z5 zLvof6nW9OP7dV*V%|B9X`qVcSRJl|imqG47V#>Xq8LE3$El^wT-1g4|5DQ8qvU$h!`&7DuLRyYu7CR z=Z_wLkbUvXdwXE59~gc%cw8!#x?wD?qzJ5Yt5&Q2_5J6b`0;<+&oBr;+JESN53tD4 z(WzRc99`8j;mD3V4vcKu)_LX9F?Ra$U$cLF>nMBhtM_$0GaT951B!eUH@}#CYSn7h z_T6_$yY}79UVP&_?3*wC8Qb|=pLe)cZQT5P52y+C5CK&mn^4Y=j~ky}l|cRG(9owh zY#MfhPJP41;W&SpUynnLr7AajR6#xkpS7y#!urU_y|+e&9|J&<$l&gRNxU9m~~^`VZMHRV-H3oKUIAHcMn{9UNPzHh*E*Y!AsJs=?9(#Hq6CjtNld zTxLPCPXZj>WIHvD-Lz<$g}gUs(J|#rSndfal{_LFSgzDy<*LmT-DQ6btIgad;^Fixz2)!LGzr7SIr;)w`@_b!fZ7CQ>@z4q%`yhQo%% zd9Hsfz8P}+i z;<9YnBJDG!WWKJ%(zP;y8z*1p;2Z#_Zccw{qtR%ySXy^E@G0%Js?olmu|=vL!3<%J zC>+c*$Dt8&=#A~WKWhoVzH$6d7y{)GA6Dv@It~upc(!7HKanw5Np_i}Hd&$Ka6nS| zI+;_AT_w{DbM{x0S|^dIbu)!JD@Z1j$ow>;#ca|l%VEqUsoNw3bV0JZ0FpGd7EOQX z`xgf+FR;z=Bpj_z-+$}Ip*;X>WZSj|e3vl6ho9WfLE1FDM9GRRlk=F5IT47+oe1OGR<`wMS#hON;8ie86%(Xiv=` ztmMN`fIwaf>0#2Oee;-Y&v4&FTH=T|A9&#TXonDNx1C8q8@`qS*f5~fn#+Iv*+g0! z(+u|ei#|I-Rgn+(wV}k*z9FW$5PCuy^}je@i8M)=Q9ljg+9fnBpj~x)Dxh`%bc@W> zvO7~uR3UAp>$XWoHKTpNve@-w`CiIbJsU8i%TQ%xIQudF{vj2+fu?^6=MfJH2OI>+ z@*lJZh~sG&Keo|fO07vI< z=QT-j&PjUHDU%PXXw7+u%K?>Cx0aWzzah;$RIIwAlIG@!zx|$w4gDFk!t4WNtsR&HuyZ8H<2@biR?pIsJ3i}KVv#U=TB7Qc{~uD`sD2A@hH#*)8|tC1iulq zg0H(Cy~vk6hfhKB%bLw1K{1v()x6Ll(j<^%zWxXB6%(1-|8Ss4qc||Of5)3ZE*+nE ziV&usnD!*&7sndJxx5)u|B!ss|6#_RA~t(z`2vL&$GBo%rMM3dA!*IOt*GwnSSQlh z>9K5|c?;4R)R=x^2Q*NCh8Z%E<+P(yD4SneF{bB*Mrs0V85vFiR;|HaPUh;DIbbQ> zFo`HSejMmDCj(`39s&|;e>wrCPk?EpT}Ve0AJc1%&MQPXPYR*qpYKyo`1slcc#s@d zeny(rsnuKD`Ev6}=--ML>JLFCQpyWN4v8SD&8q5jRo}V8$uC6o5GhtnL16zY=(C6f z-#inj!QHnG3{^i$f#oA64Am33SrirU#u1Mp1q^2%ASx+yk;>~K$XU?~>sGbaf7k0Ql(iF3FCp#y#NR!_Zrgqb?`s{{ zG)$WHxgUQo6`wkb6fOKuKQprfY2)dcPa{2ww&7ffuR!s2VkKZwR!8-4mtXtE?v?uuD*W_^{+KrGagQm&4v>I&zfZHVUAwx z>t}8a`hD65EI~oDYP9%vWK_L;zH<%%^wjiq>V`;U>&@uFAgT9yS~m^XJ~KGDbg3G! zbux`Sikv78gn`BL>TY0L2w1kCYwuNZ0?ylZC#yY{Z_W}?j;nq~6=6=UEO8)Gwsg~7$L&rr8*YZa`8DjBW+=j) zex~U7K-t0lt_XR$#Mo^%k=FYWQvh{l(R&*fp^@Z)e*UYUgYN;+$H80v{(jsnC?W=h zW<}%rXLGXk88pQ$E07R#kpn*fNn{OPA}fEV8Pe(M-|&5gaiDB`at|wrocp zNfqm7X|iC2s)e);7X;qusNn%PElaYur1Kzs%(5l(wPeotDtsq0q8u#JsDdy z1VUSYMGtfzX%J80!VchK9t`UbQ(`dJiqOlIEf755~y?T&85!a+0Ox ztFBV0x*rhV>h-kZx&RHnZ26{^{gh2G8<3OCzrf$Zrv+!q;OvHgykU|y`3ZkS&=f z9iRC-Qwgu-Ol?5|DMr`>a1jnc>tN=nFv&Hx3+d%$@59hU;`bk%7cJMQ`-yHCE6|YE z>%np-`BcAHQGhM@ngCezXw`oj9mJAdzhN#%l;-6X)#o5e>gf4|20#-;%}{8VIZeBQ z8fFICkHP>JFCYkVS+T`r(!MUO-HScoTv4*mq5id(w?2N3p-hnxSbJ2Q~oNs?oH99i+wf2lI zWOCkUHA4J{j|3oDa`15S$o0eF!#{~HF9h4iI?b96vpm%iSoR45>vi$B_-Ft` zRI4*CAfQ6DhDStbS!h0fi)Cw(QzvrTY$NJJigtD)Z3MJPKIMNmX^W4vqT}+{vCcoK@&405X`$a8^&L17-p=$B zitX1T{)3#zmYd~7uAyREs%Rd{l&lZt3zqO%WO9f3{l$OeM^gohXJ9J|l7wD*=5kE_ z{%EZF548U@EuY7AMK2d>1ENN-koyk>7Xc`pO!ME0CIZrF+pk$NC5J&1q7>&9sx6+d z^U}^1Q;pfd%9Xv;3qC$im#~f$bDdpH>TC(BNm^)dE@qVJ4fxY%nuW-vad{tnNKt8@ zixp~*mXv?)ujrwlyd0D6p#b?k@!c~8(w)3yvwUUp6O}^6X0fcnKM#&3wg1HV^3~># zAY%#TPoXiRarp+O;ZIra78S+*e z(WG9!nlcXi=QvA}3kKw$Se`{QVKl5;5C1l$tgtOd@D|C5U&I>~|7Th7Gd=?n*n(#* b_5J@pArWMUA-0<+00000NkvXXu0mjfGB{0X delta 4302 zcmV;<5Hat;BElk&BpC@wL_t(|+U;CxY#i5h){p$~5C8Cw6fhEzJsE$MT4@A0LHtUf zAaW`HSYojunCT^?Ris}TaqoOV#AdO?df}zAOMHZXJ+T|%{k|O=P_KjZW)a?-e8|tw>IV;(Wn*~iz!ts*U*?_T#l=^ z5?E|3A@5s5V}6>&M&p0-fi*Pz5s5^u3)?;#uMBd{im4B-YJfIu+`NC|=36ow28P-< z4-AzEup4H86;tl^%uwC4YJu8v`?h~0fLKr>kzb{lM_k!Q)b?)OBNVB}HJJUA0>EAMZW$*iV1ndWt~+(*8sDdVocS zj!xAo<>;!O2}gF^c3@=Nw$95JkFisi{*L|2n@8FGU%jW}nc>LZ9#G_?xcSB8ldD#% zw(q_}+O_Xa_QLB=vTwieS8V6+f6n1rwQ=)vJ)kDkLj+WPY(hCVK5l$+RRZ;?p`lN1 z*fi`0o%)82!*PEyzaEDgOI2?4sDgYFK5JFeh4qnQMa zL9063DQWCPNn??c(*9XqYCQo#7NR7#&tq9sJI84MUIKsb07U#={BFr63qRVgV%aB4 za08LZ2xR@n;ho+rH*{db!0t562&JBBirTq0WE7QFNCztTuC-jEkl>Su$&|s@`I% z(Mf4_mLQ;FwESMpVS|@q)x9`JMYdTyqj!8wJaHkV-LUAU2o_BjXocB5v<6^&@5I-6 zj3?x!_nzTP#C`zoKSz)4zZ$UcV40G|5(LKOxXJ<=!nAsq)vOL}_rSz<00V6?95yV@ zb9sM4y$AbrqsbhXalq*}-ODkhfPIS#mT!s_qdhxg=ia@aAh0fM-m=v}Ff4-Njl;LF z&;Q})+1H+WkbVEuH`xonI`Yfk+q(67$U?y?%1uTl!xV#&>9tu|Y0`R||4nAbHL9ez zEL*l%u4GEdd|ip9Yh?mAPQK2;IRH-GoYa3tqtRxuw9frtG^M>-HQM(wwn)_@m?6v& zg@c*qI5a{Iy|I1wXDk8OH=q3qL!cbu!%F>9$H9Rc&sOXokke)**=3U2B!A>^KvMZS znNy8jNok?Z{z_8oz=y$X;m;&8Kh0<{o3zSu7&A%gHVFY;kgP6%Bu%YF6Z-ze0n2|2 zY;!ybN9)t~-@I{X4*(n4wygo*B~0+a$MFdBA1e1HHH0D~zyzJ>`cyOPkF za5amT-MEyf?&P^807j-cQ^PjzfJuJ>95O>YGB|>qIvd=wu&H1|!UC60LWfd`(Cb_l_C+nEHk;cFRy4FgK8x!ixBO{BFk z&0v4B=(8hK75Q*q8%jLw8)BLZp(mtK|BLgLNRxya_0tfpT|&bG+Eurw0%`|9x5zv# zyEDZ^71CC^ZkuFOGuj6%i(NaG@1=azGXXQY1XV_cvmfK{A5yXFX!@6M9`TTHz(J5K z|3Q0zIG%R#V;dc&)S6^cE=_*~7RwYH+^>;IPoW$-&7$0dP41^!v@e#G&Ck+#_kr18 z^NB8(YVl=L` z#*?}f&lZuSwu>Auc-73`I)_XqdP$+(F5XgLIv+B5?@NkG8E>NOjahY1@c+d zJB+k|lTo?mEkRB}Tm^rF7w1MMLa(zg&^3-mlgeFwoC$~C$rjD;)=hSZet(SQG=gc! zHT7GIF`#L3t^H4hvYRc*&XuCiKcH7|6CGzlb`um350 z#YCp|KO891C=P#&?eQj%OUEakB82HDraj5{#jyr)E^o%vKOo=qf0%Knh|OMHzCfYH zF|L?bDDJ~UNLuqBDysV$)`>KBdMw*#-hy-nHKw1~0Sy$OVTMd(Iqm2a%H|hWjOlry zk(vNoMut;>Rco-9lDYaN4p>SzOd^Vo9|t?nofY}6JQ!?7lG9!KBm_i zotKGlo)ALEKi8+8@X@si@E|#^{E9TIQ>(YQ^X2A|(7zKe)E|IMq?G5091=lPn^o26 zs=jlFlV6DFAyTZEg24VF=(C6f-#8Pf!QD3x3{^i&f#pLc4AtYfSriuV#u1Mp1q^2% zq4omu=cet| z3sE=?O&1&O^Rqkjp;v~tZEJ77WedCO&;Ec{qr5iFp*>49`zgHQ(hnr?Cc~aALvgVu zbLm!qjLzxX=zJ)3;hHFF1oxp@9gS=5Y&o^{14G9F4!}Y+YV+2u9dh))T)L!RTz!8F z>R)TLW;~oAn++!bo;AtX!yLWX*U#J<^!v0ASb~CP)oAhU$f$bxeCI3z=&9-J)OC@_ z)*I1-K~nGav~C)%eR^tq^v6gg2G2m_1f)!o3h5U^}N*WRn-1e~|+PF8y? z-<&0)99R5|D#Dyx$pi3mQu#h+L{5KW;_{FDs#FzZ`KC>q2Eo|ZM~3f1Zz}-&Na8@G zZ0V-Ej@zALHrxz-^J~~M%}|6p{Y=sEfwF`9T@mthiLu*kBCYo$rU2^nqW3l|LL8E7l|E9YYx0*>v5r+3yB@iCNn^_^Lkedqz=DjY z^tVAJ@Sp-HWCE^b4A?7r#Fb82b&uc$qSv&nvLnkrg-kd8JDMe1A|~VyGNC+DtlFm} z)%}2$qnV=lV>n_6N>60-V+7!tlKRJ_b3@?9={4(3$&@mVF z23f7eenWDO}Sja=-(r*8_Z352!)iyr76(jcC~$x9}Q1+Cx@3=N5=y=rr?^d4Gl zCCx+EABq!~i9Qg(xlGBdAnx)$3`+bpaZD+44;-`zf1XHXtXNe~rI| zPYceJ!PyM~dBY@a@)LiEyz!RI4(*PZaZ$a71_HETu{J350xF`-6E#D0D=%*!M#K;r zCQ4Fda`)mvR39uW*eYaC_Fqj|IzIDvrV?Junc9K`QjD+%;36D?*1^nCVUlZX7t+hi z-iM)y#P2^iCt9vi_Y>VPR-hrR*MsFw@~M8Yq5xa)H36{b(W-wnI*28^e#2ajD9uYN zs?R}`)Y0<^4S*(ynxW7zbDDMqHOvgOAB6!dUO*7!vSN$Lqi2L!z&kf2M&JBVLxW*lAgB zy$y2&=c4r}Ip2SxYIJ1sYwa0b$mG1yYJ~U?9|=IRfgWaDlHXcvp>%Rsi0G-I8rMuAJ{aDFdoqt3in%Q_m+Z+^w zJyN_ z&A=-`(~yGBmYsG{?xX__{@wY2g>|7>ImwL?NIcn>DcaeIv=PuE`K15dq%A(uijK?Q zz&ih=#`{kLrGND_MKnM*PG2cxm-KhyqGw0sWN6}?=j4Tu`SLhe5lTm+zWGR=Q0 zng~dzZNF;ClpF?4h*F$asJ3{*&PzL6Of_Z)D_8bXFX^Ji(j}}T#aw4sk~&+0YLXTj zoQoM{dISFSnPwq!aa`U9A5v7>XJduh!zF*E`&)YG$1laCyC^_@SA6$OfpjM?*(_g~ z{6wWtu~{r@@Xv#zN$tOIzI?U$W5`%S`AcZbXk7l`Xsq&rx1_(P368tkdk@26$*6;* zvmXhcgMq#T`~!|?LK`J*X@(^b diff --git a/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1.png b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1.png new file mode 100644 index 0000000000000000000000000000000000000000..80a0159dbf1bb5c6f2a626d4dcf7fb5934172865 GIT binary patch literal 459 zcmV;+0W|)JP)>nCkjkU=3jf@oW z3yzKlr2rD@g8xv5%?27A4oWaYRX)&4hd2vxxfmaSB;DBSXolU!lAKTDti=cc-{43M zaH|4XKL>`!*}x0O&=_z3km%{4qQEOOL4si*0RSqSerQkhZI1u|002ovPDHLkV1jl+ B!9@T7 literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1_banner.png b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..0ecf7ac5d410f8bbc145a04d94dcb6d78f435bdf GIT binary patch literal 513 zcmV+c0{;DpP)=wrpoo}&C_<2T03ik= z57C-Kg5hy#D-S(M)8_W(oUh+K_uNvH2u{@6ndoz@#9z93jn=T(9LKYhciH`cU`naf zPg4DWR;$O8sdQOrK`fql>l}LuM~Zz3xZEDMAQP4g$C2!+&sp>8)%A_9Ua!mL7s{2& z7utAcFfY?IJw_zQ1WXho+M)M^Q@ue{tW+v}nk}~7E&-{EK|VLX(72>T0{4%ZE`fah z&M^ zA(R{T8hCH-LTxT0wW?ni#S_W*uE;=A4r?EvBY(e>J9B=JEJCrwG_BTZ!k}r2M7BG4 z6EU(6RjMf?XWfPagkJ!KdAz=$(adeaFtQFG96E9ZdR8n3RFY0-s;xvw+)g{geLYVx zDJV4BS^QPteAemMrDizlS<}k3$LmKF>?@dQ>Ob)f=Rf4PBI#rQ00000NkvXXu0mjf Dq4nn3 literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_2.png b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4ffb5043e411f0bfb8c0a95a5156a427e1d193f1 GIT binary patch literal 494 zcmVx2vk@q@zSiLqogM&x27KOmkqa~_J}9X%7l7}=8UzA2a%ASYcA1LP%a zE?K^EE!YqcyP>7?|DQj9{{Q^->wj5Q1K1J}0I9+5i|FalpouBR6_&^rz}U!!;`l6-v|B0im(USc_~>WP>sXwCMg# zLVfTVtS30u9cO)j#Yf##uhGzbgQbK$jYVufS#>hF;*UsB0978qWLFJpVZd7(p>a0A k;AjUXjP;SL!9x$;d-Leof1+4Q!HeLf;6Kn)Pl6y6N)H83t?Z>3Dfu$GA#qJMHHmB1 z#>6CUj4|10z9c4^wnk%`WSe(k!?<6w3gQC`v%~WIcIJKN9fB~B!{L5iu2gSh@kEyL z((^D!lH|yS+xz}kGQ>LqS`}n4h`5He+30g+oZdVg<*XfA+u>?>10-x6zW=zvOevnMUhk63@ zkDtDX-^lNVtGR8r`+@DSMFr^fdVQSv)Y}>9!9g;|Cp8rS3WzfYV|Z|olU)8v1*lff z?{Ma_aFApwT~rlU89$KIMcp%UQ66!JcR>V2E|=?IjA3$Ec|h0JP-~EE3J;@7_}Za(Uqo;SU6tp9-)} z(F@WxB~rYA1Hit+{!h=m6OS@kDPcx{K{MosDT3pzY;0&@rWt>Ce*<8c)NmfE|=DH^tE*7KyB13TIpo@CrMg@TL&}y~%I0()h zVjpIAEt)NxbU0pkX=Wj^7v0zE{dz4rv=iano~;k_OG~4sE}sY&<;(*7%(nBvS0=2c zRIap9BcX75t(=2`KI%@Ex~$DL$)}Ic2lb(?R_7~ue$Zv-*ji_@%07*qoM6N<$f_LjM+yDRo literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3.png new file mode 100644 index 0000000000000000000000000000000000000000..31ff7289a8b0ac87962619ec52df90bacba72d59 GIT binary patch literal 526 zcmV+p0`dKcP)g;)Ce>gbWAKM>CHRW66GOKDbTD za1cKzG@h^}z~qZ!cxY%S4>li6OPGUVct>3S|BC2F6id3}CSeJpn8WbM1~EWkhRr3* zlUIWc0kIomJO2ME`u_iR?k%`aKyn~8IFfEVEcImL3QJ@QK)Bpeg literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3_banner.png b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..8bc025081f0b8bd3c0b9b1b9964b988447b0d315 GIT binary patch literal 551 zcmV+?0@(eDP)@FG)SpUc%1RS%Zj(>#&n_+#g`Ncbfp9>fglosQN?r9f@0baO4x_Rx)AB3jN~Iar1y&;5&BAOeY%iT#tasa#p5!kndoa49w%@yodTgjv9??kOtB+@BznYeoV+-wZcGtE-? zh5#U{#FOfH{`G4mc*kq60;Z`8z{6de*(`wZtV&*Ndaok@z_v_2Uy!K;&9K=@Vs-bz6avz`5l!2$gvM%jkpJqqvP`y7iqSt-9@k^oJ4TZ zZ8G)T5gACz-}(;Fk-z_v+jIUWS%hLW)AU7>l%J+464~n$?3$6iVl)ofobClUK=}qx zSU3_DZ4T!=3`2GJ;LxEJ=vuKJP)R0}eQ72_;20#80 pj+?xFIuwq?5CzNY+%WT>cmsk=BkR332A}`{002ovPDHLkV1fW;1iSzM literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-mdpi/ic_guild_nitro_progress.png b/com.discord/res/drawable-mdpi/ic_guild_nitro_progress.png new file mode 100644 index 0000000000000000000000000000000000000000..5e9493a002c3a2d5882a6a52b3b664935e8698cd GIT binary patch literal 454 zcmV;%0XhDOP)FcVeg@Wd)mV#cH8nL61!c8( zPzoTnE`Z|iz&d0$P;WRW!4O%asZ1umM#JG^d;nSiUPtr(ZS>>}N_{wMF~U`-ng*y< w0ji&sl+HaM0HS_H5+s&hy8r+H07*qoM6N<$g7JpDo!F@lx=lP`+lp`oEX*nD8);D%v1x+V6`URZ)C<}f_6K@3osVRMOvwFB4?TtNYn z1F6B0blYL6CmWXm6j=bV#2pm&k7;EAD5yZ?O+KwG0A|==a2xN1(eqJL5tg7L zHx&W#d5j_hQc_YW9{@vS0CF;B*-v&^1ad5{()2qON>fmYT#mKK_Kl1b@e7WQ2c-ZK z>Vp3ehec2K4~-57B^aVAA84gRoCTrL)g)J$kfe)V|AP6C(MrzaIBPLNz&AKj1C-rC u@dImBfD6aa7;jLJfaJVF6C@Z05&!@t{Q_wpH)sI>0000qEDL}xZbma4Ck_aWO(x#p&?p0-rg9+uPOJq${Ms)xCLa`}I1L6WO2_a% zdH6KYGH+}ae5ZopFuWR@1<$Ey!G25&f}`(K(Sq&Rd~hCFQB-`||L(pi|JQHa3Z_FN z6HyFlZtMBKa?OVSOO~zvUslzCBIg$pvlzv2zu@S2WCaN++5aCudHNq2JbV5EY*1`s z=Kr(jFQUl(`Sa)hoOz3pE&1&m6m5aXt!NRvYtR1w*Z{~NkZ+D2KZzmt^Vcu1!;s8* z9uSZqzyQjL=wbNs)oZY(Lr0E-UA%C~ivQoge}`MrH*wnkiBo3&&(1IVzkTOkxFsOV zQO$~;4zwWVIJyO2zI+91IB@U?m|sv*{lB556K)9zY}vjG>|#)`!9YjPL{tkxW7Y%1 zKh^{kX2=pJPM(2lf?0O&{sXW9$d-VD1%zP$Er>n`L?kFclW1%y7#15ogx8XmhDGaq0U z&4V{51B2%l8MyhxT`qfq1_|&nFQEa)3j_eGZ7>Z~wz_$J_Hj z`Z|hO``g{*Sj8OHngm-~P`z`0anz!jEVcyjhH%q2iGh1WkJX|KXcI|B=CycYnYJ z`A>NF|K#0YC~|-P{{KID_g7>~emiu&wLs3TC=tBn!jJ#h0LUPaZw_4li6Qs%_dl@1 zkj#1R(C}UW6!yE(!|?fszhF&!ul)qOc;^1E|G)kG2e+hU)93%~TfY2{oAu%U#&ZbA zfGkG~s_7sLj-y-f`8&k0T~~gB`6=^0{4ZVc32q4ptUL1^>|#)`!9d+QGz&W3t!HrP zd~E^_GbD+_HxWSqv+VYZKVSopEdd1!2*Utc5Pf!Nf3E;dL2t5=Er_1+;s4t&e=))s z6a=7PL6-vov`7Z!g=qA`?KFBy0)_qdOFzIg$YA6oJZ(r$_B|CWcn(T5IIBs=_P4>H41%6?3E=ObI@+=0t-C|Re-`3u zHi#ueTJWZtj7tB#08sN|Oz&d^<7JS~$*cGwx%@dWk1PiV9nkyW)&{VW2bK8{2fR|j aX9fU?blAY7ID29M0000+_W%x#9>E*X-oyhicnC)aM+Oc+;zAT~VR-#MQcNY3pHeqT zzJ#{)dH8u-Ja5GDlvo!6;ay_xxjq=43nWw^$;GKehf|eKCCxj32(0KlQnG6_pK#8@cIL1){-KC=z`bPlu$da`f2_kK_1{xO%AYa z!ga|@U{hTuaIzA7+J>ruf5Gnrl%RcwpyUu(2{M5*BxWi}$2K^}m&ZBI)V>W8aO^mK zDu$s!@&)HLqxutGs6$q>-yxX>@00L$JsI97aRN6qEDL}xZbma4Ck_aWO(x#p&?p0-rg9+uPOJq${Ms)xCLa`}I1L6WO2_a% zdH6KYGH+}ae5ZopFuWR@1>4o8X3@J%5p~k3(bD1H(Vo1QcfI zk`Es~h8qTQH7MLc7J|UXPoMrLq+}Da;B!Dkf&w&&#%7}{0EO-2Cr|%l1I=wc1YHkI zNzv%Z^fb1#e)`Ng6vMag+)ISvv70gT0cOz*$4i#21_uwwM<7dyNNuF&#e=_t>*(NEcLxUt7NTl4s3pW% z5E@-gdYud`M}V3iV|X7u7=ft|D-nv}ed24!6=S^prcuD(hhoa8glMB0U?Jw@RDZ)SwXlS_40Wutj|HClQ zqVq*vx2~gzb==xbmIXkK&BzAf!-buA^E1&+u!2Xl(Q02RBE=DoDu=8d-DTXiF z_#AHdlb1jKm-XI8SMwVf*%rvTmFNg=nQ{OBkDq_RhJ%8qYwiOaYHvO-=)W%j%22y; z88&h8BNTo~_wD}=o_>eBe(mm8cpU>OVnC659Gm3S<&XdW{rm6#smmYXL9qAuJGkN3 z?|mgEPpk)q{|ysJn4wBOfBh3~7|7M2a0gik0$;xU`CmWfE+Gp(7qnkjfacE zI=Z;ywtGXveiq`YOo%1KT2M`LoeU~RfECAM4DVwG<7JS~$*TAvx%}pHpl_Cgf)3<; okYS)o9#rOo98lPPM+Ki50N@Ygc8BDd!~g&Q07*qoM6N<$g4lg0Pyhe` literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-mdpi/ic_verified_check.png b/com.discord/res/drawable-mdpi/ic_verified_check.png deleted file mode 100644 index 0b982f97f2a088d1ffd629ea4bf890bcd2c90a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 429 zcmV;e0aE^nP)PWUa~!9E1ab6qyoUP*M{1C7I2iv94GrbN zZ9zz!KZO?j#~V~2+kuL{6KhyON%jAVnkHni$N0lPBqkl?O=1iO8T|eG_y3cp%|;gg z3hDNr5O!W8sM}5R18yWL1d%|p~CJm*%kncb)w3D zzu@S2P^9M XAOT%Ll(C9K00000NkvXXu0mjft}C@M diff --git a/com.discord/res/drawable-mdpi/ic_verified_check_brand.png b/com.discord/res/drawable-mdpi/ic_verified_check_brand.png deleted file mode 100644 index 7a43cf5e7275a5e0e1e2e0cc0db075eccc56b434..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 zcmV;s0Yv_ZP)-}Q0bJa9YdT)Ti`#B$kZU*;|ITW- z%7fE_!j9Yi6k6~fZ%~132P*nbtYN+LAO4@b^f8=Y*m>(Q{_yX(l@9VIF@}Q-{_*qg z|CQTcAd7zng#z~Q@3?70tjl4Buix_uoBa2}_B$%rQcph>42Ptqu3Pz7EVw-xUE!7k zum7*z{fZ>RA#riD7_%toxaEzmaNfG7|Ns8|2R4vc!$EO~GbLfmwF}li16%U@_dlWx z2jydF5_8=n)C0B+;Y$sM=dDa~l0(g1f(1{T8 z#X3>tKQNiagUWkQdWII;*bVKv)eS5`mlt*3+zzUY@D_A<%crhe*D=z1*RA~^$55?S l1DCWw7lU#<&hlnh0ss~MQ{qm-hQ|N^002ovPDHLkV1hhF*AV~! diff --git a/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_1.png b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_1.png new file mode 100644 index 0000000000000000000000000000000000000000..309e23bea3f6e36aa0135f6591edd25b3f58cf08 GIT binary patch literal 784 zcmV+r1MmEaP)WE3Ut1H5xBVCYBIl0zhAZbOuCtCuOHT^L&3rc+&_P_B{0O zuejcK%d%c*Ct$mBX9)b0AjkkTy$--Xf~LPd2i`BX@K?2hk6h&AAYV>{&f%vc7E-q3?c>!w+D*EFi3NObagnGBxkVvx%?X~F zL_j#G*?c_?JQoQJh!hK)ae@DFe$n~a{>4Z_HVFh|lM8%pX{EE|t+A0H1v}it1-|!x zHWCnrC@%DY6Fesg+x4uhS!OEmTqMfw`|8N(3mb2#U#J2;iG+d`F8^6OgawL_-&9Q6 zzbN4QNu(rzSLt3Xc&v<64^>(aSwA~K0!@-O_c29afCOlMJ8fVwNgzt_oJ_foX#$uv zWXgRCK>+Ukjd3MVapX!b`W}z%A%47xQjjo6;CLvYr6FM=kYRT(IT|Y*YW=B%-yYcj zQ%R?FCv&70B%bV|rqj9913C+uk?C}nzNe0o5*u9<3j~EN>fr_=5b)bYZL5T-L*4}P zY;0l8LUEyk!nPJ2f0xviPMaI$+1y3N+IHiWQkNR9t*GG9++O#t@W5iG4DwD1xX}Rz zD2dejDd>pl&*Gy0W_*Wy;Hu+1X1!zcbMko*aw`E4l52%S?rwG)Bn`T8Ag+B>B+KVLPDCIOxUjRcTi3fHzgqY)=?`7&e*U!_x(d;a zMx*2TQu)iVBuVFl1AIu$CG|c5k%jf*ZtR`*DxT1Mt7{wE-NM@=8cVzoDjv(=v|iV# z;^^r3x6q}8wW|{cW=e>7e<*T?a`anKtya&lPiz&hM51GuZr!HX+S)$F0Fj8D@cAx< z)#>|5Ev4Xy+}qp#r3(sxEM;?L{5Lc}3%78uH+Tg{A%&3V(zqTBM@XRN7Z$TPx|skN zZ7T8CZ{BWxs388%$TSn+;NY-9DV`DnxrGT}b*=XjPX&R5$OM3|p%VY-$y0sw-UBj- zg>)v*1i(X7;$a_ZwHg@&SF*!HRN`Af1%W)o1c=4ok5h`LgqTtyBbHpIS@Bd5Z`9~R zX7;UAD%@7Vi1puz241^Pj4As4X+1SXY7HuVP*=H8OjM!<>W{#@_iJk3MJ8jE- zK;(snX{W8!Jw;q8QRrdtHv4orNvjS(pInOt#?G(jt0m zTvcha-pJ14E(X@?4PP`=rN*&^3yoa7$mORj~iP|wUd)G zSypZgZIcg6b!gkHXz-D(bKXF=q@N(bVdKNu;)Coy$fcqoF1%9@U*4VcARNmJGt}!< zgI@I~$6hsPU4YO}z>$X;;prv<1dx~^H0~UG+2el@#UCq63|!Aut5pC1002ovPDHLk FV1k#VjO_pb literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_2.png b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_2.png new file mode 100644 index 0000000000000000000000000000000000000000..213d0906e132b11babd55f6143919aaf32961cfb GIT binary patch literal 900 zcmV-~1AF|5P)W5AE3*R>t?Y&g#ArjKQJrV2iMb^b~~>11!JuM&Uf zUm=1Q$?M_%bifl@#ReZ{PRV$IHLXx;J-<9h2@ z;G@7Ip;YJzi<2>UR1$=4sSx;r4IYaGyd5fSatjMQ0FL|4oCIB!w@b17kG|0}tOt(eL+l2y9Co3qI(k>J4AKY)MJTz(0EORIl$#)u==3 zI#VhmfdxL?&|F2|(5R5W0Iwvc)m&#i5@_HxY?Zd@!V*UU3w%hRm8-21M*<6cm~91H zh3#ZDpvFlcfrrzaj>-%?#;^e+5@_I6Yd|>Dd|>DhXC{FJz6Y4JZFjNB=dDW+GIZ=r z-*wCJ9>RZXS?f~I=$e1lWbdpa6;J`ESTA{;((F|#^vrZlDTg(Jd&sBad!n9~Ar$%O z*;t}smE&1)nr8X|n-19W4No0000cT2(ZpypjZqiIYDg8W z+6QeZLxCBF0);|Ld6fcvP#$gRleSQ#t+XSj4Ter<=E88HY0^I-5V(;4yL0EBd(J^3 zDM7u2rgkP2-dtH({Tm8Lk}5U%qPn`eO6WV?ivA|I#~TjLgx39mi3mYZmn6rbZi2Xy zOeS|3mZGzBe|r1+AF{{y5&ie4rh{wj@v())Et;m!Rvci&?(i}Kip3VThpZz`7zeL~ z#u`l)qN3*8<%*h2Cd1%TDwW#n>{MQ?7=Xj+o@6k~WFDd`v-W$5mpErXr|q2`Myb@^ zDVy=u*54OMO5c{=+S+5vq>YV4Moa0NOTMY4Qt26(4TI6#KI(9f!xjlMRIJkJG$ZC} z!6bzv(KV;b<1t&T-$|0LFW9_XPSnlL&8JG8O)&rH$us8Fn|BP3C6|pE^RRUz0mi(( z7%uZS>l^nUxFF0!wgDu-`ufH$PV+b+0+Z9LNB~sO5n~<~1gs7u08rvG|5+;Af8c_! z4ck3PfZ>r*7cTQT;ew!OLpu@x2H`Z16N2lIctqJ?)rH$UE(kc$A_1(!_R&Ir5M|zM zu`%Pm01~25X-Mj=pm~|Btp;YbP@&Aed<7?}OAizBPbFl!~ znYRcg^TpiM`2mZ|BtY=J&lli?cb)L&ktocTjyA{&&QV!M1}?KG^Xwyrkkq993-UCo zq3D*P5^V$oF7u%7Ug9zKgr?9dQL1^6Qmt)90zlp=s^q}~fy;cs_0x&TskrF64F?1+ z^B||o6GQ?mEiLabC5R1y%RC4gBuIc#&PK%~G-5OzoJpW_Vw>HDqtYytQi|1p$xI;u zptL!s9AQ3^+*sTS$C>aw<&I=U4%pecvjJY@fm_92_zkIh3aV^p?VF+6QN~CXsGuU@6^MV#{TO7 w%p@!YuG#$Xsr52Iu|Zt!v8d!!r#e3U1HvMDP5Ti7S^xk507*qoM6N<$f={gfEdT%j literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3.png new file mode 100644 index 0000000000000000000000000000000000000000..e4bab6dcec02fd4357c3f58370c060f3dcbd4bd8 GIT binary patch literal 869 zcmV-r1DgDaP)byh{Y8t z1Qo8ZNFmx->lG<1EGz;>R5(y!eQ$4%?Cs~w?%TNyxbR4Eo4enC=FPk}?@g^%;5o-T zN1K-22iwBGCZ9hg^*_v6YcjFXu$->Z=^U)h;^CYh0_bfpcgnc^qR!eU!tXb@eH@|T zoj<|%87B2Z&~*+wCJTBIn_Y?|EA#6Q9ci zj|zd^={f#3G9ZgIc&jCj;Z{fi^786y_vxi)B%(}aKf$d#+fBxSi3HwV`Ry5%h$a`S zG6KF(!V`-aNG#N1z8(ipB?1GY%nWQ%!N0rl-u-m*BcTYe)2h)2#7;6E_9s|o>GKq*+$VUQwjdQc<3&*?~;kATMNz1=nF6I$bMlK{Al@y z`|b8lrU->u_>g#Z@D38 zL>&Cz(`y{Q}E$voLc}B8|l$lVNvT(C7fYq0Zb*G)}72rl^}6tS2dk3>O6AQscJeA9ysE*X?awu$U=>olydxX@dg>Nvif!(H7IsxjEn@p}ORonmR#SjbT;FSQkF(oBTB92q;@Ug)n3u-{y%D+>&QR=CgP8i$%&r>j-IowO v?+ygah)g#Th4^czkBz&TUH16@5Iz3@X1azhAyZLP00000NkvXXu0mjf0Ya4X literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3_banner.png b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..b3683158f3671ea4223a1ce73932b4c3ad554006 GIT binary patch literal 882 zcmV-&1C9KNP)YuW6oy&4bm!8YOLzSR?p(R^5BLL2svF{hl^eJ2T%d_D8p~H{N3ay6ptKfBDTPuI zqSn~j?*>sirHs5aBy^bJ-kCXbnI@iuG^Im%pSkzk^EED)1$!|Oy1r5@ef?akAK+&& zEZye$OlJOLCcnH=U0BR5c>{sVu2EPh6uPp#y(23sE0rrhCW7Ic>g!(z!Z#qg-EN<| zzE=NoQ4M!`c)#C_LtW_ZK;L#TP&V@DpWkS!LckWRCaiH zbSiW!Vecx$hLsW`J{XSNp}hM&Yc`u5_=&CJrAW+;&)6p4E zDxHyVMDFhHohX6~Aj^ef9p4QN(84X;=bIeEQAnaB*gbjXXclZSyHvo@%>=;RCKEp{ z|9cTZbXR1C39!F^&?Xg62!Ytb1hBlyU;t&%co|t=1DxMHxN{ZaIlw}$gU+*Z&&kh;Hn`rDIGx|0f z4gUYg67TN5?~&OMoc3+w`!C(v0a0$fTH7ni1b{`OvyZIhKEnXi;tQwb z0LU7wTH?p)0p89go}BqXadmCO7Jz>7!~g>)ktv8_BGlqN zbO6vg5YS9P=mjzatp_Uc>S$~d0NuTz(b$kv3r;0a>@yo+hSF)l$sAV;5}xhUblRSJ zKwv?`Os6gNJq47MXml|F(7JGHQI8Xd2>?%bYFp(jb+8@4#>N(E7A8P0U#K{>wTRgo zS6A9}Ze(L~H=E0seZJ|dhPu=^wovehZm(l_2!}YxYV*j`v6 ztw#;C`cET!)Sy=YVV-~^4=chmO#}!au|gQ!jqG8M|3+kg0i#9<22w>Fx&QzG07*qo IM6N<$f^e9VN&o-= literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xhdpi/ic_guild_nitro_progress.png b/com.discord/res/drawable-xhdpi/ic_guild_nitro_progress.png new file mode 100644 index 0000000000000000000000000000000000000000..5fd341c6553577f4d77af49f5afc575b8b0eb083 GIT binary patch literal 759 zcmVR0RaO60|NyG0|5n@-{mfAKF_{;XJ4dQdWsyKli$z2_w8D(z+jARvOx5h zFRtQGCZ6l9k)PG`T_s=C{9(<-sMqU{yg>X^AV$*y-x!nIv(IzR0YR%ZclV!H^Xo7S zA6O^g`Qp<&_z9>x=F1Dum&a-zsrmO=;8V~0@ZKu;{fXS7o|Fy#Reap^;8W@229bc3Qf?^4J5W~TBsP(O7?cQnj))h?GyHGFfLOGF z1HhBm6cPY=xw}7l(byp&<#G6mrdvlrdsN_??+#-jBjJlywtWx8FG}#FB$RK_Ie`H+ zcq$U;5VHx4;~En1;oh6k{_7?siMGxOw5h=3_W?YmBoXNlh^WA)LPkRQp=<(Ne4qqR zN&+A(6lLZGPeuZuspEZbbbrtU{3;UqRtSD9%^i{i<oPuVx4nnc}O^NWZjkC*hHyqhZ5teMMeS4B%HP#%xRS%QL`%>PM47nSWRfM z!s#M)Pdh0koM1KIqEP)AP@)y;zR|ayzh1k*I(N=J8yT}giT(WYi4`j&&=C-Z{FKV#o=04 zt@HKJd?Y){0|vhE3@xAj23uZ7V&uhlwTDdSQ~ogvX(vi^uEb65?USI5WKl(`Ji zH0Jlo@wL!=_B`)Y;Q)T9cP7ODGl*={Our!EFKMPfjSD|%zKWg~Dn4tK5XXhKB*jZY_@VJ!v&>B5r68)|)B4=#O9Ov$f6zvJ8id6ve4TlAK$OGb!e&V` ziijby-iu6FM7#@t>%AioSdy%{PgwvX5H#~|vIdqi0g?nSaLRqk20+$Oamn)+0)Y1Y zSIY`O?ysHB01NRD|J{i~bFf4J2NMA;3q%=#4B2vOG`4xDi%%t@&fEf+O*(z=!J2b2 z_i$~UzwdKOkhMTRvsqFugsb@6&I23>5%HXK+NJI}3qneKV%wY*XlD&9(;x)J_t9Tq z07M;^(#JT2nD}ApkT<|A2m$fv{(Q-;tda&HB0fIU>m62ATB<$@2r==2+4KF@S*!9o zwk;G?<5G9Q<#l)hGG($yR>IRuF2>8Z!C|^$4UQ68Ovf7=(e>qR^3mD6=r-%IWP?x4 z&)E$>dbm>r^^%=zi__@FxWYU2$jhe$y&l{PD>U_0g8|fHylOB!0AYWQ-+`bN;kZEp kvYWg&v0Iw>|CiA92h38;_uj7EkN^Mx07*qoM6N<$g6i^ktN;K2 literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xhdpi/ic_partnered_badge.png b/com.discord/res/drawable-xhdpi/ic_partnered_badge.png new file mode 100644 index 0000000000000000000000000000000000000000..5e9851030ef86a91f3655ff2ea0733234097a946 GIT binary patch literal 1147 zcmV->1cdvEP)t{_NeoFOF*3=p z#8@g~D-9DR3nLQ`9jvy}veZ~oVVd9Us_X81Z|1FU*XJMpxGwYY`_25nW@a-oHXyl@ zyvHudgLbFq6aMD74%>Ns98zJH-6eNY4bnb64u^MV#%2g6rXWI8Nv!6&uQJB{`ZNjaKU@CPLCE;?~ohk#KH z*}UHEX(K?*q}D|65z}*eiqZofj_ZeS+L4p* z*-r;AjfTE(%D}JbJk^_+6LSND@d!hsLP}TKm?C-&Q`0@TX%1?ZI-IhTOTa=aucn=)an(hs8hKjvIBn0?tni;=jAE;^y+qK&%;MVPnMULN#OA_1~#@IR{GcMZ^Dz8 z1B1E+pJr(hDb$p4J@9SqcZjIW%={$2>hr80b_K*l1-qn!<6goEE^<872M;?p0s;~a zhnczM7Zj0KgG0joFb~JC)=1z3J79C{zN`Cz>SX^G7r9`r);Fq>070!q;p_tHqU(l= zw|J+8^!5da6#*CgR@Xi^=!@^no?dqg#n0}u#Ii4cHO#>dvCveH=z&4NsfR#NKHt& zmaGXO?yrPPZ%H{b4=sC-mDfWf>&W*7o+Pxvd|VTfX`U{%e=IZpRpy;1^ZfmF|vg@wN?fyMTN35x6>#z%V%3}M_$aSru- zr$)?IE68BaaAZ`eT4t!V8|d58dW%zydg}PM5;Qr8mc#&rA`Pl6OogEvy}B@rTP)BVuBWFmoZ+J7^_-33V=i?m^Pt&^5n{nf*d+nuTL;2l(} z8WB-6h)gB*lxl`VFM}r|Kexe;JM_z4mSZAed6bc-yW}|J-MtYE{{hT-BM6^w0}B8E N002ovPDHLkV1gMR8yf%s literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xhdpi/ic_partnered_badge_banner.png b/com.discord/res/drawable-xhdpi/ic_partnered_badge_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..7012680592030de7bf08c1bbb0ce7e5699c1dad2 GIT binary patch literal 1118 zcmV-k1flzhP)I0!@DHVc7Y_VX~AUy=B5=eG7Y0_j(lXRSaHi2#SF|*svcKgFm(z3JjeKY@aCZW(K zL=aQ^1rf!FCg8JGlG~VLZe$Im)NeHKQ2@!OdM2}7_^m%Ic zR+=aJn9d1v6AW%5Oh=Pf+KHA4p1D>@Ilgrc>XEjJ=oFhka8}+dUySqYKr*ldNcq8I z|8v15AdhmGkZHXV5EGI`9v|onFoAZy5E@t$N(($r+{OFCwm}77e7b_q4rd&LIejmK zFO9C?D`PqO-9rNMeb$Svy~yDof6G`e$!rzB|6Zbmtj3)fQ1D2!i2o=R+$g{03Krk4 zvchNwqgzrA+SctvpMO@dom8qAzyA7S*g6v1ao~dZ%P6PS}lt0E@)YK$Wigu=(HdcUsQawPoee>4rpcL zbrSF%7z6Ku2n2s0>sRonr8UEtZ_8!Ayg-;N@enWr2a`8Onfb(;C5aoa@}}>;@FZ(^ z9-oqnWckcLYxhdON~Q4*4%rtNV=s-S55h*gLhK!xzKLEFS^Sff>(Y2 z%>>6TENaidSu6A8qdVlcz@@bLg*QYHW7Vid6jLJ0uC7wOiAr!7OhF~IA9vW7yEMmW kVR@lOeo+uJ`!<8&KcOrJlkRDM0000007*qoM6N<$f=m|vP5=M^ literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xhdpi/ic_user_premium_guild_subscription.png b/com.discord/res/drawable-xhdpi/ic_user_premium_guild_subscription.png new file mode 100644 index 0000000000000000000000000000000000000000..e42eaacf23801761ac560e345e852217954134a8 GIT binary patch literal 384 zcmV-`0e}99P)d?o^1lg2*tLqrC*bhbTI_~KS}0bOS(1%9kLiV5nqc%V)fA>zTzo5#7ulVh=q83#9aKVq((-=BUJIvigq$~4$&5L zf{!2fQ6NYl&hYWD2$Og?giSmQ!X#dPCRPrEFpVE>qYns#W&F5rSOhaZEW%NIIE2G^ zD}-x6$BbV@h%IFaZ)E0TLhqq6GA|@$w-U9H5*e zHR6BgD(`^dOLHzlHPMP;ZtwdFn9uagahweh2fevMSp1f#*#N3&;{p*R-W4KfJQo2G z&q2V%+ajRixd>H!Q_^Mif2U0m$}=DG9f2+aGF}$}9j}9ckJmup$7>^yF|828YjLx&C?I(F#Lp@Rnx9rs+UyE-%2Iy1TU&!k9Uqk;-6C5x3J3_}ztluR@% zDTE3Z`okt#CPoq)nrtDZ5veg`!s~sryDGbHX5O25Gj1Pz?CkD)Gr#Y>?|tw0eQyd1 z97u_z>VnpyCCO=v(XiM5%TB`0ceVd!5se+P#Vo6Tt(0VBtW<1}JgtLh5za1qlGMeHnJw_3c_( z+lk;cO+!bINB9&1B&AkQ8=)9Q+o`wzfg!L=ID{F3?<8q$>*SU{uSO!4Jz!+?Eiw}@ zaBBK9@xRx@qnv_+I+?Sf(Ha3RWHbwAGC%*raILU{2du>1*e`^3(o%_r%gu&vLXr!O zS9y%S26ZWmq@I3JgRjrbBrU-YJ{sba)QfV1byWgy4y^RpC|rWTdXPd@ycTXbcLOpC zTt0ipg}ov>ygHi!s(e5%hueApq=k?kW(3kk&eWuurm)rJls3ag2MN0i+$u^l1CE&~ z_&lGGX{WFS=UsVP*aF7zzn2z=oSuDcY;jkVBbEjLK}sh%i+KcoPG_F%=L8i+>3t!p zp9gzb#DzhGa=ImTU^U220>nbpfRDL*$S0`9E*&*3x(?nB;bRDq^0;2k5eMu;c|h9qqrrSgz;F*uQW-3DInFsHlv9+L{o kW4iHpmV*1j+nr$e2jem()?BY-od5s;07*qoM6N<$f_IVZXaE2J literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xhdpi/ic_verified_badge_banner.png b/com.discord/res/drawable-xhdpi/ic_verified_badge_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..6c714e24d0298ff89e3c943fb5d8da415723bfe2 GIT binary patch literal 1055 zcmV+)1mOFLP)AJbL%wfrCd59!R`Mf7BRbsKL8@6Ehg5_etN^|5vzAvWK{2$&>gRghJ2D5ZRtww_H2j1#6C$$6X3W^hrQBx0}VI; zri_mVgF`!9H^3i8Z4@xN=E?IxucY`1=+nf|0r;KKc(0@$a~1qaIkksOoHH?iQk8*aXjD2L9NR_Q<)AN& znj!Rw^?O6jkU4u{PM8}o@Vg0#3Qn#xr;_NUjs(K!@U|ULVJf3W>-b(fD_?m=h#NEP z05!YTgaZ9waiI~n0G+$^1qUK3hYKlvECxi~G9WRrhQFnA`26Jw#vM>X)&|HZ;s*HW zi&?D8YW6qoxjQW;TSEwS8hq!Cueeb7gSQHNfAVJD^u0hxJ;Y!DFi7XXpXo~CnfVP& zlgF>->>EHrRgaSfydPbrf}fbmS{`Ui+8u}_518?GyLvPFg9<*oUceWwq?ibwA+^vr zzKjx1fd_y9lqRp~=V3E7ef%e@4KEVu9_P-#>jjPX)iQ z{0pDGn5^>es@<-Tx9;0h6(Lg(oAAtb6-Pd()x7+0a25}JSTv0su)46yGAn6q1Ek+Zjl|loa_HH!LSQ)7*p!C zsx`CvoB5(csiR$ZLj<9*Mu;dhLrnXfPD`m744_g_WLwc)tqVxPaw*$`@$r^WVy_(x Ze*tI@D8^abfwlku002ovPDHLkV1hU3@-qMc literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xhdpi/ic_verified_check.png b/com.discord/res/drawable-xhdpi/ic_verified_check.png deleted file mode 100644 index 9b00ecda61e923fde5f8671b760747ed15a0ba9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 752 zcmVQz!gQM>Q>E-^R(cy#E z@c|*x&Ok>#hC3Pu_6vzQ92gj@GpHO7au7<06UNWILK7qgB#HP2MOy@f#5jOxm^jcu z`$=#-ELqKm<(0tDI2(|ee!;OOAU^ez2QV`Nqkb`#P`(Ys-6T66f`0>(T{9>)(8OQ+ zheS`OTITl)jqwH=`kqWjQi2~N$1+&}luk)Z+f?@iDA|(j0sr9G_5pM}45w4zf#~@I z?Ezrkt0zDGLo)8b#sDxCkRJmfG35j90ZM9bQ29L29taAGmZ7L5f|m7EcUX8#%Kx+H zFaCe|>h=G!ss>!4zne102gkb8q7DE#{@V4M|6!oGycTCM3aXvSt-$g@wI!_`KWE-z zLVCUj1jhuEllBLL<6-zSFhEs^PddP~H;5b$!?THUJg5;h2ptcO1tL2pF%E;!@n8&U z6;sUv+4*Jv_wGORf8ml9ba6b<9spGw#28jx-wJowrY+lP?s!mXM095dsQ5G?17j02 z|37~66ssp_;CK*TO=>5GprHvV*%+Rnk>h^{ghm;V+JxvP#}n_~f1tMGK`qj3^7_J| zvB|_#Xy~4xqT@jom^Y=3x%0%v#EqM`!HqMjg?wntddfy4faz|4o72B38l8YP=mxYu z;2RR>KZ3iIL%&lW+dtqQ048Hf@_-60`UNE5_W=P30u+`+#MK2fz?9bk@R$JhOF`rM z*g^=@Mxh{mg9?f7=tU=Jf`p_V7_k7{QVop`2hYL)>Cn(n9#SehY?TzKoCkU&8e}G@ z?>itq3nM6MyRf0000>T&_bL5zWKbg>%PQ*B$1-d+ZHA5w;ez5btu!#UH>uKPy z%Kkh5uiyLn|Luog|0gbfgjEf&p4d&1Y`>#If(LHx9z>3Z)d#bQb3CvSHTWD4 zi3Q>sZ{Vi#pmRJJgIdK@^FYU(2meo9{`h~(f!B0#JkcHiRUE_^Hg)-9xWf*feou49 zgGwW!J3GJ(bDEHWwUh4tfBEJoR!`8t@t`_kHL0B#f`-;l!Sn zuB(XdiBDhtP}}jqKEcgw@;Wq~x08vf(9k_WMaO>zr3T8{L!GzI6B`o`o_+^6&Zrjh zowwIhHW~p;cLUs<{!P*71hhdnusyPl+x{cCOF85_^_{o+2igOmWK90J5U>qSi+%wK z_$X(={j$-7X(evzDOw1yDDTCeucvU=)l3FaQ9ca^>|~39O<30000< KMNUMnLSTY7#d8S& diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1.png b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1.png new file mode 100644 index 0000000000000000000000000000000000000000..41a34d4f99ba5249eb97b5630a7ae021222efe0a GIT binary patch literal 1214 zcmV;v1VQ_WP)-XOK{yxJ{ zJj%9v({#Kard@5DwztB59v8k=xptCW<9f;VmQBlDDp~Gqp-?zxWN{Q~wd4Ma*j_J0 zTE&WcG3m9gIJMIyyZV^@-EPRWRx=5SJ$QWpoP7a+CC57_2xebEOEU!rUYb34Hx3Y& zE=-rQ?G<1O6{n_7!8Bx_H{!q?kR5=TCGA;F_+n@RnwAMTWoLSf8V;A;OlT3?vEFF{ zlzuHLS=9@=-~?J!zE(S%N;sh2>;X451M*FX^sPH!z&YMp3gGmG?TTQBX*UF~Iy0Bx zVTRa_DP^6>0&E(}4arKyJyW!2OlF_lVGH30eslDfs!YzRg4N}&P7@Y#a8Xd!DgeWQ zDF2TGoG)u%d+$FsDYdLww5HAr!SSb$?R6;O1cMmTmXQ5KWzQUjqXQE232%wG3+uYz zkV9h1Fgzg3-Ove#7*bP2gTCp8Lk5YNDk6YZsNulpKij`_Kw1z1v_K69zMu5w$RUA^ zCld6UpoSCtE;S?}qY(@!9dI;2+7+4k;wITg!w_wZS2T^j$23!RDoII7E=P zMKcpOWNy6p>NN_SB#@rHSd`nvhRD$!)Shjbo36Zhiv}kS65LDD7yFzzX5=`|37D6% zb2|(WM!W|gVFT)m`#e$T6lh}X4qwq`YeVzMIrpt~P+>;12Qf^_(i>4ps_%Ycp) zL~w(!g>AlP91utYWjoI?pdR?6$^v6~0AxDuCqq??B^Q9ePg50p&W#2^5^V%%kOoyR zD+{mYW)}Udm05X+H)1aLNg|G@{u-WA??xU7afW6IpL{^)6F^iLGhAUJz_d%fFtAJFH;c;HOx z#xEC_Q6NRZx&QEqblOL_0u7@+NEVV}IC|4QvXGR+;RRGOWxYLJkci;;GV}t?`@F`n z&G)2`DB<|Id1rczJTE2+i5d=%L%SmDPeWC#C<+oa9PYK>69Lpx_COJk$l-7oLjVwN zmO}&*5gf7p4wW^ENgxrz=|>LJv!c3VKC2bYo0{bcmTESuuCphq9agti{9XK_{$kKp5&^Rz)Lq%=J{(%L|Pl|2BA cqmkwD7jMq1&XMP)z5oCK07*qoM6N<$g3$FP9RL6T literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1_banner.png b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..11b9335953a1ab5b04ca3619f2ead913909034c2 GIT binary patch literal 1276 zcmV~n2TZ~u6vr*E{eCHBhgcAs#mD0hARN!*BTpdVx7YrbIg zChKdxsq>%h`jYP6-q|_wTK(UKrj>-$l}e}dG6KMl^}!1~V2TARRSFJndUtnMXAyo6 z%Ow0O$jR+7#yC{ zZIa`yC=iHV*KHK6$Qx`p??^Z>@72|{UEO9Ogm4@j>^>8dQ(4_1!mfxo%=SPq6w+?t z&9H9Alv-R|+KDHU5o{XL14)l3aIQgXe$t-oiVqHbU%+!Sl<#PhmHb%sYqm*B{e zq6qO-00STt|8d;J)8{Yr*X~*}D+91PU+^Lq94w#B&CPvEIG3(mJNTf4w7$Nv#}z+O z#WRQD*a0cg(HS!hNS2>rfkO=m#$X!I^76`WJK<15f-f=+Xli=qr`>R1*{fCdqAt7Ee4G4ck4F^BZ<#ObZ5aXE!6xNy^QNt+|z=$Dn1&s)x?0`cJ3272v zuJt#6u?r3*B<$AQsfL|!s31+x%>LqngLP>)912L;Y<7NCwQ^x!AS?t93#4dc zizP^A&gcr(1F}{w`u2lY7@TsDa4jnu8=u%_&R@b%>AQAN*KoSiI`kKxR zFqKY0Q^f9I1W1%*04jSbf|>}bZlZ2NML-aa!;dUC(Qs4-1pU(xflqK$B079m84!ft z03q9Xr2>MGk4h_yRRW-q(XkbmE=iRD=pav%ReP=&3&J5<6_Bwa(dGxz%BvN#i{;PR zMW2IJOdM2PAQRa-rz)V5U9%z~sR)RvrC1asBS6T+t!i~`T?!z$7*iz=bjOPZgj$Xj zNPu(u&OPCPaId&$Q$;hJ61HMPDp4G77atXfeiNYrqkWM?XA8jy@SH47waIQbOA zG$7HZ96XRH;6PmS9Wr|qSs+otDO3)fCRhmfG>_2XI>Gg9tHNl3?GuMakeo1{n_}&hbaSFqs+WTUYSkPsv33gjP|<4-s%<^=y7l0F$iq~@={JTh zhq$R0Q1s^%(-aWHyj3*FHpd=~f>u7C8bCfrOP&~HITdi=$e_b&oCb0^pwSPxWvPeIxM0)Ey=22|F4y<(OzYfl{YZ zr7pvuR2P7S3kJCgZhfC_t;p1rK{8?w3=Ycz)?oik`XGmUDd{91T~p{LSQ-LwKJR?7 zKWu)K38~%cZG%%Q8Y-Ar$H9f;E>uW5*{3Ju9RGvYFxOPTQ36S`?g>~X^P4I-=#WGl zOxb{f;9x=m<0Ejy$fjyIh>)rxF;x{C&b#-k3p(29RG0!!P=m1t<{Ck&@4p3_xDdc_&DIsSz1~z+vW1 zn61PO$SXQ;hZHt%6c-?Hb;35ax3|;@f9TBJ2lm0i0XHOGIQ4qnp1e5|)nfICCha5n zNB18+=7z)z=f>?jkvq|%wDd+!f$%~?h9h3~aR9|)9Yi5XhZCu)5o2Xl1QHUQW>uqH z?oPx=L0CwbaD605Av=HXKJrMV>!PvKp5BASr+o-h*xfv@Yul`9Z>lBi@3C z(8L)82?LHJ>mq&98wg*_6A~gEkW~>t(^!qp+no|V` ze7D5ESipJfOFh$`__e6se4z>Rxf&?muwpH$h4y4MqQP`^n-@O{?YUvwc#r;lI<$y- zsexbuMzg^hv3>kA3k~i@@Wi~!LpNuS9T#ebd1uz0+5PbjplaaV=dzWpY-Q_&u7AO# Vr$TOJK-T~O002ovPDHLkV1mHBJnjGh literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_2_banner.png b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_2_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..d790f121a02cfa0701d0eb4c5500b0622d0428c5 GIT binary patch literal 1553 zcmV+s2JZQZP)5R|1;h59p1vz$j%TqsTSj8z@s-uJQg(CmFgh|8 z3I>B$FfHnLqxH4rmDPQ^f{MlBUmh>jt<&im`5en+?fYbAcCJwASo5j$uGMP2tT{ka z@x&s{AqL=KKTdp8bp+b_@6OGqcDRl+9336e6db!9zfB7efFgaA-QgrYht2B`;!Bz3 z65st#PEKf>1HYjeK+MhU(TFt_pI+4j9GEh+Lh9+UG^-v^W_jg6DL{Y&>de00U~b*s-Z`OFBJhm}Z}7TeK)@4*p&Xz>4lvQQ z3I(P=F`Z0N!AJ)|kj>0j7i58=+sC=B?PC=GIKa8n`YHX{mtWJUo@Kj*!ZVL2a90!@+~s+Q zYC4qRyxn~3bVCUVrsAJw+na&`C1>Zilz^iIq@n2OQ^A08xvghP!9fivF+IDcIzU`- zP(qrVN(cuupIRs=4F?sZ;b<%_7!d4)8qTk}uG0-QBoFDg2nGZ@p@vfyYDkPb^Oayg zkhoF;juMc5>oUA5Jg00hy`dBwl#urK_n(V$6q}lw8kB^C3KCdr#Q@a`2L&WZ@QDIs zHal*jh7(UD;ewGuDjgn*n_`in=twPq{xFyX!+Gac3;lk}9l?+cJ+&EJwxy>k`JUd} z5X4Chhzm~ncS0e-xoS~1yLs$(yI~M^h8&bgG3urnyTM-TyBsl0koloA~$>*O-<@@jfRP8y%b@OroD(AER zR}j(NZM-QZ94!L^t#4!x{(UBO>h)LUNNs2t5Gb{f&M_YiSU55~Do2E@bwD7}PjzB) ztx}u^KuekBB37%vbDjZ#e}pZhGle>!${HJ=%wPiq*;)rwc{xb0H+^tw$wJ{FR~^vH z!Ux>=OTG{@ocwh_F9d;lMQ@r4MS4*Jvh?{Vp%Bh@J|DaXA1%5{)mUYH%QUl>?B+8;A&7o1dA>N(~4yjC>%m!GQ>0 zYCz1r?m&uJaM^z?C#{ys;DRI+4qM)cuk?E3hr$b|bh^e`z3ghqFg8f2;XpoHbO9A4 zv}>K)LLs4qQ`52!NGj7Q7Lwd>K!rk4+^PmtT}kPD35A3LPFau>6W;69=ej4g`_2~< zN;szutC-?*=(v$1h~P#c*U8N7b*vRv#pFz8RW^?N0omWL-bL!NJ#EZeN?98ni@XV-xeK zg>9(sqg5`rM(DX`{^&U2_L>Yv>qqVF?U#`BjWOqMfEIA*I93}NW;Et|ZO#s4FqEjP z7Aqi9%l@sX5B&gA&M@&dVje)RbI(ebfja3Ft05P@r|ZVmSZLJ`HL)?k=a z{fh;ltY3*y1lCHlKcj_F1UHyo%p9cCOC>RN&yb$c%*#!F`sML8NM-U36dg|DTj;JX z?|=V($7Q?I^@wric(t5EnaY3n*Mz`J;3K7${kWw^Lzt)m2wr=Tv_KzaJ~FFWPjT00000NkvXXu0mjf D{}a}m literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_3.png new file mode 100644 index 0000000000000000000000000000000000000000..5fde49ba2d161d4af191bf3dce432222376517a0 GIT binary patch literal 1311 zcmV+)1>pLLP)bD;&UtflA@TNSW_ISyuH3*YvUl0t`R>ik`@<*pPhcPgLHAIoL2=yP7=(4fR<(o4s@Elcqa}J zlMW1*vhC$z2o)wKPQfrF*BfzQ4#_^i%#!vrIXk9IK+`e-r|e9QV8db3&V&|`73+;5 zKLNd&-@F=1SH}UF37kG zTc+TkLn6u`4#;x1O~OHjv@WATUrob7gG5Xf89-~;aNzpSyFW}onwJ4Ij|~StA9rq{ zLjoI5Cg?SW4X6KIY)Dc@BN$L7;240^mh-iU|6&RbDkQR6CkdSzgM$d^n_LKkj7w}d zweeXB1R2tvY-Zwqk_W$-UKNJ3bMF@gAqwePZ8_O0CXk~$tUY^49=dk3DGaCoJyA&T ztc1SUNA8%B<2WZ^TqYgcL4bJR@IX=xs3-1ouFxsaRIxe)0pf)N0@va5pnK~96q6O{ z1>I@Xt&0UH=sR(6bOP$9!v}_&YB)&%#lg`HXkbGGGYB_So9{A!c;Fxb0%<5&&Q$^8 zg@XvF3;w9Kz?cZ2FgUR4J#-h00V+A}hn%h$3ooE3IAAvgbsh~6_-VRg&pd$Y)u)kg z!a9$tL6Af<1&GIoGpj-VWo_YA89+e}u0cSJBYAe!c`#8xVcx$XK!Y1YnLX4r0Vpao zvO4`58&LSJS(T7@0Y$+Hb67P3ir-SK3Q`cDpw9Z&W`w+XSoO33B2$c5$b;^VR|_br z(>(E@Fz-JxAktUpvshNcu9lKK6l@%kVG|co41@FMLA(3NU&POgvA|iP2QS}vDGW&z z&SG^baoR_E2bzlgL86e5;h0VPB!#3M4%sJR_8UU+I;7Qgb9b{ z=AFqA^t_lXBy2b=4(-a!KMh^6q9{n%aG2NrL@rmS;h=4~rGS{Is9K5~wg~(RYT!2#9?L`+-pE$*6|)49cw(LV^8Fb?IszrNwoM z=BBsrE!2lrq#Jo=uo3 z(<0td@m;X5`avt0?BN6lb}SCBCEtQmV{%z)PzM?Z25hLP<(M8=K>Vaw*p@$=%UX-D zjbgzBm8Y{|+ZjB2D1&g0XaR9iV1A$l{f;-5%XecZsgh0fOV>^zIJe-Hg!(g0u z973YJ6Xl&aAy4PXpWrAY=kxB~?(7}PFIggvbLah--JO}8IiF9lnp>0M>6zKB+1a_B zp5FfPXv`=Ry;dMlbFDGa^1iFPcQn)0GyJ6?@z(G6U-EfT{;H}g7>H@1Un8R{p-B88 z>$N^qR^RCSmj1D`yL;|hy?uj|o`lqyN~g>c0>IBzk=r6*P77A*DL5GP{{FtnB76?h zB^rxA#uWM(3|_}HOlP{YrN9)lwY_}+n4SRyvp0zaOY;PrP$YKG)F4=!C#ik|JvT!IxzTi4mVdas=OLl@U;-?WQT?qu#h7} zk+N0+41kdQmjlkb!zC<4w~PT;Whin-2o9#t=H})BDV!&}$1g%itE+2yA^(ZYpE(Oh z1EjW&R5LdqW$O$J9AZc?25vx$i%WZ2;SfT?TEq=#VsdIjI~*cNa8`g~_#7`J!`W9I868_=&KXr#S6{`vbUeAO0I|Sffg~9a^gW&FXG)!d zrj+f$3J@zCyzu^dk!vdeRPs~=IT2*tq&XNYfQ&pp9EE@&9EYEqZqng60aOZ(VnEP8 z1rhiMj!LBa?;?O$;1B?UP#Yj;JC_BB6%G*~2=S=8#262tVsJ3-u>);@hK5I$e5NX~ z0YNfmd^12vP+HB(E_rqnw1KP6_6dAVgainKujgY(jZv@ zvKs6LXEeXA22fAmz%*CN1J&`;0oe_jB_C8Q`gaHjW5t-cl4dw7a&*^Bo^RTe$|x3t z^YrkQbykETbS?&>j_tNZ01_{pZfDkmV;|uPG%58#ypRatoP-nFj(wa$QVa(|0hMrB zuT<}=MQ}}02&W+K1^TE2FJ_cU_up9|5yF8`2}^%2CJKod&XGq_*Z77T5P~&jxgtAA z#BiYYj#N80ASHQf7D&W!3LyqJAnB(ZB9I8+KtlZ;N^2BZAQ8bi$sD?B4JrkR5RUK~ zguYXBqBIya6xCbkdtWTRU1abD|Gu{#mD-DPGi#} z!c4$-Mm;qAyI?T#fTW)c7KR&=v@LK7^-Zu4;cgzO&2_T#*$#!)g7S)r%kFv<#UUg& zv}MA7ld`U;>X~PK;)1G$*A-LBPFM(a0TOCTar1LKWLuBjgHrwrD{=yssR+|eR>ayW zj+7_-t3V)hx3Jjb2@WWzWcB3nIXpGS=OrcEIufP8z=yJP*idzgIH?ru#-`*apVw5( zH(~)})t-)Ndv*%qXHUX8tysMN1=a^l8Pxnac?tqT9>4`GWE;@B?z_;1F63qX0cd=f UEmxX(u>b%707*qoM6N<$g8ZyyRsaA1 literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress.png b/com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress.png new file mode 100644 index 0000000000000000000000000000000000000000..afb2d77e77b42b031a1335eb67c4a9a644567d07 GIT binary patch literal 1190 zcmV;X1X=ruP)A)6vtN}5C{aKf^c)Yv(rm1Bo|uRLR)gAO=u{|iPk}aL?9{TOXf1=27E0x)s zQk))=IBoO3eSSZjvN@Rf^djAFD|c_Of2DUyDL)d@|SNL^@Y`IsHlqUC1!j z6#u;)-p?+N#o-?W38|E%9|pp?FgdoDBnj04b735Ar9r`gN%Q~N^KpQr1)PiJLTMeA z5M%5XEW=VlcgKP08{-ea499x7*{e*i*=W+z(l6J|Wq562HA`c~(-aO4XPJ|x=Gu%PtVCmd8r+!twB z5dGmB4kDzcjs@*w!-1c#t~ESBqT4!7dK()K{CiBN@geaTPsd5GW5elnbVxcuBLq-B z;CO&^rWGi{`NbC;WJt#b$uEC!5F!24JgrxVZ#Wo`xUc=KYdu>gAD(-#Yz2-Aq?x%z zLnp0%NB7TqfUL^zA5L7s@3WZSeK^DYY-qCJ`Et*1|<7OrPL|V zv@sD^fS@}9H2PLVUh}qXO(IZ0;yV1waCN1Rl7f*r^4%hFLq5uE@07*qoM6N<$ Ef=`ni&j0`b literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress_banner.png b/com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..5a829b3d9c9ab421e246225c932104f8a6d363db GIT binary patch literal 1209 zcmV;q1V;ObP)8kCMFpY)fj}TC5D^GOMMVT6q9W|OJ3@fue%|iBy-Tw*Z>CMAceh{P?!MnM48^15 zxX&%-9av8Fo8@@h{P$V(wMw-!{2FUT$9r$t?z^JxJ~d5q#K_|?YqeAUL>#Z(L-q@0 zcOvPv7Fq3V(W$=Sf7j}9t({y#;t#&j2Tn%-V3BzjkYG9jTAC|3Flqka$8mr{Ifms@ zay%23P@z&8g=NS;---j%B|iaXp0sBt;l!i~Xj(4dl-SBRHJngdxzHkhVtvpADEnGe zw5xY?!TGI4r6;wqOu_;6<`4KoGa%oD$lksK1|0J~X8=yed;mL4yCDciGaS(=j$=w` zaH+$gp&VAZ?4Bz)s}{FUUh$1^mqYoUK_Jn#R^aOF!A1@)ij=(y!1zFjCUW!kz4qOS zX-aT=1-o(?1!tM9PJx9=31{s5MPG;^9ir?fN_(aojt)q$bzt0uhAuedkhn6W2Sl(D zN5LV6w1?54FS_B7LE@$g2GBM&9Qgd|jaxb()iHqT)NtVYLV1N864-c{pw|*LoX!Ii zLqZviU_j}BqXAM2=WChfh%Pv!koajW5<1lehYS+)4san1zAkmcA%b*-%}lI|-1z?V zoD?`oAWfO`LXg1k#Awfv$W13EO=)oAAi=!^18koXCm$JOr}-a!6Gs6lltrh$=uJY5>J#MS`HaA9ZV=R6wC@|F_&^!^t_IzY8MZ2U*K%fB=DP z{i)wk-~bK)pf>oUhN@)WAONzM`_WJpV;KlQ;HRmIJr9fqK@x2UsGkN^7nFrp2j&#( ziv8>i0Ywys%7&Ce#`;fs>(y*DnQBWt)ZSKsE(Hl z2x2)RkO0o5E7#=%;&X*CPr9szvucUlbY^z3XY>yXsUIAWhx3obT?$MEnW)-MKA4jN zDGJWa+@hYePiP-Cbwg4NM}OK!1d?(%VF8s$S#MhxBqBJzq~4%|qrSQz+k8(7i4u;V zn`bNI_NZ~kM16nRn#-d+_M_6$WkO<*Ghth_W zP9VP%+4gL1FTC{Q*FkSslkmSRD$U@T-A%rno}m_Liu=e7fd3 z1wntoGM3%Uy^X<#l!dlTOmvWHEH78DrFi3llFmYOgB)4kyo7*1X;VtZ-`gQodor;h zE7qc8Jlq6Dm>JWeR^sEBxi7l+4*v}f{D@9rYc-*F-^kN|NymW!8!F0RgGoa_X#&`5 zM&3q*Z4?WpSA0B7iMM(z$^60jHvt*GMQQ^QbRq^ExIEx01d#@JGtFzhhGRH}Ba`D7 Xi`G$wBjg*P00000NkvXXu0mjfwY(%< literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxhdpi/ic_partnered_badge.png b/com.discord/res/drawable-xxhdpi/ic_partnered_badge.png new file mode 100644 index 0000000000000000000000000000000000000000..db847a9bd800d16bdf8016e295649e0c14b1b381 GIT binary patch literal 1616 zcmV-W2Cw;vP)NhMkYcvZ=I_@f@+tTNNbuy{|6VaCRE zMn4uL#{#Lhroa&k(~PA+fL0ja8%bx(Cz?At9s=WU+cafm6rN<+higZBm@z83u*kSY zGY`}RIBjj_qm>57(IWW0_-l`Z&nTZ3#oQMu`kr#|Vr;cYOl-8qGOI0KNn90q2`{X5Yj#7$eGJ|XoZ(9DqR++*m=bJG+d0)PJUgN+UTkzF zgQjn`^O}YDgCWg#p!Ln#_B0t76oH~JtRGOKO)#xGX-~a_Q)H{Op%j~wi2=wetSK4s zY+?Xn`d9-Xe;%Qj*mzO^B4yuk%8bh%$(WI&B!#&~6!Y~#qN|q(fJog)yLFKSfbN9Z zvPpn>>9b*WCX%2*S4rT&E~!8I+zUPY^qCL&x8Ggkzx}=-`1>0({PQm^@&189&N_CG z(9I8YtVQ4eVvBf&(7?=o20l{kiy;FjdHfc}!iq z9$F@R5`1H5kSO55EbstP5=`}-cL$0-D6E+&YEfyBsCC!D!J|?Sh%l_;Xz^VckRVqk zFu(<zaduNOa zkY5;v`FSO2@JCLWp#l<2(@Q4&n;*$&VaeT&Hn#n7s*`pcrx)cvy|89M00o+W$a8)A zMzIvw)BBcmlta<`+MD~=$VGyQ9LkT7?W;yI^u$7K62gxJ5x_uQ1dUoBX|Px)iGwVa zQ~+|J!H^L|hNV?b~FVf*^n&@5=<~kf>yd~ zywH2~lwvi={$&Uz=+1X2Ee>ilRUTxJ8Ul~7-2pHVh1@dXh{KvM0)c|>k>6d#Xuo|P zLK-AQBGrbOQ%^Y+e5vG5#tD0YBi}GHrvNul~`OTP{5;Xp@kpPh1nIM3+Q2b9{VkXQq zy{9G)#nsl7YYa~AG^SkR!{d!9SO4bxDCH1KPlARxyGgZ}&&2@slt~{WUrbp^iiS&*ZjdH$Wf`rr9T(C&TQiRrG9_h{*b3%phPFr(#!G;D^MK%s8e5D-FM{ z*j#=>Y514%{QQZ=v2Y*FiS3m+_9#tNoo{odG%euC8hUCr8aZjFNGM0yWL3HlE@DbuNZ1iFy` O0000I>Ka literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxhdpi/ic_partnered_badge_banner.png b/com.discord/res/drawable-xxhdpi/ic_partnered_badge_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..d3434c006b076999a309df5f6683a048de3b3204 GIT binary patch literal 1583 zcmV+~2GIG5P)bc<7;&h(&rR*a#-OZ7dNZwrXLa zrKAw)KZ^lFiLz*x|9$VJQrk$%AbUm`*2a~L#w?y!vf6+$SlC69cXs(jC8LiSa^{Sm3x=!_Ww5wA z6-QDAOV1h$$vePt@}j|S2+JBOyRZKj9XW3fIKQSDJL^d20O(;4lx$Y@PE zs~`4A;(Emm^M#f6cHPI|?Z6o#cQJkzA_hz+o;PzU{S<$8L|Nm-h6YM{NIhWXHOnyo zLzJt~`gB%362N?lyRE{I?P#VZn1&6X-tpkrPTeSNBoYG>DLWM=3Mzf(8u`dOF%bKZ`1c0hR+80Rxs1T$( zm;?tsO9RKSOX`=td9lnc|G3H?6xP{NxyAYSe;Vw&-|Fn6+g0}Rh)$CG`e!9JHuZ$% z|E#k|YO^gH{L{iZ`~2<`cH|Rj*-JElhP8KO7x3z*C3g3ZI`gB|`UVG36sWf^l{qLP zRBvo>5T%}dNZ(JWMK9y%|mO~cx_ zoO71k*E*Ja%(a3_(7LUr0qy#JzRrRW%nl%nfutT4O%O+Az7HKOjZmN(A^O$|K9#|%P5`1G|kSO55Ebstf5=`}j z>(#ao3TkGOTGSaNYTb42+ZCY)L>QKFwD_zDNRTTM7~leAcSX>Pch26Bc0>I_`sBkk z?xSp{`{B(h&tGIg0#DpCO}Sdz;4j9O3jj}lUG>#uV#oY+b+v|Vvz#^#uKmsr#*}E5I?yOMO zIG5sMBRv4fPA*0BC%^0%kt%$E^o0~3gChdu6^3DcZb=&akzHoUfCSTYlL`OkMIu_* zakst_fyuf?)lw#G-{zV8T=*)MTt#AMmiKfzn z41z=8p|v{z2BMHtCLD24^F<&K_B}GYs~GJ!&qIiVgh(XYFth6^yMphO{E0YWH*ka- zW*D-PJ@bLH6qKGZnpC2#ja=Tp?FtPzKe-}o#)y=VD-*RygH%@Am6Slji;HJ+6#d=n8r~z54+T2 z07lh}$m#_?gMeL}Ze3-8FS3qgMlmIr!_GuxE*B^`c))D`S0NSiNrbK^-b zvoJ3;&}L(Mp^3m@m_@e}HqbKR^uatgvgFpPh{eT9?uYW!Z>)RDO7Ih;{;$0q&PxTS hM(Jar-ow#>o&slrUzfBg@!kLc002ovPDHLkV1lJ0{@4Hj literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxhdpi/ic_user_premium_guild_subscription.png b/com.discord/res/drawable-xxhdpi/ic_user_premium_guild_subscription.png new file mode 100644 index 0000000000000000000000000000000000000000..9de0ba8fdeb12bd8f7436436b2bdbf1ff761522e GIT binary patch literal 535 zcmV+y0_gpTP)h}fxB)1ypk#n67$6cQce#e*k(}-%B$U{( z{Tx5P|4C1ZqzCa@cgakb-es=7@E=x=M^B2WJ5!c{mA?@2a*HM?%2?6B`sngx!_2@GvBMnF(v4$50?q^yaK?~&oR3^^ ZegQc;x~$AYY=Zy*002ovPDHLkV1isO-8%pP literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxhdpi/ic_verified_badge.png b/com.discord/res/drawable-xxhdpi/ic_verified_badge.png new file mode 100644 index 0000000000000000000000000000000000000000..b7db2d0169074f82297d95fe79f170c32bc16987 GIT binary patch literal 1468 zcmV;t1w;CYP)9(E6z;->3l}b2xMbnNg$oxfT}qByYJ1JpOc)Vi_U#- zzPb1OeCM3o(h{L05{X-qhBfM{Q&4-hjaivQI(@6kdTl9teS6Bwadu+*){sD&SQW_vH@;fU~O1oWPe4+%e3$ zE15D6^VV@e>aQtqyf0>0c`iT&#s7^ZQ}zR`U0ruT@wb08Mc2qZ$kKP#&hBAWR`82y z(>BB2TNB`PblCUA4Nh?v!S2!DJpwi(x?M!v7D?KkD0G?ZF7jd?W=&NQ98VD^5q0b4 zfog+O0#b_1u5pjmhM*v>ikim{*1j>lE_NG(UkApp5WAT3#DFQI_N*UMJ%@LPm&FgO zFJ&;y`~A3Pi9Q&@`ZsoctFbw$3=EP$FEOkiQ1k|vZl2Uv@8JBeZfc{FY)&@}KyG5K z5)scg3_#4BXaZDO$5f8kWTOD26n#^QjDz&}iFchNN8b+b$(WT<2?{fm!Flne*PNn! zefo^kX+0XV7b~!OB*C$_Y;~?&`Q0g%pBH~|wm;jaw4M?h=~EXZ0h&JZjZ;o?xtue! ze?&T}4pXur2hPYFZ#q25zW0&D@iOPbR3=D)gCq3s_3K=KhDQ#`tb0}o9Gpu^;IOVO z&gIJsTySvwB-dV4%i@{+2ql2VKmL>p&L7KvdInr}ZBQW6nLMRPde`njM?`kMvRm~T zqq5v`mI^oz_dM%+nG6co(m3a6KqsinwHCD zQvwHyG=eAaYN`RE6iC#-+3~_oXJuuD3(%n>$FvjvH-SVg??PVn>u*b3aK8QSTx3-d zaPg(RH+f0`eQ|1v3l0o740wd^vE=1wQF*MFckNO7+~Cl#kV}7k&rm#szFz{-4o)$u zm7yV?c(T_^IC*mNlgXHe~jp}aGp zb5W32YvtOtf4EWZiR}AaaNyP8-D0hFbg<3$=`zy$h7VT!az~Gi1+s%8E9|y<-?7Ks{Om#S0hb98tM6|APl;(2*?16c+!# zs^#b~APo%e7urFkaf}Fs0fFl$Q>zaH(o@eo?|B)Wf}oLHBZE*Acz|x|emsy=mlfD1 ztVgc8iq?LA9zywnqsQL~1rEGgU;nGIHCai|d|;L$?1K^eAO=zq#6@u(Eu}^(k9O7Y za757}Wcyk#7o$thE4SpK?^qXo@!996gusC(+?Lr9WAhZDx){hUUc@X})2bdo=va^9 zg(MGP|R$Sb*2jP}9-@&;}LzGZ4qi zfdPF8v$%e68&pH&%R>207ScQuL>IfY3 zu=2$OK1ls_Xpc~&m<}}#b<>gCm|lkkF_`90Hc#uWsYNy$=6PiE0D2Hm#fj}I3p~gh z$)p$(6bQc_GMArFYM*hXS?&ifNIs?8&+C`P_A|ken z^mdHY&F)!EQ>=t+HjU1Hu$Uf`>4yH220yRF3Rd?nkJ8KC0(HF7vG6W6Fs!pRd!dQI zFw8>Ggbj9?X!zjIjVuOH6*Y0OQqWMI8$f>G=RV7@6H5H=YSf-7-BH*%TJPZ~BmV($ W8kb$_xJ7dS0000OmKGg$T_ji#hhbXj`7*Km}S4YJ?moM-u&$B?yT>g^duL)*`06S zy#F^nJrPnaH+Dqx4=p&K(vjlD6-HBX{WXANgx_Idjb%J{o}GXr9(nf0f46?tC6PFa%@WBrCPwk0c$9P`{$`HPb_aY_DfN3R7Q+1!pc?$0iD~k`S z(5JEY`hHDCdocL<8l=A0a2}Kf20@@77`nTh^OBN74tD@JeoW}>lL;4o=@ftvSj$LI zsdFTVjCKKP!?4KWCfy=q9dyJ7)9o1t@K--xbwB;K68?x;l>SH;j=5k zUUiuCg?8Y4IQoyvqOqSBMb<2Zh{N;(2S=z@`;Q6G=`ZK`^^Zx;N`ZrOsS`L)9&_As zWrGP0j-S}tc3Cd9VLFfK1kev>mzm(KtlppsTy$-uKqMl0eLU&6KALlR=(YD}<;=WE z3WCZxk-An(e)g4%?&{hNCOG52Erkp>>;t@tIj;*ieFKhLytKvy2f7J5Dr}mTnakD* z95BKN7Qw2?I*39b=?2b=r!Kpjn{1Q*$u||%&)x}=ZgCgls;kS_nc&#d|3+37K`y?j z_a@P5=nnq<&lM&(P~1@95xz%-#%NJltP>y1N&W7fGi5H5{`TN7azBFX^dMoaa#19& zw$s}BCezFPdSa0Y4y+oiTddWNtYP1;N=d&ra;5F&KL2hZFgwU&(t~~%)UJ_%rwKfW55G_hOsb0#bQ9LouDXiW zet#Z9`hj13zYq!>Shbf6GqE*U3D10BmLlwf;rqY`k|Fp-vDM~f8mauWYv_l=i{?qT zZ?|$Wn)I4-NjG9HF@Wp?QCBRG*9lwGQt~ba*)OhtEHV(s%OL|G z*lZAilW1qtG8C7pF4u`p0jS&M$~s~e8S8erwm)LSGFB|xF#s9%{3ku7$}TRpfMgj2&m%3c9jJlR3FLI z(j}NgWkQ?FPqb>EvFuabvG6vMqwSSBek)C~)6PfjySo>gsC4)`Ns8LtMWoj)42nBO zc8&CGU6Ir8JRllPqq84bOq$8`Tz^4@Uz5rTCVZDifn!c$q}{PVBPE7SQhT8ZYZ!)J z<`ytv11aNmAL?@>b~z|jk&26z+6?8L@f)<3peLmAzrNQ_Lxr0p${AF84@V37AN+Zt UV$N>O-~a#s07*qoM6N<$f>?ULxc~qF literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxhdpi/ic_verified_check.png b/com.discord/res/drawable-xxhdpi/ic_verified_check.png deleted file mode 100644 index 543565f32d825335ac526489fd6e6e90e9e97da0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1022 zcmVsI5;>sI5;>sI5-442ukzs?os32wZRS<3Pz|X*r7t9B9S`iD0ZmW zA%jDOfJ+9EA|gcug9MBar9*}c9Wo?ve&5}tGzpmNz4z|jy}S=TIwZ&C{rbJ{&wJmO zNGMUFM2Qk5N|f-CSuKAtMa)uKH@87+X=1*Ezh%%Oem0d*Zji#+G%;2HLIc$PuWCj! zrJJkx%v8Y1=*BWEygL!hxOP*Tu^=}b&3q96%&>yxNeKtGi9rp=Q}9_g<+7Yi;WR9) z!wL{+D_JO^!A6dXYXf;EuMf{HEcWkDrSxX4si-0xIw)a^NBH?#% z?we?7$z<|`m@NYi(*rSSF%6&JJ0>8b>G%D!`g}TEtI^F0^96I(lx{r_#hTznJ8^?E zP>iCniA16_OXjcf1oScPfM5+<+yDj4fFq_>oo6m%OQ0Q|78HL#kRI>@Q~>P@<^o-?jW3uoYuXsigcPKn_R zv>40n6%rh}ZRXq#$PC9ltKOloprNarW9j?q2fOv>ul?q2#m>zwL=ujt)zG)t+WNDh z1%BH7>nOw)-m6ZFLh#4jXKa8Rjxkg&iD@?r$x z2a-rQ*sR5(pC_;tO@bs8j&63dS?dz3`><8kkbX6Pi-cn{Z^pvAZPt*4!69aeXGcee zHKY*Xw7554Vcx*fl0vl{a1~tP5JFDTUOyuw%&vdbf7<1ZmtmJNE!Ev2vb%$3dqt?b zgWoozDPAL_RgQpE^MY!Bp|qf$1b`Ym0ez7GP=#X@vzB5X#dv1Y*cp)~=B~1y2`w-& z?RKqTB@kM-y>|rSr|iJu_JG5J+kW4V)w__H4QFytHy?W2t~=Upo6(Imv^XYnVxwot z#9G8#QRf(Dyd~$rxp43XUZOMh1V0#cbW{ocgBKX52>YY&!0m(Y&gG1Ai8zWkqsnUL zLQBXd=mQuH!ju!TitF41AKmsaFbErv3sdke%IO^O*YDUyCqK0_^p0Z(pMnt&Cvn{9 s-kEJleEB}$YiQ6fVA0SAqza5vdo5dZ)H07*qoM6N<$f^1FWzW@LL diff --git a/com.discord/res/drawable-xxhdpi/ic_verified_check_brand.png b/com.discord/res/drawable-xxhdpi/ic_verified_check_brand.png deleted file mode 100644 index 00e6af76eb031377c12f6abbf4e96c865b79cf73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1026 zcmV+d1pWJoP)8lJdMmh_-I@KF%!5}YVKN`@&3iNN zy#+i)=yn6z;J$B(M%@Y zD;79W-OR2Ihz!TkdU!wwN;#ux^G(m%+5KTXf4OTFDdVrBCTtG=E^){s8$d`}XN#k?5{YTK+KB?SkbZa8*ygzNM9 zAEdb8KwlB}<}1h>SXxq?mIFrxS2)*7AC5#VKLaGluG?GRtjEtf@s@n31q2m>fQ4Gyy9T3+{8agBB zBCn+N__x3`vj_)n0`bjgI8Pu!t{rf>?Q__4H|Y9sdrxF$!(*u$0A4`s-o^QjJGAHZxK#>5%A2RyrUb^rhX diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_1.png b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_1.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b71e3dc339ea803f729b0e3b963d8d987eec9e GIT binary patch literal 1542 zcmV+h2Ko7kP)E zSfmhCNRi?Sksv9q2pHsw6e<=0Pe^ga1RHfg>d}Agwd`z zi?yuRu&l;$F8a4I*XS`QE5#Jw4(|O!{Nd5E+^gp@2;cqRH7qx{Rw(f+b?-t#@#E32 z+1`tK-8+RT{LnbCt~6$fwDh!70{FdTINp=09h@H#p3M^W{k4?B50CX?-2H4_pHiT| z2dwEWcDKKqu)e1r(=2sGy8Fcs*MDX1e#Il#vw-y7pZ8gy!`&Z`ahtr>R&F$o)|_Bh z7XWM)Y=P&T8vvH=Kh{S4crS3gn|WFHZ|f$0?EGo%A;UV#gKPtx2lF$U6?@?f?Ii}> z|48ub;HlPZZ%=pOM@O(*b%KZR86lKXSy(us=4poA4ZnnDn-%-_zA91b^GmA19I&ws zaVpS6Xn31HMv{4s2l3x;eHgrcyFqQXv|xr{Z=`FKK4dI@Yy=_n*^{4*v%WiinX>qV zA#`DHL`a;3>ln1)K z2(Gs(vwA_g_#bya4L*PQN*99b&1VO|ehF3a=l$hDV|j%v1eEL=uQnhle*7~;A@osl z3Q;nJuK0u@v@t^w9m?Vpg|LnZphaDLauC?V3nqY<4GT$Xz$4cfGvJf z2!aZ{c3jszHkJ67+{Q`vOFoO*q$ZgN@rNNu1;G7*)E;ppzSvSi1wyF2ZgL2`?4*-Z zA(UM=5d<#&HyN&a0Rh0H>6?jrf=uy?3Lt(w9f1(8`I5^Ciwb}zYBv8^j#T7*3k_h{ zQ&y4jG6057;_w1n13*pQ_+?3yr)vNtD|s)82(%dh$wL*e2W%PuiU2_2ma6J!1HkY9 zI{Flzb};~CkG0>WC(unw@={cA02?E5A#jgnmZFqmug(bfza52?tQC51p$e11%67UQJ+s;Z;@Ng$9FAF*Fh zQ`rYd0D-Ldi2Z_;wyT*20tNAN(=RA31Ty0D4vGkSfSeR11_WZ_gK~XJ5QvH2gLPkMw{>V; z5T+@immF-+uD?TVcF2nLgl8+5;PA2ssIi6SR_a>VUun!#UH@_|dSOG0(o8|Qvt4g9 z78<1`v1o%0h`+i-XApfj%Z0X?Dw!G42CgH7KKe$g>~$uBI<9Eb@k+JvQpdJN0Jd}W z8Y_zLArRW$eM(w1f-Vl$ey8exnAiD53m5O8uJ>*W+_LinS zT*4i|Zecv$)E+VucdS5cO=seH7|sv`&UjXD+>F>qJ4B)FOn?`GGO;0w3SS|rD$E5PMGB}8LKKJs355bt(12u$2!V)S>v*#pzi_-{ zV<(Q|7$*+KRubEBl!xsIj1%KzlF!x{C%YTZ?3{b=xjXYqQKUrjuK#c5-Z_tZCYN)p zLUG{J*(-CmZ{51RwYaqW@5JQP?D0bJBk9j+Z*PBr&nlljGt6g^fNj-`VL|G`ue?x&wj>(t*v0_xAHHkG{16Yyb?svU-JuV-Mxj@MvdRt z*m!i%XABID{Fo~9yL*dmK@4qgZwHeXF3xpyuHLJ)zBi&qmb%nj{Wdgn zY4%2T^*dHm-vyel{-(bRe7O2U)!O8}R(n_1iz_QPANT^`>b2{C6FD~xfV1b$PX(T7 zWVD=b3iC(Hl|ta52>!f|kXc7bvIU;&!qoJ_vF_g2Rhv!tkKseZr;ZY--nn!4zo5y) z9yWG%;yk}2sg$2PJ70EUHdjMvG@I2EJ#@KDxD+|0>x)bOkf*{Eqv>rPBQ-t8WBylP ze;fSJepJ<+vYWjvwuzcgl1tkLiTQ85{m#xGZ4mf=rPAOL5%Z}|X*ORg1hTU1jfnxU zzG*jKD+G~h8|hvj%-0Bk05mZGisinTuMGmLM`8f%>OPsT34#a!N_D=OuLT0FFV?yj zT$umKXI}(|Km1rNgp&h<-y{aW57BD==H_Owy0)$sf=G3ZAEMR#P#Piddx+E&D5hvO zUn>OCHe#s=8;_z%%-0A(w9m-&qo{=W+92@oA_m~%^vpFM%+~~g_DC@RRE2yoUke1$ zu4{@8KAEop0@X9IawC-==`U#7eAf_2Vu}D@Ei-Y2*f2j11QSYp(uYDjE#Wo+NShxO zf(b3(SlR69>3OLk^M5+l^UCV#nz5>PJtIt*zaN540AV~3J0iw>)2)QIjd1z7u^`ZP zVk7cR6M)DNFkkAlNd}-=moEQ#v+kZ?)BLmo2p>3>}{s|G)L*Nl;*WDM~W{4lh>ag$R#rwxVaLh#KNQn3a$L zaA5xa<;X@yblL!LVMnfx*?^E0WFkN?xg6Cqg0i70EiNrv2T+yyj3aItQ>DpzMo>66 z0Ri*hZ#!%i04e^&C+bbj`FUQ8h%|(Q%zvx(JtF`l=AQ1z#9ff@D_VgN#r)G1`E%$y zi8d*j+K^2{aAiKCpVo^}1*RalG#`m}N1Hw^FAc%9`Bk|dAC9U@LC|3SUaHx*ag#|Q zXfZ!bJBR_WSv6}Ef+q73gRI0RWZBM@$AzHH{7@oe%@{lsI8amwTFpniu|s0)WPjjD zQ6OkFABmh3Gj%{u3W8Sik;uFt*W+p$fuO;Bu}4u20OCN=fU^Ux`bVQe&}crM;hjh@Ml7Hef=2Vn9Ec5W4b|0Ec$1`@ z>v_%3LeOMB7b)w$(P`_9E}+!LI2JZ&I()U=9ky~koUOocUiLtbEyJyxjj-oUbbY1% z&)Il*{L*x%NL<-;H-tuuj3hQKHXtHFpF!~5Im;!snYs|0k&h5WC!o8QsfjBlC0f&U zEjq(|c!^sm22?fGYpgWBhv0cK@kVbI(vsLSo;0ZfYXlxWe382C=4>`iH)g2!=?UQPrz; zN08AJJ4E5{a@2PSv&o|JH(6Cv(KwA#>=UHYf$v3DGgGEanKCu49s`0j%f=>%N>=~? N002ovPDHLkV1i!11}y*p literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2.png b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2.png new file mode 100644 index 0000000000000000000000000000000000000000..666a824ee0e669dbb6aea6f869dc2fbb516f6be7 GIT binary patch literal 1629 zcmV-j2BP_iP)@68*}vsi*4xYYLJAKJZWEb2s7KYZTlh2M9(;bqEqt*pfF$#(_eWAUDSQMZ?S z*V|rQi-aFUyJz5Euj6aIc=O|+|4y0r0J3=2UdnqO)KUNe_qP-%$@)sv+pT{8&0Nn9 zqEA#yU-%C6xO&0&!y6glC+i{pU8~i4BSVWH=6v>exf_013;1Zs;)9P12yiw>h;jVu zPVm|Lcov2-{24zJL)z2A&lSC;76M36#UW{}9Y69b4ZqXrzoo|X3DbI5?Xf?IZZU>0 zYh{_V}DQ5&p*+^M<` zeU5Q3+7aJ+r|riZqAqnl?O!q5ve(w$?ga7YupqX3@quk9{hJ$;)##>eVbII>Fvxu?C;92)E0dk289eY{Ta%LU@{BFT# zBm%)4V9AA;1^%y(wkJ<^e`hNKiE~Gq8JNPy?{-&juoVHpU^EeBOySQeQxQ(+A{mmQ zgUsMF7GaN20R4uyGVqy-@PM)h47tPSCIWomguztNLl@w)5<#pU*$bcpJ{J)X1I2m{ zpn#8OpmG!eo->+&Dg?f2Xdx8v@eEW75p?*HNxWma%+VC^XN5upP4mENxuFNnXHAn7 z6?`fYG=1mG!j5}of*6|?pv=7S;>A(wcn%Q^3n0%OyY6jz%1%|p^w-U{30Oo7Ip&28XwFR!6f|p3NS~6PA_VigkNs~rXrlp3F_p^ zv1w;Ty#u~?jkY6P$*z#as+*9c%o z0BN$un$*ToqDFv3^t6rGpSlb1n#as^8iAS%aL;-!hZ+koNcEJdLwM}0p{J*(ncYMM_34lY6&U?fbiLeO1J%>zA_=$+Pb<+ZD-1@SR z2wC9c?~Myk_LPjS0~+(n->?43EkaiK_&vh{?B&h&c+tw}T^&PF8jL(5P{7CgwCr?y zQHv@xahLi(mjy}|5h&mB$yVe<7PwsDtEK1{6aoxvW*k{00$2E{ zo-dcu)f5qd34EHv+8hMPBLXA%I3xC$BJ25mE;-mZPq^B4!`!ka&J%$h{Apb$$s1~F zCtOqnrtptSJ7bbr&^aXUyGR6<@cr;P$tLW4Pf(8fZ7x~SAp#@#Nb5Y5cb!qS{51Oz zOcZi{nBE0BQ29k&x+SAjSh=zgW0Sg$OW?Fa&)Q3n;tV@L7jMl-8&c5F;NxX^kHFk? z_tR?yj~#}8lI8kD_P1%YUAVsL0{APz^^d$N6l4u?O@PW>Yp7OFPQb6k4N9gGKj~Ob zA{fo9V$mI4VKtD}gA$<5cW)y}A^2!DrSJ`eU^4Jgrl$xbk@N4q4c8EKJC0R@E`a zj(ObNxG^Hs`X-ZR? bQor&q^Qs-3KDP6w00000NkvXXu0mjf12Yt& literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2_banner.png b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..a7fd530c4e4e3dfdbaebd62c042ab254842a0a8c GIT binary patch literal 2002 zcmV;@2QB!CP)NklwCxJ3%GZ7c9?z5&o68{TpqhpsX0mVUNmj2b$NWw^k`;rA(z`6 z9vNLQTOBtGw|tALMs;*_9G{t)U1tsuKq(kD(4y!#!R0>PwEpT?c6{}q`-F#LV^s+u znHrg6SZHl+ZP#eFb^dny_K{MquTX1$$&OE~v$=;q5OPkXHy!u$r6>gdwa@^hw4!5m?-*lD#^R}0s=ckkXYrBZ#~ zYIF2XOity?y)KNFssI2+F-S$zeb+16{2Mpwj<2jd+rF4t97jP8hi%s;BRIkBIGZGQ3wkpc}rl!`@`Fvg~{xiAU;*L_;^=?I&56i?vGPS}; zOtE-E`VsQ2KOek5JTkh>NK~;zDq%Dlk4Vn=$8D-lZFZ*_whvV2FtM4_jK! zzJ7p$lt`G*HX*|X0%<|U5OOJ;0r&%9US2;W%rE6BE(U=Q8BEqYoXn?tjZJ(_Ql!i$ z1%VGiRftCS^po<;r~9t+@#-lCfbWEikN`l_GqZWG*ZW>+!7hP2=08n9$+I}@Bz{wS;hZj0oQOy8eY*&xv_5eT?Gb4hk9RSE;>Ay;GIa@0O z;HGFSIYludNe1v@zlaj!{VxO9p9eClQ1=s;0f+;@Z0UDX-FnkWG3x%S9RO_9!5O-} zl~94iA2I-8)z+^0>tDf`*XO5Y0K!ObF#G;@JHqAhb;|&FUi;e}i9=f<*d5MRi~v5b z{f4#qwHGg;1Yj^)0<8K_z?^_BAJFe`vw{HTN1}0b0J^$+O_I-u6@yUBe6awOZ2mv5 zBez0m0L2VE2m%}P;ctZoU^3eWIVI+!u|!r#0BntX9YQ&OBLsk0Jh5DAx5xje&t&4I zJpHf~V=0D`FrSaQAkd?hwo62cvqm#x&q)7s#ggo7jU{0|AC+-L%hQ8{p%@=e2nh%n z%?CMM-Uu-O&_bB6Ns2EBVww+vL>DmtaNd>AWg2M+Vw+EV1Vo~VX}$v$QV=kh4}#uF z!~jf9O>YVjs&j>a#e7g^EW1XgU5!e0RLFXvav@+cA4Kewq*ATBnQXyb7e_zl$ zk23&TZ>ncR5L*aX%?A-VDerRo+>A(K0|Be~AhXq`;S2y~b4El-xm$|QAB;)9T}?R< zu=ERp?vfP&pcDw0I%Y-ViFp!dgwqTXNv&s`cOVew48Ur4K4cI{DqRy_u7Vml1Ayk$ zP|uDT0!H(p1w0$v*1gqU~Co`5^6mn~#7z8Zl z!v`v&vG_t~4}FJo8j?-dbiL91JIG)`1_EiU0EqPaM?VVcADrTPDl<8p zUNu|nc8Eedv_17^tHTA+Dc1Sl5t@%)RMr`X?G7+*ueHNn4!;FVj6TGs@ zy+^06=f`4Sa)l@zqIIeoRsW#r+?zS)+1a@*Xnft;sv!10R3J!+H-kf`eBC&ZG kEtD)-vSi7UC9C@MHwS6l{_&%Y^8f$<07*qoM6N<$g3AJ%)c^nh literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_3.png new file mode 100644 index 0000000000000000000000000000000000000000..2be33f42fa1e3ab41019141d28061a2fdf193288 GIT binary patch literal 1668 zcmV-~27CF5P)I4&2*MH0BI-e~*pVVBxjD4MQxx5dqRdM}0aE&VS7AnmDqm<_nf^hxr zklC7aXRBGSQL8l$3g}-4T%*lJnad}9C%8WXe(!A7*truKz;Et#jT#Fs|-8+>K zempx>$9q<piYG!O1@Ge3kI8FG_;%oy+;S`?+0D z3265Oo8IJi`@13bU3#W5b$Pn`)lcTXEbe~8bF5bZ>AQd2SAh+8e>?|m@>Y*>qp`p0 z25Ytmz*oV4;5me^z_QU`Iuet!wk-e#X+IGjoi# zi2?UN0)7!Z)vDutvK@T?4Av@c@DM&DgiLMaO$)Qd z=Ld*W0TZR+ZSfdM<~bhV|9k0u_tigdsI8VJtPt#tbdl1BjNx~0{s<>Q5jysZKoWlZ ze~60ELCGmZ$rQTq35(Fe3`ML{hEG(4WlRB@)Zvp8fj_)p3h=@P_>@F|@<_bwmg_Is z0-uZsm{r$d(t#j+_}ZwXj7bq7dxn;76qz5?Ul0R6d=LB_iXuP|6U+SEQE`W0z>mKl zLj*OYEg4Vxh(vo^rvS3>u|!Z*;I+yaJCF+g8P+(=f5;bAo76B6Y2eFm$C(1ovSrAF!KbU=peqF612>4%hxazVXFyI>& z03JXiI5ki}60BPWp5un#o zHj(klDnMHJlmys5i6aVZtq~vz{85jhlmvh%b4it_t3rUJ@Y^@OTOvTPR#FjYQz3v1 z{4`HfhR&j`!XB_> zfj=t8YfJ!sV<*mz=@20eh%4vjGr_kaA+vL1R%ecefq=B3sxxA9Gq>~$usiZ8Gr~PV zQEGA+2uPf#5g`fuZ`U{U3gCF3GM}hd)#qoF8IctsD|`rZsQ8Q+eNTm>hQA7){`DM1 z1Pu6TL)&`>+7L?S!T=wyarN5h%eIa|5$Omez2stOx|*M}7cCTQg`pWFljhR0OK< z#WAG`jFa*UrjGh25rHgx#C}0b#y&s-5y-+v>=$ITT}>JhD8L_^enGM#kby5cC?f0u zdQy}aA`pX*vjS?acaKsdykR1cgCEWL%mRqRdTq)g5QX0cc3AD_9jYP_g};T?xHTSA zQ^9c&l^?(gXyt>3@Av$oD3vDwsvNEC#+(r>P=o_iA z*O@5lxMEGmE7L=iI<_nl;KNwG#){&52$c5up*pAp_LK+Eid9hD{kE=xW@+5V6q`Mb z;TVO-skj#!X6&NV{+;6PS6%28g*`3~sy2Xs15Y(W%bk3@(i}#;?j4b=HEJa-^@ey% zh56Sch1i7Osg$RY&_iCYINtfRhf9P5xS1P|SK347a0de7Hl4%sFq|O>oQbU7pcS!! zc8J2-l>jdS<**@&3V%XWRhc*L1QX#t;RN?Vd@G`w#VAHGicyTQ9lrpRFld}JZlx{& O0000-?zK(_hd|YwE0^7od%0gC2|xc}GVl7(la=D%{YmF+Q1ClDJA21n zBQr8~JyP)dld1ErfGU-WJ3IGixwkjbMG4+hX?J(8FL~$7$QXd>#SI`#8B^1<3yDPP zT%)PZ*@?;NNfGdeHUHZmtC4_@dEF%t=5$O?E5)Z<&F1$Y3NqD2=I+;_h2Ixnb?$z{ z3iT-9eD{Zb6xeY0duq1GTdnSR{FAk{*Y9jG;OVpH{~&S>jR6m*W(uxl8q4Mqp@5&w z$_mWOV!|M5-GboA2F_32WHI!|56P zjYy^RJI?1uVB>D^Kx470scMW$)vPJVAw6Gx@h|dJV4^g=jmJn<&+&kNqf(2UDy&Az ze)cwXo)kWkT&(^|5B`Pn{ueV7uz;u2!{3v@M|Fxde5NKKD~q*J+5pUN?BO#tVLW^P zrnCV__gVp;p$P~;r43kLe^a&wJ~I7MpS;te?toR_#S)?Llcn1BryPUnUY(C0>1bC6ecK;^iCfX+R+lO z)c{fWR3<3U%U5fqfq{Wf1Hu3K*1#8ATifbZsa7C@z!xz=qXAw#ARG|`zVcQ=Q4q($ z$JfQ$S8c6n7=Tno3@fq~ z28h77#DIF^ma*<e~W7{W*9fb8H_Pw}|(6_RpjsbggV zBlx9KsXp&3J#8IF7ogOJ<5;jjqr;co=+Knw!QKi0$IBkjV~fMBj2&T*H_;8Ihc08` z!Q&UJkwP$^qr1TaO>!i$YGDCFBxth{_}#IWi)=A9AuL8Vnm~F2x@jppaYdm>Yr3X| z&M+HZ;^qklRE6p_RxIB`&_*iW=*>cG5__r>Xq{2ex%;gg1);wC4@SZ5^w$)D5!ybc zX6BYqu|q^k@u(a6yI;1^tM+tK!uz_e_w<}P`kClJK%^S<$eqZ%(tJOkl;{%aHNqpT z-&SwrV@AhveIiEezws#16^oMmM94Tg?e6gCwV<0z5KIB?aS^YR%3O&>QGnYF5a#ss z(8yJaUc(}CJK9}qrsDajVvnuMOIZ+G>%3otP@D3!+a~UnjLl2QAZtx aRv!SP*}ERg9xiME0000A)6vs~>5Qqu{qRGwe&TKCfl7^7b5FnR8QUW9=+JGnt0#SiLASx;<5EY0D1Ojma zfvBiJR8$}k2t)+}QBi?FR8$};Dvo*Y_WF5OcK6=QyxE;eCQS;tz5ajmvF~Hv)M}2K z5OPK|l8t(#wne12>aqMNq-;??r`2j*z-L8r8JjxQOye~6-qn`ebrQ}tNA%Om_L2y4|4U$5&0#Xr^c zny!~8E!?*u>wErQV5zIp=(o`2dKmq#dzohe@6liKS>VO!Py3)v-t*T^aZ&$azkC58 zV)Y#?=Q3Hm@4XTK&^Sxplw{qPi@u59H~ze~kYODKC!3Grp9GP75+Z4GU*pG6@K`N? zrK{1#{Nxk5m%tlk?b+y@=* z;O4FQ~(R9OwnCPs)2@$*11G7CmM>4SmxUP`z%0Mz1Vg<$Aa^ylQ{ z z*aiS@0DzadX3EkH0J5dL*GxFt0)XtU3IMPf063cg9cS6kRR@3tNcu;g(qlydfYroZ z_3qFP0HeV6QdDUGjb!7DUkJ=&o2lr*6)~W}KR~U70KkFxrXR%!#YlU4$ez3n%IJ_5?Gb$zei3;M@cR5dU%escir|BcG@@Rp;lt z6cK6&{}bO}T1uNLH8^1wt0_r*7Ob<7gvHPdBn5n}*;}e5|tKMX3T)5L}8+ zo*ixav^+Hg_u`-O_4sg9l?nm}@yX5z+b%abDg;L2(`84eGr(HZtSAId;->(1=_+Jd z_Lb*_z)k#qCn;+Ng@;^3%(6n@Dt_;vwwxIqKtnCLI_jSV0$cIv>IIoQphp3LtN3K~ zf;g0`DFVT@_@$~BlotXM@v(v;#UZ_Q7Jp1e2yDbBE7;UfZ#fmhI}ZXg@xdRoNO4a1 zimUw5JP`PauQk)!QCY&XoFQ-%zgNz#Lm4E;=k>-xT^wJ;n$Zj|$^jM91 z!;|*f67(5F`rTK_Hd7Z3HX|P)kXArDi8<+qN39&Q-<<2zzhgxi0Di^Ey<<1JD|Nw$qWL4s6ZepDiDYY1OkDm zsHljjjHrk}AP^CViV6fG0#OlBaU$%yY}&L*n!DWF-FLUQGpqV>$^W;vyYKCLZw*6n zGp+K1X?r!+k63T8{=H~>Iqc`;a=9z;tb*-r!81(9-7GlXjG=Q2gs{E#klx7K>t@_% z6pNK>T=eFEXPhu7@AVYlDu2F2{N7$KI%^MN2!A~48AYf3Rx9!ICHHAa@w?qOEqA9> zawjo`@9C}L>&lc)Q%@rzfU_yXcE1&@^5Z_?*;~SXz8z8c-d@#X^s{+=Oo1-;e=t3< z(f(t|{2sZFGu7!d`o(w0+s{V7;-2cafb{53`&*EN(ckT`OG}mbj^kW4?ebw#0I;{< zCs@v@0Z_EOuZa=AyB65)hqTQ5ACo5jsqtrf?-DCK7)z$(9wb!!-oBT&R&UXsV!-?d z!P$rbOVza8KPeFYLN6Z{?D7}*j<85CIh7k~b~9`=oC?hrD{hf0+O4dq2Ge5w7qiB9 zK@*|wZN80c(Ag@kwdd|VY~O$MgxcFuN8iTsSFcS?{Hf`iK_>{oXFER&XMVT69A)td zLpX-D5#iv(-Jvc%RS0ZN*g%+m0(UQY@hL(80~EoKQtv_tD?T|0Z1%vgWa~*1pA-Zn z0M(?4PX>bHZpw^akS;#_eD?NTx)2=qReS*KpHLMaes9@)NfrXi=^BqVASr(LZ-_$h zQO*={mC6KV@d-m{VEXirD2q=NLKPE0ox1qsAh68~CV;&ph))RughwKJLj!+zBE%;H z0W<0v4jqytJ_QKi!bdx9Xs2Z6`@G-a6T8Ulb`8@eXQ6klTi!S=Kd0$*_d%5>N23V4}N^(M-<^XDaejzZAWrm_>u82WFSnwuD3dYqDz@_4! zgCHR*MoV{er7}S#F)uriQJfnvOb9qO6!px-7q)^U$qSy($W>05wI&k)9Gr`Q0OHTg z&dCOFlwV!FPO{F=Wg#Ni5JrhVJu@pN>=L2wsjx)7=krTaAcPTre$f=;XhRH56tWhG zhM-RTV9U9S31C~)A|(ofO7YR7qea^V*br2U&-*s{DM$naBI4uZ2+J-v85aT>@iC*L zIe?ZdXVth6D2d-Kt&CYAORBpzDg=V!ckF<;Mi?(SX{k6d3k!j&`25gi0V7j>Q&p;e z7zkv=$I25Em7s?Ofvos=^@7xvs~HCZ1@Ti;FDNPmGUD?JiU@0fw@;-6*eD3Z#K(C9 zinjZSQX#xy5Xgy-RREml4xCViKv8_q46VE|w*^`hArKY6RdBpz)atn_E9ERqm*35gUOrdb1PA76`rpN$pB+-3ZnS1_l-$9_DzGBC+AS z)IewmW=1JVECUFSE%FmAybs?&*EkvUJa;iF(}OkA`svVHb$9cJ+3r|Rw}uZ5i|4~VMD!P`&h8tHxX+e9m8ib zbZR{Bz{e844+K0z=G$1D}C5nlC`X5Eo)iJnymI8K|+YWq9f0~00000NkvXXu0mjfa1p|7 literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxxhdpi/ic_partnered_badge.png b/com.discord/res/drawable-xxxhdpi/ic_partnered_badge.png new file mode 100644 index 0000000000000000000000000000000000000000..4b5471e9bb584e7198dd381291c5929014bafd37 GIT binary patch literal 2138 zcmV-g2&MOlP)Jb2iI1Brxo?d$~0%+N(pBvm2SP$H7zKPoAK5D0{n zfCK^(Fjc@bf}{$VNmqy z!iIV!4!&s*OaVWWCm@JaHv5puI*o=i$9+~`sdd~n_SdBV@Wlhb_w(q2%;Kid&o}KS zTmknAtzlYg>k52V70eR^-w)EMw7KZ1a?gh9N*ngJX=<%JPeMi2j{q{xaA*N|K)HM< zov~Ae&wS2Y{EYi=Jy2az&vs8sU4RdDA_;yWk8>N6vm>`Co+)y|60rO2K_UUrbJ9;i zI%CbPS@82-k!!pY?D;syYh3_tjIcMEyWiEXH4naL=o5Jgf`Xx%Q$tA$&fG6##RdE+ zkEn>N8)wyXH*NxOc`Ww9ndkG5#Snato#EJ>g!J>-$D0hNjb|NW3w)tXaE_-KJ6k*>dn+lR2Qa>4e^bWV>BcqfuE#XLVuIm-y9@Jtdh&q|8$SS( zo=DOe$T0E(h6Y+Vm`kNnvq->4K|~>YS=T}!awDCk8qg}{m4vHGnxm<-xevOa!IWid zC&dXE(m+4JZ~SUBtX2(X6^r~{XPE|6f>pcv z{%;}FV9In@3{jR7$26!_Y;j3aZoh&xge`O@K&K;Q3j3Xe&9v5D4QkjZ*lDZjhN`xe ztJ&tQJJ_MaAF~sEC;6{ix9?(WJKtvu?PZaGVzw+{YuWI1R~AGQ6BF#qug-BmnisYzt%;xCuyHf{=KMwW z@BRC%9O3_*IXA#oy|GsH`yL`JL#l(1-Tn8SJ1i`X{`4~kP-e{!Hf=2{>{9gL!2@>k zi++_8F`iCmXRB4iQmI+09uRgQcC#uCUAfBDmdKjfWo_)j#qSse-Ml#}ylxThP<1~$ zRl&b>`3j>VsE1v(2#a>*oO0Lh;aOTLV9>X?5Uh|p3FmO@O zw}Y39ss1Rs4rX_{o-7+NUVx~5NA}%9bPQUU0df38}4;)cd6oZVOp)A%*cSq)DL#)3(H@dralm`0UQb;fRCN%o2J9@ zXaAacn-wIiLOR-ejILt>bxX>8i|EluYM|6n#@{1fBjZvQ69NE(P=nG75I#<#2qDNL zD_K(K`b7<(NObw?>uZETDJKNcbcv|SBkKxMs}-Fx;6uY=E2Q2}J^5mEyjMg<}7A2zQfD+E#B9eJb* z3*ZQO-w%o#A_TP}lFsnEd=LWiKr)0hg|lQu;CgTjLySCc4n%&Zm_dby z;uiw4lPWq9hI?{X)iY8G} zwS|CFqcR8tBYOffq7*`a+lVSsRD_O({94fG@JcF`^n;3(2H&s^p_%}N5Vq~;i4+VN z(@LKN`GQOc@C$@6QHi{e%uX!qlzF&|%qP^<~-dn4+F z$0A$g!OtN$lTwG4gADtWCt%VS#7(@Lw*xc9x!)o;|bWCcXXLh_{stk$R5t$>0 z4zEVjUdaQsoToHaPwIsavC6%l*h1}>Ox-A@Ez;T9-rMrJ6ZMh@d>0pN^h#m##o}Eu zTxIbS63aIzO{o=3zN(4ct?0(a(Pm8Y3lvG9IA&DwnH!QqF^nY!W36@q27$z7_s?xe zBE?|l@df!g02YqP5Wi~YrMC3k5;^oGcM$*ji8-6sOpjA z-h*j(1hrP;Gt`ahDItW;sm!VSD=vdj2SWTcEQZtOO@^898SoC0_q-_3f4b@NNtGS4 Qy#N3J07*qoM6N<$g3pWjhX4Qo literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxxhdpi/ic_partnered_badge_banner.png b/com.discord/res/drawable-xxxhdpi/ic_partnered_badge_banner.png new file mode 100644 index 0000000000000000000000000000000000000000..70bca1340582747b08b9a42a6ac97bb12954dbf8 GIT binary patch literal 2095 zcmV+~2+;S5P)U@4NG+yiDfjzI)G`nfK-%IP`bk zoqXrs^MB9l=x8Dt1F3tAs5xvz%!19#;e^fo#_803q-zbPAGA4QKRfQM5wp3wqg{!E zA2DZLz?XBL3t}L#Uum78#Y6UUrmL@$o@h@2*gtp;@ZEf;Gn(%5{`}NIBWisrwnqA7 zTY=vhH6IfM-_0@OROX?&z}u?Jh*+a#YONj@prYDn_nY$)0&svbCymIWvFDjl>k<3k z&pWEi`?KxS(k8n<-6aWr8DM6{u_53^l4lB>u;B0hsCknFEI&Bxr=asx`f$sFf0t7S z!|eH7X?+2h5O8AkryyD(1O97F~If_6;2ZS z6|$FYEd-)co^5f}V9Iefg#ez_KsK?+?{t=FFlAV=tIyp+sKNBkbCl)8qz1H!EiU28?KesQ z<_KXkl}<-Ua6jb<7}tP$Jpt+7mTste=KU;t^NSoCkFT-IH}d?~$ki40^2KHL_!-L= zP#zt&*ozZO?9BAa-F2sLt+UU6UT5d7t+LlXrd*q_<(;Ym_QZ(AE_}Pj{;{@LEn3^y zVPF5c!2vluq_!qLfAW(Yi~qU7HVQke9^wC7`+b8w|3Oym=N&XB3Cob`;A3}Z*XjdM zPPfxr96*^hU%#BIE9`2twawVoU)JSM1iH5eG6xi60Jcxn1Hul(ZdRq6w>P=k5?S-f zw=?Yfg-u35f2X#D*WJt3302k8uL}N+1Pu@+^>Fs9)tYM_A75grBKD-?ngX@)Y`5nINOY7oP+`3cnZ9S+!*cab~;M`s;sCqo_ z&8)IU5me5rmzH-40S4PIy7WU{t=F`g5S&|vBwftZMo`3Mgv;qR{@={|qmFR06=RdV zLf{RxM17r52{QT|{`%H7tq>4U)p9R!Qhxil;Ms7$GP$f8q+Q=tE2uLvz&G`SUHa5J znO*7w0UN-f5CVAWr~ED*jz7ECEZMAD!YZeWvv~@v#!KLLQ|4Plk3LcZ)s8a$9{Cy> zm$H%&02qW?E4={W<0Og@f;_U4C3UV})BuV^m(N|u3WHKl2%_l{QI$#7H$;7XNE9$H zF0G7fDIfjiN5L{OZ ztPuE?QqE)zxbR-QxS^F)5ehLSy+K3@VahGA=4b zLQb)6oCDUr=7Uf)@r#-*1e_X`K_D2}Q?Ca|SqN|&QAP5L(9uv@3;G;hNu!c}P_feB zN6e$5jabS;IQ`{{uVBEKHu@we6lBD~FB3w(5qTk*omk!}0U^LW^o#Ip$&#dZ@LfVU zt|9aH+$5#yOdiKBjzk+bM6FXzNnPzf8(=ab8d;zH;SE(q?l??XeEB(!zEs^!^r^1NF0Kp zA|WKKjr4cRT+-GzCH4J)Am5M~CcGh|FKah-0IVL^A;odZ6Ohq>dQUmiO+nOPN?z1f zyr5C+7qyOPFeQ1&e3-%m>eFCKw;&#)2*SoRn6d&$N7`)axt^G%nR;G?9@yG^0q8V@ zeCy#T)d+eGrc~#f_cs7myR5B8S4wm~)6I`A4)4}N@KB7Qej9A@BorHY;}kb3L&!Ny zl_60(B6H;UOWC64OHQB`YqPOtb9{&uFH~7QylzgVZqx*mIp7FpIAkw*NN}*xD`juK zV7yBPDvO_xK)ylA)kvG}ZHe8j=*9-oW)%1ZiZD<>Gpc?&~NVynvHwc{UHgu==)8r8JYeX=S19TcpqnQ zR1tqON4!=rr0S6r--BtLsMA^*ZyVK9MF{<_%xMCbL8t>EzE1Ha)3dIdpGhtpiub%I Z(EnQ${GGbNvdI7d002ovPDHLkV1ix${EPqq literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxxhdpi/ic_user_premium_guild_subscription.png b/com.discord/res/drawable-xxxhdpi/ic_user_premium_guild_subscription.png new file mode 100644 index 0000000000000000000000000000000000000000..7d60b11f893af102f3a1a290f717699e505b79ec GIT binary patch literal 555 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VEp9i;uunK>+LN=zrzk9u7ToH zbQ&f#O}e{*VVZ+uzQ6y())dJ|7cVcB6#+dO8g^xqmngf<+>`#_`jSSkuIu+Hb-tS$ zE|-7Yl>K<&Lyt%6+oTWwWpos`cerqz{h)#!2ir$SgO2^~FK$;XnWOga;kJ)1j-fRI zJdc_a1ms()KJMRjgJ*xVfXm1G-Z9@*^Be?@-rvvNqzBc<-{c5W%hLQqLE;Ge!lFMP zcWM-}Hfj9(@u%RrLdPTdz1&S&2=#xiaOiyuR@!mYzx9EXJ#SO-A8&;-Ob(L!&6;c* zod3+?c*h{G_wj%82JJ%o@`mu`KY|7KdEe2KdvNLFa)l)f0Y~iJJop!M)q6Prg9tCM z;64!c!?TF_z!l2}l8^tJ&h%tl;9yazvyG);d)DC_r#>G4eDmmCp=F)f;w@6fp4ANE zEm6`}BNyHPe*8Gck@?74X-W6{mI-G2n4Nz8@M3wy zE!d&&qOeb*@kbKNquI&=@f{8|icB9{IgW@cp>cW~Y7Ch^K5xXS0H{^cN&0;8pa1)7 W1jSW0+CN(e@}8%wpUXO@geCy&y4y4W literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxxhdpi/ic_verified_badge.png b/com.discord/res/drawable-xxxhdpi/ic_verified_badge.png new file mode 100644 index 0000000000000000000000000000000000000000..e49b091ed4846818f06b8ae2ef68290dc25a4a2e GIT binary patch literal 1928 zcmV;32Y2|1P)GREU*4XNoffw z2_e#2S{h4~sHp@RC2EyeQjC()SR$y;l`Pv?nsL1`XBHmQ^Y>z2t3hjdFr!)BWbX@bjf`$g zkky=uD>>ln=F~dy)oTS9k;L%qLl zK0p{e>gyW1(G@H3i743W6Z~?JCbIhWhc?<9L|0Zb`|c2H8?RLmQSo6w&YGiUfD05^ z!`YmfuH5r+eaEBZe?uU;nD!=bODw<#al#0GO-;sq z;+*c5mV4lIl)$!*x=MCY70^8vJmX|0XABU(rh`~a+d^ZE130;`6HiwkXj=aPFc}IY zoB$ z8!(#y8KE91*}MsujB5yk0V4^JQR)EA>Q)t?L$AJRKl9vyAQ`}4_|>Qxttx{5)Si9z zty_QFD=RB@&yi!ngtRfdVz;tPDe#+`TkY?z&fDem;kj|=@0i!&t?K)~gitXCoPGCw zyA}acp4|N`R)xhZW;(H`3iw@x*X*^mHM<`DvGk{X@TG3CN?cTl?Qd^=+P-n)cY7lO z2Aw?p4sQs#9~_GgzVt=4<5H^>5ap^9A2>19#L!-^`Z{OQ$!m~7o`OsOvj&#zfge>p$Q04gjH)=mkDl{;j+voCpb^ECMN{v z!Y=r&VuDjpD|uZfBvoi>^n;J0y5H$Las?ZV43H+fMMK~nV<%vkDkdOr8AV14bFV9N zSE)_T_PzU~@4|tUWfYz+#M(cZ{M?Dt1eM+LqQSS`7N>3~Y{k3p`L1;{asK;jTq(c< zFTPA|a!z0RTBOGC*%b3^1;)ta!jC^yr2tth5x?23a)Qu=wR4Y1`fEN^1zayO38%QP ze~4-?aGq!hf^&iy5F?@0{XnAIPZGqBf@aBXof|(dVC|^2)d@KVU4Tm?E+8Tak<5B~ zf%QV0-2$)fD_E(vGNdCO;42IS1`KBLW#E)DNam_U<^!TuU-X>5UJw7Lx)s|nE66>l(A21V@nnIi`k zUX8lB*KyQJmQpcJ;>8(aRr)@$0l8l^al;k1$mTb@U(4%J>LU;EECg(*m4d@3#kXV} zk>$K0QuiJ&!{jR=PB*6+E2GX>bs8vCAdw=fzMUv?&nZ<%LSJG=YO&)n2t=0Cza^z2 z$uRy5HJL7`LRLS1BeWo{d0S8RBl)EQojr1Tw3 zv(u}z67C^3qNffM3hR+m@)MdtupJ@iGc20b?oNhTDO2E`DBpSEpnm~m9rj!46K0+O O000038wugtGtmJC0x~Fp zfD9O9fq?*)FmMP12BFAA&h9!n$98ft=fsX}948lN*>7*{9OwJl*?GG=Gq+EAQj}uX z_r0C>|K21L5z^B=XYNjAjlPs-lx?Rkj}81lMRoakwmIAu;6t7G1izM-TpI!|Q9RSj36o#_XvSYe0tkQ= zKLxfovR7R2U88RsZ-oV5jEF9PRK_^2B>2#;!h`P`dL>Um(_lz6RxLP7YvvQufbViW zS661$vnrba>=Rp*J~*rR{CZJ7@V8WvF(ute=;)ogKb6rBxmia`5gtiu=E1|7d7n6X z{bl_gd>t;>IoHUR6au{wmy%gy%nm4zB{e2&~^E}miCMnB_MODCmV{p#e+`MfyqLsB<*0GP~#cFX;CAWX%m1%2vrEIk#2-U3Dgj7a0XuxuwB{E!n83fXeA9X^H_e-f8zd`3%KY`izh@yB;8#!1l5}r( z*uVs^;=BfBM>8whRet#_?=?e z&p75I6zenpGJy{xjr>p$-4e_bpR$Ah#rGv<)$_qfF~F>-G38kZvV)&{Z?J|$jI;Jkb`0AKI-7<=b6y>wd&#g1NoSAoK zBL8rll4TT;E^_U^PhNBKG(lCjn$c&Y|A^B!6t>|#di=t+n>btKD*^U@ILGXAo|#?~ zNqtTx{O?xqmzi8xys@JM=*JWBTHUH9q$Zw!?VLygFhe!KjWUz?ia$Pendw;wo>&RV zIib3zHDf5Wz8@62y%a&b7-&D$t^A)$;x+Huf$vtzInV}N7IlG)Br=(eo(1oPwYmkh zM`7@3!8b-j3&dE}1?)n-qKKdB7StOIzi2baI|loLN<|>c=!XE@;8&Nqs#_prMg>zn ztH3(6d=TpwTTgexE})T?m8LJO3%3XaD|=dGL}`Tpw~w_rQV&Sh>K0NHgl&d2;Af5f z-iEM=g@7;EPsGYYTs=Kef?p#9(jX0>uzE0l2x$(f!LRCwdy4uGf*V;I4O0?DPY-eG znXfY4|ayY!nMSkdm$)C9S2(``YF_{YG= zmdm%r>FMzr2k;JPI1@4%W1k2=21OO586XG|dU`y1LXS}Fib#v{gOJ)5t+3v_=x!b) z*!%3Psf<_8_z{2|KegA^^LS%c%;ftb;)Sgd3qXZ61rZ9MpJ)Yr45lw5?BfQ&M#I|i z>PjD-&t&_fE7t?YLSQMzP~QgYoCLR#H!t%fWsn_j*eXM!cD(J8)Ay#c#xn@iDxQ)$ zYt6i<7kD@bv~WQYYQJRahAVNGE9`b|%d1?{Tu=z`f&+F&--C}&io0a+Mc{-;K6|{1 z%~wKv-JEW$j5ed}3{a>*B4t#)XEOD4LKTuNmcW&}QmdUNi$Ekf0WEs?WhF`0pXC#( zk_>sJPy(rlPl33$AZtt|R43ZGWJKR|5jg%fZ5M{u-PJ`yF$k_i@TX?#&$eX2B4zN8;RrshM3Z zS}XHyqk8HK!P(Bcl{qa`hCyfpA?H1ndymKOOn$<6n_VRLyl~Ke9E51f7#W|900000 LNkvXXu0mjfa?gxN literal 0 HcmV?d00001 diff --git a/com.discord/res/drawable-xxxhdpi/ic_verified_check.png b/com.discord/res/drawable-xxxhdpi/ic_verified_check.png deleted file mode 100644 index c8006e2a4fddcd9bfcb661f93c52ee47bc4417ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1383 zcmV-t1(^DYP)F`MItIz=%9mGOQljQh*Wgw zkfB47A{`t8{-KCs28RwEN+}q%V1*9Brf|OR-8H18N$;-j-Fuh&e(=#rbNPMuzJKrg zzI1dT5C{YUfj}S-2m}Ig5Ykujr_&nIlA1Y?(yXrDUh8ZkkvM|P2!df4$AIvZX1=Df zlG2I2zgSE3?{vyAv*~pHI5KzGH{Iwv$4J*nwK?fcr3U{N{tsl*CoUWLla#<>0MeU? z`8<)&A4O(8AZd^@l(aQ|FE|uzU!Q0;h0(IsFMW!!ozMPQ%o6Tj)s%Z(zSB@VJjfuXV$=n!0A@-ttS-;BuWx`a_I?D$7X!UuS-R`Npj+L zAxTqIq%1YBfQTl>(bsR6yJmfIdL74}f$W$!D@5vwmO3Fm!iiHCzQ~)+n9;a$Vjfic?3AEP0vi zfc@a%n0@2cy}*|{nT&Z#_BG;i6v-bd+_isHe%d>jd-FDc`7z(AaF072Me_e_{IwfV ztyb+U8T6}wtlUzxmg}TWXff*K1AhHpXC}#CmxVPi%>*TNVg~G3Q;vMVigO{&n4&P~^5e-Waa>#GIFBW?e+`Hc@lHc4M3H1r>;&26#zaz6^A|Aaz zh2(pzj*95KgQNq=_bk&QDxWnZ-+RjnU+3%ecp~|Jk~E$@Ls1AlRU)7JEg7}{BS^l_ z6F^^Do@IyoJRk1noe}%}$3=T}b&V0^w+5p+`TP~Y*#rUcjrg?qIgk=mCEx9syTtS6 ztBcoz!R5z(@T&xs$p?Yqao$b1+#as+A|!|sR3~4^MLkRy@_N8WV-xoF_I4m8M1Xvl z#+*^U3i|lTq;DlefqY?&TF?j2dxqDK5~4yrm6Et}w389n!d60r$gl35{uEJ^-wX|Vfl`|s-KB46TCH_iKjQq0n zwFfjy9t!IuC}?)NRp^Wp(jg5>__wvih=;$bkuSY7y51Ql@C)`0T(id~rtJLSkgBEd zs?;S=yvx*4l+Z%Yc4$)(Bt7-__z#baGevD;RoFAXjA}Pz8L)%aZWgP zgW7lkFWtRj4~~F?I44#gFIUw{frU0 z)!eE_Wz9-SxB_2S)^{_rJ<=t&a$1Jza<=Z0lHRx!JLH`crN(fY{XUKJoC~l8(d_~( zvE~EA%t~3v)Xt@iNWIA+cUpuo2sn*Qx6UgBE&;cel-qo+o+)DY3?h=dHDxxQN8%)K zG)Lh0@fVbWR$PPskQ>`*1z|BV$>IJPA{RGqUufYcmSH#oS_NYfI!aCWs7V2T0g8bo pviRGP2m}IwKp+qZ1OkEZg#Vi>p*(lIT=oC}002ovPDHLkV1hA!rFQ@T diff --git a/com.discord/res/drawable-xxxhdpi/ic_verified_check_brand.png b/com.discord/res/drawable-xxxhdpi/ic_verified_check_brand.png deleted file mode 100644 index ed54257b570b9e56966d99304f7b320ddaa42988..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1397 zcmV-*1&aEKP)^JosJs3}P}S&e+xM1&fU)Aie40 zpLMNRtZpV|+d!^V*_E@{ye#q~LYOREbhZ)0YpEQrw?jQHm;A_jPR4o-$W%M6R?c=x z#B>w%m)RlJQOJ-YdYP$twAcdjB!HEX)pYHE?UXVvfHFIdCx9T1 zZm{tja{cS~-~0Bhxx~qxvzEI9IT*)W6Ui^%obzjofBa=kyj+YQ3o5gxIz&UynMnTk zAAkKQe*IqZ&kt8(hNYce+$78eXE)!-3)9I5eEIe#P)RXAZyZep6)g8?!iqKR$Onu* z{*>4ah5FQV$q$m%=Bu4$j6M6j;Yth0ZBqyWhx~>Rl%Iq!_uDyYM7sFirm84pvIHPk7WyF)(n~8 zdg?^J^eh?wzyTsZcD+!a%z)dV%*|c8^UiSR3?Ls8H6z+bLGO-zj4cEs$X8XU1$FSUdwAmr!4&dyHk(iu4HY+HFKr>1 zLOz7*S9gD^um#dDWorpxy7I#m^5y#e>j+^uO(B>-KBQ^Wt_K>x5`t#rdpXNJhEf?J zY(h0nA?QRt)W)KZJ;;}xlWCm<-P8`uw?MCqQ&k}iLh!s$2=G%k^3f}!Bb9N=zTm*+ zihu9Xf-h$m(zx>e2zCaI2oB+pjj{M5Bhk5^;?;oC+${{ z1#_e&mOjR5BNEZvcA5@7=>0;ua3wBh6tkIOjx^NDK;%>;Z^mKVC6FE+ik;@niD>Q4 z^80DRdDp>%GX+(EV$Z`cjsRsKQzwTujCzvOHRfqF0!nV6>m-Et3WYN&$Nz1k*$BjwBEW1OkCTAP@)yLR - + @@ -11,7 +11,7 @@ - + diff --git a/com.discord/res/layout-w600dp-v17/widget_guild_invite_info.xml b/com.discord/res/layout-w600dp-v17/widget_guild_invite_info.xml index 400cb58db3..e4c836f1f0 100644 --- a/com.discord/res/layout-w600dp-v17/widget_guild_invite_info.xml +++ b/com.discord/res/layout-w600dp-v17/widget_guild_invite_info.xml @@ -4,14 +4,14 @@ - + - + diff --git a/com.discord/res/layout-w600dp/widget_guild_invite_info.xml b/com.discord/res/layout-w600dp/widget_guild_invite_info.xml index ce093ad23e..db0fcdfbee 100644 --- a/com.discord/res/layout-w600dp/widget_guild_invite_info.xml +++ b/com.discord/res/layout-w600dp/widget_guild_invite_info.xml @@ -4,14 +4,14 @@ - + - + diff --git a/com.discord/res/layout/widget_guild_invite_info.xml b/com.discord/res/layout/widget_guild_invite_info.xml index ea90e383bc..5318a25449 100644 --- a/com.discord/res/layout/widget_guild_invite_info.xml +++ b/com.discord/res/layout/widget_guild_invite_info.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml index 3fab0747b2..2f46c240aa 100644 --- a/com.discord/res/values/plurals.xml +++ b/com.discord/res/values/plurals.xml @@ -449,8 +449,8 @@ %d more boost - %d extremely cool people - %d extremely cool person + %d extremely cool people have + %d extremely cool person has %d Members @@ -609,10 +609,26 @@ %d minutes %d minute - + %d days %d day + + %d hours + %d hour + + + %d hours + %d hour + + + %d minutes + %d minute + + + %d minutes + %d minute + %d months %d month @@ -708,6 +724,6 @@ false false false - false - false + false + false diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 432c8b2905..fa3f75670c 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -2002,34 +2002,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2039,7 +2039,7 @@ - + @@ -2220,289 +2220,300 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2559,15 +2570,15 @@ - - - - - + + + + + - - + + @@ -2625,21 +2636,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -2653,55 +2664,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2712,19 +2723,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -5290,29 +5301,33 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5324,8 +5339,8 @@ - - + + @@ -8088,1052 +8103,1052 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10429,1286 +10444,1292 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 81a3a6fb0e..58d0268d35 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -958,7 +958,6 @@ LOVE, DISCORD {fixed} No topic set. Channel Type Channels - Channels matching **%1$s** "You find yourself in a strange place. You don't have access to any text channels, or there are none in this server." No Text Channels Character limit exceeded %1$d of %2$d @@ -1004,7 +1003,7 @@ LOVE, DISCORD {fixed} Unable to sync cloud saves OR Collapse Category - 9ec31162-042b-4b7f-98cc-515f700a1ace + ce62f3f4-37cc-4902-88d7-680c54d11b1e Coming Soon Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings. COMING SOON! @@ -1091,7 +1090,7 @@ LOVE, DISCORD {fixed} No Route RTC Connecting RTC Disconnected - Connected to Stream + "Watching %1$s's Stream" Video Connected Voice Connected Verified @@ -1452,7 +1451,7 @@ LOVE, DISCORD {fixed} Automatically move members to this channel and mute them when they have been idle for longer than the AFK timeout. This does not affect browsers. Lower the volume of other applications by this percent when someone is speaking. Set to 0%% to completely disable attenuation. If the indicator is solid green then Discord is transmitting your beautiful voice. - **ALL THE BITS!** Going above %1$skbps is not recommended unless you are an audiophile because it will adversely affect people on mobile devices or poor connections without noticeable benefit. + ALL THE BITS! Going above %1$skbps may adversely affect people on poor connections. While using a Discord Certified microphone certain voice processing features are no longer handled by Discord itself, but rather the microphone. Selecting roles will automatically setup basic permissions for this channel. Use any alphanumeric value as a code. @@ -2007,6 +2006,7 @@ LOVE, DISCORD {fixed} Only @mentions Server is currently muted, therefore these are disabled Server Owner + View Server Discord Nitro Status Prevent potentially dangerous administrative actions for users without two-factor authentication enabled. **This setting can only be changed by the server owner if they have 2FA enabled on their account**. [Enable on your account.](onClick) @@ -2204,7 +2204,7 @@ LOVE, DISCORD {fixed} Careful! You have unsaved changes! Members of your server with an active Nitro subscription can help unlock tiers by bestowing their Nitro status. For every tier achieved, you’ll unlock perks for everyone in your server. Members can revoke their buff at any time. Your server will keep perks for three days if a tier is lost. Only %1$s until the next tier! - **%1$s** have boosted this server + **%1$s** boosted this server %1$s Boosts Nitro Server Status Unlocked @@ -3305,6 +3305,7 @@ To keep your sub, go to Settings and update your payment." PLUS $1000 worth of PC games and perks Free Games Free Games and game perks. + Server Boosting Want more? Get Nitro with PC games. Send a gift Upgrade your friends! Gift them Nitro games and chat perks. @@ -3325,9 +3326,6 @@ To keep your sub, go to Settings and update your payment." No Nitro Boosts No Tier Nitro Server Boost - Tier 1 - Tier 2 - Tier 3 For every tier achieved, you’ll help unlock perks for everyone in your server. These perks are only in effect within the server. [Learn more about Nitro Boosting.](%1$s) Get Nitro to Boost! Boost this Server @@ -3361,9 +3359,15 @@ To keep your sub, go to Settings and update your payment." "Use your Nitro powers to boost a Server you've joined! Boosting a Server allows it to progress towards Tiers. Each Tier gives collective perks for the entire server." Nitro Server Boost Nitro boosting since %1$s + Tier 1 + Tier 2 + Tier 3 Are you sure you want to remove your Nitro Boost from: Yes, Remove Boost - This server will lose Tier progress if you remove your boost. **You will not be able to give another boost for %1$s.** + This server will lose Tier progress if you remove your boost. + This server will lose Tier progress if you remove your boost. **You will not be able to give another boost for %1$s and %2$s.** + This server will lose Tier progress if you remove your boost. **You will not be able to give another boost for %1$s and %2$s.** + This server will lose Tier progress if you remove your boost. **You will not be able to give another boost for %1$s.** Remove Nitro Boost? Included in Nitro: %1$s (monthly) occurs on %2$s. @@ -3911,6 +3915,7 @@ To keep your sub, go to Settings and update your payment." Sounds Speak Spectators - %1$s + Spectators Spellcheck Spoiler Click to hide spoiler @@ -3966,6 +3971,7 @@ To keep your sub, go to Settings and update your payment." Your stream currently has reduced video or audio quality. This may be due to network conditions. Members with this permission can stream to the channel. This stream has ended + There are no spectators because the stream has ended. Sorry, this stream has the max amount of viewers. Stream is Full Stream Issue @@ -3989,7 +3995,7 @@ To keep your sub, go to Settings and update your payment." Streamer Mode Streamer Mode Enabled playing %1$s - Streamer Settings + Stream Settings Streaming **%1$s** Volume Unfortunately our payment processor is unable to load right now. Please try again later diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali index 68b36a9c67..3952416390 100644 --- a/com.discord/smali/androidx/appcompat/R$drawable.smali +++ b/com.discord/smali/androidx/appcompat/R$drawable.smali @@ -183,33 +183,33 @@ .field public static final abc_vector_test:I = 0x7f080064 -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf -.field public static final tooltip_frame_dark:I = 0x7f0803c9 +.field public static final tooltip_frame_dark:I = 0x7f0803d4 -.field public static final tooltip_frame_light:I = 0x7f0803ca +.field public static final tooltip_frame_light:I = 0x7f0803d5 # direct methods diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali index afe1c41ea4..dac3d9fb48 100644 --- a/com.discord/smali/androidx/appcompat/R$string.smali +++ b/com.discord/smali/androidx/appcompat/R$string.smali @@ -93,9 +93,9 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120e87 +.field public static final search_menu_title:I = 0x7f120e8b -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali index 266d12c6ed..3bce269025 100644 --- a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali +++ b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali index d55f8df4ad..3676fa8128 100644 --- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali +++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali index f09700c6ec..8c49f03cc7 100644 --- a/com.discord/smali/androidx/browser/R$drawable.smali +++ b/com.discord/smali/androidx/browser/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali index 9a3899603a..4617249868 100644 --- a/com.discord/smali/androidx/browser/R$string.smali +++ b/com.discord/smali/androidx/browser/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali index 66065065d6..e394ee480a 100644 --- a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali +++ b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali index b81cdd7823..3ac51d69f4 100644 --- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali +++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali index 3193c9e879..48fe1bf126 100644 --- a/com.discord/smali/androidx/core/R$drawable.smali +++ b/com.discord/smali/androidx/core/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali index 10e7038082..80665929a9 100644 --- a/com.discord/smali/androidx/core/R$string.smali +++ b/com.discord/smali/androidx/core/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali index 1108c6cc4d..cb2ba07409 100644 --- a/com.discord/smali/androidx/customview/R$drawable.smali +++ b/com.discord/smali/androidx/customview/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali index acd0a8f2fc..7bd60fffa6 100644 --- a/com.discord/smali/androidx/customview/R$string.smali +++ b/com.discord/smali/androidx/customview/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali index 291482e744..1024c2da68 100644 --- a/com.discord/smali/androidx/drawerlayout/R$drawable.smali +++ b/com.discord/smali/androidx/drawerlayout/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali index 8353c4bf78..d74dacd5ef 100644 --- a/com.discord/smali/androidx/drawerlayout/R$string.smali +++ b/com.discord/smali/androidx/drawerlayout/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali index 10485640f5..5cbcb4107c 100644 --- a/com.discord/smali/androidx/fragment/R$drawable.smali +++ b/com.discord/smali/androidx/fragment/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali index 3c441245f1..cb2484477b 100644 --- a/com.discord/smali/androidx/fragment/R$string.smali +++ b/com.discord/smali/androidx/fragment/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali index 8b1f9bcf3f..59044bd3c0 100644 --- a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali +++ b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/legacy/coreui/R$string.smali b/com.discord/smali/androidx/legacy/coreui/R$string.smali index de48ab8e97..b6d3b9af02 100644 --- a/com.discord/smali/androidx/legacy/coreui/R$string.smali +++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali index aca32917c1..0bd8001c2d 100644 --- a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali +++ b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/legacy/coreutils/R$string.smali b/com.discord/smali/androidx/legacy/coreutils/R$string.smali index 330a13f2fc..41fdf90dcc 100644 --- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali +++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/legacy/v13/R$drawable.smali b/com.discord/smali/androidx/legacy/v13/R$drawable.smali index c941ffaad9..57d2562287 100644 --- a/com.discord/smali/androidx/legacy/v13/R$drawable.smali +++ b/com.discord/smali/androidx/legacy/v13/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/legacy/v13/R$string.smali b/com.discord/smali/androidx/legacy/v13/R$string.smali index 5a8704b4ad..448a3ae621 100644 --- a/com.discord/smali/androidx/legacy/v13/R$string.smali +++ b/com.discord/smali/androidx/legacy/v13/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/legacy/v4/R$drawable.smali b/com.discord/smali/androidx/legacy/v4/R$drawable.smali index a9c83d1b7c..e1b019714a 100644 --- a/com.discord/smali/androidx/legacy/v4/R$drawable.smali +++ b/com.discord/smali/androidx/legacy/v4/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/legacy/v4/R$string.smali b/com.discord/smali/androidx/legacy/v4/R$string.smali index 4be1677c68..bc042f7e4e 100644 --- a/com.discord/smali/androidx/legacy/v4/R$string.smali +++ b/com.discord/smali/androidx/legacy/v4/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali index 890ba6fedb..d3ff615e99 100644 --- a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali +++ b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali index 44892ce9c5..aa629522b9 100644 --- a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali +++ b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali index 9f92bc4da2..5e08743ddd 100644 --- a/com.discord/smali/androidx/loader/R$drawable.smali +++ b/com.discord/smali/androidx/loader/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali index b2838cee48..922d234d97 100644 --- a/com.discord/smali/androidx/loader/R$string.smali +++ b/com.discord/smali/androidx/loader/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/media/R$drawable.smali b/com.discord/smali/androidx/media/R$drawable.smali index 79a96362b6..206938ecc0 100644 --- a/com.discord/smali/androidx/media/R$drawable.smali +++ b/com.discord/smali/androidx/media/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali index 3d2a46da17..4cf8840ed0 100644 --- a/com.discord/smali/androidx/media/R$string.smali +++ b/com.discord/smali/androidx/media/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali index df12147062..f6190216bb 100644 --- a/com.discord/smali/androidx/recyclerview/R$drawable.smali +++ b/com.discord/smali/androidx/recyclerview/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali index 189c1f9d32..f4063fbc49 100644 --- a/com.discord/smali/androidx/recyclerview/R$string.smali +++ b/com.discord/smali/androidx/recyclerview/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/room/R$drawable.smali b/com.discord/smali/androidx/room/R$drawable.smali index cadf4f981f..c5692d0fcd 100644 --- a/com.discord/smali/androidx/room/R$drawable.smali +++ b/com.discord/smali/androidx/room/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali index 6fa5bc7d5a..a0bec71061 100644 --- a/com.discord/smali/androidx/room/R$string.smali +++ b/com.discord/smali/androidx/room/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali index 7ec9dc0b52..6c8154ad9b 100644 --- a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali +++ b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali index ac21abb69c..a7fa21c7dd 100644 --- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali +++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali index 0938333f92..394a8a3c3a 100644 --- a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali +++ b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali index 36f03ce725..1a22707c24 100644 --- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali +++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali index e05993ea88..f800367722 100644 --- a/com.discord/smali/androidx/transition/R$drawable.smali +++ b/com.discord/smali/androidx/transition/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali index 027be59dea..61f1e36565 100644 --- a/com.discord/smali/androidx/transition/R$string.smali +++ b/com.discord/smali/androidx/transition/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali index 2c13ac6a79..667a06eff7 100644 --- a/com.discord/smali/androidx/vectordrawable/R$drawable.smali +++ b/com.discord/smali/androidx/vectordrawable/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali index c791028677..5eac34827b 100644 --- a/com.discord/smali/androidx/vectordrawable/R$string.smali +++ b/com.discord/smali/androidx/vectordrawable/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali index 2ad270f293..61bd5ee653 100644 --- a/com.discord/smali/androidx/viewpager/R$drawable.smali +++ b/com.discord/smali/androidx/viewpager/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali index 19fa182e90..a5a0f312c1 100644 --- a/com.discord/smali/androidx/viewpager/R$string.smali +++ b/com.discord/smali/androidx/viewpager/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/work/R$drawable.smali b/com.discord/smali/androidx/work/R$drawable.smali index 7751182876..bdcb35ac00 100644 --- a/com.discord/smali/androidx/work/R$drawable.smali +++ b/com.discord/smali/androidx/work/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali index 383fbef059..a5dfdc4901 100644 --- a/com.discord/smali/androidx/work/R$string.smali +++ b/com.discord/smali/androidx/work/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/androidx/work/ktx/R$drawable.smali b/com.discord/smali/androidx/work/ktx/R$drawable.smali index 6c85acf186..502d4f56cb 100644 --- a/com.discord/smali/androidx/work/ktx/R$drawable.smali +++ b/com.discord/smali/androidx/work/ktx/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf # direct methods diff --git a/com.discord/smali/androidx/work/ktx/R$string.smali b/com.discord/smali/androidx/work/ktx/R$string.smali index 66414130d7..c222804899 100644 --- a/com.discord/smali/androidx/work/ktx/R$string.smali +++ b/com.discord/smali/androidx/work/ktx/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index b4ebf88c55..e46caf86f8 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -30,11 +30,11 @@ .field public static final LOCAL_VOICE:Ljava/lang/String; = "" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/899" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/900" -.field public static final VERSION_CODE:I = 0x383 +.field public static final VERSION_CODE:I = 0x384 -.field public static final VERSION_NAME:Ljava/lang/String; = "8.9.9" +.field public static final VERSION_NAME:Ljava/lang/String; = "9.0.0" # direct methods diff --git a/com.discord/smali/com/discord/a/a.smali b/com.discord/smali/com/discord/a/a.smali index b396eea716..79b935d660 100644 --- a/com.discord/smali/com/discord/a/a.smali +++ b/com.discord/smali/com/discord/a/a.smali @@ -266,7 +266,7 @@ new-instance v1, Lcom/discord/a/a$b; - const v3, 0x7f120d56 + const v3, 0x7f120d5a invoke-virtual {p0, v3}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -276,7 +276,7 @@ invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v4, 0x7f120d55 + const v4, 0x7f120d59 invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -286,7 +286,7 @@ invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f0803a7 + const v5, 0x7f0803b2 invoke-direct {v1, v5, v3, v4}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V @@ -294,7 +294,7 @@ new-instance v1, Lcom/discord/a/a$b; - const v3, 0x7f120d53 + const v3, 0x7f120d57 invoke-virtual {p0, v3}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -304,7 +304,7 @@ invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v4, 0x7f120d52 + const v4, 0x7f120d56 invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -314,7 +314,7 @@ invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f08038d + const v5, 0x7f080398 invoke-direct {v1, v5, v3, v4}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V @@ -324,7 +324,7 @@ new-instance v1, Lcom/discord/a/a$b; - const v4, 0x7f120d4d + const v4, 0x7f120d51 invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -334,7 +334,7 @@ invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f120d4c + const v5, 0x7f120d50 invoke-virtual {p0, v5}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -344,7 +344,7 @@ invoke-static {v5, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v6, 0x7f080369 + const v6, 0x7f080374 invoke-direct {v1, v6, v4, v5}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V @@ -354,7 +354,7 @@ new-instance v1, Lcom/discord/a/a$b; - const v5, 0x7f120d59 + const v5, 0x7f120d5d invoke-virtual {p0, v5}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -366,7 +366,7 @@ new-array v4, v4, [Ljava/lang/Object; - const v6, 0x7f120573 + const v6, 0x7f120572 invoke-virtual {p0, v6}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -374,7 +374,7 @@ aput-object v6, v4, v2 - const v6, 0x7f120571 + const v6, 0x7f120570 invoke-virtual {p0, v6}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -382,7 +382,7 @@ aput-object v6, v4, v3 - const v6, 0x7f120d58 + const v6, 0x7f120d5c invoke-virtual {p0, v6, v4}, Lcom/discord/a/a;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -392,7 +392,7 @@ invoke-static {v4, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v6, 0x7f0803a8 + const v6, 0x7f0803b3 invoke-direct {v1, v6, v5, v4}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V @@ -402,7 +402,7 @@ new-instance v1, Lcom/discord/a/a$b; - const v4, 0x7f120d4a + const v4, 0x7f120d4e invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -412,7 +412,7 @@ invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f120d49 + const v5, 0x7f120d4d invoke-virtual {p0, v5}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -422,7 +422,7 @@ invoke-static {v5, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v6, 0x7f080371 + const v6, 0x7f08037c invoke-direct {v1, v6, v4, v5}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V @@ -430,7 +430,7 @@ new-instance v0, Lcom/discord/a/a$b; - const v1, 0x7f120d50 + const v1, 0x7f120d54 invoke-virtual {p0, v1}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -440,7 +440,7 @@ invoke-static {v1, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v4, 0x7f120d4f + const v4, 0x7f120d53 invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -450,7 +450,7 @@ invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f080374 + const v5, 0x7f08037f invoke-direct {v0, v5, v1, v4}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/a/c.smali b/com.discord/smali/com/discord/a/c.smali index af3806d9bb..5f1b659ce2 100644 --- a/com.discord/smali/com/discord/a/c.smali +++ b/com.discord/smali/com/discord/a/c.smali @@ -225,7 +225,7 @@ move-result-object p1 - const v0, 0x7f120747 + const v0, 0x7f120746 invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -239,7 +239,7 @@ move-result-object p1 - const v0, 0x7f12072a + const v0, 0x7f120729 invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -259,7 +259,7 @@ if-eqz v0, :cond_0 - const v1, 0x7f12073f + const v1, 0x7f12073e invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -301,7 +301,7 @@ move-result-object v0 - const v1, 0x7f120747 + const v1, 0x7f120746 invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -315,7 +315,7 @@ move-result-object v0 - const v1, 0x7f12073b + const v1, 0x7f12073a invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -357,7 +357,7 @@ if-eqz v1, :cond_0 - const v2, 0x7f120ddb + const v2, 0x7f120ddf invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -402,7 +402,7 @@ move-result-object p1 - const v0, 0x7f12072e + const v0, 0x7f12072d invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V @@ -427,7 +427,7 @@ move-result-object p1 - const v0, 0x7f12072a + const v0, 0x7f120729 invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V @@ -452,7 +452,7 @@ move-result-object p1 - const v0, 0x7f12072b + const v0, 0x7f12072a invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V @@ -477,7 +477,7 @@ move-result-object p1 - const v0, 0x7f120729 + const v0, 0x7f120728 invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V @@ -493,7 +493,7 @@ if-eqz v0, :cond_a - const v1, 0x7f12073f + const v1, 0x7f12073e invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -719,7 +719,7 @@ if-ne v3, v1, :cond_3 - const v3, 0x7f12074b + const v3, 0x7f12074a new-array v1, v1, [Ljava/lang/Object; @@ -751,7 +751,7 @@ throw p1 :cond_4 - const v3, 0x7f12074a + const v3, 0x7f120749 new-array v1, v1, [Ljava/lang/Object; @@ -807,7 +807,7 @@ if-eqz v2, :cond_0 - const v2, 0x7f120749 + const v2, 0x7f120748 new-array v5, v3, [Ljava/lang/Object; @@ -820,7 +820,7 @@ goto :goto_0 :cond_0 - const v2, 0x7f120748 + const v2, 0x7f120747 invoke-virtual {p0, v2}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -837,7 +837,7 @@ if-eqz v5, :cond_1 - const p1, 0x7f120736 + const p1, 0x7f120735 new-array v0, v3, [Ljava/lang/Object; @@ -856,7 +856,7 @@ if-eqz p1, :cond_2 - const p1, 0x7f120735 + const p1, 0x7f120734 new-array v0, v3, [Ljava/lang/Object; @@ -869,7 +869,7 @@ goto :goto_1 :cond_2 - const p1, 0x7f120734 + const p1, 0x7f120733 new-array v1, v3, [Ljava/lang/Object; @@ -910,7 +910,7 @@ if-eqz v0, :cond_3 - const v1, 0x7f120743 + const v1, 0x7f120742 invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -948,7 +948,7 @@ move-result-object p1 - const v0, 0x7f120747 + const v0, 0x7f120746 invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -962,7 +962,7 @@ move-result-object p1 - const v0, 0x7f120726 + const v0, 0x7f120725 invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -984,7 +984,7 @@ if-eqz v0, :cond_0 - const v1, 0x7f12073f + const v1, 0x7f12073e invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -1040,7 +1040,7 @@ if-eqz v1, :cond_0 - const v1, 0x7f120746 + const v1, 0x7f120745 new-array v4, v2, [Ljava/lang/Object; @@ -1053,7 +1053,7 @@ goto :goto_0 :cond_0 - const v1, 0x7f120745 + const v1, 0x7f120744 invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -1070,7 +1070,7 @@ if-eqz v4, :cond_1 - const v4, 0x7f120728 + const v4, 0x7f120727 const/4 v5, 0x2 @@ -1091,7 +1091,7 @@ goto :goto_1 :cond_1 - const v4, 0x7f120727 + const v4, 0x7f120726 new-array v2, v2, [Ljava/lang/Object; @@ -1132,7 +1132,7 @@ if-eqz v1, :cond_2 - const v2, 0x7f12073d + const v2, 0x7f12073c invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -1302,7 +1302,7 @@ if-eqz v1, :cond_0 - const v1, 0x7f120746 + const v1, 0x7f120745 new-array v4, v3, [Ljava/lang/Object; @@ -1315,7 +1315,7 @@ goto :goto_0 :cond_0 - const v1, 0x7f120745 + const v1, 0x7f120744 invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -1332,7 +1332,7 @@ if-eqz v4, :cond_1 - const v4, 0x7f120728 + const v4, 0x7f120727 const/4 v5, 0x2 @@ -1353,7 +1353,7 @@ goto :goto_1 :cond_1 - const p1, 0x7f120727 + const p1, 0x7f120726 new-array v3, v3, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/app/AppFragment$b.smali b/com.discord/smali/com/discord/app/AppFragment$b.smali index 5a5790342a..1e49d5f14b 100644 --- a/com.discord/smali/com/discord/app/AppFragment$b.smali +++ b/com.discord/smali/com/discord/app/AppFragment$b.smali @@ -84,7 +84,7 @@ iget-object v2, p0, Lcom/discord/app/AppFragment$b;->this$0:Lcom/discord/app/AppFragment; - const v3, 0x7f1204e8 + const v3, 0x7f1204e7 invoke-virtual {v2, v3}, Lcom/discord/app/AppFragment;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/app/AppFragment$c.smali b/com.discord/smali/com/discord/app/AppFragment$c.smali index abedf8e293..a48f11a658 100644 --- a/com.discord/smali/com/discord/app/AppFragment$c.smali +++ b/com.discord/smali/com/discord/app/AppFragment$c.smali @@ -72,7 +72,7 @@ aput-object p1, v2, v3 - const p1, 0x7f121083 + const p1, 0x7f121089 invoke-virtual {v1, p1, v2}, Lcom/discord/app/AppFragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/app/g.smali b/com.discord/smali/com/discord/app/g.smali index c74ec0784c..f67b4be029 100644 --- a/com.discord/smali/com/discord/app/g.smali +++ b/com.discord/smali/com/discord/app/g.smali @@ -252,7 +252,7 @@ .method public static synthetic c(Landroid/content/Context;Ljava/lang/CharSequence;)V .locals 1 - const v0, 0x7f120435 + const v0, 0x7f120434 invoke-static {p0, p1, v0}, Lcom/discord/app/g;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V @@ -276,7 +276,7 @@ .method public static final d(Landroid/content/Context;Ljava/lang/CharSequence;)V .locals 1 - const v0, 0x7f120435 + const v0, 0x7f120434 invoke-static {p0, p1, v0}, Lcom/discord/app/g;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V diff --git a/com.discord/smali/com/discord/gateway/R$drawable.smali b/com.discord/smali/com/discord/gateway/R$drawable.smali index 24495715f8..2243e3d8b8 100644 --- a/com.discord/smali/com/discord/gateway/R$drawable.smali +++ b/com.discord/smali/com/discord/gateway/R$drawable.smali @@ -247,45 +247,45 @@ .field public static final googleg_standard_color_18:I = 0x7f08017a -.field public static final ic_mtrl_chip_checked_black:I = 0x7f08028f +.field public static final ic_mtrl_chip_checked_black:I = 0x7f080297 -.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080290 +.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080298 -.field public static final ic_mtrl_chip_close_circle:I = 0x7f080291 +.field public static final ic_mtrl_chip_close_circle:I = 0x7f080299 -.field public static final mtrl_snackbar_background:I = 0x7f0803b6 +.field public static final mtrl_snackbar_background:I = 0x7f0803c1 -.field public static final mtrl_tabs_default_indicator:I = 0x7f0803b7 +.field public static final mtrl_tabs_default_indicator:I = 0x7f0803c2 -.field public static final navigation_empty_icon:I = 0x7f0803b8 +.field public static final navigation_empty_icon:I = 0x7f0803c3 -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf -.field public static final tooltip_frame_dark:I = 0x7f0803c9 +.field public static final tooltip_frame_dark:I = 0x7f0803d4 -.field public static final tooltip_frame_light:I = 0x7f0803ca +.field public static final tooltip_frame_light:I = 0x7f0803d5 # direct methods diff --git a/com.discord/smali/com/discord/gateway/R$string.smali b/com.discord/smali/com/discord/gateway/R$string.smali index 8d776d955e..18656064cc 100644 --- a/com.discord/smali/com/discord/gateway/R$string.smali +++ b/com.discord/smali/com/discord/gateway/R$string.smali @@ -99,49 +99,49 @@ .field public static final bottom_sheet_behavior:I = 0x7f12032b -.field public static final character_counter_content_description:I = 0x7f1203a7 +.field public static final character_counter_content_description:I = 0x7f1203a6 -.field public static final character_counter_pattern:I = 0x7f1203a8 +.field public static final character_counter_pattern:I = 0x7f1203a7 -.field public static final common_google_play_services_enable_button:I = 0x7f1203e4 +.field public static final common_google_play_services_enable_button:I = 0x7f1203e3 -.field public static final common_google_play_services_enable_text:I = 0x7f1203e5 +.field public static final common_google_play_services_enable_text:I = 0x7f1203e4 -.field public static final common_google_play_services_enable_title:I = 0x7f1203e6 +.field public static final common_google_play_services_enable_title:I = 0x7f1203e5 -.field public static final common_google_play_services_install_button:I = 0x7f1203e7 +.field public static final common_google_play_services_install_button:I = 0x7f1203e6 -.field public static final common_google_play_services_install_text:I = 0x7f1203e8 +.field public static final common_google_play_services_install_text:I = 0x7f1203e7 -.field public static final common_google_play_services_install_title:I = 0x7f1203e9 +.field public static final common_google_play_services_install_title:I = 0x7f1203e8 -.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203ea +.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203e9 -.field public static final common_google_play_services_notification_ticker:I = 0x7f1203eb +.field public static final common_google_play_services_notification_ticker:I = 0x7f1203ea -.field public static final common_google_play_services_unknown_issue:I = 0x7f1203ec +.field public static final common_google_play_services_unknown_issue:I = 0x7f1203eb -.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ed +.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ec -.field public static final common_google_play_services_update_button:I = 0x7f1203ee +.field public static final common_google_play_services_update_button:I = 0x7f1203ed -.field public static final common_google_play_services_update_text:I = 0x7f1203ef +.field public static final common_google_play_services_update_text:I = 0x7f1203ee -.field public static final common_google_play_services_update_title:I = 0x7f1203f0 +.field public static final common_google_play_services_update_title:I = 0x7f1203ef -.field public static final common_google_play_services_updating_text:I = 0x7f1203f1 +.field public static final common_google_play_services_updating_text:I = 0x7f1203f0 -.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f2 +.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f1 -.field public static final common_open_on_phone:I = 0x7f1203f3 +.field public static final common_open_on_phone:I = 0x7f1203f2 -.field public static final common_signin_button_text:I = 0x7f1203f4 +.field public static final common_signin_button_text:I = 0x7f1203f3 -.field public static final common_signin_button_text_long:I = 0x7f1203f5 +.field public static final common_signin_button_text_long:I = 0x7f1203f4 -.field public static final fab_transformation_scrim_behavior:I = 0x7f120568 +.field public static final fab_transformation_scrim_behavior:I = 0x7f120567 -.field public static final fab_transformation_sheet_behavior:I = 0x7f120569 +.field public static final fab_transformation_sheet_behavior:I = 0x7f120568 .field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12089a @@ -157,9 +157,9 @@ .field public static final path_password_strike_through:I = 0x7f120c1a -.field public static final search_menu_title:I = 0x7f120e87 +.field public static final search_menu_title:I = 0x7f120e8b -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/com/discord/models/domain/ModelGuild.smali b/com.discord/smali/com/discord/models/domain/ModelGuild.smali index a7284b4b21..b640a70e03 100644 --- a/com.discord/smali/com/discord/models/domain/ModelGuild.smali +++ b/com.discord/smali/com/discord/models/domain/ModelGuild.smali @@ -51,6 +51,8 @@ .field private static final FEATURE_MORE_EMOJI:Ljava/lang/Integer; +.field private static final FEATURE_PARTNERED:Ljava/lang/Integer; + .field private static final FEATURE_VANITY_URL:Ljava/lang/Integer; .field private static final FEATURE_VERIFIED_SERVER:Ljava/lang/Integer; @@ -150,7 +152,15 @@ .field private ownerId:J +.field private premiumSubscriptionCount:Ljava/lang/Integer; + .annotation build Landroidx/annotation/Nullable; + .end annotation +.end field + .field private premiumTier:Ljava/lang/Integer; + .annotation build Landroidx/annotation/Nullable; + .end annotation +.end field .field private presences:Ljava/util/List; .annotation system Ldalvik/annotation/Signature; @@ -261,6 +271,8 @@ sput-object v0, Lcom/discord/models/domain/ModelGuild;->FEATURE_BANNER:Ljava/lang/Integer; + sput-object v0, Lcom/discord/models/domain/ModelGuild;->FEATURE_PARTNERED:Ljava/lang/Integer; + new-instance v0, Ljava/util/HashMap; invoke-direct {v0}, Ljava/util/HashMap;->()V @@ -359,7 +371,7 @@ .end method .method private static computeFeature(Ljava/lang/String;)Ljava/lang/Integer; - .locals 8 + .locals 3 const/4 v0, 0x0 @@ -374,16 +386,6 @@ move-result v2 - const/4 v3, 0x5 - - const/4 v4, 0x4 - - const/4 v5, 0x3 - - const/4 v6, 0x2 - - const/4 v7, 0x1 - sparse-switch v2, :sswitch_data_0 goto :goto_0 @@ -415,6 +417,19 @@ goto :goto_0 :sswitch_2 + const-string v2, "PARTNERED" + + invoke-virtual {p0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + + move-result p0 + + if-eqz p0, :cond_1 + + const/4 v1, 0x6 + + goto :goto_0 + + :sswitch_3 const-string v2, "VANITY_URL" invoke-virtual {p0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -427,7 +442,7 @@ goto :goto_0 - :sswitch_3 + :sswitch_4 const-string v2, "VIP_REGIONS" invoke-virtual {p0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -440,7 +455,7 @@ goto :goto_0 - :sswitch_4 + :sswitch_5 const-string v2, "INVITE_SPLASH" invoke-virtual {p0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -453,7 +468,7 @@ goto :goto_0 - :sswitch_5 + :sswitch_6 const-string v2, "VERIFIED" invoke-virtual {p0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -466,59 +481,68 @@ :cond_1 :goto_0 - if-eqz v1, :cond_7 - - if-eq v1, v7, :cond_6 - - if-eq v1, v6, :cond_5 - - if-eq v1, v5, :cond_4 - - if-eq v1, v4, :cond_3 - - if-eq v1, v3, :cond_2 + packed-switch v1, :pswitch_data_0 return-object v0 - :cond_2 + :pswitch_0 + sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_PARTNERED:Ljava/lang/Integer; + + return-object p0 + + :pswitch_1 sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_BANNER:Ljava/lang/Integer; return-object p0 - :cond_3 + :pswitch_2 sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_MORE_EMOJI:Ljava/lang/Integer; return-object p0 - :cond_4 + :pswitch_3 sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_VERIFIED_SERVER:Ljava/lang/Integer; return-object p0 - :cond_5 + :pswitch_4 sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_VANITY_URL:Ljava/lang/Integer; return-object p0 - :cond_6 + :pswitch_5 sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_INVITE_SPLASH:Ljava/lang/Integer; return-object p0 - :cond_7 + :pswitch_6 sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_VIP_REGIONS:Ljava/lang/Integer; return-object p0 + nop + :sswitch_data_0 .sparse-switch - -0x4839f138 -> :sswitch_5 - -0x1cfad3a3 -> :sswitch_4 - -0x4c01663 -> :sswitch_3 - 0x6b879bb -> :sswitch_2 + -0x4839f138 -> :sswitch_6 + -0x1cfad3a3 -> :sswitch_5 + -0x4c01663 -> :sswitch_4 + 0x6b879bb -> :sswitch_3 + 0x3b10e747 -> :sswitch_2 0x69708abc -> :sswitch_1 0x7458732c -> :sswitch_0 .end sparse-switch + + :pswitch_data_0 + .packed-switch 0x0 + :pswitch_6 + :pswitch_5 + :pswitch_4 + :pswitch_3 + :pswitch_2 + :pswitch_1 + :pswitch_0 + .end packed-switch .end method .method private static computeShortName(Ljava/lang/String;)Ljava/lang/String; @@ -841,17 +865,37 @@ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer; - move-result-object p0 + move-result-object v1 goto :goto_f :cond_12 invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer; - move-result-object p0 + move-result-object v1 :goto_f - iput-object p0, v0, Lcom/discord/models/domain/ModelGuild;->premiumTier:Ljava/lang/Integer; + iput-object v1, v0, Lcom/discord/models/domain/ModelGuild;->premiumTier:Ljava/lang/Integer; + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer; + + move-result-object v1 + + if-eqz v1, :cond_13 + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer; + + move-result-object p0 + + goto :goto_10 + + :cond_13 + invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer; + + move-result-object p0 + + :goto_10 + iput-object p0, v0, Lcom/discord/models/domain/ModelGuild;->premiumSubscriptionCount:Ljava/lang/Integer; return-object v0 .end method @@ -1335,6 +1379,19 @@ goto/16 :goto_1 :sswitch_3 + const-string v1, "premium_subscription_count" + + invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :cond_0 + + const/16 v0, 0x18 + + goto/16 :goto_1 + + :sswitch_4 const-string v1, "members" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1347,7 +1404,7 @@ goto/16 :goto_1 - :sswitch_4 + :sswitch_5 const-string v1, "mfa_level" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1360,7 +1417,7 @@ goto/16 :goto_1 - :sswitch_5 + :sswitch_6 const-string v1, "voice_states" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1373,7 +1430,7 @@ goto/16 :goto_1 - :sswitch_6 + :sswitch_7 const-string v1, "roles" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1386,7 +1443,7 @@ goto/16 :goto_1 - :sswitch_7 + :sswitch_8 const-string v1, "name" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1399,7 +1456,7 @@ goto/16 :goto_1 - :sswitch_8 + :sswitch_9 const-string v1, "icon" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1412,7 +1469,7 @@ goto/16 :goto_1 - :sswitch_9 + :sswitch_a const-string v1, "id" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1425,7 +1482,7 @@ goto/16 :goto_1 - :sswitch_a + :sswitch_b const-string v1, "member_count" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1438,7 +1495,7 @@ goto/16 :goto_1 - :sswitch_b + :sswitch_c const-string v1, "afk_timeout" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1451,7 +1508,7 @@ goto/16 :goto_1 - :sswitch_c + :sswitch_d const-string v1, "features" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1464,7 +1521,7 @@ goto/16 :goto_1 - :sswitch_d + :sswitch_e const-string v1, "verification_level" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1477,7 +1534,7 @@ goto/16 :goto_1 - :sswitch_e + :sswitch_f const-string v1, "unavailable" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1490,7 +1547,7 @@ goto/16 :goto_1 - :sswitch_f + :sswitch_10 const-string v1, "splash" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1503,7 +1560,7 @@ goto :goto_1 - :sswitch_10 + :sswitch_11 const-string v1, "presences" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1516,7 +1573,7 @@ goto :goto_1 - :sswitch_11 + :sswitch_12 const-string v1, "region" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1529,7 +1586,7 @@ goto :goto_1 - :sswitch_12 + :sswitch_13 const-string v1, "system_channel_id" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1542,7 +1599,7 @@ goto :goto_1 - :sswitch_13 + :sswitch_14 const-string v1, "premium_tier" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1555,7 +1612,7 @@ goto :goto_1 - :sswitch_14 + :sswitch_15 const-string v1, "emojis" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1568,7 +1625,7 @@ goto :goto_1 - :sswitch_15 + :sswitch_16 const-string v1, "banner" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1581,7 +1638,7 @@ goto :goto_1 - :sswitch_16 + :sswitch_17 const-string v1, "afk_channel_id" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1594,7 +1651,7 @@ goto :goto_1 - :sswitch_17 + :sswitch_18 const-string v1, "explicit_content_filter" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z @@ -1629,16 +1686,20 @@ move-result-object p1 - iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->premiumTier:Ljava/lang/Integer; + iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->premiumSubscriptionCount:Ljava/lang/Integer; return-void :pswitch_1 - invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String; + invoke-virtual {p1, v2}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I + + move-result p1 + + invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object p1 - iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->splash:Ljava/lang/String; + iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->premiumTier:Ljava/lang/Integer; return-void @@ -1647,11 +1708,20 @@ move-result-object p1 - iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->banner:Ljava/lang/String; + iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->splash:Ljava/lang/String; return-void :pswitch_3 + invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String; + + move-result-object p1 + + iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->banner:Ljava/lang/String; + + return-void + + :pswitch_4 iget v0, p0, Lcom/discord/models/domain/ModelGuild;->memberCount:I invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I @@ -1662,7 +1732,7 @@ return-void - :pswitch_4 + :pswitch_5 new-instance v0, Ljava/util/ArrayList; new-instance v1, Lcom/discord/models/domain/-$$Lambda$ModelGuild$OuAC3hpIEfyOwZmnEstH-svPffw; @@ -1679,7 +1749,7 @@ return-void - :pswitch_5 + :pswitch_6 invoke-virtual {p1, v3, v4}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J move-result-wide v0 @@ -1692,7 +1762,7 @@ return-void - :pswitch_6 + :pswitch_7 invoke-virtual {p1, v3, v4}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J move-result-wide v0 @@ -1705,7 +1775,7 @@ return-void - :pswitch_7 + :pswitch_8 iget v0, p0, Lcom/discord/models/domain/ModelGuild;->afkTimeout:I invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I @@ -1716,7 +1786,7 @@ return-void - :pswitch_8 + :pswitch_9 iget v0, p0, Lcom/discord/models/domain/ModelGuild;->mfaLevel:I invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I @@ -1727,7 +1797,7 @@ return-void - :pswitch_9 + :pswitch_a iget-boolean v0, p0, Lcom/discord/models/domain/ModelGuild;->unavailable:Z invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextBoolean(Z)Z @@ -1738,7 +1808,7 @@ return-void - :pswitch_a + :pswitch_b new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$KW5HtJk2bBU0tHNWw0ImtIGfmgQ; invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$KW5HtJk2bBU0tHNWw0ImtIGfmgQ;->(Lcom/discord/models/domain/Model$JsonReader;)V @@ -1751,7 +1821,7 @@ return-void - :pswitch_b + :pswitch_c new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$Qsbza12RuygC8RvJQRPXHFCfrHg; invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$Qsbza12RuygC8RvJQRPXHFCfrHg;->(Lcom/discord/models/domain/Model$JsonReader;)V @@ -1766,7 +1836,7 @@ return-void - :pswitch_c + :pswitch_d new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$pAnonXadxTjVgELafELkwlqcK3Q; invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$pAnonXadxTjVgELafELkwlqcK3Q;->(Lcom/discord/models/domain/Model$JsonReader;)V @@ -1779,7 +1849,7 @@ return-void - :pswitch_d + :pswitch_e new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$jpvW6M4tOHNKpM4sRqDhgm9a-pg; invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$jpvW6M4tOHNKpM4sRqDhgm9a-pg;->(Lcom/discord/models/domain/Model$JsonReader;)V @@ -1792,7 +1862,7 @@ return-void - :pswitch_e + :pswitch_f invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextIntOrNull()Ljava/lang/Integer; move-result-object p1 @@ -1801,7 +1871,7 @@ return-void - :pswitch_f + :pswitch_10 invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextIntOrNull()Ljava/lang/Integer; move-result-object p1 @@ -1810,7 +1880,7 @@ return-void - :pswitch_10 + :pswitch_11 iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->icon:Ljava/lang/String; invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String; @@ -1821,7 +1891,7 @@ return-void - :pswitch_11 + :pswitch_12 iget-wide v0, p0, Lcom/discord/models/domain/ModelGuild;->ownerId:J invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J @@ -1832,7 +1902,7 @@ return-void - :pswitch_12 + :pswitch_13 iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->region:Ljava/lang/String; invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String; @@ -1843,7 +1913,7 @@ return-void - :pswitch_13 + :pswitch_14 iget-wide v0, p0, Lcom/discord/models/domain/ModelGuild;->id:J invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J @@ -1854,7 +1924,7 @@ return-void - :pswitch_14 + :pswitch_15 invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextIntOrNull()Ljava/lang/Integer; move-result-object p1 @@ -1863,7 +1933,7 @@ return-void - :pswitch_15 + :pswitch_16 const-string v0, "" invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String; @@ -1874,7 +1944,7 @@ return-void - :pswitch_16 + :pswitch_17 new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$i_6cUeymrhpBQ_vl7i5gRwJUrXY; invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$i_6cUeymrhpBQ_vl7i5gRwJUrXY;->(Lcom/discord/models/domain/Model$JsonReader;)V @@ -1887,7 +1957,7 @@ return-void - :pswitch_17 + :pswitch_18 new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$TuwGhFjOyv513QkkXXPpGAXuf3A; invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$TuwGhFjOyv513QkkXXPpGAXuf3A;->(Lcom/discord/models/domain/Model$JsonReader;)V @@ -1900,31 +1970,30 @@ return-void - nop - :sswitch_data_0 .sparse-switch - -0x65a25c97 -> :sswitch_17 - -0x5db95d30 -> :sswitch_16 - -0x533a80d4 -> :sswitch_15 - -0x4d727713 -> :sswitch_14 - -0x4a4d6536 -> :sswitch_13 - -0x4191ce19 -> :sswitch_12 - -0x37b7d90c -> :sswitch_11 - -0x36f3fd28 -> :sswitch_10 - -0x3565d599 -> :sswitch_f - -0x27aa27b0 -> :sswitch_e - -0x1e2c6ba0 -> :sswitch_d - -0x11531bc3 -> :sswitch_c - -0x93bd8f8 -> :sswitch_b - -0x3899cd6 -> :sswitch_a - 0xd1b -> :sswitch_9 - 0x313c79 -> :sswitch_8 - 0x337a8b -> :sswitch_7 - 0x67a8ebd -> :sswitch_6 - 0xbb68daf -> :sswitch_5 - 0x3855966d -> :sswitch_4 - 0x388ec919 -> :sswitch_3 + -0x65a25c97 -> :sswitch_18 + -0x5db95d30 -> :sswitch_17 + -0x533a80d4 -> :sswitch_16 + -0x4d727713 -> :sswitch_15 + -0x4a4d6536 -> :sswitch_14 + -0x4191ce19 -> :sswitch_13 + -0x37b7d90c -> :sswitch_12 + -0x36f3fd28 -> :sswitch_11 + -0x3565d599 -> :sswitch_10 + -0x27aa27b0 -> :sswitch_f + -0x1e2c6ba0 -> :sswitch_e + -0x11531bc3 -> :sswitch_d + -0x93bd8f8 -> :sswitch_c + -0x3899cd6 -> :sswitch_b + 0xd1b -> :sswitch_a + 0x313c79 -> :sswitch_9 + 0x337a8b -> :sswitch_8 + 0x67a8ebd -> :sswitch_7 + 0xbb68daf -> :sswitch_6 + 0x3855966d -> :sswitch_5 + 0x388ec919 -> :sswitch_4 + 0x3d7e9655 -> :sswitch_3 0x47f6cf32 -> :sswitch_2 0x556423d0 -> :sswitch_1 0x63219e27 -> :sswitch_0 @@ -1932,6 +2001,7 @@ :pswitch_data_0 .packed-switch 0x0 + :pswitch_18 :pswitch_17 :pswitch_16 :pswitch_15 @@ -2646,6 +2716,31 @@ return v2 :cond_29 + invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer; + + move-result-object v1 + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer; + + move-result-object v3 + + if-nez v1, :cond_2a + + if-eqz v3, :cond_2b + + goto :goto_e + + :cond_2a + invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z + + move-result v1 + + if-nez v1, :cond_2b + + :goto_e + return v2 + + :cond_2b invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String; move-result-object v1 @@ -2654,23 +2749,23 @@ move-result-object p1 - if-nez v1, :cond_2a + if-nez v1, :cond_2c - if-eqz p1, :cond_2b + if-eqz p1, :cond_2d - goto :goto_e + goto :goto_f - :cond_2a + :cond_2c invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z move-result p1 - if-nez p1, :cond_2b + if-nez p1, :cond_2d - :goto_e + :goto_f return v2 - :cond_2b + :cond_2d return v0 .end method @@ -3024,6 +3119,14 @@ return-wide v0 .end method +.method public getPremiumSubscriptionCount()Ljava/lang/Integer; + .locals 1 + + iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->premiumSubscriptionCount:Ljava/lang/Integer; + + return-object v0 +.end method + .method public getPremiumTier()Ljava/lang/Integer; .locals 1 @@ -3635,7 +3738,7 @@ :goto_e add-int/2addr v0, v2 - invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String; + invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer; move-result-object v2 @@ -3643,14 +3746,34 @@ if-nez v2, :cond_f + const/16 v2, 0x2b + goto :goto_f :cond_f invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I - move-result v1 + move-result v2 :goto_f + add-int/2addr v0, v2 + + invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String; + + move-result-object v2 + + mul-int/lit8 v0, v0, 0x3b + + if-nez v2, :cond_10 + + goto :goto_10 + + :cond_10 + invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I + + move-result v1 + + :goto_10 add-int/2addr v0, v1 return v0 @@ -3694,6 +3817,31 @@ return p1 .end method +.method public isPartneredServer()Z + .locals 2 + + iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->features:Ljava/util/List; + + if-eqz v0, :cond_0 + + sget-object v1, Lcom/discord/models/domain/ModelGuild;->FEATURE_PARTNERED:Ljava/lang/Integer; + + invoke-interface {v0, v1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :cond_0 + + const/4 v0, 0x1 + + return v0 + + :cond_0 + const/4 v0, 0x0 + + return v0 +.end method + .method public isUnavailable()Z .locals 1 @@ -4007,6 +4155,16 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + const-string v1, ", premiumSubscriptionCount=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer; + + move-result-object v1 + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + const-string v1, ", shortName=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage.smali b/com.discord/smali/com/discord/models/domain/ModelMessage.smali index af051ad3b1..f57d28d571 100644 --- a/com.discord/smali/com/discord/models/domain/ModelMessage.smali +++ b/com.discord/smali/com/discord/models/domain/ModelMessage.smali @@ -85,6 +85,14 @@ .field public static final TYPE_USER_JOIN:I = 0x7 +.field public static final TYPE_USER_PREMIUM_GUILD_SUBSCRIPTION:I = 0x8 + +.field public static final TYPE_USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_1:I = 0x9 + +.field public static final TYPE_USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_2:I = 0xa + +.field public static final TYPE_USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_3:I = 0xb + .field private static final sortByIds:Ljava/util/Comparator; .annotation system Ldalvik/annotation/Signature; value = { diff --git a/com.discord/smali/com/discord/restapi/R$drawable.smali b/com.discord/smali/com/discord/restapi/R$drawable.smali index 5f1c146fdf..720d67ad07 100644 --- a/com.discord/smali/com/discord/restapi/R$drawable.smali +++ b/com.discord/smali/com/discord/restapi/R$drawable.smali @@ -247,45 +247,45 @@ .field public static final googleg_standard_color_18:I = 0x7f08017a -.field public static final ic_mtrl_chip_checked_black:I = 0x7f08028f +.field public static final ic_mtrl_chip_checked_black:I = 0x7f080297 -.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080290 +.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080298 -.field public static final ic_mtrl_chip_close_circle:I = 0x7f080291 +.field public static final ic_mtrl_chip_close_circle:I = 0x7f080299 -.field public static final mtrl_snackbar_background:I = 0x7f0803b6 +.field public static final mtrl_snackbar_background:I = 0x7f0803c1 -.field public static final mtrl_tabs_default_indicator:I = 0x7f0803b7 +.field public static final mtrl_tabs_default_indicator:I = 0x7f0803c2 -.field public static final navigation_empty_icon:I = 0x7f0803b8 +.field public static final navigation_empty_icon:I = 0x7f0803c3 -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf -.field public static final tooltip_frame_dark:I = 0x7f0803c9 +.field public static final tooltip_frame_dark:I = 0x7f0803d4 -.field public static final tooltip_frame_light:I = 0x7f0803ca +.field public static final tooltip_frame_light:I = 0x7f0803d5 # direct methods diff --git a/com.discord/smali/com/discord/restapi/R$string.smali b/com.discord/smali/com/discord/restapi/R$string.smali index bd74eb7567..eef70d7f46 100644 --- a/com.discord/smali/com/discord/restapi/R$string.smali +++ b/com.discord/smali/com/discord/restapi/R$string.smali @@ -97,49 +97,49 @@ .field public static final bottom_sheet_behavior:I = 0x7f12032b -.field public static final character_counter_content_description:I = 0x7f1203a7 +.field public static final character_counter_content_description:I = 0x7f1203a6 -.field public static final character_counter_pattern:I = 0x7f1203a8 +.field public static final character_counter_pattern:I = 0x7f1203a7 -.field public static final common_google_play_services_enable_button:I = 0x7f1203e4 +.field public static final common_google_play_services_enable_button:I = 0x7f1203e3 -.field public static final common_google_play_services_enable_text:I = 0x7f1203e5 +.field public static final common_google_play_services_enable_text:I = 0x7f1203e4 -.field public static final common_google_play_services_enable_title:I = 0x7f1203e6 +.field public static final common_google_play_services_enable_title:I = 0x7f1203e5 -.field public static final common_google_play_services_install_button:I = 0x7f1203e7 +.field public static final common_google_play_services_install_button:I = 0x7f1203e6 -.field public static final common_google_play_services_install_text:I = 0x7f1203e8 +.field public static final common_google_play_services_install_text:I = 0x7f1203e7 -.field public static final common_google_play_services_install_title:I = 0x7f1203e9 +.field public static final common_google_play_services_install_title:I = 0x7f1203e8 -.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203ea +.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203e9 -.field public static final common_google_play_services_notification_ticker:I = 0x7f1203eb +.field public static final common_google_play_services_notification_ticker:I = 0x7f1203ea -.field public static final common_google_play_services_unknown_issue:I = 0x7f1203ec +.field public static final common_google_play_services_unknown_issue:I = 0x7f1203eb -.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ed +.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ec -.field public static final common_google_play_services_update_button:I = 0x7f1203ee +.field public static final common_google_play_services_update_button:I = 0x7f1203ed -.field public static final common_google_play_services_update_text:I = 0x7f1203ef +.field public static final common_google_play_services_update_text:I = 0x7f1203ee -.field public static final common_google_play_services_update_title:I = 0x7f1203f0 +.field public static final common_google_play_services_update_title:I = 0x7f1203ef -.field public static final common_google_play_services_updating_text:I = 0x7f1203f1 +.field public static final common_google_play_services_updating_text:I = 0x7f1203f0 -.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f2 +.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f1 -.field public static final common_open_on_phone:I = 0x7f1203f3 +.field public static final common_open_on_phone:I = 0x7f1203f2 -.field public static final common_signin_button_text:I = 0x7f1203f4 +.field public static final common_signin_button_text:I = 0x7f1203f3 -.field public static final common_signin_button_text_long:I = 0x7f1203f5 +.field public static final common_signin_button_text_long:I = 0x7f1203f4 -.field public static final fab_transformation_scrim_behavior:I = 0x7f120568 +.field public static final fab_transformation_scrim_behavior:I = 0x7f120567 -.field public static final fab_transformation_sheet_behavior:I = 0x7f120569 +.field public static final fab_transformation_sheet_behavior:I = 0x7f120568 .field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12089a @@ -155,9 +155,9 @@ .field public static final path_password_strike_through:I = 0x7f120c1a -.field public static final search_menu_title:I = 0x7f120e87 +.field public static final search_menu_title:I = 0x7f120e8b -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali index c39764c81f..c5f12ad1fe 100644 --- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali +++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali @@ -111,7 +111,7 @@ throw p1 :cond_1 - const v0, 0x7f120f49 + const v0, 0x7f120f4e invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -120,7 +120,7 @@ goto :goto_0 :cond_2 - const v0, 0x7f120f4a + const v0, 0x7f120f4f invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali index 8b5916dc4b..d010f42b95 100644 --- a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali +++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali @@ -1126,7 +1126,7 @@ .end method .method public final set(JJI)V - .locals 9 + .locals 11 const/4 v0, 0x0 @@ -1138,47 +1138,45 @@ invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable; + invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable; - move-result-object v0 - - sget-object v1, Lcom/discord/app/h;->ts:Lcom/discord/app/h; - - new-instance v1, Lcom/discord/stores/StoreChannelsSelected$set$1; - - move-object v2, v1 - - move-object v3, p0 - - move v4, p5 - - move-wide v5, p1 - - move-wide v7, p3 - - invoke-direct/range {v2 .. v8}, Lcom/discord/stores/StoreChannelsSelected$set$1;->(Lcom/discord/stores/StoreChannelsSelected;IJJ)V - - move-object v2, v1 - - check-cast v2, Lkotlin/jvm/functions/Function1; + move-result-object v2 invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; move-result-object v3 + new-instance v0, Lcom/discord/stores/StoreChannelsSelected$set$1; + + move-object v4, v0 + + move-object v5, p0 + + move/from16 v6, p5 + + move-wide v7, p1 + + move-wide v9, p3 + + invoke-direct/range {v4 .. v10}, Lcom/discord/stores/StoreChannelsSelected$set$1;->(Lcom/discord/stores/StoreChannelsSelected;IJJ)V + + move-object v8, v0 + + check-cast v8, Lkotlin/jvm/functions/Function1; + const/4 v4, 0x0 const/4 v5, 0x0 const/4 v6, 0x0 - const/16 v7, 0x3c + const/4 v7, 0x0 - invoke-static/range {v2 .. v7}, Lcom/discord/app/h;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;I)Lrx/Observable$Transformer; + const/16 v9, 0x1e - move-result-object p1 + const/4 v10, 0x0 - invoke-virtual {v0, p1}, Lrx/Observable;->a(Lrx/Observable$Transformer;)Lrx/Observable; + invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V return-void .end method diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index b6bad61251..f7ff49f4aa 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, 0x383 + const/16 v0, 0x384 iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali index 6be50f4d98..2dc8096838 100644 --- a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali +++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali @@ -57,7 +57,7 @@ if-eqz p2, :cond_0 - const p1, 0x7f120424 + const p1, 0x7f120423 goto :goto_0 @@ -70,7 +70,7 @@ if-eqz p2, :cond_1 - const p1, 0x7f120421 + const p1, 0x7f120420 goto :goto_0 @@ -83,7 +83,7 @@ if-eqz p2, :cond_2 - const p1, 0x7f120420 + const p1, 0x7f12041f goto :goto_0 @@ -96,7 +96,7 @@ if-eqz p2, :cond_3 - const p1, 0x7f120423 + const p1, 0x7f120422 goto :goto_0 @@ -109,7 +109,7 @@ if-eqz p2, :cond_4 - const p1, 0x7f120428 + const p1, 0x7f120427 goto :goto_0 @@ -122,7 +122,7 @@ if-eqz p2, :cond_5 - const p1, 0x7f120427 + const p1, 0x7f120426 goto :goto_0 @@ -135,7 +135,7 @@ if-eqz p2, :cond_6 - const p1, 0x7f120422 + const p1, 0x7f120421 goto :goto_0 @@ -148,7 +148,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f120426 + const p1, 0x7f120425 :goto_0 iput p1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->stateString:I diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali index 89a0210c68..3883de2cdb 100644 --- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali +++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali @@ -71,7 +71,7 @@ iget-object p1, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context; - const v0, 0x7f121136 + const v0, 0x7f12113c invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$1.smali new file mode 100644 index 0000000000..975355e3a7 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$1.smali @@ -0,0 +1,99 @@ +.class final Lcom/discord/stores/StoreMessageAck$init$1$1; +.super Ljava/lang/Object; +.source "StoreMessageAck.kt" + +# interfaces +.implements Lrx/functions/b; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreMessageAck$init$1;->call(Ljava/lang/Long;)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/b<", + "Lcom/discord/stores/StoreChat$InteractionState;", + "Ljava/lang/Boolean;", + ">;" + } +.end annotation + + +# instance fields +.field final synthetic $selectedChannelId:Ljava/lang/Long; + + +# direct methods +.method constructor (Ljava/lang/Long;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/stores/StoreMessageAck$init$1$1;->$selectedChannelId:Ljava/lang/Long; + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lcom/discord/stores/StoreChat$InteractionState; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$init$1$1;->call(Lcom/discord/stores/StoreChat$InteractionState;)Z + + move-result p1 + + invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Lcom/discord/stores/StoreChat$InteractionState;)Z + .locals 4 + + invoke-virtual {p1}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J + + move-result-wide v0 + + iget-object p1, p0, Lcom/discord/stores/StoreMessageAck$init$1$1;->$selectedChannelId:Ljava/lang/Long; + + if-nez p1, :cond_0 + + goto :goto_0 + + :cond_0 + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J + + move-result-wide v2 + + cmp-long p1, v0, v2 + + if-nez p1, :cond_1 + + const/4 p1, 0x1 + + return p1 + + :cond_1 + :goto_0 + const/4 p1, 0x0 + + return p1 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$2.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$2.smali new file mode 100644 index 0000000000..1a81afba5e --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$2.smali @@ -0,0 +1,123 @@ +.class final Lcom/discord/stores/StoreMessageAck$init$1$2; +.super Ljava/lang/Object; +.source "StoreMessageAck.kt" + +# interfaces +.implements Lrx/functions/Func2; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreMessageAck$init$1;->call(Ljava/lang/Long;)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/Func2<", + "TT1;TT2;TR;>;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1$2; + + +# direct methods +.method static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/stores/StoreMessageAck$init$1$2; + + invoke-direct {v0}, Lcom/discord/stores/StoreMessageAck$init$1$2;->()V + + sput-object v0, Lcom/discord/stores/StoreMessageAck$init$1$2;->INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1$2; + + return-void +.end method + +.method constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final call(Ljava/util/Set;Lcom/discord/stores/StoreChat$InteractionState;)J + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Set<", + "Ljava/lang/Long;", + ">;", + "Lcom/discord/stores/StoreChat$InteractionState;", + ")J" + } + .end annotation + + invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->isAtBottomIgnoringTouch()Z + + move-result v0 + + if-eqz v0, :cond_0 + + invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J + + move-result-wide v0 + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + invoke-interface {p1, v0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z + + move-result p1 + + if-nez p1, :cond_0 + + invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J + + move-result-wide p1 + + return-wide p1 + + :cond_0 + const-wide/16 p1, 0x0 + + return-wide p1 +.end method + +.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/util/Set; + + check-cast p2, Lcom/discord/stores/StoreChat$InteractionState; + + invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreMessageAck$init$1$2;->call(Ljava/util/Set;Lcom/discord/stores/StoreChat$InteractionState;)J + + move-result-wide p1 + + invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object p1 + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali index 087da4cda2..371a8182ab 100644 --- a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali +++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali @@ -3,7 +3,7 @@ .source "StoreMessageAck.kt" # interfaces -.implements Lrx/functions/Func2; +.implements Lrx/functions/b; # annotations @@ -18,40 +18,30 @@ .annotation system Ldalvik/annotation/Signature; value = { - "", "Ljava/lang/Object;", - "Lrx/functions/Func2<", - "TT1;TT2;TR;>;" + "Lrx/functions/b<", + "TT;", + "Lrx/Observable<", + "+TR;>;>;" } .end annotation -# static fields -.field public static final INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1; +# instance fields +.field final synthetic this$0:Lcom/discord/stores/StoreMessageAck; # direct methods -.method static constructor ()V - .locals 1 - - new-instance v0, Lcom/discord/stores/StoreMessageAck$init$1; - - invoke-direct {v0}, Lcom/discord/stores/StoreMessageAck$init$1;->()V - - sput-object v0, Lcom/discord/stores/StoreMessageAck$init$1;->INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1; - - return-void -.end method - -.method constructor ()V +.method constructor (Lcom/discord/stores/StoreMessageAck;)V .locals 0 + iput-object p1, p0, Lcom/discord/stores/StoreMessageAck$init$1;->this$0:Lcom/discord/stores/StoreMessageAck; + invoke-direct {p0}, Ljava/lang/Object;->()V return-void @@ -59,82 +49,78 @@ # virtual methods -.method public final call(Ljava/util/Map;Lcom/discord/stores/StoreChat$InteractionState;)J - .locals 4 - .annotation system Ldalvik/annotation/Signature; - value = { - "(", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Long;", - ">;", - "Lcom/discord/stores/StoreChat$InteractionState;", - ")J" - } - .end annotation - - invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->isAtBottomIgnoringTouch()Z - - move-result v0 - - if-eqz v0, :cond_1 - - invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J - - move-result-wide v0 - - invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - - move-result-object v0 - - invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object p1 +.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 check-cast p1, Ljava/lang/Long; - invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->getLastMessageId()J - - move-result-wide v0 - - if-nez p1, :cond_0 - - goto :goto_0 - - :cond_0 - invoke-virtual {p1}, Ljava/lang/Long;->longValue()J - - move-result-wide v2 - - cmp-long p1, v2, v0 - - if-nez p1, :cond_1 - - invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J - - move-result-wide p1 - - return-wide p1 - - :cond_1 - :goto_0 - const-wide/16 p1, 0x0 - - return-wide p1 -.end method - -.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Ljava/util/Map; - - check-cast p2, Lcom/discord/stores/StoreChat$InteractionState; - - invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreMessageAck$init$1;->call(Ljava/util/Map;Lcom/discord/stores/StoreChat$InteractionState;)J - - move-result-wide p1 - - invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$init$1;->call(Ljava/lang/Long;)Lrx/Observable; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Ljava/lang/Long;)Lrx/Observable; + .locals 4 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/lang/Long;", + ")", + "Lrx/Observable<", + "Ljava/lang/Long;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/stores/StoreMessageAck$init$1;->this$0:Lcom/discord/stores/StoreMessageAck; + + invoke-static {v0}, Lcom/discord/stores/StoreMessageAck;->access$getStream$p(Lcom/discord/stores/StoreMessageAck;)Lcom/discord/stores/StoreStream; + + move-result-object v0 + + iget-object v0, v0, Lcom/discord/stores/StoreStream;->messages:Lcom/discord/stores/StoreMessages; + + invoke-virtual {v0}, Lcom/discord/stores/StoreMessages;->getAllDetached()Lrx/Observable; + + move-result-object v0 + + iget-object v1, p0, Lcom/discord/stores/StoreMessageAck$init$1;->this$0:Lcom/discord/stores/StoreMessageAck; + + invoke-static {v1}, Lcom/discord/stores/StoreMessageAck;->access$getStream$p(Lcom/discord/stores/StoreMessageAck;)Lcom/discord/stores/StoreStream; + + move-result-object v1 + + iget-object v1, v1, Lcom/discord/stores/StoreStream;->chat:Lcom/discord/stores/StoreChat; + + invoke-virtual {v1}, Lcom/discord/stores/StoreChat;->getInteractionState()Lrx/Observable; + + move-result-object v1 + + new-instance v2, Lcom/discord/stores/StoreMessageAck$init$1$1; + + invoke-direct {v2, p1}, Lcom/discord/stores/StoreMessageAck$init$1$1;->(Ljava/lang/Long;)V + + check-cast v2, Lrx/functions/b; + + invoke-virtual {v1, v2}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable; + + move-result-object p1 + + sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; + + const-wide/16 v2, 0x1f4 + + invoke-virtual {p1, v2, v3, v1}, Lrx/Observable;->i(JLjava/util/concurrent/TimeUnit;)Lrx/Observable; + + move-result-object p1 + + sget-object v1, Lcom/discord/stores/StoreMessageAck$init$1$2;->INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1$2; + + check-cast v1, Lrx/functions/Func2; + + invoke-static {v0, p1, v1}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable; move-result-object p1 diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck.smali b/com.discord/smali/com/discord/stores/StoreMessageAck.smali index eef2c939d6..1c335a2a1d 100644 --- a/com.discord/smali/com/discord/stores/StoreMessageAck.smali +++ b/com.discord/smali/com/discord/stores/StoreMessageAck.smali @@ -903,7 +903,7 @@ .end method .method protected final init(Landroid/content/Context;)V - .locals 6 + .locals 3 const-string v0, "context" @@ -911,45 +911,29 @@ invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V - iget-object p1, p0, Lcom/discord/stores/StoreMessageAck;->stream:Lcom/discord/stores/StoreStream; - - iget-object p1, p1, Lcom/discord/stores/StoreStream;->messagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent; - - invoke-virtual {p1}, Lcom/discord/stores/StoreMessagesMostRecent;->get()Lrx/Observable; - - move-result-object v0 - - iget-object p1, p0, Lcom/discord/stores/StoreMessageAck;->stream:Lcom/discord/stores/StoreStream; - - iget-object p1, p1, Lcom/discord/stores/StoreStream;->chat:Lcom/discord/stores/StoreChat; - - invoke-virtual {p1}, Lcom/discord/stores/StoreChat;->getInteractionState()Lrx/Observable; + invoke-static {}, Lcom/discord/stores/StoreStream;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected; move-result-object p1 - sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; - - const-wide/16 v2, 0xc8 - - invoke-virtual {p1, v2, v3, v1}, Lrx/Observable;->i(JLjava/util/concurrent/TimeUnit;)Lrx/Observable; - - move-result-object v1 - - sget-object p1, Lcom/discord/stores/StoreMessageAck$init$1;->INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1; - - move-object v2, p1 - - check-cast v2, Lrx/functions/Func2; - - sget-object v5, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; - - const-wide/16 v3, 0xfa - - invoke-static/range {v0 .. v5}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;JLjava/util/concurrent/TimeUnit;)Lrx/Observable; + invoke-virtual {p1}, Lcom/discord/stores/StoreChannelsSelected;->getId()Lrx/Observable; move-result-object p1 - const-string v0, "ObservableWithLeadingEdg\u20260, TimeUnit.MILLISECONDS)" + invoke-virtual {p1}, Lrx/Observable;->Fp()Lrx/Observable; + + move-result-object p1 + + new-instance v0, Lcom/discord/stores/StoreMessageAck$init$1; + + invoke-direct {v0, p0}, Lcom/discord/stores/StoreMessageAck$init$1;->(Lcom/discord/stores/StoreMessageAck;)V + + check-cast v0, Lrx/functions/b; + + invoke-virtual {p1, v0}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable; + + move-result-object p1 + + const-string v0, "StoreStream\n .get\u2026 0L\n }\n }" invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6$1.smali deleted file mode 100644 index cc8ac35a74..0000000000 --- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6$1.smali +++ /dev/null @@ -1,91 +0,0 @@ -.class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1; -.super Ljava/lang/Object; -.source "StoreMessagesLoader.kt" - -# interfaces -.implements Lrx/functions/b; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6;->call(Ljava/lang/Boolean;)Lrx/Observable; -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x18 - name = null -.end annotation - -.annotation system Ldalvik/annotation/Signature; - value = { - "", - "Ljava/lang/Object;", - "Lrx/functions/b<", - "Lcom/discord/models/domain/ModelChannel;", - "Ljava/lang/Boolean;", - ">;" - } -.end annotation - - -# static fields -.field public static final INSTANCE:Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1; - - -# direct methods -.method static constructor ()V - .locals 1 - - new-instance v0, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1; - - invoke-direct {v0}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;->()V - - sput-object v0, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;->INSTANCE:Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1; - - return-void -.end method - -.method constructor ()V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - - -# virtual methods -.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Lcom/discord/models/domain/ModelChannel; - - invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;->call(Lcom/discord/models/domain/ModelChannel;)Z - - move-result p1 - - invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; - - move-result-object p1 - - return-object p1 -.end method - -.method public final call(Lcom/discord/models/domain/ModelChannel;)Z - .locals 0 - - if-eqz p1, :cond_0 - - const/4 p1, 0x1 - - return p1 - - :cond_0 - const/4 p1, 0x0 - - return p1 -.end method diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali index af0000cfad..00a753745a 100644 --- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali +++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali @@ -110,15 +110,23 @@ move-result-object v0 - sget-object v1, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;->INSTANCE:Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1; + sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1; check-cast v1, Lrx/functions/b; invoke-virtual {v0, v1}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable; + move-result-object v0 + + sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2; + + check-cast v1, Lrx/functions/b; + + invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable; + move-result-object v2 - const-string v0, "stream\n .ch\u2026 .filter { it != null }" + const-string v0, "filter { it != null }.map { it!! }" invoke-static {v2, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali index 6c37dc88e1..a4b1fb3765 100644 --- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali +++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali @@ -1,5 +1,5 @@ -.class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$8; -.super Lkotlin/jvm/internal/k; +.class final synthetic Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$8; +.super Lkotlin/jvm/internal/i; .source "StoreMessagesLoader.kt" # interfaces @@ -12,13 +12,13 @@ .end annotation .annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x18 + accessFlags = 0x1018 name = null .end annotation .annotation system Ldalvik/annotation/Signature; value = { - "Lkotlin/jvm/internal/k;", + "Lkotlin/jvm/internal/i;", "Lkotlin/jvm/functions/Function1<", "Lcom/discord/models/domain/ModelChannel;", "Lkotlin/Unit;", @@ -39,13 +39,37 @@ const/4 p1, 0x1 - invoke-direct {p0, p1}, Lkotlin/jvm/internal/k;->(I)V + invoke-direct {p0, p1}, Lkotlin/jvm/internal/i;->(I)V return-void .end method # virtual methods +.method public final getName()Ljava/lang/String; + .locals 1 + + const-string v0, "handleTargetChannelResolved" + + return-object v0 +.end method + +.method public final getOwner()Lkotlin/reflect/KDeclarationContainer; + .locals 1 + + const/4 v0, 0x0 + + return-object v0 +.end method + +.method public final getSignature()Ljava/lang/String; + .locals 1 + + const-string v0, "invoke(Lcom/discord/models/domain/ModelChannel;)V" + + return-object v0 +.end method + .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 @@ -61,13 +85,12 @@ .method public final invoke(Lcom/discord/models/domain/ModelChannel;)V .locals 1 + const-string v0, "p1" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + iget-object v0, p0, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$8;->$handleTargetChannelResolved$2:Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2; - if-nez p1, :cond_0 - - invoke-static {}, Lkotlin/jvm/internal/j;->zI()V - - :cond_0 invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2;->invoke(Lcom/discord/models/domain/ModelChannel;)V return-void diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali index f80222d019..69b7d9cc5a 100644 --- a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali +++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali @@ -1099,9 +1099,9 @@ .end method .method private final declared-synchronized tryLoadMessages(JZZZLjava/lang/Long;Ljava/lang/Long;)V - .locals 15 + .locals 19 - move-object v9, p0 + move-object/from16 v9, p0 move-wide/from16 v0, p1 @@ -1168,49 +1168,39 @@ invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable; - move-result-object v0 + move-result-object v10 - sget-object v1, Lcom/discord/app/h;->ts:Lcom/discord/app/h; + invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - new-instance v1, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$1; + move-result-object v11 - invoke-direct {v1, p0}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$1;->(Lcom/discord/stores/StoreMessagesLoader;)V + const/4 v12, 0x0 - check-cast v1, Lkotlin/jvm/functions/Function1; + new-instance v0, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$1; - invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; + invoke-direct {v0, v9}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$1;->(Lcom/discord/stores/StoreMessagesLoader;)V - move-result-object v2 + move-object/from16 v16, v0 - const/4 v3, 0x0 + check-cast v16, Lkotlin/jvm/functions/Function1; - new-instance v4, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2; + new-instance v0, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2; - invoke-direct {v4, p0}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2;->(Lcom/discord/stores/StoreMessagesLoader;)V + invoke-direct {v0, v9}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2;->(Lcom/discord/stores/StoreMessagesLoader;)V - check-cast v4, Lkotlin/jvm/functions/Function1; + move-object v13, v0 - const/4 v5, 0x0 + check-cast v13, Lkotlin/jvm/functions/Function1; - const/16 v6, 0x30 + const/4 v14, 0x0 - move-object/from16 p1, v1 + const/4 v15, 0x0 - move-object/from16 p2, v2 + const/16 v17, 0x1a - move-object/from16 p3, v3 + const/16 v18, 0x0 - move-object/from16 p4, v4 - - move-object/from16 p5, v5 - - move/from16 p6, v6 - - invoke-static/range {p1 .. p6}, Lcom/discord/app/h;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;I)Lrx/Observable$Transformer; - - move-result-object v1 - - invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$Transformer;)Lrx/Observable; + invoke-static/range {v10 .. v18}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V :try_end_1 .catchall {:try_start_1 .. :try_end_1} :catchall_0 @@ -1283,11 +1273,11 @@ :cond_8 new-instance v2, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3; - invoke-direct {v2, p0}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;->(Lcom/discord/stores/StoreMessagesLoader;)V + invoke-direct {v2, v9}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;->(Lcom/discord/stores/StoreMessagesLoader;)V new-instance v12, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$4; - invoke-direct {v12, p0, v2}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$4;->(Lcom/discord/stores/StoreMessagesLoader;Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;)V + invoke-direct {v12, v9, v2}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$4;->(Lcom/discord/stores/StoreMessagesLoader;Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;)V if-eqz p7, :cond_9 @@ -1390,7 +1380,7 @@ check-cast v1, Lkotlin/jvm/functions/Function1; - invoke-direct {p0, v10, v11, v1}, Lcom/discord/stores/StoreMessagesLoader;->channelLoadedStateUpdate(JLkotlin/jvm/functions/Function1;)V + invoke-direct {v9, v10, v11, v1}, Lcom/discord/stores/StoreMessagesLoader;->channelLoadedStateUpdate(JLkotlin/jvm/functions/Function1;)V iget-object v1, v9, Lcom/discord/stores/StoreMessagesLoader;->stream:Lcom/discord/stores/StoreStream; @@ -1434,7 +1424,7 @@ move v3, v4 - move-object v4, p0 + move-object/from16 v4, p0 move-object v5, v0 @@ -1678,15 +1668,15 @@ move-result-object p1 - invoke-static {}, Lcom/discord/app/h;->dx()Lrx/Observable$Transformer; - - move-result-object p2 - - invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$Transformer;)Lrx/Observable; + invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable; move-result-object p1 - const-string p2, "channelLoadedStateSubjec\u2026onDistinctUntilChanged())" + invoke-virtual {p1}, Lrx/Observable;->Fp()Lrx/Observable; + + move-result-object p1 + + const-string p2, "channelLoadedStateSubjec\u2026 .distinctUntilChanged()" invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V @@ -1718,7 +1708,7 @@ invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable; + invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable; move-result-object v0 @@ -1821,6 +1811,8 @@ .method public final declared-synchronized handleChannelSelected(J)V .locals 13 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation monitor-enter p0 @@ -2097,7 +2089,7 @@ move-result-object p3 - invoke-static {p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable; + invoke-static {p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable; move-result-object v2 @@ -2157,7 +2149,7 @@ invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable; + invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable; move-result-object v2 diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali index e686c9df4f..15d51556b5 100644 --- a/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali +++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali @@ -83,11 +83,11 @@ sget-object v0, Lcom/discord/widgets/notice/WidgetNoticePopup;->Companion:Lcom/discord/widgets/notice/WidgetNoticePopup$Companion; - const v2, 0x7f1203b3 + const v2, 0x7f1203b2 const v3, 0x7f120b6e - const v4, 0x7f08029e + const v4, 0x7f0802a6 const/16 v5, 0x1e diff --git a/com.discord/smali/com/discord/stores/StoreNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation.smali index 874d47d4e5..9f3235eada 100644 --- a/com.discord/smali/com/discord/stores/StoreNavigation.smali +++ b/com.discord/smali/com/discord/stores/StoreNavigation.smali @@ -167,11 +167,11 @@ const-string v1, "CONNECTION_ISSUES" - const v2, 0x7f12041b + const v2, 0x7f12041a - const v3, 0x7f12041f + const v3, 0x7f12041e - const v4, 0x7f080316 + const v4, 0x7f080320 const/16 v5, 0x1e diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali index a8f400874e..94bc1604f6 100644 --- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali @@ -735,7 +735,7 @@ invoke-direct {v4, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(I)V - const v5, 0x7f120ec1 + const v5, 0x7f120ec5 move-object v0, p0 @@ -765,7 +765,7 @@ invoke-direct {v4, p3, p4, p5}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V - const v5, 0x7f120ec1 + const v5, 0x7f120ec5 move-object v0, p0 diff --git a/com.discord/smali/com/discord/stores/StoreUserSettings.smali b/com.discord/smali/com/discord/stores/StoreUserSettings.smali index 6729a02081..5caf98f5fa 100644 --- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali +++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali @@ -1372,7 +1372,7 @@ move-result-object v0 - const v1, 0x7f120fe3 + const v1, 0x7f120fe9 invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1804,7 +1804,7 @@ move-result-object p2 - const v0, 0x7f120fe3 + const v0, 0x7f120fe9 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1835,7 +1835,7 @@ move-result-object p2 - const v0, 0x7f120fe2 + const v0, 0x7f120fe8 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index bcdd87dec5..d3d86649e1 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali @@ -179,7 +179,7 @@ const-string v1, "browser_user_agent" - const-string v2, "Discord-Android/899" + const-string v2, "Discord-Android/900" invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; @@ -189,7 +189,7 @@ aput-object v1, v0, v2 - const/16 v1, 0x383 + const/16 v1, 0x384 invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -207,7 +207,7 @@ const-string v1, "client_version" - const-string v2, "8.9.9" + const-string v2, "9.0.0" invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali index 47d782f6af..6be1364885 100644 --- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali +++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali @@ -3457,7 +3457,7 @@ return p1 :sswitch_5 - const p1, 0x7f121090 + const p1, 0x7f121096 return p1 @@ -3467,7 +3467,7 @@ return p1 :sswitch_7 - const p1, 0x7f12049a + const p1, 0x7f120499 return p1 @@ -3477,17 +3477,17 @@ return p1 :sswitch_9 - const p1, 0x7f120f22 + const p1, 0x7f120f26 return p1 :sswitch_a - const p1, 0x7f120400 + const p1, 0x7f1203ff return p1 :sswitch_b - const p1, 0x7f12108d + const p1, 0x7f121093 return p1 @@ -3497,7 +3497,7 @@ return p1 :sswitch_d - const p1, 0x7f120d9e + const p1, 0x7f120da2 return p1 @@ -3507,7 +3507,7 @@ return p1 :sswitch_f - const p1, 0x7f12052f + const p1, 0x7f12052e return p1 @@ -3517,27 +3517,27 @@ return p1 :sswitch_11 - const p1, 0x7f120eb0 + const p1, 0x7f120eb4 return p1 :sswitch_12 - const p1, 0x7f120eae + const p1, 0x7f120eb2 return p1 :sswitch_13 - const p1, 0x7f120d9f + const p1, 0x7f120da3 return p1 :sswitch_14 - const p1, 0x7f120d60 + const p1, 0x7f120d64 return p1 :sswitch_15 - const p1, 0x7f121170 + const p1, 0x7f121176 return p1 @@ -3585,7 +3585,7 @@ return p1 :cond_2 - const p1, 0x7f120452 + const p1, 0x7f120451 return p1 diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali index a7ec75dd0f..5b881ce164 100644 --- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali +++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali @@ -308,7 +308,7 @@ :cond_1 if-eqz v0, :cond_2 - const p2, 0x7f12078f + const p2, 0x7f12078e invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -342,7 +342,7 @@ if-eqz v0, :cond_6 - const p2, 0x7f1204d0 + const p2, 0x7f1204cf invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali index dc6ab4e019..daac12da89 100644 --- a/com.discord/smali/com/discord/utilities/error/Error.smali +++ b/com.discord/smali/com/discord/utilities/error/Error.smali @@ -728,7 +728,7 @@ return-object p1 :pswitch_4 - const v0, 0x7f120fe8 + const v0, 0x7f120fee invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -797,7 +797,7 @@ return-object p1 :pswitch_9 - const v0, 0x7f120d91 + const v0, 0x7f120d95 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali index 756b925b41..a573434ff5 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali @@ -1538,7 +1538,7 @@ if-eqz v0, :cond_c - const v0, 0x7f120656 + const v0, 0x7f120655 new-array v1, v4, [Ljava/lang/Object; @@ -1567,7 +1567,7 @@ if-eqz v0, :cond_c - const v0, 0x7f1206d1 + const v0, 0x7f1206d0 new-array v1, v6, [Ljava/lang/Object; @@ -1915,7 +1915,7 @@ invoke-direct {p2, v0}, Landroidx/core/app/RemoteInput$Builder;->(Ljava/lang/String;)V - const v0, 0x7f120eac + const v0, 0x7f120eb0 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1963,7 +1963,7 @@ new-instance v2, Landroidx/core/app/NotificationCompat$Action$Builder; - const v3, 0x7f0802e6 + const v3, 0x7f0802f0 const v4, 0x7f120b81 @@ -2777,7 +2777,7 @@ goto :goto_0 :cond_0 - const v0, 0x7f1204e8 + const v0, 0x7f1204e7 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -3041,7 +3041,7 @@ if-eqz v0, :cond_0 - const v0, 0x7f08029d + const v0, 0x7f0802a5 return v0 @@ -3054,7 +3054,7 @@ if-eqz v0, :cond_0 - const v0, 0x7f0802a0 + const v0, 0x7f0802a8 return v0 @@ -3079,13 +3079,13 @@ if-eqz v0, :cond_0 :goto_0 - const v0, 0x7f08029f + const v0, 0x7f0802a7 return v0 :cond_0 :goto_1 - const v0, 0x7f08029c + const v0, 0x7f0802a4 return v0 @@ -3284,7 +3284,7 @@ if-eqz v0, :cond_5 - const v0, 0x7f1206d2 + const v0, 0x7f1206d1 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali index 3272bd3853..e10c366400 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali @@ -879,7 +879,7 @@ move-result-object p3 - const v3, 0x7f0802a0 + const v3, 0x7f0802a8 invoke-virtual {p3, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder; @@ -966,7 +966,7 @@ new-instance v2, Landroid/app/NotificationChannel; - const v4, 0x7f121176 + const v4, 0x7f12117c invoke-virtual {p1, v4}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -998,7 +998,7 @@ new-instance v6, Landroid/app/NotificationChannel; - const v8, 0x7f1204d1 + const v8, 0x7f1204d0 invoke-virtual {p1, v8}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -1012,7 +1012,7 @@ new-instance v8, Landroid/app/NotificationChannel; - const v9, 0x7f120658 + const v9, 0x7f120657 invoke-virtual {p1, v9}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -1026,7 +1026,7 @@ new-instance v9, Landroid/app/NotificationChannel; - const v10, 0x7f120691 + const v10, 0x7f120690 invoke-virtual {p1, v10}, Landroid/app/Application;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali index 97793f4241..57460bd823 100644 --- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali +++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali @@ -106,13 +106,13 @@ move-result-object v2 - const v3, 0x7f08029c + const v3, 0x7f0802a4 invoke-virtual {v2, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder; move-result-object v2 - const v3, 0x7f1204e8 + const v3, 0x7f1204e7 invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -126,7 +126,7 @@ if-nez p2, :cond_0 - const p2, 0x7f120691 + const p2, 0x7f120690 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -135,7 +135,7 @@ goto :goto_0 :cond_0 - const v3, 0x7f12068c + const v3, 0x7f12068b const/4 v4, 0x1 diff --git a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali index 6770d7ff21..33fb313221 100644 --- a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali +++ b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali @@ -2607,7 +2607,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f080341 + const p1, 0x7f08034c return p1 @@ -2620,7 +2620,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f08034e + const p1, 0x7f080359 return p1 @@ -2633,7 +2633,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f080351 + const p1, 0x7f08035c return p1 @@ -2668,7 +2668,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f08034a + const p1, 0x7f080355 return p1 @@ -2681,7 +2681,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f08033d + const p1, 0x7f080348 return p1 @@ -2694,7 +2694,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f080356 + const p1, 0x7f080361 return p1 @@ -2707,7 +2707,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f080349 + const p1, 0x7f080354 return p1 @@ -2720,7 +2720,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f080354 + const p1, 0x7f08035f return p1 @@ -2755,7 +2755,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f080357 + const p1, 0x7f080362 return p1 @@ -2769,7 +2769,7 @@ if-eqz p1, :cond_1 :goto_0 - const p1, 0x7f080344 + const p1, 0x7f08034f return p1 @@ -2783,13 +2783,13 @@ if-eqz p1, :cond_1 :goto_1 - const p1, 0x7f080346 + const p1, 0x7f080351 return p1 :cond_1 :goto_2 - const p1, 0x7f08035c + const p1, 0x7f080367 return p1 diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali index 61a65c7785..59156ae375 100644 --- a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali +++ b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali @@ -41,7 +41,7 @@ if-eqz v0, :cond_0 - const v1, 0x7f121049 + const v1, 0x7f12104f const/4 v2, 0x1 diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali index eda54b5ebd..0f03e302ed 100644 --- a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali +++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali @@ -346,7 +346,7 @@ if-eqz p3, :cond_0 - const p2, 0x7f120efa + const p2, 0x7f120efe invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali index a7db64b2e4..8ff3f6abd7 100644 --- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali +++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali @@ -137,7 +137,7 @@ aput-object v1, v0, v2 - const v1, 0x7f1204e6 + const v1, 0x7f1204e5 invoke-virtual {p1, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -157,7 +157,7 @@ invoke-static {v3, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f1204e5 + const v0, 0x7f1204e4 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -185,7 +185,7 @@ move-result-object v7 - const p2, 0x7f1204e3 + const p2, 0x7f1204e2 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -222,7 +222,7 @@ new-instance p2, Lcom/discord/utilities/notices/NoticeBuilders$DialogData; - const v0, 0x7f120d94 + const v0, 0x7f120d98 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -232,7 +232,7 @@ invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120d93 + const v0, 0x7f120d97 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/platform/Platform.smali b/com.discord/smali/com/discord/utilities/platform/Platform.smali index 38826ce835..8c3e94dfe9 100644 --- a/com.discord/smali/com/discord/utilities/platform/Platform.smali +++ b/com.discord/smali/com/discord/utilities/platform/Platform.smali @@ -95,7 +95,7 @@ const v6, 0x7f08018c - const v7, 0x7f080339 + const v7, 0x7f080344 const/4 v8, 0x0 @@ -225,7 +225,7 @@ const v8, 0x7f080182 - const v9, 0x7f080279 + const v9, 0x7f080281 move-object v3, v1 @@ -295,7 +295,7 @@ const v8, 0x7f080186 - const v9, 0x7f0802d5 + const v9, 0x7f0802df const/4 v12, 0x1 @@ -323,7 +323,7 @@ const v8, 0x7f080187 - const v9, 0x7f0802f0 + const v9, 0x7f0802fa const/4 v10, 0x1 @@ -353,7 +353,7 @@ const v8, 0x7f080188 - const v9, 0x7f0802f4 + const v9, 0x7f0802fe const/4 v10, 0x0 @@ -385,7 +385,7 @@ const v8, 0x7f080189 - const v9, 0x7f0802fb + const v9, 0x7f080305 const/4 v11, 0x0 @@ -413,7 +413,7 @@ const v8, 0x7f08018a - const v9, 0x7f080313 + const v9, 0x7f08031d move-object v3, v1 @@ -437,7 +437,7 @@ const v8, 0x7f08018b - const v9, 0x7f080315 + const v9, 0x7f08031f move-object v3, v1 @@ -489,7 +489,7 @@ const v8, 0x7f08018e - const v9, 0x7f08033a + const v9, 0x7f080345 const/4 v12, 0x1 diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali index 3e44e28680..01daf9f8a2 100644 --- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali +++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali @@ -101,7 +101,7 @@ return-object p1 :cond_0 - const p2, 0x7f12118e + const p2, 0x7f121194 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -119,7 +119,7 @@ return-object p1 :cond_2 - const p2, 0x7f120f73 + const p2, 0x7f120f79 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali index af4f9217ee..48dc312424 100644 --- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali +++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali @@ -43,7 +43,7 @@ move-result v0 - const v1, 0x7f1210aa + const v1, 0x7f1210b0 if-eqz v0, :cond_3 @@ -68,7 +68,7 @@ goto :goto_0 :cond_0 - const v0, 0x7f1210ad + const v0, 0x7f1210b3 new-array v1, v3, [Ljava/lang/Object; @@ -85,7 +85,7 @@ goto :goto_0 :cond_1 - const v0, 0x7f1210a8 + const v0, 0x7f1210ae new-array v1, v3, [Ljava/lang/Object; @@ -102,7 +102,7 @@ goto :goto_0 :cond_2 - const v0, 0x7f1210a9 + const v0, 0x7f1210af new-array v1, v3, [Ljava/lang/Object; @@ -158,7 +158,7 @@ if-ne v0, v1, :cond_0 - const p1, 0x7f0802f9 + const p1, 0x7f080303 return p1 @@ -192,7 +192,7 @@ if-ne v0, v1, :cond_3 - const p1, 0x7f0802f8 + const p1, 0x7f080302 return p1 @@ -211,7 +211,7 @@ if-ne v0, v1, :cond_5 - const p1, 0x7f0802f6 + const p1, 0x7f080300 return p1 @@ -230,7 +230,7 @@ if-ne v0, v1, :cond_7 - const p1, 0x7f0802f5 + const p1, 0x7f0802ff return p1 @@ -244,7 +244,7 @@ invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I :goto_4 - const p1, 0x7f0802f7 + const p1, 0x7f080301 return p1 .end method @@ -281,7 +281,7 @@ if-ne v0, v1, :cond_2 - const p1, 0x7f120f4a + const p1, 0x7f120f4f return p1 @@ -300,7 +300,7 @@ if-ne v0, v1, :cond_4 - const p1, 0x7f120f46 + const p1, 0x7f120f4b return p1 @@ -319,13 +319,13 @@ if-ne p1, v0, :cond_6 - const p1, 0x7f120f44 + const p1, 0x7f120f49 return p1 :cond_6 :goto_3 - const p1, 0x7f120f49 + const p1, 0x7f120f4e return p1 .end method 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 c70eb5d97a..1e5dd5f001 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali @@ -167,7 +167,7 @@ .method public final getUserAgent()Ljava/lang/String; .locals 1 - const-string v0, "Discord-Android/899" + const-string v0, "Discord-Android/900" return-object v0 .end method diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali index 6cf57cd319..872dc88c7b 100644 --- a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali +++ b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali @@ -627,17 +627,17 @@ goto :goto_0 :cond_0 - const p2, 0x7f120572 - - goto :goto_0 - - :cond_1 const p2, 0x7f120571 goto :goto_0 + :cond_1 + const p2, 0x7f120570 + + goto :goto_0 + :cond_2 - const p2, 0x7f120573 + const p2, 0x7f120572 :goto_0 const v0, 0x7f0d00d0 diff --git a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali index b63b3e9ec7..5386d6a554 100644 --- a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali +++ b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali @@ -38,7 +38,7 @@ invoke-direct {p0}, Ljava/lang/Object;->()V - const v0, 0x7f120e6e + const v0, 0x7f120e72 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -50,7 +50,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fromFilterString:Ljava/lang/String; - const v0, 0x7f120e70 + const v0, 0x7f120e74 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -62,7 +62,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->inFilterString:Ljava/lang/String; - const v0, 0x7f120e72 + const v0, 0x7f120e76 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -74,7 +74,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->mentionsFilterString:Ljava/lang/String; - const v0, 0x7f120e6f + const v0, 0x7f120e73 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -86,7 +86,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->hasFilterString:Ljava/lang/String; - const v0, 0x7f120e5b + const v0, 0x7f120e5f invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -98,7 +98,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->linkAnswerString:Ljava/lang/String; - const v0, 0x7f120e59 + const v0, 0x7f120e5d invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -110,7 +110,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->embedAnswerString:Ljava/lang/String; - const v0, 0x7f120e58 + const v0, 0x7f120e5c invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -122,7 +122,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fileAnswerString:Ljava/lang/String; - const v0, 0x7f120e5d + const v0, 0x7f120e61 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -134,7 +134,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->videoAnswerString:Ljava/lang/String; - const v0, 0x7f120e5a + const v0, 0x7f120e5e invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -146,7 +146,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->imageAnswerString:Ljava/lang/String; - const v0, 0x7f120e5c + const v0, 0x7f120e60 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali index 8f883672f1..b3e7da5136 100644 --- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali +++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali @@ -190,11 +190,11 @@ check-cast v0, Landroid/widget/TextView; - const v5, 0x7f1204e1 + const v5, 0x7f1204e0 invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V - const v2, 0x7f1204e2 + const v2, 0x7f1204e1 invoke-virtual {v3, v2}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali index 539e66c0e6..a73a77db8d 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali @@ -33,12 +33,6 @@ :array_0 .array-data 4 - 0x7f120f98 - 0x7f120f99 - 0x7f120f9a - 0x7f120f9b - 0x7f120f9c - 0x7f120f9d 0x7f120f9e 0x7f120f9f 0x7f120fa0 @@ -72,6 +66,12 @@ 0x7f120fbc 0x7f120fbd 0x7f120fbe + 0x7f120fbf + 0x7f120fc0 + 0x7f120fc1 + 0x7f120fc2 + 0x7f120fc3 + 0x7f120fc4 .end array-data .end method diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali index dd79c16962..3024d1a167 100644 --- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali +++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali @@ -149,7 +149,7 @@ move-result-object v1 - const v2, 0x7f08029c + const v2, 0x7f0802a4 invoke-virtual {v1, v2}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder; @@ -317,7 +317,7 @@ move-result-object v10 - const v11, 0x7f1204e3 + const v11, 0x7f1204e2 invoke-virtual {v10, v11}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -333,12 +333,12 @@ if-eqz v3, :cond_0 - const v8, 0x7f08028c + const v8, 0x7f080294 goto :goto_0 :cond_0 - const v8, 0x7f08028b + const v8, 0x7f080293 :goto_0 if-eqz v3, :cond_1 @@ -347,7 +347,7 @@ move-result-object v3 - const v9, 0x7f12105b + const v9, 0x7f121061 invoke-virtual {v3, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -377,12 +377,12 @@ if-eqz p0, :cond_2 - const v4, 0x7f080253 + const v4, 0x7f08025b goto :goto_2 :cond_2 - const v4, 0x7f080252 + const v4, 0x7f08025a :goto_2 if-eqz p0, :cond_3 @@ -391,7 +391,7 @@ move-result-object p0 - const v6, 0x7f121053 + const v6, 0x7f121059 invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -404,7 +404,7 @@ move-result-object p0 - const v6, 0x7f120499 + const v6, 0x7f120498 invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utils/R$c.smali b/com.discord/smali/com/discord/utils/R$c.smali index cecab9c046..47c24c90c2 100644 --- a/com.discord/smali/com/discord/utils/R$c.smali +++ b/com.discord/smali/com/discord/utils/R$c.smali @@ -247,45 +247,45 @@ .field public static final googleg_standard_color_18:I = 0x7f08017a -.field public static final ic_mtrl_chip_checked_black:I = 0x7f08028f +.field public static final ic_mtrl_chip_checked_black:I = 0x7f080297 -.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080290 +.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080298 -.field public static final ic_mtrl_chip_close_circle:I = 0x7f080291 +.field public static final ic_mtrl_chip_close_circle:I = 0x7f080299 -.field public static final mtrl_snackbar_background:I = 0x7f0803b6 +.field public static final mtrl_snackbar_background:I = 0x7f0803c1 -.field public static final mtrl_tabs_default_indicator:I = 0x7f0803b7 +.field public static final mtrl_tabs_default_indicator:I = 0x7f0803c2 -.field public static final navigation_empty_icon:I = 0x7f0803b8 +.field public static final navigation_empty_icon:I = 0x7f0803c3 -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf -.field public static final tooltip_frame_dark:I = 0x7f0803c9 +.field public static final tooltip_frame_dark:I = 0x7f0803d4 -.field public static final tooltip_frame_light:I = 0x7f0803ca +.field public static final tooltip_frame_light:I = 0x7f0803d5 # direct methods diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali index 2f1ff51173..55936c7632 100644 --- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali +++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali @@ -52,7 +52,7 @@ const-string v3, "MECH_WUMPUS" - const v4, 0x7f0803b2 + const v4, 0x7f0803bd const/high16 v5, -0x40800000 # -1.0f @@ -68,7 +68,7 @@ const-string v3, "WHEEL_WUMPUS" - const v4, 0x7f0803b3 + const v4, 0x7f0803be invoke-direct {v1, v3, v2, v4}, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->(Ljava/lang/String;II)V @@ -82,7 +82,7 @@ const-string v3, "BROKEN_WHEEL" - const v4, 0x7f080396 + const v4, 0x7f0803a1 invoke-direct {v1, v3, v2, v4}, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->(Ljava/lang/String;II)V diff --git a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali index bfd0ce2b1c..16906b38df 100644 --- a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali +++ b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali @@ -210,9 +210,9 @@ if-eqz v1, :cond_2 - const v1, 0x7f120500 + const v1, 0x7f1204ff - const v6, 0x7f120500 + const v6, 0x7f1204ff goto :goto_2 diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali index 30a2a577e3..56ad398142 100644 --- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali +++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali @@ -1141,14 +1141,14 @@ if-eqz v3, :cond_10 - const p1, 0x7f08024f + const p1, 0x7f080257 goto :goto_8 :cond_10 if-eqz p1, :cond_11 - const p1, 0x7f080289 + const p1, 0x7f080291 goto :goto_8 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali index 8c7f6032ab..79d474033a 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali @@ -66,7 +66,7 @@ sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; - const v7, 0x7f12052c + const v7, 0x7f12052b invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; @@ -80,7 +80,7 @@ sget-object v6, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils; - const v8, 0x7f12052b + const v8, 0x7f12052a invoke-virtual {v6, v8}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali index 71d0362215..93e4b11088 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali @@ -423,7 +423,7 @@ move-result-object v0 - const v1, 0x7f12052c + const v1, 0x7f12052b invoke-static {v0, v1}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V @@ -998,7 +998,7 @@ aput-object p1, v0, v1 - const p1, 0x7f12052d + const p1, 0x7f12052c invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/auth/WidgetAuthLogin;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali index 8e08ce7257..53701a93b6 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali @@ -185,7 +185,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const p2, 0x7f121014 + const p2, 0x7f12101a invoke-static {p1, p2}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V @@ -216,7 +216,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f12103b + const v0, 0x7f121041 invoke-static {p1, v0}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V @@ -462,7 +462,7 @@ move-result-object v1 - const v4, 0x7f12101e + const v4, 0x7f121024 const/4 v5, 0x2 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali index 0cd11a6935..4f1d287706 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali @@ -102,7 +102,7 @@ move-result-object p1 - const v0, 0x7f120fd4 + const v0, 0x7f120fda invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali index 2c535b83ae..119eac70d8 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali @@ -68,7 +68,7 @@ sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; - const v7, 0x7f121133 + const v7, 0x7f121139 invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; @@ -102,7 +102,7 @@ sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; - const v9, 0x7f12052c + const v9, 0x7f12052b invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; @@ -114,7 +114,7 @@ sget-object v8, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils; - const v9, 0x7f12052b + const v9, 0x7f12052a invoke-virtual {v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali index 444e8933f2..61203d03c1 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali @@ -722,7 +722,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120fd1 + const v1, 0x7f120fd7 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -732,7 +732,7 @@ aput-object v1, v0, v2 - const v1, 0x7f120d65 + const v1, 0x7f120d69 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1324,12 +1324,12 @@ if-eqz v3, :cond_1 - const v3, 0x7f120fd3 + const v3, 0x7f120fd9 goto :goto_1 :cond_1 - const v3, 0x7f120fd2 + const v3, 0x7f120fd8 :goto_1 invoke-direct {p0, v5, v3}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali index efc4a46493..d9dafbe79e 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali @@ -85,7 +85,7 @@ const v3, 0x7f12093e - const v4, 0x7f080316 + const v4, 0x7f080320 const/16 v5, 0x1e diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali index c5eeeea97f..d0e675cc2a 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali @@ -65,7 +65,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegisterInvite; - const v1, 0x7f121133 + const v1, 0x7f121139 invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite;->getString(I)Ljava/lang/String; @@ -104,7 +104,7 @@ move-result-object p1 - const v0, 0x7f120fd4 + const v0, 0x7f120fda invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali index a2a15edea6..e7a5ff164a 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali @@ -718,7 +718,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120fd1 + const v1, 0x7f120fd7 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -728,7 +728,7 @@ aput-object v1, v0, v2 - const v1, 0x7f120d65 + const v1, 0x7f120d69 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -981,7 +981,7 @@ move-result-object p1 - const v0, 0x7f121133 + const v0, 0x7f121139 invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V @@ -1275,12 +1275,12 @@ if-eqz v8, :cond_1 - const v8, 0x7f120fd3 + const v8, 0x7f120fd9 goto :goto_1 :cond_1 - const v8, 0x7f120fd2 + const v8, 0x7f120fd8 :goto_1 invoke-direct {v0, v6, v8}, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali index d7257532d5..beb1718fac 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali @@ -423,7 +423,7 @@ .method private handleUpdate()V .locals 2 - const v0, 0x7f1207a5 + const v0, 0x7f1207a4 invoke-static {p0, v0}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V @@ -717,9 +717,9 @@ .method public synthetic lambda$null$7$WidgetChannelGroupDMSettings()V .locals 2 - const v0, 0x7f1203b2 + const v0, 0x7f1203b1 - const v1, 0x7f121049 + const v1, 0x7f12104f invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali index ac35b506d4..6e91ea49ab 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali @@ -90,12 +90,12 @@ if-ne v0, v1, :cond_1 - const v0, 0x7f12044f + const v0, 0x7f12044e goto :goto_0 :cond_1 - const v0, 0x7f120450 + const v0, 0x7f12044f :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetCreateChannel;->setActionBarTitle(I)Lkotlin/Unit; @@ -946,12 +946,12 @@ if-ne v1, v2, :cond_4 - const v1, 0x7f120d67 + const v1, 0x7f120d6b goto :goto_1 :cond_4 - const v1, 0x7f120d69 + const v1, 0x7f120d6d :goto_1 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -962,12 +962,12 @@ if-ne v1, v2, :cond_5 - const v1, 0x7f120d68 + const v1, 0x7f120d6c goto :goto_2 :cond_5 - const v1, 0x7f120d6a + const v1, 0x7f120d6e :goto_2 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -978,12 +978,12 @@ if-ne v1, v2, :cond_6 - const v1, 0x7f1205c0 + const v1, 0x7f1205bf goto :goto_3 :cond_6 - const v1, 0x7f1205c3 + const v1, 0x7f1205c2 :goto_3 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -999,7 +999,7 @@ goto :goto_4 :cond_7 - const v1, 0x7f1205c1 + const v1, 0x7f1205c0 :goto_4 invoke-virtual {p0, v1}, Lcom/discord/widgets/channels/WidgetCreateChannel;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali index c320895b93..1fdd6f1d88 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali @@ -82,7 +82,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const p2, 0x7f120795 + const p2, 0x7f120794 invoke-static {p1, p2}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali index 8c382b7e10..84ae1df823 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali @@ -43,7 +43,7 @@ move-result-object p1 - const v0, 0x7f120795 + const v0, 0x7f120794 invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali index f89fa53203..55a172a576 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali @@ -615,7 +615,7 @@ if-nez p1, :cond_0 - const p1, 0x7f12078f + const p1, 0x7f12078e invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String; @@ -835,7 +835,7 @@ aput-object v2, v1, v3 - const v2, 0x7f1207a0 + const v2, 0x7f12079f invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -869,7 +869,7 @@ if-lt v1, v2, :cond_0 - const p1, 0x7f120794 + const p1, 0x7f120793 invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String; @@ -928,7 +928,7 @@ :cond_1 if-nez v2, :cond_2 - const p1, 0x7f12079f + const p1, 0x7f12079e invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali index 9fbc306d6f..58c0de8cbe 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali @@ -951,13 +951,13 @@ move-result v3 - const v4, 0x7f1205c1 + const v4, 0x7f1205c0 const v5, 0x7f12036a if-eqz v3, :cond_4 - const v3, 0x7f1205c1 + const v3, 0x7f1205c0 goto :goto_2 @@ -1480,12 +1480,12 @@ if-eqz v5, :cond_0 - const v5, 0x7f1204ac + const v5, 0x7f1204ab goto :goto_0 :cond_0 - const v5, 0x7f1204ab + const v5, 0x7f1204aa :goto_0 invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V @@ -1510,7 +1510,7 @@ invoke-static {v3, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f1204ad + const v0, 0x7f1204ac const/4 v2, 0x1 @@ -2012,7 +2012,7 @@ move-result-object p1 - const v0, 0x7f120625 + const v0, 0x7f120624 invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getString(I)Ljava/lang/String; 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 7214970061..69c6b9dfe7 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 @@ -285,7 +285,7 @@ const-wide/16 v7, 0x0 - const v9, 0x7f1204d1 + const v9, 0x7f1204d0 const/4 v10, 0x0 @@ -333,25 +333,31 @@ move-result-object v0 :goto_6 - move-object v3, v0 - - new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel; + new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelListModel; const/4 v2, 0x0 - const/4 v4, 0x0 + const/4 v3, 0x0 + + const/4 v4, 0x4 const/4 v5, 0x0 - const/16 v6, 0xc + move-object p1, v1 - const/4 v7, 0x0 + move-object p2, v2 - move-object v1, v0 + move-object/from16 p3, v0 - invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V + move/from16 p4, v3 - return-object v0 + move/from16 p5, v4 + + move-object/from16 p6, v5 + + invoke-direct/range {p1 .. p6}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V + + return-object v1 .end method .method public final bridge synthetic call(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/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali index 4d5a4d077d..c49a4177af 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 @@ -168,13 +168,9 @@ move-result-object v2 - invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/channel/GuildChannelsInfo;->isVerifiedServer()Z + const/4 v3, 0x1 - move-result v3 - - const/4 v4, 0x1 - - invoke-direct {v1, v2, v0, v4, v3}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)V + invoke-direct {v1, v2, v0, v3}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)V return-object v1 .end method diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali index 039f464584..5897b41fb8 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali @@ -146,7 +146,7 @@ move-result-object p1 - const-string p2, "Observable\n .co\u2026rifiedServer)\n }" + const-string p2, "Observable\n .co\u2026ected = true)\n }" invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali index c9396b0cde..f3fa3bb7f6 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali @@ -19,8 +19,6 @@ # instance fields .field private final isGuildSelected:Z -.field private final isVerifiedServer:Z - .field private final items:Ljava/util/List; .annotation system Ldalvik/annotation/Signature; value = { @@ -49,7 +47,7 @@ return-void .end method -.method public constructor (Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)V +.method public constructor (Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)V .locals 1 .annotation system Ldalvik/annotation/Signature; value = { @@ -58,7 +56,7 @@ "Ljava/util/List<", "+", "Lcom/discord/widgets/channels/list/items/ChannelListItem;", - ">;ZZ)V" + ">;Z)V" } .end annotation @@ -74,67 +72,49 @@ iput-boolean p3, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z - iput-boolean p4, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z - return-void .end method -.method public synthetic constructor (Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 1 +.method public synthetic constructor (Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 0 - and-int/lit8 p6, p5, 0x4 + and-int/lit8 p4, p4, 0x4 - const/4 v0, 0x0 - - if-eqz p6, :cond_0 + if-eqz p4, :cond_0 const/4 p3, 0x0 :cond_0 - and-int/lit8 p5, p5, 0x8 - - if-eqz p5, :cond_1 - - const/4 p4, 0x0 - - :cond_1 - invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)V + invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)V return-void .end method -.method public static synthetic copy$default(Lcom/discord/widgets/channels/list/WidgetChannelListModel;Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZILjava/lang/Object;)Lcom/discord/widgets/channels/list/WidgetChannelListModel; +.method public static synthetic copy$default(Lcom/discord/widgets/channels/list/WidgetChannelListModel;Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZILjava/lang/Object;)Lcom/discord/widgets/channels/list/WidgetChannelListModel; .locals 0 - and-int/lit8 p6, p5, 0x1 + and-int/lit8 p5, p4, 0x1 - if-eqz p6, :cond_0 + if-eqz p5, :cond_0 iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->selectedGuild:Lcom/discord/models/domain/ModelGuild; :cond_0 - and-int/lit8 p6, p5, 0x2 + and-int/lit8 p5, p4, 0x2 - if-eqz p6, :cond_1 + if-eqz p5, :cond_1 iget-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->items:Ljava/util/List; :cond_1 - and-int/lit8 p6, p5, 0x4 + and-int/lit8 p4, p4, 0x4 - if-eqz p6, :cond_2 + if-eqz p4, :cond_2 iget-boolean p3, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z :cond_2 - and-int/lit8 p5, p5, 0x8 - - if-eqz p5, :cond_3 - - iget-boolean p4, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z - - :cond_3 - invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->copy(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)Lcom/discord/widgets/channels/list/WidgetChannelListModel; + invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->copy(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)Lcom/discord/widgets/channels/list/WidgetChannelListModel; move-result-object p0 @@ -175,15 +155,7 @@ return v0 .end method -.method public final component4()Z - .locals 1 - - iget-boolean v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z - - return v0 -.end method - -.method public final copy(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)Lcom/discord/widgets/channels/list/WidgetChannelListModel; +.method public final copy(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)Lcom/discord/widgets/channels/list/WidgetChannelListModel; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { @@ -192,7 +164,7 @@ "Ljava/util/List<", "+", "Lcom/discord/widgets/channels/list/items/ChannelListItem;", - ">;ZZ)", + ">;Z)", "Lcom/discord/widgets/channels/list/WidgetChannelListModel;" } .end annotation @@ -203,7 +175,7 @@ new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel; - invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)V + invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)V return-object v0 .end method @@ -213,13 +185,13 @@ const/4 v0, 0x1 - if-eq p0, p1, :cond_3 + if-eq p0, p1, :cond_2 instance-of v1, p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel; const/4 v2, 0x0 - if-eqz v1, :cond_2 + if-eqz v1, :cond_1 check-cast p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel; @@ -231,7 +203,7 @@ move-result v1 - if-eqz v1, :cond_2 + if-eqz v1, :cond_1 iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->items:Ljava/util/List; @@ -241,47 +213,31 @@ move-result v1 - if-eqz v1, :cond_2 + if-eqz v1, :cond_1 iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z - iget-boolean v3, p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z + iget-boolean p1, p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z - if-ne v1, v3, :cond_0 + if-ne v1, p1, :cond_0 - const/4 v1, 0x1 + const/4 p1, 0x1 goto :goto_0 :cond_0 - const/4 v1, 0x0 + const/4 p1, 0x0 :goto_0 - if-eqz v1, :cond_2 - - iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z - - iget-boolean p1, p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z - - if-ne v1, p1, :cond_1 - - const/4 p1, 0x1 + if-eqz p1, :cond_1 goto :goto_1 :cond_1 - const/4 p1, 0x0 - - :goto_1 - if-eqz p1, :cond_2 - - goto :goto_2 - - :cond_2 return v2 - :cond_3 - :goto_2 + :cond_2 + :goto_1 return v0 .end method @@ -345,8 +301,6 @@ iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z - const/4 v2, 0x1 - if-eqz v1, :cond_2 const/4 v1, 0x1 @@ -354,17 +308,6 @@ :cond_2 add-int/2addr v0, v1 - mul-int/lit8 v0, v0, 0x1f - - iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z - - if-eqz v1, :cond_3 - - const/4 v1, 0x1 - - :cond_3 - add-int/2addr v0, v1 - return v0 .end method @@ -376,14 +319,6 @@ return v0 .end method -.method public final isVerifiedServer()Z - .locals 1 - - iget-boolean v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z - - return v0 -.end method - .method public final toString()Ljava/lang/String; .locals 2 @@ -413,14 +348,6 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; - const-string v1, ", isVerifiedServer=" - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; - const-string v1, ")" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; 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 ec95018d8b..899cd90c87 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 @@ -28,18 +28,18 @@ # instance fields -.field final synthetic $list:Lcom/discord/widgets/channels/list/WidgetChannelListModel; +.field final synthetic $guild:Lcom/discord/models/domain/ModelGuild; .field final synthetic this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList; # direct methods -.method constructor (Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V +.method 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;->$list:Lcom/discord/widgets/channels/list/WidgetChannelListModel; + iput-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$guild:Lcom/discord/models/domain/ModelGuild; const/4 p1, 0x1 @@ -105,13 +105,9 @@ 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;->$list:Lcom/discord/widgets/channels/list/WidgetChannelListModel; + iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$guild:Lcom/discord/models/domain/ModelGuild; - invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer()Z - - move-result v0 - - invoke-static {p1, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$configureHeaderIcons(Lcom/discord/widgets/channels/list/WidgetChannelsList;Z)V + invoke-static {p1, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$configureHeaderIcons(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V :cond_0 return-void 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 3ea6bdc2aa..64d451518a 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali @@ -310,10 +310,10 @@ return-void .end method -.method public static final synthetic access$configureHeaderIcons(Lcom/discord/widgets/channels/list/WidgetChannelsList;Z)V +.method public static final synthetic access$configureHeaderIcons(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V .locals 0 - invoke-direct {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->configureHeaderIcons(Z)V + invoke-direct {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->configureHeaderIcons(Lcom/discord/models/domain/ModelGuild;)V return-void .end method @@ -362,14 +362,16 @@ return-void .end method -.method private final configureHeaderIcons(Z)V - .locals 14 +.method private final configureHeaderIcons(Lcom/discord/models/domain/ModelGuild;)V + .locals 7 - if-eqz p1, :cond_1 + if-eqz p1, :cond_10 - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView; + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->isVerifiedServer()Z - move-result-object v0 + move-result v0 + + if-eqz v0, :cond_1 invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout; @@ -381,21 +383,249 @@ if-eqz p1, :cond_0 - const p1, 0x7f080324 + const p1, 0x7f08032f - const v1, 0x7f080324 + const v1, 0x7f08032f + + goto/16 :goto_4 + + :cond_0 + const p1, 0x7f080330 + + const v1, 0x7f080330 + + goto/16 :goto_4 + + :cond_1 + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->isPartneredServer()Z + + move-result v0 + + if-eqz v0, :cond_3 + + invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout; + + move-result-object p1 + + invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->isCollapsed()Z + + move-result p1 + + if-eqz p1, :cond_2 + + const p1, 0x7f0802b8 + + const v1, 0x7f0802b8 + + goto/16 :goto_4 + + :cond_2 + const p1, 0x7f0802b9 + + const v1, 0x7f0802b9 + + goto/16 :goto_4 + + :cond_3 + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer; + + move-result-object v0 + + if-nez v0, :cond_4 goto :goto_0 - :cond_0 - const p1, 0x7f080325 + :cond_4 + invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I - const v1, 0x7f080325 + move-result v0 + if-nez v0, :cond_7 + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer; + + move-result-object v0 + + if-eqz v0, :cond_7 + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer; + + move-result-object v0 + + if-nez v0, :cond_5 + + invoke-static {}, Lkotlin/jvm/internal/j;->zI()V + + :cond_5 + invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I + + move-result v0 + + if-lez v0, :cond_7 + + invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout; + + move-result-object p1 + + invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->isCollapsed()Z + + move-result p1 + + if-eqz p1, :cond_6 + + const p1, 0x7f080251 + + const v1, 0x7f080251 + + goto/16 :goto_4 + + :cond_6 + const p1, 0x7f080252 + + const v1, 0x7f080252 + + goto/16 :goto_4 + + :cond_7 :goto_0 + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer; + + move-result-object v0 + + if-nez v0, :cond_8 + + goto :goto_1 + + :cond_8 + invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I + + move-result v0 + + const/4 v1, 0x1 + + if-ne v0, v1, :cond_a + + invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout; + + move-result-object p1 + + invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->isCollapsed()Z + + move-result p1 + + if-eqz p1, :cond_9 + + const p1, 0x7f08024b + + const v1, 0x7f08024b + + goto :goto_4 + + :cond_9 + const p1, 0x7f08024c + + const v1, 0x7f08024c + + goto :goto_4 + + :cond_a + :goto_1 + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer; + + move-result-object v0 + + if-nez v0, :cond_b + + goto :goto_2 + + :cond_b + invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I + + move-result v0 + + const/4 v1, 0x2 + + if-ne v0, v1, :cond_d + + invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout; + + move-result-object p1 + + invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->isCollapsed()Z + + move-result p1 + + if-eqz p1, :cond_c + + const p1, 0x7f08024d + + const v1, 0x7f08024d + + goto :goto_4 + + :cond_c + const p1, 0x7f08024e + + const v1, 0x7f08024e + + goto :goto_4 + + :cond_d + :goto_2 + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer; + + move-result-object p1 + + if-nez p1, :cond_e + + goto :goto_3 + + :cond_e + invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I + + move-result p1 + + const/4 v0, 0x3 + + if-ne p1, v0, :cond_10 + + invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout; + + move-result-object p1 + + invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->isCollapsed()Z + + move-result p1 + + if-eqz p1, :cond_f + + const p1, 0x7f08024f + + const v1, 0x7f08024f + + goto :goto_4 + + :cond_f + const p1, 0x7f080250 + + const v1, 0x7f080250 + + goto :goto_4 + + :cond_10 + :goto_3 + const/4 p1, 0x0 + + const/4 v1, 0x0 + + :goto_4 + invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView; + + move-result-object v0 + const/4 v2, 0x0 - const v3, 0x7f080362 + const v3, 0x7f08036d const/4 v4, 0x0 @@ -406,27 +636,6 @@ invoke-static/range {v0 .. v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V return-void - - :cond_1 - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView; - - move-result-object v7 - - const/4 v8, 0x0 - - const/4 v9, 0x0 - - const v10, 0x7f080362 - - const/4 v11, 0x0 - - const/16 v12, 0xb - - const/4 v13, 0x0 - - invoke-static/range {v7 .. v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V - - return-void .end method .method private final configureUI(Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V @@ -546,27 +755,27 @@ invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected()Z - move-result v5 + move-result p1 - xor-int/2addr v3, v5 + xor-int/2addr p1, v3 - invoke-static {v1, v3, v4, v6, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + invoke-static {v1, p1, v4, v6, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView; - move-result-object v1 + move-result-object p1 - new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1; + new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1; - invoke-direct {v3, p0, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V + invoke-direct {v1, p0, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V - check-cast v3, Landroid/view/View$OnClickListener; + check-cast v1, Landroid/view/View$OnClickListener; - invoke-virtual {v1, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V + invoke-virtual {p1, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView; - move-result-object v1 + move-result-object p1 if-eqz v0, :cond_4 @@ -577,77 +786,73 @@ :cond_4 check-cast v2, Ljava/lang/CharSequence; - invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer()Z - - move-result v1 - - invoke-direct {p0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->configureHeaderIcons(Z)V + invoke-direct {p0, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->configureHeaderIcons(Lcom/discord/models/domain/ModelGuild;)V if-eqz v0, :cond_5 invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getBanner()Ljava/lang/String; - move-result-object v1 + move-result-object p1 - if-eqz v1, :cond_5 + if-eqz p1, :cond_5 invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsBanner()Lcom/facebook/drawee/view/SimpleDraweeView; - move-result-object v1 + move-result-object p1 - invoke-virtual {v1, v4}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V + invoke-virtual {p1, v4}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsBanner()Lcom/facebook/drawee/view/SimpleDraweeView; - move-result-object v1 + move-result-object p1 - sget-object v2, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils; + sget-object v1, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils; invoke-virtual {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getResources()Landroid/content/res/Resources; - move-result-object v3 + move-result-object v2 - const v4, 0x7f070104 + const v3, 0x7f070104 - invoke-virtual {v3, v4}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I + invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I - move-result v3 + move-result v2 - invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v3 + move-result-object v2 - invoke-virtual {v2, v0, v3}, Lcom/discord/utilities/icon/IconUtils;->getBannerForGuild(Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;)Ljava/lang/String; + invoke-virtual {v1, v0, v2}, Lcom/discord/utilities/icon/IconUtils;->getBannerForGuild(Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;)Ljava/lang/String; - move-result-object v0 + move-result-object v1 - invoke-virtual {v1, v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V + invoke-virtual {p1, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V goto :goto_2 :cond_5 invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsBanner()Lcom/facebook/drawee/view/SimpleDraweeView; - move-result-object v0 + move-result-object p1 const/16 v1, 0x8 - invoke-virtual {v0, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V + invoke-virtual {p1, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V :goto_2 invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout; - move-result-object v0 + move-result-object p1 new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2; - invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V + invoke-direct {v1, p0, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V check-cast v1, Lkotlin/jvm/functions/Function1; - invoke-virtual {v0, v1}, Lcom/discord/views/CustomAppBarLayout;->setOnPercentCollapsedCallback(Lkotlin/jvm/functions/Function1;)V + invoke-virtual {p1, v1}, Lcom/discord/views/CustomAppBarLayout;->setOnPercentCollapsedCallback(Lkotlin/jvm/functions/Function1;)V return-void .end method diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali index eb1267abe8..237fbab893 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali @@ -188,13 +188,13 @@ if-eq p1, v0, :cond_2 - const p2, 0x7f120fd9 + const p2, 0x7f120fdf const/4 v0, 0x0 if-eq p1, p2, :cond_1 - const p2, 0x7f12117e + const p2, 0x7f121184 if-eq p1, p2, :cond_0 diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali index 9657b34563..3ae9d0dd27 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali @@ -117,7 +117,7 @@ .method private final getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence; .locals 3 - const v0, 0x7f12102b + const v0, 0x7f121031 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali index 132c647f0a..0ee9fec08b 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali @@ -331,7 +331,7 @@ if-eqz v0, :cond_0 - const v0, 0x7f12105b + const v0, 0x7f121061 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali index 7c2f1baae9..f795122fde 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali @@ -916,7 +916,7 @@ if-eqz p2, :cond_0 - const p1, 0x7f12051e + const p1, 0x7f12051d goto :goto_0 @@ -940,12 +940,12 @@ if-eqz p1, :cond_2 - const p1, 0x7f12051d + const p1, 0x7f12051c goto :goto_0 :cond_2 - const p1, 0x7f120dff + const p1, 0x7f120e03 :goto_0 invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali index 6cd049fe37..0d9532b581 100644 --- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali +++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali @@ -67,7 +67,7 @@ move-result-object p1 - const v2, 0x7f120d00 + const v2, 0x7f120cfe const/4 v3, 0x1 diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali index da606ee29c..35a63a7f2f 100644 --- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali +++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali @@ -55,7 +55,7 @@ iget-object v1, p0, Lcom/discord/widgets/chat/WidgetUrlActions$onViewCreated$3;->this$0:Lcom/discord/widgets/chat/WidgetUrlActions; - const v2, 0x7f120619 + const v2, 0x7f120618 invoke-virtual {v1, v2}, Lcom/discord/widgets/chat/WidgetUrlActions;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali index a526868f8d..daa8fca648 100644 --- a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali +++ b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali @@ -72,7 +72,7 @@ invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable; + invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable; move-result-object v0 diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali index ed2d553cd5..dc4235e39b 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali @@ -66,7 +66,7 @@ new-array v1, v1, [Ljava/lang/Object; - const v2, 0x7f120fca + const v2, 0x7f120fd0 invoke-virtual {v0, v2, v1}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali index 1243dce606..69d6e902d9 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali @@ -74,7 +74,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120fcb + const v1, 0x7f120fd1 invoke-virtual {p2, v1, v0}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali index 381ba798e7..fb2ac71854 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali @@ -235,7 +235,7 @@ new-instance v5, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1; - const v6, 0x7f080261 + const v6, 0x7f080269 const v7, 0x7f12026f diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali index eb23785ea8..5731519477 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali @@ -99,7 +99,7 @@ if-eqz p2, :cond_0 - const p1, 0x7f1204ff + const p1, 0x7f1204fe invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -123,7 +123,7 @@ move-result-object p1 - const p2, 0x7f120fdc + const p2, 0x7f120fe2 invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -784,7 +784,7 @@ return-object p1 :cond_0 - const v0, 0x7f121162 + const v0, 0x7f121168 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -793,7 +793,7 @@ return-object p1 :cond_1 - const v0, 0x7f121158 + const v0, 0x7f12115e invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali index 506587a37e..905b088aee 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali @@ -142,7 +142,7 @@ iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1;->$appActivity:Lcom/discord/app/AppActivity; - const v3, 0x7f120d57 + const v3, 0x7f120d5b invoke-virtual {v0, v3}, Lcom/discord/app/AppActivity;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali index 4dd18144b7..a6fae16b35 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali @@ -106,7 +106,7 @@ iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2; - const p2, 0x7f120528 + const p2, 0x7f120527 invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali index 114e4a285e..d59b2540c8 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali @@ -95,57 +95,57 @@ packed-switch p1, :pswitch_data_0 - const p1, 0x7f120f4c + const p1, 0x7f120f51 return p1 :pswitch_0 - const p1, 0x7f120538 + const p1, 0x7f120537 return p1 :pswitch_1 - const p1, 0x7f120532 - - return p1 - - :pswitch_2 - const p1, 0x7f120533 - - return p1 - - :pswitch_3 - const p1, 0x7f120539 - - return p1 - - :pswitch_4 - const p1, 0x7f120536 - - return p1 - - :pswitch_5 - const p1, 0x7f12053a - - return p1 - - :pswitch_6 const p1, 0x7f120531 return p1 - :pswitch_7 - const p1, 0x7f120534 + :pswitch_2 + const p1, 0x7f120532 return p1 - :pswitch_8 + :pswitch_3 + const p1, 0x7f120538 + + return p1 + + :pswitch_4 const p1, 0x7f120535 return p1 + :pswitch_5 + const p1, 0x7f120539 + + return p1 + + :pswitch_6 + const p1, 0x7f120530 + + return p1 + + :pswitch_7 + const p1, 0x7f120533 + + return p1 + + :pswitch_8 + const p1, 0x7f120534 + + return p1 + :pswitch_9 - const p1, 0x7f120537 + const p1, 0x7f120536 return p1 diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali index 553c181456..8e1b8379ac 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali @@ -1046,12 +1046,12 @@ :cond_1 if-eqz v1, :cond_2 - const v0, 0x7f120d4b + const v0, 0x7f120d4f goto :goto_0 :cond_2 - const v0, 0x7f120d51 + const v0, 0x7f120d55 :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->getString(I)Ljava/lang/String; @@ -1060,12 +1060,12 @@ if-eqz v1, :cond_3 - const v1, 0x7f120d4c + const v1, 0x7f120d50 goto :goto_1 :cond_3 - const v1, 0x7f120d52 + const v1, 0x7f120d56 :goto_1 invoke-virtual {p0, v1}, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali index 55beac3ee7..e2d12b4487 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali @@ -47,7 +47,7 @@ if-eqz p0, :cond_0 - const v0, 0x7f120509 + const v0, 0x7f120508 const/4 v1, 0x1 @@ -98,7 +98,7 @@ check-cast p0, Landroid/content/Context; - const v0, 0x7f120508 + const v0, 0x7f120507 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali index 99ddd3f559..20745f3dde 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali @@ -89,7 +89,7 @@ iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions$configureUI$8;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListActions; - const v2, 0x7f120eff + const v2, 0x7f120f03 invoke-virtual {v1, v2}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali index 8f03767466..8a64bc84dc 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali @@ -1116,7 +1116,7 @@ if-eqz v1, :cond_6 - const v1, 0x7f12105e + const v1, 0x7f121064 goto :goto_4 @@ -1653,7 +1653,7 @@ move-result-object v2 - const v3, 0x7f120db8 + const v3, 0x7f120dbc invoke-virtual {v0, v3}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String; @@ -1663,7 +1663,7 @@ invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v4, 0x7f120db7 + const v4, 0x7f120dbb invoke-virtual {v0, v4}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String; @@ -1673,7 +1673,7 @@ invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f1211c2 + const v5, 0x7f1211c8 invoke-virtual {v0, v5}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali index 2f2fc79267..c52092a710 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali @@ -30,6 +30,9 @@ .end annotation .end method +.method public abstract getGuild()Lcom/discord/models/domain/ModelGuild; +.end method + .method public abstract getGuildId()J .end method diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali index 362a094c00..558fe6d9c1 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali @@ -31,6 +31,8 @@ .end annotation .end field +.field private final guild:Lcom/discord/models/domain/ModelGuild; + .field private final guildId:J .field private final isSpoilerClickAllowed:Z @@ -116,6 +118,14 @@ return-object v0 .end method +.method public final getGuild()Lcom/discord/models/domain/ModelGuild; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData;->guild:Lcom/discord/models/domain/ModelGuild; + + return-object v0 +.end method + .method public final getGuildId()J .locals 2 diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali index 0521855216..5ab714774a 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali @@ -131,7 +131,7 @@ .end method .method private final getNewMessageEntryIndex(Ljava/util/List;)I - .locals 10 + .locals 11 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -146,172 +146,203 @@ const-wide/16 v2, 0x0 - cmp-long v4, v0, v2 + const/4 v4, 0x1 - if-lez v4, :cond_0 + const/4 v5, 0x0 + + cmp-long v6, v0, v2 + + if-nez v6, :cond_0 + + const/4 v0, 0x1 goto :goto_0 :cond_0 - iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter; - - invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data; - - move-result-object v0 - - invoke-interface {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getNewMessagesMarkerMessageId()J - - move-result-wide v0 + const/4 v0, 0x0 :goto_0 - const/4 v4, -0x1 + iget-wide v6, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->messageId:J - cmp-long v5, v0, v2 + cmp-long v1, v6, v2 - if-gtz v5, :cond_1 + if-nez v1, :cond_1 - return v4 + iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter; + + invoke-virtual {v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data; + + move-result-object v1 + + invoke-interface {v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getNewMessagesMarkerMessageId()J + + move-result-wide v6 :cond_1 + const/4 v1, -0x1 + + cmp-long v8, v6, v2 + + if-gtz v8, :cond_2 + + return v1 + + :cond_2 invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator; move-result-object v2 const/4 v3, 0x0 - const/4 v5, 0x0 - :goto_1 invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z - move-result v6 + move-result v8 - const/4 v7, 0x1 - - if-eqz v6, :cond_4 + if-eqz v8, :cond_5 invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v6 + move-result-object v8 - check-cast v6, Lcom/discord/widgets/chat/list/entries/ChatListEntry; + check-cast v8, Lcom/discord/widgets/chat/list/entries/ChatListEntry; - instance-of v8, v6, Lcom/discord/widgets/chat/list/entries/MessageEntry; + instance-of v9, v8, Lcom/discord/widgets/chat/list/entries/MessageEntry; - if-eqz v8, :cond_2 + if-eqz v9, :cond_3 - check-cast v6, Lcom/discord/widgets/chat/list/entries/MessageEntry; + check-cast v8, Lcom/discord/widgets/chat/list/entries/MessageEntry; - invoke-virtual {v6}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->getMessage()Lcom/discord/models/domain/ModelMessage; + invoke-virtual {v8}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->getMessage()Lcom/discord/models/domain/ModelMessage; - move-result-object v6 + move-result-object v8 - invoke-virtual {v6}, Lcom/discord/models/domain/ModelMessage;->getId()J + invoke-virtual {v8}, Lcom/discord/models/domain/ModelMessage;->getId()J move-result-wide v8 - cmp-long v6, v8, v0 + cmp-long v10, v8, v6 - if-nez v6, :cond_2 + if-nez v10, :cond_3 - const/4 v6, 0x1 + const/4 v8, 0x1 goto :goto_2 - :cond_2 - const/4 v6, 0x0 + :cond_3 + const/4 v8, 0x0 :goto_2 - if-eqz v6, :cond_3 - - move v4, v5 + if-eqz v8, :cond_4 goto :goto_3 - :cond_3 - add-int/lit8 v5, v5, 0x1 + :cond_4 + add-int/lit8 v3, v3, 0x1 goto :goto_1 - :cond_4 - :goto_3 - invoke-static {v4, v3}, Lkotlin/ranges/b;->Z(II)Lkotlin/ranges/IntProgression; - - move-result-object v2 - - check-cast v2, Ljava/lang/Iterable; - - invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - - move-result-object v2 - :cond_5 - invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z + const/4 v3, -0x1 - move-result v5 + :goto_3 + if-gez v3, :cond_7 - if-eqz v5, :cond_7 + if-eqz v0, :cond_7 - invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-static {p1}, Lkotlin/a/l;->W(Ljava/util/List;)I - move-result-object v5 + move-result v0 - move-object v6, v5 + const/16 v2, 0xa - check-cast v6, Ljava/lang/Number; + if-ge v0, v2, :cond_6 - invoke-virtual {v6}, Ljava/lang/Number;->intValue()I + return v1 - move-result v6 + :cond_6 + invoke-static {p1}, Lkotlin/a/l;->W(Ljava/util/List;)I - invoke-interface {p1, v6}, Ljava/util/List;->get(I)Ljava/lang/Object; + move-result v3 - move-result-object v6 + :cond_7 + invoke-static {v3, v5}, Lkotlin/ranges/b;->Z(II)Lkotlin/ranges/IntProgression; - check-cast v6, Lcom/discord/widgets/chat/list/entries/ChatListEntry; + move-result-object v0 - instance-of v8, v6, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry; + check-cast v0, Ljava/lang/Iterable; - if-eqz v8, :cond_6 + invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - check-cast v6, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry; + move-result-object v0 - invoke-virtual {v6}, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;->getMessageId()J + :cond_8 + invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z + + move-result v1 + + if-eqz v1, :cond_a + + invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v1 + + move-object v2, v1 + + check-cast v2, Ljava/lang/Number; + + invoke-virtual {v2}, Ljava/lang/Number;->intValue()I + + move-result v2 + + invoke-interface {p1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object; + + move-result-object v2 + + check-cast v2, Lcom/discord/widgets/chat/list/entries/ChatListEntry; + + instance-of v8, v2, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry; + + if-eqz v8, :cond_9 + + check-cast v2, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry; + + invoke-virtual {v2}, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;->getMessageId()J move-result-wide v8 - cmp-long v6, v8, v0 + cmp-long v2, v8, v6 - if-nez v6, :cond_6 + if-nez v2, :cond_9 - const/4 v6, 0x1 + const/4 v2, 0x1 goto :goto_4 - :cond_6 - const/4 v6, 0x0 + :cond_9 + const/4 v2, 0x0 :goto_4 - if-eqz v6, :cond_5 + if-eqz v2, :cond_8 goto :goto_5 - :cond_7 - const/4 v5, 0x0 + :cond_a + const/4 v1, 0x0 :goto_5 - check-cast v5, Ljava/lang/Integer; + check-cast v1, Ljava/lang/Integer; - if-eqz v5, :cond_8 + if-eqz v1, :cond_b - invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I + invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I move-result p1 return p1 - :cond_8 - return v4 + :cond_b + return v3 .end method .method private final scheduleRetry()V @@ -404,7 +435,7 @@ .end method .method public final run()V - .locals 4 + .locals 5 iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter; @@ -412,6 +443,36 @@ move-result-object v0 + instance-of v1, v0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel; + + const/4 v2, 0x0 + + if-nez v1, :cond_0 + + move-object v0, v2 + + :cond_0 + check-cast v0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel; + + if-eqz v0, :cond_1 + + invoke-virtual {v0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages()Z + + move-result v0 + + if-eqz v0, :cond_1 + + invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->scheduleRetry()V + + return-void + + :cond_1 + iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter; + + invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data; + + move-result-object v0 + invoke-interface {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getList()Ljava/util/List; move-result-object v0 @@ -420,13 +481,13 @@ move-result v0 - if-gez v0, :cond_0 + if-gez v0, :cond_2 invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->scheduleRetry()V return-void - :cond_0 + :cond_2 iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter; invoke-virtual {v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data; @@ -443,58 +504,53 @@ instance-of v1, v1, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry; - iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter; - - invoke-virtual {v2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getRecycler()Landroidx/recyclerview/widget/RecyclerView; - - move-result-object v2 - - invoke-virtual {v2}, Landroidx/recyclerview/widget/RecyclerView;->getHeight()I - - move-result v2 - - int-to-float v2, v2 - - const/high16 v3, 0x40000000 # 2.0f - - div-float/2addr v2, v3 - - float-to-int v2, v2 - iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter; - invoke-virtual {v3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getLayoutManager()Landroidx/recyclerview/widget/LinearLayoutManager; + invoke-virtual {v3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getRecycler()Landroidx/recyclerview/widget/RecyclerView; move-result-object v3 - if-eqz v3, :cond_1 + invoke-virtual {v3}, Landroidx/recyclerview/widget/RecyclerView;->getHeight()I - invoke-virtual {v3, v0, v2}, Landroidx/recyclerview/widget/LinearLayoutManager;->scrollToPositionWithOffset(II)V + move-result v3 - invoke-virtual {v3, v0}, Landroidx/recyclerview/widget/LinearLayoutManager;->findViewByPosition(I)Landroid/view/View; + int-to-float v3, v3 - move-result-object v0 + const/high16 v4, 0x40000000 # 2.0f - goto :goto_0 + div-float/2addr v3, v4 - :cond_1 - const/4 v0, 0x0 + float-to-int v3, v3 - :goto_0 - if-eqz v0, :cond_3 + iget-object v4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter; - if-nez v1, :cond_2 + invoke-virtual {v4}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getLayoutManager()Landroidx/recyclerview/widget/LinearLayoutManager; - invoke-direct {p0, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->animateHighlight(Landroid/view/View;)V + move-result-object v4 - :cond_2 + if-eqz v4, :cond_3 + + invoke-virtual {v4, v0, v3}, Landroidx/recyclerview/widget/LinearLayoutManager;->scrollToPositionWithOffset(II)V + + invoke-virtual {v4, v0}, Landroidx/recyclerview/widget/LinearLayoutManager;->findViewByPosition(I)Landroid/view/View; + + move-result-object v2 + + :cond_3 + if-eqz v2, :cond_5 + + if-nez v1, :cond_4 + + invoke-direct {p0, v2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->animateHighlight(Landroid/view/View;)V + + :cond_4 iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->onCompleted:Lkotlin/jvm/functions/Function0; invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object; return-void - :cond_3 + :cond_5 invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->scheduleRetry()V return-void diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali index 83f71d8981..ccbef95a43 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali @@ -264,7 +264,7 @@ move-result-object v0 - const v3, 0x7f120f95 + const v3, 0x7f120f9b new-array v2, v2, [Ljava/lang/Object; @@ -285,7 +285,7 @@ move-result-object v0 - const v3, 0x7f120f94 + const v3, 0x7f120f9a new-array v2, v2, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali index fbf28a52ef..d246365183 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali @@ -610,7 +610,7 @@ if-eqz p1, :cond_2 - const p1, 0x7f12076f + const p1, 0x7f12076e invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -621,7 +621,7 @@ goto :goto_2 :cond_2 - const p1, 0x7f12076e + const p1, 0x7f12076d invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -636,7 +636,7 @@ move-result-object p1 - const v2, 0x7f12076b + const v2, 0x7f12076a invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(I)V @@ -666,7 +666,7 @@ const p1, 0x7f0401cd - const v2, 0x7f0803a3 + const v2, 0x7f0803ae invoke-static {v0, p1, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I @@ -734,7 +734,7 @@ move-result-object v1 - const v2, 0x7f120770 + const v2, 0x7f12076f invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V @@ -1060,7 +1060,7 @@ const v3, 0x7f040144 - const v12, 0x7f080398 + const v12, 0x7f0803a3 invoke-static {v2, v3, v12}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I @@ -1133,7 +1133,7 @@ if-eqz v4, :cond_7 - const v4, 0x7f120773 + const v4, 0x7f120772 invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1144,7 +1144,7 @@ goto :goto_6 :cond_7 - const v4, 0x7f120772 + const v4, 0x7f120771 invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1273,7 +1273,7 @@ aput-object v4, v13, v6 - const v4, 0x7f120766 + const v4, 0x7f120765 invoke-virtual {v2, v4, v13}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -1398,7 +1398,7 @@ if-nez v3, :cond_c - const v3, 0x7f12071e + const v3, 0x7f12071d invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1427,7 +1427,7 @@ :cond_c if-eqz v7, :cond_d - const v3, 0x7f12074e + const v3, 0x7f12074d invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1438,7 +1438,7 @@ :cond_d if-eqz v9, :cond_e - const v3, 0x7f12072a + const v3, 0x7f120729 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1453,7 +1453,7 @@ if-eqz v3, :cond_f - const v3, 0x7f12071d + const v3, 0x7f12071c const/4 v8, 0x1 @@ -1488,7 +1488,7 @@ :cond_f if-eqz v8, :cond_10 - const v3, 0x7f12071c + const v3, 0x7f12071b invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1562,7 +1562,7 @@ if-eqz v9, :cond_13 - const v4, 0x7f120761 + const v4, 0x7f120760 goto :goto_b @@ -1573,7 +1573,7 @@ if-eqz v4, :cond_14 - const v4, 0x7f120763 + const v4, 0x7f120762 goto :goto_b @@ -1586,12 +1586,12 @@ if-eqz v4, :cond_15 - const v4, 0x7f120764 + const v4, 0x7f120763 goto :goto_b :cond_15 - const v4, 0x7f120762 + const v4, 0x7f120761 :goto_b invoke-virtual {v3, v4}, Landroid/widget/Button;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali index fc1b72f80b..666c2e977d 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali @@ -312,7 +312,7 @@ check-cast v3, Landroid/view/View; - const v6, 0x7f1211ae + const v6, 0x7f1211b4 new-array v7, v4, [Ljava/lang/Object; @@ -333,7 +333,7 @@ check-cast v3, Landroid/view/View; - const v6, 0x7f1211b3 + const v6, 0x7f1211b9 new-array v7, v4, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali index 31d3a1361f..f2f3da2d61 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali @@ -671,7 +671,7 @@ move-result-object v3 - const v5, 0x7f0803af + const v5, 0x7f0803ba invoke-virtual {v3, v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V @@ -799,7 +799,7 @@ if-eqz v2, :cond_8 - const v3, 0x7f120452 + const v3, 0x7f120451 invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali index a86accaa78..6ad8111310 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali @@ -558,7 +558,7 @@ move-result-object v5 - const v7, 0x7f1210b7 + const v7, 0x7f1210bd new-array v3, v3, [Ljava/lang/Object; @@ -720,7 +720,7 @@ return-object v0 :cond_0 - const p2, 0x7f1205cc + const p2, 0x7f1205cb invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali index ad3ebcf92e..e5fc78cc21 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali @@ -193,7 +193,7 @@ move-result-object p1 - const v3, 0x7f12105d + const v3, 0x7f121063 invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali index 4ee1ec314a..d0d16b3257 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String; + value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String; .end annotation .annotation system Ldalvik/annotation/InnerClass; @@ -32,6 +32,8 @@ .field final synthetic $context:Landroid/content/Context; +.field final synthetic $guildName:Ljava/lang/String; + .field final synthetic $otherUserId:Ljava/lang/Long; .field final synthetic $otherUserNickname:Ljava/lang/String; @@ -40,7 +42,7 @@ # direct methods -.method constructor (Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Landroid/content/Context;)V +.method constructor (Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Landroid/content/Context;Ljava/lang/String;)V .locals 0 iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage; @@ -53,6 +55,8 @@ iput-object p5, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$context:Landroid/content/Context; + iput-object p6, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$guildName:Ljava/lang/String; + const/4 p1, 0x1 invoke-direct {p0, p1}, Lkotlin/jvm/internal/k;->(I)V @@ -87,54 +91,228 @@ move-result v0 - const/4 v1, 0x2 + const/4 v1, 0x3 - const/4 v2, 0x0 + const v2, 0x7f120fc6 - const/4 v3, 0x1 + const/4 v3, 0x2 - if-eq v0, v3, :cond_7 + const/4 v4, 0x1 - if-eq v0, v1, :cond_4 + const/4 v5, 0x0 - const/4 v4, 0x4 - - if-eq v0, v4, :cond_3 - - const/4 v1, 0x5 - - if-eq v0, v1, :cond_2 - - const/4 v1, 0x6 - - if-eq v0, v1, :cond_1 - - const/4 v1, 0x7 - - if-eq v0, v1, :cond_0 + packed-switch v0, :pswitch_data_0 + :pswitch_0 const-string p1, "" return-object p1 - :cond_0 + :pswitch_1 + new-array v0, v1, [Ljava/lang/Object; + + iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; + + aput-object v1, v0, v5 + + iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$guildName:Ljava/lang/String; + + aput-object v1, v0, v4 + + const v1, 0x7f120d01 + + invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; + + move-result-object v1 + + aput-object v1, v0, v3 + + invoke-virtual {p1, v2, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; + + move-result-object p1 + + return-object p1 + + :pswitch_2 + new-array v0, v1, [Ljava/lang/Object; + + iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; + + aput-object v1, v0, v5 + + iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$guildName:Ljava/lang/String; + + aput-object v1, v0, v4 + + const v1, 0x7f120d00 + + invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; + + move-result-object v1 + + aput-object v1, v0, v3 + + invoke-virtual {p1, v2, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; + + move-result-object p1 + + return-object p1 + + :pswitch_3 + new-array v0, v1, [Ljava/lang/Object; + + iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; + + aput-object v1, v0, v5 + + iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$guildName:Ljava/lang/String; + + aput-object v1, v0, v4 + + const v1, 0x7f120cff + + invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; + + move-result-object v1 + + aput-object v1, v0, v3 + + invoke-virtual {p1, v2, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; + + move-result-object p1 + + return-object p1 + + :pswitch_4 + const v0, 0x7f120fc5 + + new-array v1, v4, [Ljava/lang/Object; + + iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; + + aput-object v2, v1, v5 + + invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; + + move-result-object p1 + + return-object p1 + + :pswitch_5 iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$context:Landroid/content/Context; iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage; invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getId()J - move-result-wide v4 + move-result-wide v1 - invoke-static {v0, v4, v5}, Lcom/discord/utilities/textprocessing/MessageUtils;->getSystemMessageUserJoin(Landroid/content/Context;J)I + invoke-static {v0, v1, v2}, Lcom/discord/utilities/textprocessing/MessageUtils;->getSystemMessageUserJoin(Landroid/content/Context;J)I move-result v0 + new-array v1, v4, [Ljava/lang/Object; + + iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; + + aput-object v2, v1, v5 + + invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; + + move-result-object p1 + + return-object p1 + + :pswitch_6 + const v0, 0x7f120fc9 + + new-array v1, v4, [Ljava/lang/Object; + + iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; + + aput-object v2, v1, v5 + + invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; + + move-result-object p1 + + return-object p1 + + :pswitch_7 + const v0, 0x7f120f9c + + new-array v1, v4, [Ljava/lang/Object; + + iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; + + aput-object v2, v1, v5 + + invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; + + move-result-object p1 + + return-object p1 + + :pswitch_8 + const v0, 0x7f120f9d + new-array v1, v3, [Ljava/lang/Object; - iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; + iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; - aput-object v3, v1, v2 + aput-object v2, v1, v5 + + iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage; + + invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String; + + move-result-object v2 + + aput-object v2, v1, v4 + + invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; + + move-result-object p1 + + return-object p1 + + :pswitch_9 + iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$otherUserId:Ljava/lang/Long; + + iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage; + + invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; + + move-result-object v1 + + const-string v2, "author" + + invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J + + move-result-wide v1 + + if-nez v0, :cond_0 + + goto :goto_0 + + :cond_0 + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J + + move-result-wide v6 + + cmp-long v0, v6, v1 + + if-nez v0, :cond_1 + + const v0, 0x7f120fce + + new-array v1, v4, [Ljava/lang/Object; + + iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; + + aput-object v2, v1, v5 invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -143,115 +321,18 @@ return-object p1 :cond_1 - const v0, 0x7f120fc3 - - new-array v1, v3, [Ljava/lang/Object; - - iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; - - aput-object v3, v1, v2 - - invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; - - move-result-object p1 - - return-object p1 - - :cond_2 - const v0, 0x7f120f96 - - new-array v1, v3, [Ljava/lang/Object; - - iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; - - aput-object v3, v1, v2 - - invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; - - move-result-object p1 - - return-object p1 - - :cond_3 - const v0, 0x7f120f97 - - new-array v1, v1, [Ljava/lang/Object; - - iget-object v4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; - - aput-object v4, v1, v2 - - iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage; - - invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String; - - move-result-object v2 - - aput-object v2, v1, v3 - - invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; - - move-result-object p1 - - return-object p1 - - :cond_4 - iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$otherUserId:Ljava/lang/Long; - - iget-object v4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage; - - invoke-virtual {v4}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; - - move-result-object v4 - - const-string v5, "author" - - invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J - - move-result-wide v4 - - if-nez v0, :cond_5 - - goto :goto_0 - - :cond_5 - invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - - move-result-wide v6 - - cmp-long v0, v6, v4 - - if-nez v0, :cond_6 - - const v0, 0x7f120fc8 - - new-array v1, v3, [Ljava/lang/Object; - - iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; - - aput-object v3, v1, v2 - - invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; - - move-result-object p1 - - return-object p1 - - :cond_6 :goto_0 - const v0, 0x7f120fc7 + const v0, 0x7f120fcd - new-array v1, v1, [Ljava/lang/Object; + new-array v1, v3, [Ljava/lang/Object; - iget-object v4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; + iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; - aput-object v4, v1, v2 + aput-object v2, v1, v5 iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$otherUserNickname:Ljava/lang/String; - aput-object v2, v1, v3 + aput-object v2, v1, v4 invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -259,22 +340,39 @@ return-object p1 - :cond_7 - const v0, 0x7f120fc6 + :pswitch_a + const v0, 0x7f120fcc - new-array v1, v1, [Ljava/lang/Object; + new-array v1, v3, [Ljava/lang/Object; - iget-object v4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; + iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String; - aput-object v4, v1, v2 + aput-object v2, v1, v5 iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$otherUserNickname:Ljava/lang/String; - aput-object v2, v1, v3 + aput-object v2, v1, v4 invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; move-result-object p1 return-object p1 + + nop + + :pswitch_data_0 + .packed-switch 0x1 + :pswitch_a + :pswitch_9 + :pswitch_0 + :pswitch_8 + :pswitch_7 + :pswitch_6 + :pswitch_5 + :pswitch_4 + :pswitch_3 + :pswitch_2 + :pswitch_1 + .end packed-switch .end method diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali index 8d25d363c7..b47189f3c6 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali @@ -197,54 +197,55 @@ move-result p1 - const/4 v0, 0x1 + const v0, 0x7f080249 - const v1, 0x7f080249 + const v1, 0x7f080248 - if-eq p1, v0, :cond_4 + const v2, 0x7f08032e - const/4 v0, 0x2 + packed-switch p1, :pswitch_data_0 - if-eq p1, v0, :cond_3 - - const/4 v0, 0x4 - - const v2, 0x7f080248 - - if-eq p1, v0, :cond_2 - - const/4 v0, 0x5 - - if-eq p1, v0, :cond_2 - - const/4 v0, 0x6 - - if-eq p1, v0, :cond_1 - - const/4 v0, 0x7 - - if-eq p1, v0, :cond_0 - - return v2 - - :cond_0 + :pswitch_0 return v1 - :cond_1 + :pswitch_1 + return v2 + + :pswitch_2 + return v0 + + :pswitch_3 const p1, 0x7f0801d3 return p1 - :cond_2 - return v2 + :pswitch_4 + return v1 - :cond_3 + :pswitch_5 const p1, 0x7f08024a return p1 - :cond_4 - return v1 + :pswitch_6 + return v0 + + nop + + :pswitch_data_0 + .packed-switch 0x1 + :pswitch_6 + :pswitch_5 + :pswitch_0 + :pswitch_4 + :pswitch_4 + :pswitch_3 + :pswitch_2 + :pswitch_1 + :pswitch_1 + :pswitch_1 + :pswitch_1 + .end packed-switch .end method .method private final getItemText()Landroid/widget/TextView; @@ -307,8 +308,8 @@ return-object v0 .end method -.method private final getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String; - .locals 8 +.method private final getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String; + .locals 9 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -318,7 +319,9 @@ "Ljava/util/Map<", "Ljava/lang/Long;", "Ljava/lang/String;", - ">;)", + ">;", + "Ljava/lang/String;", + ")", "Ljava/lang/String;" } .end annotation @@ -392,7 +395,9 @@ move-object v7, p2 - invoke-direct/range {v2 .. v7}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Landroid/content/Context;)V + move-object v8, p5 + + invoke-direct/range {v2 .. v8}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Landroid/content/Context;Ljava/lang/String;)V invoke-virtual {p4, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->invoke(Landroid/content/Context;)Ljava/lang/String; @@ -408,7 +413,7 @@ # virtual methods .method protected final onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V - .locals 5 + .locals 7 const-string v0, "data" @@ -428,119 +433,151 @@ invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->component5()Ljava/util/Map; - move-result-object p2 + move-result-object v4 invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; - move-result-object v1 + move-result-object p2 - const-string v2, "message.author" + const-string v1, "message.author" - invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {p2, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J + invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J move-result-wide v1 invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v1 + move-result-object p2 - invoke-interface {p2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v4, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object p2 - check-cast v1, Ljava/lang/String; + check-cast p2, Ljava/lang/String; - const/4 v2, 0x0 + const/4 v6, 0x0 - if-eqz v1, :cond_0 + if-eqz p2, :cond_0 - new-instance v3, Ljava/lang/StringBuilder; + new-instance v1, Ljava/lang/StringBuilder; - const-string v4, "**" + const-string v2, "**" - invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V + invoke-direct {v1, v2}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v1 + move-result-object p2 + + move-object v3, p2 goto :goto_0 :cond_0 - move-object v1, v2 + move-object v3, v6 :goto_0 invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemText()Landroid/widget/TextView; - move-result-object v3 + move-result-object p2 - invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context; - - move-result-object v3 - - const v4, 0x7f040361 - - invoke-static {v3, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I - - move-result v3 - - invoke-static {v0, v3}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getColor(Lcom/discord/models/domain/ModelGuildMember$Computed;I)I - - move-result v0 - - invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemText()Landroid/widget/TextView; - - move-result-object v3 - - invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context; - - move-result-object v3 - - const-string v4, "itemText.context" - - invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-direct {p0, p1, v3, v1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String; + invoke-virtual {p2}, Landroid/widget/TextView;->getContext()Landroid/content/Context; move-result-object p2 + const v1, 0x7f040361 + + invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I + + move-result p2 + + invoke-static {v0, p2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getColor(Lcom/discord/models/domain/ModelGuildMember$Computed;I)I + + move-result p2 + + iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter; + + check-cast v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter; + + invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data; + + move-result-object v0 + + invoke-interface {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v0 + + if-eqz v0, :cond_1 + + invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String; + + move-result-object v0 + + move-object v5, v0 + + goto :goto_1 + + :cond_1 + move-object v5, v6 + + :goto_1 + invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemText()Landroid/widget/TextView; + + move-result-object v0 + + invoke-virtual {v0}, Landroid/widget/TextView;->getContext()Landroid/content/Context; + + move-result-object v2 + + const-string v0, "itemText.context" + + invoke-static {v2, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + move-object v0, p0 + + move-object v1, p1 + + invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + new-instance v1, Lcom/discord/simpleast/core/parser/Parser; - const/4 v3, 0x0 + const/4 v2, 0x0 - const/4 v4, 0x1 + const/4 v3, 0x1 - invoke-direct {v1, v3, v4, v2}, Lcom/discord/simpleast/core/parser/Parser;->(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct {v1, v2, v3, v6}, Lcom/discord/simpleast/core/parser/Parser;->(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V - sget-object v3, Lcom/discord/simpleast/core/a/a;->xp:Lcom/discord/simpleast/core/a/a; + sget-object v2, Lcom/discord/simpleast/core/a/a;->xp:Lcom/discord/simpleast/core/a/a; invoke-static {}, Lcom/discord/simpleast/core/a/a;->ed()Ljava/util/regex/Pattern; - move-result-object v3 + move-result-object v2 - const-string v4, "SimpleMarkdownRules.PATTERN_BOLD" + const-string v3, "SimpleMarkdownRules.PATTERN_BOLD" - invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - new-instance v4, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1; + new-instance v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1; - invoke-direct {v4, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;->(I)V + invoke-direct {v3, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;->(I)V - check-cast v4, Lkotlin/jvm/functions/Function0; + check-cast v3, Lkotlin/jvm/functions/Function0; - invoke-static {v3, v4}, Lcom/discord/simpleast/core/a/a;->a(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule; + invoke-static {v2, v3}, Lcom/discord/simpleast/core/a/a;->a(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule; - move-result-object v0 + move-result-object p2 - invoke-virtual {v1, v0}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser; + invoke-virtual {v1, p2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser; - move-result-object v0 + move-result-object p2 sget-object v1, Lcom/discord/simpleast/core/a/a;->xp:Lcom/discord/simpleast/core/a/a; @@ -548,15 +585,15 @@ move-result-object v1 - invoke-virtual {v0, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser; + invoke-virtual {p2, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser; - move-result-object v0 + move-result-object p2 - check-cast p2, Ljava/lang/CharSequence; + check-cast v0, Ljava/lang/CharSequence; const/4 v1, 0x2 - invoke-static {v0, p2, v2, v1, v2}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List; + invoke-static {p2, v0, v6, v1, v6}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List; move-result-object p2 @@ -572,15 +609,15 @@ move-result-object v1 - const-string v3, "itemTimestamp.context" + const-string v2, "itemTimestamp.context" - invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getTimestamp()J - move-result-wide v3 + move-result-wide v2 - invoke-static {v1, v3, v4}, Lcom/discord/utilities/time/TimeUtils;->toReadableTimeString(Landroid/content/Context;J)Ljava/lang/CharSequence; + invoke-static {v1, v2, v3}, Lcom/discord/utilities/time/TimeUtils;->toReadableTimeString(Landroid/content/Context;J)Ljava/lang/CharSequence; move-result-object v1 @@ -592,7 +629,7 @@ check-cast p2, Ljava/util/Collection; - invoke-static {p2, v2}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder; + invoke-static {p2, v6}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder; move-result-object p2 diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali index 05bf914144..211b89d790 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali @@ -621,7 +621,7 @@ check-cast p2, Landroid/view/View; - const v0, 0x7f121085 + const v0, 0x7f12108b invoke-static {p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; @@ -648,7 +648,7 @@ const/4 v6, 0x1 - const v7, 0x7f1000af + const v7, 0x7f1000b3 const-string v8, "title" diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs.smali b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs.smali new file mode 100644 index 0000000000..6fdfdcad6c --- /dev/null +++ b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs.smali @@ -0,0 +1,86 @@ +.class public final synthetic Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs; +.super Ljava/lang/Object; +.source "lambda" + +# interfaces +.implements Lrx/functions/Func9; + + +# static fields +.field public static final synthetic INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs; + + +# direct methods +.method static synthetic constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs; + + invoke-direct {v0}, Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs;->()V + + sput-object v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs;->INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs; + + return-void +.end method + +.method private synthetic constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final 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; + .locals 12 + + new-instance v11, Lcom/discord/widgets/chat/list/model/WidgetChatListModel; + + move-object v1, p1 + + check-cast v1, Lcom/discord/models/domain/ModelChannel; + + move-object v2, p2 + + check-cast v2, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop; + + move-object v3, p3 + + check-cast v3, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages; + + move-object/from16 v4, p4 + + check-cast v4, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState; + + move-object/from16 v5, p5 + + check-cast v5, Ljava/util/Map; + + move-object/from16 v0, p6 + + check-cast v0, Ljava/lang/Long; + + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J + + move-result-wide v6 + + move-object/from16 v8, p7 + + check-cast v8, Ljava/util/Map; + + move-object/from16 v9, p8 + + check-cast v9, Lcom/discord/models/domain/ModelGuild; + + move-object/from16 v10, p9 + + check-cast v10, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState; + + move-object v0, v11 + + invoke-direct/range {v0 .. v10}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;Ljava/util/Map;JLjava/util/Map;Lcom/discord/models/domain/ModelGuild;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)V + + return-object v11 +.end method diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k.smali b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k.smali deleted file mode 100644 index ba6f7754a6..0000000000 --- a/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k.smali +++ /dev/null @@ -1,78 +0,0 @@ -.class public final synthetic Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k; -.super Ljava/lang/Object; -.source "lambda" - -# interfaces -.implements Lrx/functions/Func7; - - -# static fields -.field public static final synthetic INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k; - - -# direct methods -.method static synthetic constructor ()V - .locals 1 - - new-instance v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k; - - invoke-direct {v0}, Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k;->()V - - sput-object v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k;->INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k; - - return-void -.end method - -.method private synthetic constructor ()V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - - -# virtual methods -.method public final 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; - .locals 10 - - new-instance v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel; - - move-object v1, p1 - - check-cast v1, Lcom/discord/models/domain/ModelChannel; - - move-object v2, p2 - - check-cast v2, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop; - - move-object v3, p3 - - check-cast v3, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages; - - move-object v4, p4 - - check-cast v4, Ljava/util/Map; - - move-object v0, p5 - - check-cast v0, Ljava/lang/Long; - - invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - - move-result-wide v5 - - move-object/from16 v7, p6 - - check-cast v7, Ljava/util/Map; - - move-object/from16 v8, p7 - - check-cast v8, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState; - - move-object v0, v9 - - invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Ljava/util/Map;JLjava/util/Map;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)V - - return-object v9 -.end method diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali index 6391d69c8b..fa8a105b89 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali @@ -33,8 +33,15 @@ .end annotation .end field +.field private final guild:Lcom/discord/models/domain/ModelGuild; + .annotation build Landroidx/annotation/Nullable; + .end annotation +.end field + .field private final guildId:J +.field private final isLoadingMessages:Z + .field private final list:Ljava/util/List; .annotation system Ldalvik/annotation/Signature; value = { @@ -65,7 +72,7 @@ # direct methods -.method public constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Ljava/util/Map;JLjava/util/Map;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)V +.method public constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;Ljava/util/Map;JLjava/util/Map;Lcom/discord/models/domain/ModelGuild;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)V .locals 2 .param p1 # Lcom/discord/models/domain/ModelChannel; .annotation build Landroidx/annotation/NonNull; @@ -79,15 +86,23 @@ .annotation build Landroidx/annotation/NonNull; .end annotation .end param - .param p4 # Ljava/util/Map; + .param p4 # Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState; .annotation build Landroidx/annotation/NonNull; .end annotation .end param - .param p7 # Ljava/util/Map; + .param p5 # Ljava/util/Map; .annotation build Landroidx/annotation/NonNull; .end annotation .end param - .param p8 # Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState; + .param p8 # Ljava/util/Map; + .annotation build Landroidx/annotation/NonNull; + .end annotation + .end param + .param p9 # Lcom/discord/models/domain/ModelGuild; + .annotation build Landroidx/annotation/Nullable; + .end annotation + .end param + .param p10 # Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState; .annotation build Landroidx/annotation/NonNull; .end annotation .end param @@ -97,6 +112,7 @@ "Lcom/discord/models/domain/ModelChannel;", "Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;", "Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;", + "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;", "Ljava/util/Map<", "Ljava/lang/Long;", "Ljava/lang/String;", @@ -105,6 +121,7 @@ "Ljava/lang/Long;", "Lcom/discord/models/domain/ModelGuildMember$Computed;", ">;", + "Lcom/discord/models/domain/ModelGuild;", "Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;", ")V" } @@ -112,9 +129,9 @@ invoke-direct {p0}, Ljava/lang/Object;->()V - iput-wide p5, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->userId:J + iput-wide p6, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->userId:J - iput-object p4, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->channelNames:Ljava/util/Map; + iput-object p5, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->channelNames:Ljava/util/Map; invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J @@ -122,29 +139,37 @@ iput-wide v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->channelId:J + iput-object p9, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->guild:Lcom/discord/models/domain/ModelGuild; + invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J move-result-wide v0 iput-wide v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->guildId:J + invoke-virtual {p4}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->isLoadingMessages()Z + + move-result p1 + + iput-boolean p1, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages:Z + invoke-static {p3}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->access$000(Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;)J - move-result-wide v0 + move-result-wide p4 - iput-wide v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->oldestMessageId:J + iput-wide p4, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->oldestMessageId:J invoke-static {p3}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->access$100(Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;)J - move-result-wide v0 + move-result-wide p4 - iput-wide v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->newestKnownMessageId:J + iput-wide p4, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->newestKnownMessageId:J - invoke-static {p5, p6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {p6, p7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object p1 - invoke-interface {p7, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {p8, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object p1 @@ -152,11 +177,11 @@ new-instance p1, Ljava/util/HashSet; - invoke-static {p5, p6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {p6, p7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object p4 - invoke-interface {p7, p4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {p8, p4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object p4 @@ -184,7 +209,7 @@ iput-wide p4, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->newMessagesMarkerMessageId:J - invoke-direct {p0, p2, p3, p8}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->computeList(Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)Ljava/util/List; + invoke-direct {p0, p2, p3, p10}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->computeList(Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)Ljava/util/List; move-result-object p1 @@ -432,7 +457,7 @@ .end method .method static synthetic lambda$get$1(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable; - .locals 8 + .locals 10 invoke-static {p0}, Lrx/Observable;->bA(Ljava/lang/Object;)Lrx/Observable; @@ -446,45 +471,69 @@ move-result-object v2 - invoke-static {}, Lcom/discord/stores/StoreStream;->getChannels()Lcom/discord/stores/StoreChannels; + invoke-static {}, Lcom/discord/stores/StoreStream;->getMessagesLoader()Lcom/discord/stores/StoreMessagesLoader; move-result-object v3 - invoke-virtual {v3}, Lcom/discord/stores/StoreChannels;->getNames()Lrx/Observable; - - move-result-object v3 - - invoke-static {}, Lcom/discord/stores/StoreStream;->getUsers()Lcom/discord/stores/StoreUser; - - move-result-object v4 - - invoke-virtual {v4}, Lcom/discord/stores/StoreUser;->getMeId()Lrx/Observable; - - move-result-object v4 - - invoke-static {}, Lcom/discord/stores/StoreStream;->getGuilds()Lcom/discord/stores/StoreGuilds; - - move-result-object v5 - - invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J - - move-result-wide v6 - - invoke-virtual {v5, v6, v7}, Lcom/discord/stores/StoreGuilds;->getComputed(J)Lrx/Observable; - - move-result-object v5 - invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getId()J - move-result-wide v6 + move-result-wide v4 - invoke-static {v6, v7}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getChatListState(J)Lrx/Observable; + invoke-virtual {v3, v4, v5}, Lcom/discord/stores/StoreMessagesLoader;->getMessagesLoadedState(J)Lrx/Observable; + + move-result-object v3 + + invoke-static {}, Lcom/discord/stores/StoreStream;->getChannels()Lcom/discord/stores/StoreChannels; + + move-result-object v4 + + invoke-virtual {v4}, Lcom/discord/stores/StoreChannels;->getNames()Lrx/Observable; + + move-result-object v4 + + invoke-static {}, Lcom/discord/stores/StoreStream;->getUsers()Lcom/discord/stores/StoreUser; + + move-result-object v5 + + invoke-virtual {v5}, Lcom/discord/stores/StoreUser;->getMeId()Lrx/Observable; + + move-result-object v5 + + invoke-static {}, Lcom/discord/stores/StoreStream;->getGuilds()Lcom/discord/stores/StoreGuilds; move-result-object v6 - sget-object v7, Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k;->INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k; + invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J - invoke-static/range {v0 .. v7}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func7;)Lrx/Observable; + move-result-wide v7 + + invoke-virtual {v6, v7, v8}, Lcom/discord/stores/StoreGuilds;->getComputed(J)Lrx/Observable; + + move-result-object v6 + + invoke-static {}, Lcom/discord/stores/StoreStream;->getGuilds()Lcom/discord/stores/StoreGuilds; + + move-result-object v7 + + invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J + + move-result-wide v8 + + invoke-virtual {v7, v8, v9}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable; + + move-result-object v7 + + invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getId()J + + move-result-wide v8 + + invoke-static {v8, v9}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getChatListState(J)Lrx/Observable; + + move-result-object v8 + + sget-object v9, Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs;->INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs; + + invoke-static/range {v0 .. v9}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func9;)Lrx/Observable; move-result-object p0 @@ -615,6 +664,31 @@ return v2 :cond_4 + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v1 + + invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v3 + + if-nez v1, :cond_5 + + if-eqz v3, :cond_6 + + goto :goto_0 + + :cond_5 + invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z + + move-result v1 + + if-nez v1, :cond_6 + + :goto_0 + return v2 + + :cond_6 invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuildId()J move-result-wide v3 @@ -625,11 +699,11 @@ cmp-long v1, v3, v5 - if-eqz v1, :cond_5 + if-eqz v1, :cond_7 return v2 - :cond_5 + :cond_7 invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getChannelNames()Ljava/util/Map; move-result-object v1 @@ -638,23 +712,23 @@ move-result-object v3 - if-nez v1, :cond_6 + if-nez v1, :cond_8 - if-eqz v3, :cond_7 + if-eqz v3, :cond_9 - goto :goto_0 + goto :goto_1 - :cond_6 + :cond_8 invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z move-result v1 - if-nez v1, :cond_7 + if-nez v1, :cond_9 - :goto_0 + :goto_1 return v2 - :cond_7 + :cond_9 invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getOldestMessageId()J move-result-wide v3 @@ -665,11 +739,24 @@ cmp-long v1, v3, v5 - if-eqz v1, :cond_8 + if-eqz v1, :cond_a return v2 - :cond_8 + :cond_a + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages()Z + + move-result v1 + + invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages()Z + + move-result v3 + + if-eq v1, v3, :cond_b + + return v2 + + :cond_b invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getMyRoleIds()Ljava/util/Set; move-result-object v1 @@ -678,46 +765,6 @@ move-result-object v3 - if-nez v1, :cond_9 - - if-eqz v3, :cond_a - - goto :goto_1 - - :cond_9 - invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z - - move-result v1 - - if-nez v1, :cond_a - - :goto_1 - return v2 - - :cond_a - invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewMessagesMarkerMessageId()J - - move-result-wide v3 - - invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewMessagesMarkerMessageId()J - - move-result-wide v5 - - cmp-long v1, v3, v5 - - if-eqz v1, :cond_b - - return v2 - - :cond_b - invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getList()Ljava/util/List; - - move-result-object v1 - - invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getList()Ljava/util/List; - - move-result-object v3 - if-nez v1, :cond_c if-eqz v3, :cond_d @@ -735,6 +782,46 @@ return v2 :cond_d + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewMessagesMarkerMessageId()J + + move-result-wide v3 + + invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewMessagesMarkerMessageId()J + + move-result-wide v5 + + cmp-long v1, v3, v5 + + if-eqz v1, :cond_e + + return v2 + + :cond_e + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getList()Ljava/util/List; + + move-result-object v1 + + invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getList()Ljava/util/List; + + move-result-object v3 + + if-nez v1, :cond_f + + if-eqz v3, :cond_10 + + goto :goto_3 + + :cond_f + invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z + + move-result v1 + + if-nez v1, :cond_10 + + :goto_3 + return v2 + + :cond_10 invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewestKnownMessageId()J move-result-wide v3 @@ -745,11 +832,11 @@ cmp-long p1, v3, v5 - if-eqz p1, :cond_e + if-eqz p1, :cond_11 return v2 - :cond_e + :cond_11 return v0 .end method @@ -778,6 +865,14 @@ return-object v0 .end method +.method public getGuild()Lcom/discord/models/domain/ModelGuild; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->guild:Lcom/discord/models/domain/ModelGuild; + + return-object v0 +.end method + .method public getGuildId()J .locals 2 @@ -884,21 +979,7 @@ add-int/2addr v1, v0 - invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuildId()J - - move-result-wide v3 - - mul-int/lit8 v1, v1, 0x3b - - ushr-long v5, v3, v2 - - xor-long/2addr v3, v5 - - long-to-int v0, v3 - - add-int/2addr v1, v0 - - invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getChannelNames()Ljava/util/Map; + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuild()Lcom/discord/models/domain/ModelGuild; move-result-object v0 @@ -920,7 +1001,7 @@ :goto_0 add-int/2addr v1, v0 - invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getOldestMessageId()J + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuildId()J move-result-wide v4 @@ -934,7 +1015,7 @@ add-int/2addr v1, v0 - invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getMyRoleIds()Ljava/util/Set; + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getChannelNames()Ljava/util/Map; move-result-object v0 @@ -954,6 +1035,58 @@ :goto_1 add-int/2addr v1, v0 + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getOldestMessageId()J + + move-result-wide v4 + + mul-int/lit8 v1, v1, 0x3b + + ushr-long v6, v4, v2 + + xor-long/2addr v4, v6 + + long-to-int v0, v4 + + add-int/2addr v1, v0 + + mul-int/lit8 v1, v1, 0x3b + + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages()Z + + move-result v0 + + if-eqz v0, :cond_2 + + const/16 v0, 0x4f + + goto :goto_2 + + :cond_2 + const/16 v0, 0x61 + + :goto_2 + add-int/2addr v1, v0 + + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getMyRoleIds()Ljava/util/Set; + + move-result-object v0 + + mul-int/lit8 v1, v1, 0x3b + + if-nez v0, :cond_3 + + const/16 v0, 0x2b + + goto :goto_3 + + :cond_3 + invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I + + move-result v0 + + :goto_3 + add-int/2addr v1, v0 + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewMessagesMarkerMessageId()J move-result-wide v4 @@ -974,16 +1107,16 @@ mul-int/lit8 v1, v1, 0x3b - if-nez v0, :cond_2 + if-nez v0, :cond_4 - goto :goto_2 + goto :goto_4 - :cond_2 + :cond_4 invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I move-result v3 - :goto_2 + :goto_4 add-int/2addr v1, v3 invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewestKnownMessageId()J @@ -1003,6 +1136,14 @@ return v1 .end method +.method public isLoadingMessages()Z + .locals 1 + + iget-boolean v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages:Z + + return v0 +.end method + .method public isSpoilerClickAllowed()Z .locals 1 @@ -1036,6 +1177,16 @@ invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder; + const-string v1, ", guild=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v1 + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + const-string v1, ", guildId=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; @@ -1066,6 +1217,16 @@ invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder; + const-string v1, ", isLoadingMessages=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages()Z + + move-result v1 + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; + const-string v1, ", myRoleIds=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali index c76ae4ff5c..ca620fc81d 100644 --- a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali +++ b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali @@ -282,7 +282,7 @@ invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120d9c + const p1, 0x7f120da0 invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ.smali b/com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84.smali similarity index 50% rename from com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ.smali rename to com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84.smali index 86425694d4..ca0cccfd64 100644 --- a/com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ.smali +++ b/com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84.smali @@ -1,9 +1,9 @@ -.class public final synthetic Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ; +.class public final synthetic Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84; .super Ljava/lang/Object; .source "lambda" # interfaces -.implements Lrx/functions/Func6; +.implements Lrx/functions/Func7; # instance fields @@ -18,49 +18,55 @@ invoke-direct {p0}, Ljava/lang/Object;->()V - iput-object p1, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;->f$0:Landroid/content/Context; + iput-object p1, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;->f$0:Landroid/content/Context; - iput-object p2, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;->f$1:Lcom/discord/models/domain/ModelChannel; + iput-object p2, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;->f$1:Lcom/discord/models/domain/ModelChannel; return-void .end method # virtual methods -.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - .locals 8 +.method public final 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; + .locals 10 - iget-object v0, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;->f$0:Landroid/content/Context; + move-object v0, p0 - iget-object v1, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;->f$1:Lcom/discord/models/domain/ModelChannel; + iget-object v1, v0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;->f$0:Landroid/content/Context; - move-object v2, p1 + iget-object v2, v0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;->f$1:Lcom/discord/models/domain/ModelChannel; - check-cast v2, Ljava/lang/Long; + move-object v3, p1 - move-object v3, p2 + check-cast v3, Ljava/lang/Long; - check-cast v3, Ljava/util/List; + move-object v4, p2 - move-object v4, p3 + check-cast v4, Ljava/util/List; - check-cast v4, Ljava/util/Map; - - move-object v5, p4 + move-object v5, p3 check-cast v5, Ljava/util/Map; - move-object v6, p5 + move-object v6, p4 check-cast v6, Ljava/util/Map; - move-object v7, p6 + move-object v7, p5 - check-cast v7, Ljava/lang/Boolean; + check-cast v7, Ljava/util/Map; - invoke-static/range {v0 .. v7}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->lambda$null$0(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model; + move-object/from16 v8, p6 - move-result-object p1 + check-cast v8, Ljava/lang/Boolean; - return-object p1 + move-object/from16 v9, p7 + + check-cast v9, Lcom/discord/models/domain/ModelGuild; + + invoke-static/range {v1 .. v9}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->lambda$null$0(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model; + + move-result-object v1 + + return-object v1 .end method diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali index a818364d0c..26356727c1 100644 --- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali +++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali @@ -31,6 +31,11 @@ .end annotation .end field +.field private final guild:Lcom/discord/models/domain/ModelGuild; + .annotation build Landroidx/annotation/Nullable; + .end annotation +.end field + .field private final list:Ljava/util/List; .annotation system Ldalvik/annotation/Signature; value = { @@ -55,12 +60,13 @@ # direct methods -.method public constructor (Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;Ljava/util/List;Ljava/util/Set;)V +.method public constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;JLjava/util/Map;Ljava/util/List;Ljava/util/Set;)V .locals 0 .annotation system Ldalvik/annotation/Signature; value = { "(", "Lcom/discord/models/domain/ModelChannel;", + "Lcom/discord/models/domain/ModelGuild;", "J", "Ljava/util/Map<", "Ljava/lang/Long;", @@ -79,13 +85,15 @@ iput-object p1, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->channel:Lcom/discord/models/domain/ModelChannel; - iput-wide p2, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->userId:J + iput-object p2, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->guild:Lcom/discord/models/domain/ModelGuild; - iput-object p4, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->channelNames:Ljava/util/Map; + iput-wide p3, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->userId:J - iput-object p5, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->list:Ljava/util/List; + iput-object p5, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->channelNames:Ljava/util/Map; - iput-object p6, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->myRoleIds:Ljava/util/Set; + iput-object p6, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->list:Ljava/util/List; + + iput-object p7, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->myRoleIds:Ljava/util/Set; return-void .end method @@ -98,8 +106,12 @@ return-object p0 .end method -.method private static create(Landroid/content/Context;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;Z)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model; +.method private static create(Landroid/content/Context;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;ZLcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model; .locals 15 + .param p9 # Lcom/discord/models/domain/ModelGuild; + .annotation build Landroidx/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -120,7 +132,9 @@ "Ljava/util/Map<", "Ljava/lang/Long;", "Ljava/lang/String;", - ">;Z)", + ">;Z", + "Lcom/discord/models/domain/ModelGuild;", + ")", "Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;" } .end annotation @@ -156,7 +170,7 @@ :cond_1 :goto_0 - move-object v5, v0 + move-object v6, v0 goto :goto_3 @@ -303,21 +317,23 @@ move-result-object v0 :goto_4 - move-object v6, v0 + move-object v7, v0 - new-instance v7, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model; + new-instance v8, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model; - move-object v0, v7 + move-object v0, v8 move-object/from16 v1, p4 - move-wide/from16 v2, p5 + move-object/from16 v2, p9 - move-object/from16 v4, p7 + move-wide/from16 v3, p5 - invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->(Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;Ljava/util/List;Ljava/util/Set;)V + move-object/from16 v5, p7 - return-object v7 + invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;JLjava/util/Map;Ljava/util/List;Ljava/util/Set;)V + + return-object v8 :cond_7 :goto_5 @@ -359,7 +375,7 @@ .end method .method static synthetic lambda$get$1(JLandroid/content/Context;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable; - .locals 8 + .locals 9 if-nez p3, :cond_0 @@ -428,19 +444,31 @@ move-result-object v6 - new-instance v7, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ; + invoke-static {}, Lcom/discord/stores/StoreStream;->getGuilds()Lcom/discord/stores/StoreGuilds; - invoke-direct {v7, p2, p3}, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;->(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;)V + move-result-object p0 - invoke-static/range {v1 .. v7}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func6;)Lrx/Observable; + invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J + + move-result-wide v7 + + invoke-virtual {p0, v7, v8}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable; + + move-result-object v7 + + new-instance v8, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84; + + invoke-direct {v8, p2, p3}, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;->(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;)V + + invoke-static/range {v1 .. v8}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func7;)Lrx/Observable; move-result-object p0 return-object p0 .end method -.method static synthetic lambda$null$0(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model; - .locals 9 +.method static synthetic lambda$null$0(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model; + .locals 10 invoke-virtual {p2}, Ljava/lang/Long;->longValue()J @@ -460,9 +488,11 @@ move-object v4, p1 - move-object v7, p6 + move-object/from16 v7, p6 - invoke-static/range {v0 .. v8}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->create(Landroid/content/Context;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;Z)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model; + move-object/from16 v9, p8 + + invoke-static/range {v0 .. v9}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->create(Landroid/content/Context;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;ZLcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model; move-result-object v0 @@ -534,6 +564,31 @@ return v2 :cond_4 + invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v1 + + invoke-virtual {p1}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v3 + + if-nez v1, :cond_5 + + if-eqz v3, :cond_6 + + goto :goto_1 + + :cond_5 + invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z + + move-result v1 + + if-nez v1, :cond_6 + + :goto_1 + return v2 + + :cond_6 invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getUserId()J move-result-wide v3 @@ -544,11 +599,11 @@ cmp-long v1, v3, v5 - if-eqz v1, :cond_5 + if-eqz v1, :cond_7 return v2 - :cond_5 + :cond_7 invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getChannelNames()Ljava/util/Map; move-result-object v1 @@ -557,31 +612,6 @@ move-result-object v3 - if-nez v1, :cond_6 - - if-eqz v3, :cond_7 - - goto :goto_1 - - :cond_6 - invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z - - move-result v1 - - if-nez v1, :cond_7 - - :goto_1 - return v2 - - :cond_7 - invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List; - - move-result-object v1 - - invoke-virtual {p1}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List; - - move-result-object v3 - if-nez v1, :cond_8 if-eqz v3, :cond_9 @@ -599,6 +629,31 @@ return v2 :cond_9 + invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List; + + move-result-object v1 + + invoke-virtual {p1}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List; + + move-result-object v3 + + if-nez v1, :cond_a + + if-eqz v3, :cond_b + + goto :goto_3 + + :cond_a + invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z + + move-result v1 + + if-nez v1, :cond_b + + :goto_3 + return v2 + + :cond_b invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getMyRoleIds()Ljava/util/Set; move-result-object v1 @@ -607,23 +662,23 @@ move-result-object p1 - if-nez v1, :cond_a + if-nez v1, :cond_c - if-eqz p1, :cond_b + if-eqz p1, :cond_d - goto :goto_3 + goto :goto_4 - :cond_a + :cond_c invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z move-result p1 - if-nez p1, :cond_b + if-nez p1, :cond_d - :goto_3 + :goto_4 return v2 - :cond_b + :cond_d return v0 .end method @@ -664,6 +719,16 @@ return-object v0 .end method +.method public getGuild()Lcom/discord/models/domain/ModelGuild; + .locals 1 + .annotation build Landroidx/annotation/Nullable; + .end annotation + + iget-object v0, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->guild:Lcom/discord/models/domain/ModelGuild; + + return-object v0 +.end method + .method public getGuildId()J .locals 2 @@ -758,6 +823,26 @@ :goto_0 add-int/lit8 v0, v0, 0x3b + invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v2 + + mul-int/lit8 v0, v0, 0x3b + + if-nez v2, :cond_1 + + const/16 v2, 0x2b + + goto :goto_1 + + :cond_1 + invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I + + move-result v2 + + :goto_1 + add-int/2addr v0, v2 + invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getUserId()J move-result-wide v2 @@ -780,26 +865,6 @@ mul-int/lit8 v0, v0, 0x3b - if-nez v2, :cond_1 - - const/16 v2, 0x2b - - goto :goto_1 - - :cond_1 - invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I - - move-result v2 - - :goto_1 - add-int/2addr v0, v2 - - invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List; - - move-result-object v2 - - mul-int/lit8 v0, v0, 0x3b - if-nez v2, :cond_2 const/16 v2, 0x2b @@ -814,7 +879,7 @@ :goto_2 add-int/2addr v0, v2 - invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getMyRoleIds()Ljava/util/Set; + invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List; move-result-object v2 @@ -822,14 +887,34 @@ if-nez v2, :cond_3 + const/16 v2, 0x2b + goto :goto_3 :cond_3 invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I - move-result v1 + move-result v2 :goto_3 + add-int/2addr v0, v2 + + invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getMyRoleIds()Ljava/util/Set; + + move-result-object v2 + + mul-int/lit8 v0, v0, 0x3b + + if-nez v2, :cond_4 + + goto :goto_4 + + :cond_4 + invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I + + move-result v1 + + :goto_4 add-int/2addr v0, v1 return v0 @@ -858,6 +943,16 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + const-string v1, ", guild=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v1 + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + const-string v1, ", userId=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali index cf82da6e70..a9f4fa3de5 100644 --- a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali +++ b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali @@ -451,7 +451,7 @@ if-eq v0, v5, :cond_0 - const p2, 0x7f120ef9 + const p2, 0x7f120efd invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -462,7 +462,7 @@ :cond_0 sget-object v0, Lkotlin/jvm/internal/y;->bfP:Lkotlin/jvm/internal/y; - const v0, 0x7f120fe7 + const v0, 0x7f120fed invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -507,7 +507,7 @@ :cond_1 sget-object v0, Lkotlin/jvm/internal/y;->bfP:Lkotlin/jvm/internal/y; - const v0, 0x7f121040 + const v0, 0x7f121046 invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali index 2e2f577b08..521c9c95d6 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali @@ -250,7 +250,7 @@ invoke-static {p0, p1, v1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f12049e + const p1, 0x7f12049d invoke-virtual {p0, p1}, Lcom/discord/widgets/debugging/WidgetDebugging;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 550db0e2c6..873ecb243f 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -419,7 +419,7 @@ aput-object v3, v1, v2 - const v3, 0x7f12044a + const v3, 0x7f120449 invoke-virtual {p0, v3, v1}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -447,7 +447,7 @@ if-eqz p1, :cond_0 - const v5, 0x7f120f4c + const v5, 0x7f120f51 invoke-virtual {p0, v5}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I)Ljava/lang/String; @@ -467,7 +467,7 @@ :goto_0 aput-object v5, v3, v2 - const v5, 0x7f120449 + const v5, 0x7f120448 invoke-virtual {p0, v5, v3}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -481,7 +481,7 @@ move-result-object v1 - const v3, 0x7f12044b + const v3, 0x7f12044a new-array v5, v0, [Ljava/lang/Object; @@ -508,11 +508,11 @@ move-result-object p1 - const v1, 0x7f120443 + const v1, 0x7f120442 new-array v3, v0, [Ljava/lang/Object; - const-string v4, "8.9.9" + const-string v4, "9.0.0" aput-object v4, v3, v2 @@ -528,7 +528,7 @@ move-result-object p1 - const v1, 0x7f120447 + const v1, 0x7f120446 new-array v3, v0, [Ljava/lang/Object; @@ -552,7 +552,7 @@ move-result-object p1 - const v1, 0x7f120446 + const v1, 0x7f120445 new-array v0, v0, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali index e3abd4868e..152d3739be 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali @@ -460,7 +460,7 @@ invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v1, 0x7f120663 + const v1, 0x7f120662 invoke-virtual {p0, v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali index 278c273113..a517fda76d 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali @@ -96,11 +96,11 @@ invoke-direct {v1, p0, p1, v0, p2}, Lcom/discord/widgets/friends/WidgetFriendsList$addTab$1;->(Lcom/discord/widgets/friends/WidgetFriendsList;Lcom/google/android/material/tabs/TabLayout;Lcom/google/android/material/tabs/TabLayout$Tab;I)V - const v2, 0x7f120666 + const v2, 0x7f120665 if-eq p2, v2, :cond_1 - const v2, 0x7f120f78 + const v2, 0x7f120f7e if-eq p2, v2, :cond_0 @@ -164,6 +164,10 @@ invoke-static {v0, v1, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + const v0, 0x7f120663 + + invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V + const v0, 0x7f120664 invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V @@ -176,10 +180,6 @@ invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V - const v0, 0x7f120667 - - invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V - const v0, 0x7f12031f invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali index d8146124f8..dc143472e3 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali @@ -449,7 +449,7 @@ if-eqz p1, :cond_2 - const p1, 0x7f0802fb + const p1, 0x7f080305 return p1 @@ -462,7 +462,7 @@ if-eqz p1, :cond_2 - const p1, 0x7f0802f0 + const p1, 0x7f0802fa return p1 @@ -488,7 +488,7 @@ if-eqz p1, :cond_2 - const p1, 0x7f080279 + const p1, 0x7f080281 return p1 diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali index d0cd478f4b..b678bb85f7 100644 --- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali +++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali @@ -934,7 +934,7 @@ invoke-virtual {p0, v1, v3}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->setOnClickAndDismissListener(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V - const v1, 0x7f120ec2 + const v1, 0x7f120ec6 new-array v2, v2, [Ljava/lang/Object; @@ -992,7 +992,7 @@ if-eqz p1, :cond_2 - const p1, 0x7f120f07 + const p1, 0x7f120f0b goto :goto_2 diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali index d8bd47d740..bfafa4944e 100644 --- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali +++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali @@ -284,7 +284,7 @@ .method private getCommunityGuidelines()Ljava/lang/CharSequence; .locals 4 - const v0, 0x7f12045c + const v0, 0x7f12045b invoke-virtual {p0, v0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->getString(I)Ljava/lang/String; @@ -466,7 +466,7 @@ if-eqz v1, :cond_0 - const p1, 0x7f120ebb + const p1, 0x7f120ebf invoke-static {p0, p1}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V @@ -479,7 +479,7 @@ if-eqz v1, :cond_1 - const p1, 0x7f121058 + const p1, 0x7f12105e invoke-static {p0, p1}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V @@ -544,9 +544,9 @@ .method public synthetic lambda$null$3$WidgetGuildCreate()V .locals 2 - const v0, 0x7f1203b2 + const v0, 0x7f1203b1 - const v1, 0x7f121049 + const v1, 0x7f12104f invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V @@ -648,7 +648,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120457 + const p1, 0x7f120456 invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali index dc69889cdb..3a0dd0c3d7 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali @@ -1575,7 +1575,7 @@ invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v1, 0x7f120ff2 + const v1, 0x7f120ff8 invoke-virtual {p0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali index 4891dfd259..605a86cde3 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali @@ -920,7 +920,7 @@ move-result-object v9 - const v10, 0x7f080324 + const v10, 0x7f08032f const/4 v11, 0x0 @@ -934,18 +934,52 @@ invoke-static/range {v9 .. v15}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V + goto :goto_3 + :cond_4 + invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v2 + + if-eqz v2, :cond_5 + + invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->isPartneredServer()Z + + move-result v2 + + if-ne v2, v3, :cond_5 + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->getInviteMessage()Landroid/widget/TextView; + + move-result-object v9 + + const v10, 0x7f0802b8 + + const/4 v11, 0x0 + + const/4 v12, 0x0 + + const/4 v13, 0x0 + + const/16 v14, 0xe + + const/4 v15, 0x0 + + invoke-static/range {v9 .. v15}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V + + :cond_5 + :goto_3 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->getTitle()Landroid/widget/TextView; move-result-object v2 - if-eqz v1, :cond_5 + if-eqz v1, :cond_6 invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; move-result-object v8 - :cond_5 + :cond_6 invoke-direct {v0, v8}, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->getIntroText(Ljava/lang/String;)Ljava/lang/CharSequence; move-result-object v1 diff --git a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali index 153c0477e1..2a94e8f34b 100644 --- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali +++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali @@ -322,7 +322,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/guilds/management/WidgetGuildManagement;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120ec9 + const p1, 0x7f120ecd invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/management/WidgetGuildManagement;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali index e5efbc98cb..7a14d75a8f 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali @@ -174,7 +174,7 @@ return-object v2 :cond_4 - const p1, 0x7f1203a6 + const p1, 0x7f1203a5 invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -183,7 +183,7 @@ goto :goto_0 :cond_5 - const p1, 0x7f120658 + const p1, 0x7f120657 invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali index e4fcdf6bcc..93e92583a0 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali @@ -108,7 +108,7 @@ move-result-object v0 - const v1, 0x7f1203a6 + const v1, 0x7f1203a5 invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -127,7 +127,7 @@ move-result-object v0 - const v1, 0x7f1203a5 + const v1, 0x7f1203a4 invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali index e4f49980e4..cb30d01915 100644 --- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali +++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali @@ -91,7 +91,7 @@ iget-object v1, v1, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia; - const v2, 0x7f120509 + const v2, 0x7f120508 const/4 v3, 0x1 diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali index 18a68c0a46..cf52c87a13 100644 --- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali +++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali @@ -91,7 +91,7 @@ iget-object v0, v0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia; - const v1, 0x7f120508 + const v1, 0x7f120507 invoke-virtual {v0, v1}, Lcom/discord/widgets/media/WidgetMedia;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali index 4138937b73..acb26fef94 100644 --- a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali +++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali @@ -531,7 +531,7 @@ invoke-static {p0, v3, v5, v4, v5}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v4, 0x7f121173 + const v4, 0x7f121179 invoke-virtual {p0, v4}, Lcom/discord/widgets/media/WidgetMedia;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali index c9b6a48169..f3b3726b9b 100644 --- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali +++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali @@ -472,7 +472,7 @@ move-result-object v14 - const v1, 0x7f1203f9 + const v1, 0x7f1203f8 invoke-virtual {v0, v1}, Lcom/discord/app/AppActivity;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali index 7fc23e2b50..1d8d01b3ee 100644 --- a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali +++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali @@ -238,7 +238,7 @@ aput-object p1, v0, v1 - const p1, 0x7f120e84 + const p1, 0x7f120e88 invoke-virtual {p0, p1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -273,7 +273,7 @@ goto :goto_0 :cond_0 - const p1, 0x7f120e84 + const p1, 0x7f120e88 new-array v2, v2, [Ljava/lang/Object; @@ -286,7 +286,7 @@ return-object p0 :cond_1 - const p1, 0x7f120e67 + const p1, 0x7f120e6b new-array v2, v2, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$Model.smali b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$Model.smali index c617ea403d..018c465c67 100644 --- a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$Model.smali +++ b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$Model.smali @@ -273,7 +273,7 @@ move-result-object v11 - const v12, 0x7f1000ae + const v12, 0x7f1000b2 new-array v9, v9, [Ljava/lang/Object; @@ -828,6 +828,16 @@ return-object v0 .end method +.method public getGuild()Lcom/discord/models/domain/ModelGuild; + .locals 1 + .annotation build Landroidx/annotation/Nullable; + .end annotation + + const/4 v0, 0x0 + + return-object v0 +.end method + .method public getGuildId()J .locals 2 diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali index e6fba29231..233e2ae387 100644 --- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali @@ -119,27 +119,27 @@ if-eq p1, v0, :cond_0 - const p1, 0x7f120dff + const p1, 0x7f120e03 return p1 :cond_0 - const p1, 0x7f120e5e + const p1, 0x7f120e62 return p1 :cond_1 - const p1, 0x7f120e57 + const p1, 0x7f120e5b return p1 :cond_2 - const p1, 0x7f120e60 + const p1, 0x7f120e64 return p1 :cond_3 - const p1, 0x7f120e56 + const p1, 0x7f120e5a return p1 .end method @@ -173,27 +173,27 @@ if-eq p1, v0, :cond_0 - const p1, 0x7f120dff + const p1, 0x7f120e03 return p1 :cond_0 - const p1, 0x7f120e70 + const p1, 0x7f120e74 return p1 :cond_1 - const p1, 0x7f120e6f + const p1, 0x7f120e73 return p1 :cond_2 - const p1, 0x7f120e72 + const p1, 0x7f120e76 return p1 :cond_3 - const p1, 0x7f120e6e + const p1, 0x7f120e72 return p1 .end method diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali index d219c1879e..5bb5329c19 100644 --- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali @@ -80,32 +80,32 @@ throw v0 :pswitch_0 - const p1, 0x7f120e78 - - return p1 - - :pswitch_1 - const p1, 0x7f120e79 - - return p1 - - :pswitch_2 - const p1, 0x7f120e7d - - return p1 - - :pswitch_3 const p1, 0x7f120e7c return p1 - :pswitch_4 + :pswitch_1 + const p1, 0x7f120e7d + + return p1 + + :pswitch_2 + const p1, 0x7f120e81 + + return p1 + + :pswitch_3 const p1, 0x7f120e80 return p1 + :pswitch_4 + const p1, 0x7f120e84 + + return p1 + :pswitch_5 - const p1, 0x7f120e81 + const p1, 0x7f120e85 return p1 diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali index d30da8b62b..edc38a4298 100644 --- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali @@ -115,7 +115,7 @@ if-eqz v0, :cond_0 - const p1, 0x7f1205f9 + const p1, 0x7f1205f8 goto :goto_0 diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali index 6d50180d41..a10e5f0062 100644 --- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali @@ -153,7 +153,7 @@ if-eqz v0, :cond_1 - const p1, 0x7f1205f9 + const p1, 0x7f1205f8 goto :goto_1 diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali index 1c5ba1d999..a0009d1bef 100644 --- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali @@ -96,7 +96,7 @@ if-ne p1, v0, :cond_0 - const p1, 0x7f1205af + const p1, 0x7f1205ae return p1 @@ -105,7 +105,7 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f120603 + const p1, 0x7f120602 return p1 @@ -114,7 +114,7 @@ if-ne p1, v0, :cond_2 - const p1, 0x7f1205fd + const p1, 0x7f1205fc return p1 diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali index 834478bbef..7dcd4d0203 100644 --- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali @@ -172,7 +172,7 @@ move-result-object p1 - const v0, 0x7f121050 + const v0, 0x7f121056 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali index e2a489d472..63b06fb178 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali @@ -540,7 +540,7 @@ move-result-object v0 - const v3, 0x7f1205f7 + const v3, 0x7f1205f6 new-array v6, v4, [Ljava/lang/Object; @@ -614,7 +614,7 @@ move-result-object v0 - const v3, 0x7f120629 + const v3, 0x7f120628 invoke-virtual {p0, v3}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String; @@ -682,7 +682,7 @@ move-result-object v0 - const v1, 0x7f120603 + const v1, 0x7f120602 invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali index 66e0760cc7..5a8b0dc6ea 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali @@ -238,7 +238,7 @@ invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarTitle(I)Lkotlin/Unit; - const p1, 0x7f120e9b + const p1, 0x7f120e9f invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarSubtitle(I)Lkotlin/Unit; @@ -246,7 +246,7 @@ move-result-object p1 - const v1, 0x7f120e51 + const v1, 0x7f120e55 invoke-virtual {p1, v1}, Landroid/widget/EditText;->setHint(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali index 8a6899aef7..1d54c25829 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali @@ -1802,7 +1802,7 @@ invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120ec0 + const p1, 0x7f120ec4 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettings;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali index bd5786a0bc..fa7d54d5dd 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali @@ -451,7 +451,7 @@ aput-object v4, v3, v5 - const v4, 0x7f12104c + const v4, 0x7f121052 invoke-virtual {v1, v4, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -477,7 +477,7 @@ aput-object v3, v2, v5 - const v3, 0x7f12104b + const v3, 0x7f121051 invoke-virtual {v1, v3, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -507,7 +507,7 @@ check-cast v1, Lkotlin/jvm/functions/Function1; - const p1, 0x7f12104a + const p1, 0x7f121050 invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali index 0110cc9179..db8f5e10c6 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali @@ -70,7 +70,7 @@ goto :goto_0 :cond_0 - const v0, 0x7f120f10 + const v0, 0x7f120f14 :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali index af49c39cf6..4b79777137 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali @@ -505,7 +505,7 @@ aput-object p1, v1, v2 - const p1, 0x7f1207b5 + const p1, 0x7f1207b4 invoke-virtual {p0, p1, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali index de389a3b4c..651641c605 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali @@ -299,7 +299,7 @@ if-eqz p2, :cond_0 - const p1, 0x7f1205cd + const p1, 0x7f1205cc invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; @@ -341,7 +341,7 @@ return-object p1 :cond_1 - const p1, 0x7f12102c + const p1, 0x7f121032 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; @@ -782,7 +782,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const v2, 0x7f120615 + const v2, 0x7f120614 invoke-virtual {p0, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; @@ -1354,7 +1354,7 @@ return-void :cond_0 - const p1, 0x7f120613 + const p1, 0x7f120612 invoke-static {p0, p1}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali index da6393b227..43ad9f76a9 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali @@ -173,7 +173,7 @@ aput-object v0, v1, v5 - const v0, 0x7f12053f + const v0, 0x7f12053e invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -199,7 +199,7 @@ aput-object v0, v3, v2 - const p2, 0x7f12053e + const p2, 0x7f12053d invoke-virtual {p1, p2, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali index 59b1cdacf0..ff027bb365 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali @@ -325,7 +325,7 @@ move-result v5 - const v6, 0x7f120530 + const v6, 0x7f12052f invoke-direct {v4, v0, v5, v6}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;->(III)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali index 85198f1724..bbac426448 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali @@ -41,9 +41,9 @@ check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider; - const v1, 0x7f1203b2 + const v1, 0x7f1203b1 - const v2, 0x7f121049 + const v2, 0x7f12104f invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali index b0b16ad6e8..94660f8452 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali @@ -178,7 +178,7 @@ .method private final configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120530 + const v0, 0x7f12052f invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali index 006d119e5d..172a8a17b0 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali @@ -259,7 +259,7 @@ .method private final configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120530 + const v0, 0x7f12052f invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;->setActionBarTitle(I)Lkotlin/Unit; @@ -523,7 +523,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120e1b + const v0, 0x7f120e1f invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali index a4b17b71fb..7669bd22c8 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali @@ -65,7 +65,7 @@ aput-object v0, v2, v3 - const v3, 0x7f120efd + const v3, 0x7f120f01 invoke-virtual {v1, v3, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali index 21f3b34ff0..6cd61392e8 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali @@ -600,12 +600,12 @@ if-eqz p5, :cond_2 - const v0, 0x7f1204da + const v0, 0x7f1204d9 goto :goto_0 :cond_2 - const v0, 0x7f1204db + const v0, 0x7f1204da :goto_0 invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali index c508e47e51..b3ebd975df 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali @@ -367,7 +367,7 @@ .method public synthetic lambda$updateGuild$2$WidgetServerSettingsModeration(Lcom/discord/models/domain/ModelGuild;)V .locals 0 - const p1, 0x7f120ec1 + const p1, 0x7f120ec5 invoke-static {p0, p1}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V @@ -527,7 +527,7 @@ aput-object v1, v0, v2 - const v1, 0x7f12114d + const v1, 0x7f121153 invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -549,7 +549,7 @@ aput-object v1, v0, v2 - const v1, 0x7f121149 + const v1, 0x7f12114f invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBanner$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBanner$1$2.smali index ac3c955baf..32c72f1ddc 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBanner$1$2.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBanner$1$2.smali @@ -43,9 +43,9 @@ check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider; - const v1, 0x7f1203b2 + const v1, 0x7f1203b1 - const v2, 0x7f121049 + const v2, 0x7f12104f invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali index 591705bf17..9700c1cd86 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali @@ -43,9 +43,9 @@ check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider; - const v1, 0x7f1203b2 + const v1, 0x7f1203b1 - const v2, 0x7f121049 + const v2, 0x7f12104f invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplash$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplash$1$2.smali index 8300e07d38..e0df23a0c8 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplash$1$2.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplash$1$2.smali @@ -43,9 +43,9 @@ check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider; - const v1, 0x7f1203b2 + const v1, 0x7f1203b1 - const v2, 0x7f121049 + const v2, 0x7f12104f invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali index 2d47a8d445..c3e67146b4 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali @@ -2111,7 +2111,7 @@ goto :goto_0 :cond_1 - const v1, 0x7f120ebf + const v1, 0x7f120ec3 invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getString(I)Ljava/lang/String; @@ -2565,7 +2565,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120ec1 + const v0, 0x7f120ec5 invoke-static {p1, v0}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali index fa480c9061..74e63f9e99 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali @@ -86,7 +86,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120de3 + const v0, 0x7f120de7 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->setActionBarTitle(I)Lkotlin/Unit; @@ -549,7 +549,7 @@ .method public synthetic lambda$processRoleDrop$3$WidgetServerSettingsRolesList(Ljava/lang/Void;)V .locals 0 - const p1, 0x7f120de2 + const p1, 0x7f120de6 invoke-static {p0, p1}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali index 8994cf19e0..deabf43b63 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali @@ -87,7 +87,7 @@ move-result-object p0 - const v0, 0x7f1205cd + const v0, 0x7f1205cc invoke-static {p0, v0}, Lcom/discord/app/g;->d(Landroid/content/Context;I)V @@ -119,7 +119,7 @@ move-result-object p0 - const v0, 0x7f12102c + const v0, 0x7f121032 invoke-static {p0, v0}, Lcom/discord/app/g;->d(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali index 8102dba7a8..1a9abfa7eb 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali @@ -61,12 +61,12 @@ if-eqz p3, :cond_1 - const v1, 0x7f1204d2 + const v1, 0x7f1204d1 goto :goto_0 :cond_1 - const v1, 0x7f120543 + const v1, 0x7f120542 :goto_0 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali index 86b5f1f589..ae1fbda0a9 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali @@ -41,7 +41,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120e99 + const v0, 0x7f120e9d invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali index 977de3b10e..df20bfe1c8 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali @@ -106,7 +106,7 @@ move-result-object v0 - const v2, 0x7f121006 + const v2, 0x7f12100c const/4 v3, 0x1 diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali index 377450dd19..47968d1143 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali @@ -82,7 +82,7 @@ iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView; - const v4, 0x7f12113b + const v4, 0x7f121141 const/4 v5, 0x1 @@ -130,7 +130,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120ef8 + const v0, 0x7f120efc invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali index 2c99e4f4c7..92645e3389 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali @@ -568,7 +568,7 @@ move-result-object v0 - const v1, 0x7f12044c + const v1, 0x7f12044b invoke-static {v0, v1}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali index bee830e95e..4823d01c19 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali @@ -512,13 +512,13 @@ if-nez p2, :cond_3 - const p2, 0x7f120e85 + const p2, 0x7f120e89 goto :goto_3 :cond_3 :goto_2 - const p2, 0x7f120e52 + const p2, 0x7f120e56 :goto_3 invoke-virtual {p1, p2}, Landroid/widget/EditText;->setHint(I)V diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali index 45f8141740..b0fb3e382a 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali @@ -731,7 +731,7 @@ invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f1211b5 + const p1, 0x7f1211bb invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali index 0f208db3f2..cd47822dfc 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1327,7 +1327,7 @@ move-result-object v1 - const v2, 0x7f1210f4 + const v2, 0x7f1210fa invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -1381,7 +1381,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->setActionBarTitle(I)Lkotlin/Unit; @@ -1429,7 +1429,7 @@ invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v2, " - 8.9.9 (899)" + const-string v2, " - 9.0.0 (900)" invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali index a722210331..1763b866c8 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali @@ -1144,7 +1144,7 @@ move-result-object p1 - const v0, 0x7f1210e9 + const v0, 0x7f1210ef invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->getString(I)Ljava/lang/String; @@ -1172,7 +1172,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali index e341260b58..19197d21cf 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali @@ -291,11 +291,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f1205e6 + const p1, 0x7f1205e5 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarTitle(I)Lkotlin/Unit; @@ -391,7 +391,7 @@ aput-object v4, v2, v3 - const v3, 0x7f1204cc + const v3, 0x7f1204cb invoke-virtual {p0, v3, v2}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali index 003f270dfd..6a1a26df38 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali @@ -39,7 +39,7 @@ invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f1204cd + const p1, 0x7f1204cc invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali index ca529d41d7..4556a94867 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali @@ -77,7 +77,7 @@ iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames; - const v5, 0x7f121088 + const v5, 0x7f12108e invoke-virtual {v1, v5}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getString(I)Ljava/lang/String; @@ -89,7 +89,7 @@ iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames; - const v6, 0x7f12068f + const v6, 0x7f12068e invoke-virtual {v1, v6}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getString(I)Ljava/lang/String; @@ -101,7 +101,7 @@ iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames; - const v7, 0x7f120690 + const v7, 0x7f12068f invoke-virtual {v1, v7}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali index 860cc41400..2320c4a833 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali @@ -315,7 +315,7 @@ move-result-object v0 - const v1, 0x7f120ee1 + const v1, 0x7f120ee5 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -348,7 +348,7 @@ move-result-object v0 - const v1, 0x7f120edc + const v1, 0x7f120ee0 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -356,7 +356,7 @@ move-result-object v0 - const v1, 0x7f120ede + const v1, 0x7f120ee2 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -677,11 +677,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsGames;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f120702 + const p1, 0x7f120701 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsGames;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali index 2a6c5328be..3d8492fb78 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali @@ -1060,139 +1060,139 @@ const/4 p0, -0x1 :goto_1 - const v0, 0x7f080344 + const v0, 0x7f08034f packed-switch p0, :pswitch_data_0 return v0 :pswitch_0 - const p0, 0x7f08034b - - return p0 - - :pswitch_1 - const p0, 0x7f080359 - - return p0 - - :pswitch_2 - const p0, 0x7f08035d - - return p0 - - :pswitch_3 - const p0, 0x7f08035e - - return p0 - - :pswitch_4 - const p0, 0x7f080355 - - return p0 - - :pswitch_5 - const p0, 0x7f08034c - - return p0 - - :pswitch_6 - const p0, 0x7f080350 - - return p0 - - :pswitch_7 - const p0, 0x7f080342 - - return p0 - - :pswitch_8 - const p0, 0x7f080352 - - return p0 - - :pswitch_9 - const p0, 0x7f080347 - - return p0 - - :pswitch_a - const p0, 0x7f08034f - - return p0 - - :pswitch_b - const p0, 0x7f08035f - - return p0 - - :pswitch_c - const p0, 0x7f08034e - - return p0 - - :pswitch_d - const p0, 0x7f08035b - - return p0 - - :pswitch_e const p0, 0x7f080356 return p0 - :pswitch_f - const p0, 0x7f08033e + :pswitch_1 + const p0, 0x7f080364 return p0 - :pswitch_10 - const p0, 0x7f08033f + :pswitch_2 + const p0, 0x7f080368 return p0 - :pswitch_11 - const p0, 0x7f08035a + :pswitch_3 + const p0, 0x7f080369 return p0 - :pswitch_12 - const p0, 0x7f080358 + :pswitch_4 + const p0, 0x7f080360 return p0 - :pswitch_13 - const p0, 0x7f080354 + :pswitch_5 + const p0, 0x7f080357 return p0 - :pswitch_14 - const p0, 0x7f080353 + :pswitch_6 + const p0, 0x7f08035b return p0 - :pswitch_15 - const p0, 0x7f080351 - - return p0 - - :pswitch_16 + :pswitch_7 const p0, 0x7f08034d return p0 + :pswitch_8 + const p0, 0x7f08035d + + return p0 + + :pswitch_9 + const p0, 0x7f080352 + + return p0 + + :pswitch_a + const p0, 0x7f08035a + + return p0 + + :pswitch_b + const p0, 0x7f08036a + + return p0 + + :pswitch_c + const p0, 0x7f080359 + + return p0 + + :pswitch_d + const p0, 0x7f080366 + + return p0 + + :pswitch_e + const p0, 0x7f080361 + + return p0 + + :pswitch_f + const p0, 0x7f080349 + + return p0 + + :pswitch_10 + const p0, 0x7f08034a + + return p0 + + :pswitch_11 + const p0, 0x7f080365 + + return p0 + + :pswitch_12 + const p0, 0x7f080363 + + return p0 + + :pswitch_13 + const p0, 0x7f08035f + + return p0 + + :pswitch_14 + const p0, 0x7f08035e + + return p0 + + :pswitch_15 + const p0, 0x7f08035c + + return p0 + + :pswitch_16 + const p0, 0x7f080358 + + return p0 + :pswitch_17 - const p0, 0x7f080348 + const p0, 0x7f080353 return p0 :pswitch_18 - const p0, 0x7f080345 + const p0, 0x7f080350 return p0 :pswitch_19 - const p0, 0x7f080343 + const p0, 0x7f08034e return p0 @@ -1200,12 +1200,12 @@ return v0 :pswitch_1b - const p0, 0x7f080341 + const p0, 0x7f08034c return p0 :pswitch_1c - const p0, 0x7f080340 + const p0, 0x7f08034b return p0 @@ -1671,29 +1671,29 @@ const/4 p0, -0x1 :goto_1 - const v0, 0x7f120542 + const v0, 0x7f120541 packed-switch p0, :pswitch_data_0 return v0 :pswitch_0 - const p0, 0x7f120fdd + const p0, 0x7f120fe3 return p0 :pswitch_1 - const p0, 0x7f121165 + const p0, 0x7f12116b return p0 :pswitch_2 - const p0, 0x7f1211c7 + const p0, 0x7f1211cd return p0 :pswitch_3 - const p0, 0x7f120de1 + const p0, 0x7f120de5 return p0 @@ -1708,7 +1708,7 @@ return p0 :pswitch_6 - const p0, 0x7f120529 + const p0, 0x7f120528 return p0 @@ -1718,7 +1718,7 @@ return p0 :pswitch_8 - const p0, 0x7f12056c + const p0, 0x7f12056b return p0 @@ -1733,7 +1733,7 @@ return p0 :pswitch_b - const p0, 0x7f1211c8 + const p0, 0x7f1211ce return p0 @@ -1743,12 +1743,12 @@ return p0 :pswitch_d - const p0, 0x7f121046 + const p0, 0x7f12104c return p0 :pswitch_e - const p0, 0x7f120df6 + const p0, 0x7f120dfa return p0 @@ -1758,22 +1758,22 @@ return p0 :pswitch_10 - const p0, 0x7f120478 + const p0, 0x7f120477 return p0 :pswitch_11 - const p0, 0x7f121003 + const p0, 0x7f121009 return p0 :pswitch_12 - const p0, 0x7f120f7e + const p0, 0x7f120f84 return p0 :pswitch_13 - const p0, 0x7f120d6f + const p0, 0x7f120d73 return p0 @@ -1793,17 +1793,17 @@ return p0 :pswitch_17 - const p0, 0x7f120643 + const p0, 0x7f120642 return p0 :pswitch_18 - const p0, 0x7f120553 + const p0, 0x7f120552 return p0 :pswitch_19 - const p0, 0x7f120541 + const p0, 0x7f120540 return p0 @@ -1811,12 +1811,12 @@ return v0 :pswitch_1b - const p0, 0x7f120498 + const p0, 0x7f120497 return p0 :pswitch_1c - const p0, 0x7f12047e + const p0, 0x7f12047d return p0 @@ -1936,7 +1936,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const v0, 0x7f1210d8 + const v0, 0x7f1210de invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali index 182185baae..20581c26c1 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali @@ -378,11 +378,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f120fd7 + const p1, 0x7f120fdd invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali index 39a0efe09b..f9dab74084 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali @@ -533,7 +533,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali index 8b0e9f804a..8cfd9d041e 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali @@ -109,15 +109,15 @@ invoke-static {p5, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f12108c + const v0, 0x7f121092 invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f121089 + const p2, 0x7f12108f invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f12108a + const p2, 0x7f121090 invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V @@ -129,7 +129,7 @@ invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - const p2, 0x7f12108b + const p2, 0x7f121091 invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali index e7f2c2a27f..aa20afd348 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali @@ -79,7 +79,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120492 + const v0, 0x7f120491 invoke-static {p1, v0}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali index aac0df685e..95510c3836 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali @@ -75,13 +75,13 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f120491 + const v1, 0x7f120490 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v0 - const v1, 0x7f120490 + const v1, 0x7f12048f invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali index 550dff8e21..88149da657 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali @@ -86,7 +86,7 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f120488 + const v1, 0x7f120487 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -96,7 +96,7 @@ iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;->$context:Landroid/content/Context; - const v1, 0x7f120487 + const v1, 0x7f120486 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali index 756129548b..907b61065f 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali @@ -72,13 +72,13 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f120486 + const v1, 0x7f120485 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v0 - const v1, 0x7f12048b + const v1, 0x7f12048a invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali index c08c6e8849..591d45860d 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali @@ -1792,7 +1792,7 @@ move-result-object p1 - const p2, 0x7f12047f + const p2, 0x7f12047e const/4 v1, 0x1 @@ -1810,7 +1810,7 @@ invoke-direct {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v0, 0x7f120495 + const v0, 0x7f120494 invoke-virtual {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -2147,11 +2147,11 @@ invoke-static {p0, v1, v0, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v0, 0x7f1210d8 + const v0, 0x7f1210de invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarSubtitle(I)Lkotlin/Unit; - const v0, 0x7f120d63 + const v0, 0x7f120d67 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarTitle(I)Lkotlin/Unit; @@ -2179,7 +2179,7 @@ aput-object v0, v3, v1 - const v0, 0x7f120484 + const v0, 0x7f120483 invoke-virtual {p0, v0, v3}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -2217,7 +2217,7 @@ move-result-object v0 - const v3, 0x7f120481 + const v3, 0x7f120480 invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali index d8967317f2..2ac5f2a27f 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali @@ -749,7 +749,7 @@ move-result-object v1 - const v5, 0x7f1204f6 + const v5, 0x7f1204f5 new-array v6, v3, [Ljava/lang/Object; @@ -934,7 +934,7 @@ move-result-object v0 - const v1, 0x7f120f2c + const v1, 0x7f120f31 invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali index 1e57deff39..5eed24f67e 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali @@ -376,11 +376,11 @@ invoke-static {p0, p1, v1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f12042d + const p1, 0x7f12042c invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali index cde9ff4fa6..d0b50dad72 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali @@ -253,7 +253,7 @@ move-result-object v0 - const v1, 0x7f12041d + const v1, 0x7f12041c invoke-static {v0, v1}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V @@ -359,11 +359,11 @@ invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f12042d + const p1, 0x7f12042c invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali index ae81c8d876..0dfd09d21b 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali @@ -2084,7 +2084,7 @@ check-cast v0, Landroidx/fragment/app/Fragment; - const v1, 0x7f12111a + const v1, 0x7f121120 invoke-static {v0, v1}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V @@ -2106,11 +2106,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f121176 + const p1, 0x7f12117c invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali index 94f992c2e4..4035633fd3 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali @@ -52,11 +52,11 @@ const/4 v3, 0x0 - const v4, 0x7f1204d3 + const v4, 0x7f1204d2 - const v5, 0x7f1204d4 + const v5, 0x7f1204d3 - const v6, 0x7f1204d2 + const v6, 0x7f1204d1 move-object v1, v7 @@ -74,11 +74,11 @@ const/4 v10, 0x1 - const v11, 0x7f1204a4 + const v11, 0x7f1204a3 - const v12, 0x7f1204a5 + const v12, 0x7f1204a4 - const v13, 0x7f1204a3 + const v13, 0x7f1204a2 move-object v8, v1 diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali index 24b9ddbbea..6f24e6d6cd 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali @@ -628,7 +628,7 @@ move-result-object v2 - const v3, 0x7f120543 + const v3, 0x7f120542 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -683,7 +683,7 @@ move-result-object v2 - const v3, 0x7f1204d2 + const v3, 0x7f1204d1 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali index 339e3b1259..db9870bdd1 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali @@ -101,7 +101,7 @@ iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount; - const v2, 0x7f120d48 + const v2, 0x7f120d4c invoke-virtual {p1, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali index dccd5f53c7..e16156dd2f 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali @@ -43,9 +43,9 @@ check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider; - const v1, 0x7f1203b2 + const v1, 0x7f1203b1 - const v2, 0x7f121049 + const v2, 0x7f12104f invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali index ffb35e1422..4d7760d956 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali @@ -77,7 +77,7 @@ move-result-object v1 - const v2, 0x7f12110f + const v2, 0x7f121115 invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali index de9e926902..5486779c22 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali @@ -2528,13 +2528,13 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f1204a7 + const v1, 0x7f1204a6 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v0 - const v1, 0x7f1204a8 + const v1, 0x7f1204a7 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -2581,7 +2581,7 @@ move-result-object v2 - const v3, 0x7f121036 + const v3, 0x7f12103c invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2595,7 +2595,7 @@ move-result-object v3 - const v4, 0x7f12110c + const v4, 0x7f121112 invoke-virtual {v3, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2609,7 +2609,7 @@ move-result-object v4 - const v5, 0x7f121012 + const v5, 0x7f121018 invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2730,11 +2730,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f121112 + const p1, 0x7f121118 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali index c74ff869f1..844d2c825c 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali @@ -84,7 +84,7 @@ move-result-object p1 - const v0, 0x7f120435 + const v0, 0x7f120434 invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali index eb4192fb63..4b17f75c47 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali @@ -179,7 +179,7 @@ move-result-object v4 - const v5, 0x7f1210f2 + const v5, 0x7f1210f8 invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -258,7 +258,7 @@ move-result-object v2 - const v4, 0x7f121122 + const v4, 0x7f121128 invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali index de2a7f4fbe..b24da79181 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali @@ -448,7 +448,7 @@ move-result-object v2 - const v3, 0x7f1210f8 + const v3, 0x7f1210fe invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -462,7 +462,7 @@ move-result-object v2 - const v4, 0x7f121018 + const v4, 0x7f12101e invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -517,11 +517,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f121018 + const p1, 0x7f12101e invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarTitle(I)Lkotlin/Unit; @@ -553,7 +553,7 @@ new-array p2, p2, [Ljava/lang/Object; - const v0, 0x7f121017 + const v0, 0x7f12101d invoke-virtual {p1, v0, p2}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali index 5127a50c76..afe42d8365 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali @@ -617,7 +617,7 @@ move-result-object v2 - const v3, 0x7f12103b + const v3, 0x7f121041 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -740,7 +740,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali index b56d8422cc..52ab6f65e7 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali @@ -63,7 +63,7 @@ iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit; - const p2, 0x7f120d54 + const p2, 0x7f120d58 invoke-virtual {p1, p2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali index 4d2359afac..c918c3e13a 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali @@ -68,7 +68,7 @@ sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; - const v7, 0x7f121133 + const v7, 0x7f121139 invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; @@ -134,7 +134,7 @@ sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; - const v9, 0x7f12052c + const v9, 0x7f12052b invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; @@ -146,7 +146,7 @@ sget-object v8, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils; - const v9, 0x7f12052b + const v9, 0x7f12052a invoke-virtual {v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali index 841b6005be..e7e75d37cf 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali @@ -1088,11 +1088,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f1210f5 + const p1, 0x7f1210fb invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali index 3d1207a8d6..6c9e063d8f 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali @@ -119,7 +119,7 @@ aput-object v2, v0, v1 - const v1, 0x7f12101e + const v1, 0x7f121024 invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFADownload;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali index e100d2284b..e86c0d0bfe 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali @@ -202,7 +202,7 @@ invoke-virtual {v1, v0}, Landroid/content/ClipboardManager;->setPrimaryClip(Landroid/content/ClipData;)V :cond_0 - const v0, 0x7f120435 + const v0, 0x7f120434 invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V @@ -309,7 +309,7 @@ new-array v5, v2, [Ljava/lang/Object; - const v6, 0x7f121010 + const v6, 0x7f121016 invoke-virtual {p0, v6}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->getString(I)Ljava/lang/String; @@ -360,7 +360,7 @@ new-array v2, v2, [Ljava/lang/Object; - const v5, 0x7f121011 + const v5, 0x7f121017 invoke-virtual {p0, v5}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali index bfe737a68c..ab1b49c421 100644 --- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali +++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali @@ -121,7 +121,7 @@ invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarTitle(I)Lkotlin/Unit; - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali index aa1c8fbe9e..0b6acd0a4c 100644 --- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali +++ b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali @@ -390,7 +390,7 @@ goto :goto_1 :pswitch_0 - const v2, 0x7f120d30 + const v2, 0x7f120d34 invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String; @@ -407,7 +407,7 @@ goto :goto_1 :pswitch_1 - const v2, 0x7f120d31 + const v2, 0x7f120d35 invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali index 65567c8910..76068d0e3a 100644 --- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali +++ b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali @@ -703,7 +703,7 @@ new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig; - const v3, 0x7f120dda + const v3, 0x7f120dde invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -1523,7 +1523,7 @@ throw p1 :pswitch_0 - const v3, 0x7f120d31 + const v3, 0x7f120d35 invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -1532,7 +1532,7 @@ goto :goto_1 :pswitch_1 - const v3, 0x7f120d30 + const v3, 0x7f120d34 invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -1587,7 +1587,7 @@ aput-object v3, v5, v6 - const v3, 0x7f120fd1 + const v3, 0x7f120fd7 invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -2219,12 +2219,12 @@ if-eq p1, v0, :cond_0 - const p1, 0x7f080391 + const p1, 0x7f08039c return p1 :cond_0 - const p1, 0x7f08038f + const p1, 0x7f08039a return p1 .end method @@ -2282,7 +2282,7 @@ move-result-object v1 - const v2, 0x7f120d0d + const v2, 0x7f120d11 new-array v3, v7, [Ljava/lang/Object; @@ -2366,7 +2366,7 @@ if-ne v2, v3, :cond_2 - const v2, 0x7f120d07 + const v2, 0x7f120d0b goto :goto_0 @@ -2378,7 +2378,7 @@ throw v1 :cond_3 - const v2, 0x7f120d06 + const v2, 0x7f120d0a :goto_0 invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPrice()I @@ -2622,7 +2622,7 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f12058e + const p1, 0x7f12058d new-array v0, v0, [Ljava/lang/Object; @@ -2954,7 +2954,7 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f120d40 + const v1, 0x7f120d44 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -2966,7 +2966,7 @@ move-result-object v0 - const v1, 0x7f120d3f + const v1, 0x7f120d43 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -3295,11 +3295,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f1210d8 + const p1, 0x7f1210de invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f120d32 + const p1, 0x7f120d36 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->setActionBarTitle(I)Lkotlin/Unit; @@ -3319,7 +3319,7 @@ new-array v2, v2, [Ljava/lang/Object; - const v3, 0x7f120571 + const v3, 0x7f120570 invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -3327,7 +3327,7 @@ aput-object v3, v2, p1 - const p1, 0x7f120573 + const p1, 0x7f120572 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali index 157eacd3ea..f7c043d83b 100644 --- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali +++ b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali @@ -349,7 +349,7 @@ move-result-object v4 - const v5, 0x7f120d3b + const v5, 0x7f120d3f const/4 v6, 0x1 @@ -387,7 +387,7 @@ if-ne v4, v8, :cond_6 - const v4, 0x7f120d37 + const v4, 0x7f120d3b new-array v8, v7, [Ljava/lang/Object; @@ -436,7 +436,7 @@ if-ne v4, v8, :cond_7 - const v4, 0x7f120d38 + const v4, 0x7f120d3c new-array v8, v7, [Ljava/lang/Object; @@ -485,7 +485,7 @@ if-ne v4, v8, :cond_8 - const v4, 0x7f120d36 + const v4, 0x7f120d3a new-array v8, v7, [Ljava/lang/Object; @@ -522,7 +522,7 @@ goto :goto_3 :cond_8 - const v2, 0x7f120d39 + const v2, 0x7f120d3d new-array v4, v6, [Ljava/lang/Object; @@ -794,7 +794,7 @@ throw p1 :pswitch_0 - const p1, 0x7f120d30 + const p1, 0x7f120d34 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String; @@ -803,7 +803,7 @@ goto :goto_0 :pswitch_1 - const p1, 0x7f120d31 + const p1, 0x7f120d35 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali index c944f54e2e..e46f0f0b6a 100644 --- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali +++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali @@ -167,7 +167,7 @@ iget-object v0, v0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;->$context:Landroid/content/Context; - const v3, 0x7f120d57 + const v3, 0x7f120d5b invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali index 207bcf270d..8330357bf6 100644 --- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali +++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali @@ -685,7 +685,7 @@ goto :goto_1 :cond_3 - const p1, 0x7f121077 + const p1, 0x7f12107d :goto_1 invoke-virtual {v0, p1}, Landroid/widget/TextView;->setHint(I)V @@ -1641,7 +1641,7 @@ return-void :cond_0 - const v0, 0x7f120efa + const v0, 0x7f120efe invoke-virtual {p0, v0}, Lcom/discord/widgets/share/WidgetIncomingShare;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1.smali similarity index 63% rename from com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$get$1.smali rename to com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1.smali index 0d396276df..db8cb3cdc0 100644 --- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$get$1.smali +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1.smali @@ -1,14 +1,14 @@ -.class final synthetic Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$1; +.class final synthetic Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1; .super Lkotlin/jvm/internal/i; .source "WidgetStatus.kt" # interfaces -.implements Lkotlin/jvm/functions/Function3; +.implements Lkotlin/jvm/functions/Function4; # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->get()Lrx/Observable; + value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->getNew()Lrx/Observable; .end annotation .annotation system Ldalvik/annotation/InnerClass; @@ -19,8 +19,9 @@ .annotation system Ldalvik/annotation/Signature; value = { "Lkotlin/jvm/internal/i;", - "Lkotlin/jvm/functions/Function3<", + "Lkotlin/jvm/functions/Function4<", "Ljava/lang/Integer;", + "Ljava/lang/Boolean;", "Ljava/util/Set<", "+", "Ljava/lang/Long;", @@ -36,7 +37,7 @@ .method constructor (Lcom/discord/widgets/status/WidgetStatus$Model$Companion;)V .locals 1 - const/4 v0, 0x3 + const/4 v0, 0x4 invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/i;->(ILjava/lang/Object;)V @@ -68,16 +69,16 @@ .method public final getSignature()Ljava/lang/String; .locals 1 - const-string v0, "createModel(ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;" + const-string v0, "createModel(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;" return-object v0 .end method -.method public final invoke(ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; +.method public final invoke(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { - "(I", + "(IZ", "Ljava/util/Set<", "Ljava/lang/Long;", ">;", @@ -87,26 +88,26 @@ } .end annotation - const-string v0, "p2" - - invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "p3" invoke-static {p3, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$1;->receiver:Ljava/lang/Object; + const-string v0, "p4" + + invoke-static {p4, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1;->receiver:Ljava/lang/Object; check-cast v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion; - invoke-static {v0, p1, p2, p3}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->access$createModel(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; + invoke-static {v0, p1, p2, p3, p4}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->access$createModel(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; move-result-object p1 return-object p1 .end method -.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 0 check-cast p1, Ljava/lang/Number; @@ -115,11 +116,17 @@ move-result p1 - check-cast p2, Ljava/util/Set; + check-cast p2, Ljava/lang/Boolean; - check-cast p3, Lcom/discord/models/application/Unread; + invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z - invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$1;->invoke(ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; + move-result p2 + + check-cast p3, Ljava/util/Set; + + check-cast p4, Lcom/discord/models/application/Unread; + + invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1;->invoke(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1.smali new file mode 100644 index 0000000000..e338ec0979 --- /dev/null +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1.smali @@ -0,0 +1,99 @@ +.class final Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1; +.super Ljava/lang/Object; +.source "WidgetStatus.kt" + +# interfaces +.implements Lrx/functions/b; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->call(Ljava/lang/Long;)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/b<", + "Lcom/discord/stores/StoreChat$InteractionState;", + "Ljava/lang/Boolean;", + ">;" + } +.end annotation + + +# instance fields +.field final synthetic $selectedChannelId:Ljava/lang/Long; + + +# direct methods +.method constructor (Ljava/lang/Long;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1;->$selectedChannelId:Ljava/lang/Long; + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lcom/discord/stores/StoreChat$InteractionState; + + invoke-virtual {p0, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1;->call(Lcom/discord/stores/StoreChat$InteractionState;)Z + + move-result p1 + + invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Lcom/discord/stores/StoreChat$InteractionState;)Z + .locals 4 + + invoke-virtual {p1}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J + + move-result-wide v0 + + iget-object p1, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1;->$selectedChannelId:Ljava/lang/Long; + + if-nez p1, :cond_0 + + goto :goto_0 + + :cond_0 + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J + + move-result-wide v2 + + cmp-long p1, v0, v2 + + if-nez p1, :cond_1 + + const/4 p1, 0x1 + + return p1 + + :cond_1 + :goto_0 + const/4 p1, 0x0 + + return p1 +.end method diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2.smali new file mode 100644 index 0000000000..d1b1374b61 --- /dev/null +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2.smali @@ -0,0 +1,112 @@ +.class final Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2; +.super Ljava/lang/Object; +.source "WidgetStatus.kt" + +# interfaces +.implements Lrx/functions/b; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->call(Ljava/lang/Long;)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/b<", + "TT;", + "Lrx/Observable<", + "+TR;>;>;" + } +.end annotation + + +# instance fields +.field final synthetic $selectedChannelId:Ljava/lang/Long; + + +# direct methods +.method constructor (Ljava/lang/Long;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2;->$selectedChannelId:Ljava/lang/Long; + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lcom/discord/stores/StoreChat$InteractionState; + + invoke-virtual {p0, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2;->call(Lcom/discord/stores/StoreChat$InteractionState;)Lrx/Observable; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Lcom/discord/stores/StoreChat$InteractionState;)Lrx/Observable; + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Lcom/discord/stores/StoreChat$InteractionState;", + ")", + "Lrx/Observable<", + "+", + "Lcom/discord/stores/StoreMessageAck$Ack;", + ">;" + } + .end annotation + + invoke-virtual {p1}, Lcom/discord/stores/StoreChat$InteractionState;->isAtBottomIgnoringTouch()Z + + move-result p1 + + if-eqz p1, :cond_0 + + invoke-static {}, Lcom/discord/stores/StoreStream;->getMessageAck()Lcom/discord/stores/StoreMessageAck; + + move-result-object p1 + + iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2;->$selectedChannelId:Ljava/lang/Long; + + const-string v1, "selectedChannelId" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J + + move-result-wide v0 + + invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreMessageAck;->get(J)Lrx/Observable; + + move-result-object p1 + + return-object p1 + + :cond_0 + const/4 p1, 0x0 + + invoke-static {p1}, Lrx/Observable;->bA(Ljava/lang/Object;)Lrx/Observable; + + move-result-object p1 + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3.smali new file mode 100644 index 0000000000..c962fd36f9 --- /dev/null +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3.smali @@ -0,0 +1,128 @@ +.class final Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3; +.super Ljava/lang/Object; +.source "WidgetStatus.kt" + +# interfaces +.implements Lrx/functions/Func3; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->call(Ljava/lang/Long;)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/Func3<", + "TT1;TT2;TT3;TR;>;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3; + + +# direct methods +.method static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3; + + invoke-direct {v0}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;->()V + + sput-object v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3; + + return-void +.end method + +.method constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lcom/discord/stores/StoreMessageAck$Ack; + + check-cast p2, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState; + + check-cast p3, Ljava/lang/Long; + + invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;->call(Lcom/discord/stores/StoreMessageAck$Ack;Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;Ljava/lang/Long;)Z + + move-result p1 + + invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Lcom/discord/stores/StoreMessageAck$Ack;Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;Ljava/lang/Long;)Z + .locals 3 + + invoke-virtual {p2}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->isLoadingMessages()Z + + move-result p2 + + const/4 v0, 0x1 + + if-eqz p2, :cond_0 + + return v0 + + :cond_0 + if-eqz p1, :cond_1 + + invoke-virtual {p1}, Lcom/discord/stores/StoreMessageAck$Ack;->getMessageId()J + + move-result-wide p1 + + goto :goto_0 + + :cond_1 + const-wide/16 p1, 0x0 + + :goto_0 + const-string v1, "mostRecentIdSnapshot" + + invoke-static {p3, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {p3}, Ljava/lang/Long;->longValue()J + + move-result-wide v1 + + cmp-long p3, p1, v1 + + if-gez p3, :cond_2 + + return v0 + + :cond_2 + const/4 p1, 0x0 + + return p1 +.end method diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4.smali new file mode 100644 index 0000000000..f7a18b5a19 --- /dev/null +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4.smali @@ -0,0 +1,88 @@ +.class final Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4; +.super Ljava/lang/Object; +.source "WidgetStatus.kt" + +# interfaces +.implements Lrx/functions/b; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->call(Ljava/lang/Long;)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/b<", + "Ljava/lang/Boolean;", + "Ljava/lang/Boolean;", + ">;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4; + + +# direct methods +.method static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4; + + invoke-direct {v0}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;->()V + + sput-object v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4; + + return-void +.end method + +.method constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/lang/Boolean; + + invoke-virtual {p0, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;->call(Ljava/lang/Boolean;)Z + + move-result p1 + + invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Ljava/lang/Boolean;)Z + .locals 1 + + sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean; + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result p1 + + return p1 +.end method diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1.smali new file mode 100644 index 0000000000..d9e55e734d --- /dev/null +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1.smali @@ -0,0 +1,180 @@ +.class final Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1; +.super Ljava/lang/Object; +.source "WidgetStatus.kt" + +# interfaces +.implements Lrx/functions/b; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->getNew()Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/b<", + "TT;", + "Lrx/Observable<", + "+TR;>;>;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1; + + +# direct methods +.method static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1; + + invoke-direct {v0}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->()V + + sput-object v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1; + + return-void +.end method + +.method constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/lang/Long; + + invoke-virtual {p0, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->call(Ljava/lang/Long;)Lrx/Observable; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Ljava/lang/Long;)Lrx/Observable; + .locals 5 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/lang/Long;", + ")", + "Lrx/Observable<", + "Ljava/lang/Boolean;", + ">;" + } + .end annotation + + invoke-static {}, Lcom/discord/stores/StoreStream;->getChat()Lcom/discord/stores/StoreChat; + + move-result-object v0 + + invoke-virtual {v0}, Lcom/discord/stores/StoreChat;->getInteractionState()Lrx/Observable; + + move-result-object v0 + + new-instance v1, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1; + + invoke-direct {v1, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1;->(Ljava/lang/Long;)V + + check-cast v1, Lrx/functions/b; + + invoke-virtual {v0, v1}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable; + + move-result-object v0 + + sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; + + const-wide/16 v2, 0x12c + + invoke-virtual {v0, v2, v3, v1}, Lrx/Observable;->i(JLjava/util/concurrent/TimeUnit;)Lrx/Observable; + + move-result-object v0 + + new-instance v1, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2; + + invoke-direct {v1, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2;->(Ljava/lang/Long;)V + + check-cast v1, Lrx/functions/b; + + invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable; + + move-result-object v0 + + invoke-static {}, Lcom/discord/stores/StoreStream;->getMessagesLoader()Lcom/discord/stores/StoreMessagesLoader; + + move-result-object v1 + + const-string v2, "selectedChannelId" + + invoke-static {p1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J + + move-result-wide v2 + + invoke-virtual {v1, v2, v3}, Lcom/discord/stores/StoreMessagesLoader;->getMessagesLoadedState(J)Lrx/Observable; + + move-result-object v1 + + invoke-static {}, Lcom/discord/stores/StoreStream;->getMessagesMostRecent()Lcom/discord/stores/StoreMessagesMostRecent; + + move-result-object v2 + + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J + + move-result-wide v3 + + invoke-virtual {v2, v3, v4}, Lcom/discord/stores/StoreMessagesMostRecent;->get(J)Lrx/Observable; + + move-result-object p1 + + sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; + + const-wide/16 v3, 0xc8 + + invoke-virtual {p1, v3, v4, v2}, Lrx/Observable;->i(JLjava/util/concurrent/TimeUnit;)Lrx/Observable; + + move-result-object p1 + + invoke-virtual {p1}, Lrx/Observable;->Fu()Lrx/Observable; + + move-result-object p1 + + sget-object v2, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3; + + check-cast v2, Lrx/functions/Func3; + + invoke-static {v0, v1, p1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable; + + move-result-object p1 + + sget-object v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4; + + check-cast v0, Lrx/functions/b; + + invoke-virtual {p1, v0}, Lrx/Observable;->h(Lrx/functions/b;)Lrx/Observable; + + move-result-object p1 + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali index 143478168c..04bb0db52a 100644 --- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali @@ -31,21 +31,21 @@ return-void .end method -.method public static final synthetic access$createModel(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; +.method public static final synthetic access$createModel(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; .locals 0 - invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->createModel(ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; + invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->createModel(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; move-result-object p0 return-object p0 .end method -.method private final createModel(ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; +.method private final createModel(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model; .locals 17 .annotation system Ldalvik/annotation/Signature; value = { - "(I", + "(IZ", "Ljava/util/Set<", "Ljava/lang/Long;", ">;", @@ -57,7 +57,7 @@ move/from16 v0, p1 - invoke-virtual/range {p3 .. p3}, Lcom/discord/models/application/Unread;->getMarker()Lcom/discord/models/application/Unread$Marker; + invoke-virtual/range {p4 .. p4}, Lcom/discord/models/application/Unread;->getMarker()Lcom/discord/models/application/Unread$Marker; move-result-object v1 @@ -69,13 +69,13 @@ move-result-object v2 - move-object/from16 v3, p2 + move-object/from16 v3, p3 invoke-interface {v3, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z move-result v2 - invoke-virtual/range {p3 .. p3}, Lcom/discord/models/application/Unread;->getCount()I + invoke-virtual/range {p4 .. p4}, Lcom/discord/models/application/Unread;->getCount()I move-result v3 @@ -123,7 +123,9 @@ if-nez v9, :cond_4 - invoke-virtual/range {p3 .. p3}, Lcom/discord/models/application/Unread;->getCount()I + if-eqz p2, :cond_3 + + invoke-virtual/range {p4 .. p4}, Lcom/discord/models/application/Unread;->getCount()I move-result v4 @@ -196,8 +198,8 @@ # virtual methods -.method public final get()Lrx/Observable; - .locals 9 +.method public final getNew()Lrx/Observable; + .locals 6 .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -207,65 +209,91 @@ } .end annotation - invoke-static {}, Lcom/discord/stores/StoreStream;->getConnectivity()Lcom/discord/stores/StoreConnectivity; + invoke-static {}, Lcom/discord/stores/StoreStream;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected; move-result-object v0 - const-string v1, "StoreStream\n .getConnectivity()" + invoke-virtual {v0}, Lcom/discord/stores/StoreChannelsSelected;->getId()Lrx/Observable; - invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + move-result-object v0 - invoke-virtual {v0}, Lcom/discord/stores/StoreConnectivity;->getState()Lrx/Observable; + invoke-virtual {v0}, Lrx/Observable;->Fp()Lrx/Observable; - move-result-object v2 + move-result-object v0 + + sget-object v1, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1; + + check-cast v1, Lrx/functions/b; + + invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable; + + move-result-object v0 + + invoke-virtual {v0}, Lrx/Observable;->Fp()Lrx/Observable; + + move-result-object v0 + + invoke-static {}, Lcom/discord/stores/StoreStream;->getConnectivity()Lcom/discord/stores/StoreConnectivity; + + move-result-object v1 + + const-string v2, "StoreStream\n .getConnectivity()" + + invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v1}, Lcom/discord/stores/StoreConnectivity;->getState()Lrx/Observable; + + move-result-object v1 invoke-static {}, Lcom/discord/stores/StoreStream;->getMessages()Lcom/discord/stores/StoreMessages; - move-result-object v0 + move-result-object v2 - invoke-virtual {v0}, Lcom/discord/stores/StoreMessages;->getAllDetached()Lrx/Observable; + invoke-virtual {v2}, Lcom/discord/stores/StoreMessages;->getAllDetached()Lrx/Observable; - move-result-object v3 + move-result-object v2 invoke-static {}, Lcom/discord/stores/StoreStream;->getReadStates()Lcom/discord/stores/StoreReadStates; - move-result-object v0 + move-result-object v3 - const-string v1, "StoreStream\n .getReadStates()" + const-string v4, "StoreStream\n .getReadStates()" - invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v0}, Lcom/discord/stores/StoreReadStates;->getUnreadMarkerForSelectedChannel()Lrx/Observable; + invoke-virtual {v3}, Lcom/discord/stores/StoreReadStates;->getUnreadMarkerForSelectedChannel()Lrx/Observable; - move-result-object v4 + move-result-object v3 - new-instance v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$1; + new-instance v4, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1; - move-object v1, p0 + move-object v5, p0 - check-cast v1, Lcom/discord/widgets/status/WidgetStatus$Model$Companion; + check-cast v5, Lcom/discord/widgets/status/WidgetStatus$Model$Companion; - invoke-direct {v0, v1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$1;->(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;)V + invoke-direct {v4, v5}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1;->(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;)V - check-cast v0, Lkotlin/jvm/functions/Function3; + check-cast v4, Lkotlin/jvm/functions/Function4; - new-instance v1, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0; + new-instance v5, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0; - invoke-direct {v1, v0}, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0;->(Lkotlin/jvm/functions/Function3;)V + invoke-direct {v5, v4}, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0;->(Lkotlin/jvm/functions/Function4;)V - move-object v5, v1 + check-cast v5, Lrx/functions/Func4; - check-cast v5, Lrx/functions/Func3; - - sget-object v8, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; - - const-wide/16 v6, 0x1f4 - - invoke-static/range {v2 .. v8}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;JLjava/util/concurrent/TimeUnit;)Lrx/Observable; + invoke-static {v1, v0, v2, v3, v5}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable; move-result-object v0 - const-string v1, "ObservableWithLeadingEdg\u20260, TimeUnit.MILLISECONDS)" + sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; + + const-wide/16 v2, 0x1f4 + + invoke-virtual {v0, v2, v3, v1}, Lrx/Observable;->i(JLjava/util/concurrent/TimeUnit;)Lrx/Observable; + + move-result-object v0 + + const-string v1, "Observable\n .\u20260, TimeUnit.MILLISECONDS)" invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V @@ -277,7 +305,7 @@ move-result-object v0 - const-string v1, "ObservableWithLeadingEdg\u2026 .distinctUntilChanged()" + const-string v1, "Observable\n .\u2026 .distinctUntilChanged()" invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0.smali similarity index 55% rename from com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0.smali rename to com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0.smali index 0f6ea8ebc8..b51a5cfcb4 100644 --- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0.smali +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0.smali @@ -1,34 +1,34 @@ -.class final Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0; +.class final Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0; .super Ljava/lang/Object; .source "WidgetStatus.kt" # interfaces -.implements Lrx/functions/Func3; +.implements Lrx/functions/Func4; # instance fields -.field private final synthetic function:Lkotlin/jvm/functions/Function3; +.field private final synthetic function:Lkotlin/jvm/functions/Function4; # direct methods -.method constructor (Lkotlin/jvm/functions/Function3;)V +.method constructor (Lkotlin/jvm/functions/Function4;)V .locals 0 invoke-direct {p0}, Ljava/lang/Object;->()V - iput-object p1, p0, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0;->function:Lkotlin/jvm/functions/Function3; + iput-object p1, p0, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4; return-void .end method # virtual methods -.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 1 - iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0;->function:Lkotlin/jvm/functions/Function3; + iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4; - invoke-interface {v0, p1, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, p1, p2, p3, p4}, Lkotlin/jvm/functions/Function4;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali index d7d0d8c578..de63462a99 100644 --- a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali @@ -573,7 +573,7 @@ invoke-direct {p2}, Ljava/lang/StringBuilder;->()V - const v0, 0x7f12041a + const v0, 0x7f120419 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -888,7 +888,7 @@ sget-object v0, Lcom/discord/widgets/status/WidgetStatus$Model;->Companion:Lcom/discord/widgets/status/WidgetStatus$Model$Companion; - invoke-virtual {v0}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->get()Lrx/Observable; + invoke-virtual {v0}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->getNew()Lrx/Observable; move-result-object v0 diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali index 8b4d0687ab..4c83eb0fca 100644 --- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali +++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali @@ -224,7 +224,7 @@ if-eqz v0, :cond_1 - const v2, 0x7f120fd1 + const v2, 0x7f120fd7 invoke-direct {p0, v0, v2}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence; @@ -248,7 +248,7 @@ if-eqz v0, :cond_2 - const v1, 0x7f120d65 + const v1, 0x7f120d69 invoke-direct {p0, v0, v1}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence; diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali index 0abc11bfb6..3c106527a2 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali @@ -61,7 +61,7 @@ if-eqz v3, :cond_0 - const v4, 0x7f1210bd + const v4, 0x7f1210c3 const/4 v5, 0x2 diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali index ef02c03fee..4c574532c3 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali @@ -222,7 +222,7 @@ invoke-static {v5, v7}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v7, 0x7f1210b7 + const v7, 0x7f1210bd const/4 v8, 0x1 @@ -246,7 +246,7 @@ invoke-static {v3, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f1210b6 + const v5, 0x7f1210bc new-array v7, v8, [Ljava/lang/Object; @@ -334,7 +334,7 @@ invoke-static {v3, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v1, 0x7f12109d + const v1, 0x7f1210a3 invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -357,7 +357,7 @@ invoke-static {v3, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v1, 0x7f1210ba + const v1, 0x7f1210c0 new-array v4, v8, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali index af937578f3..399bf1f8b4 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali @@ -100,7 +100,7 @@ move-result-object v2 - const v3, 0x7f1210ab + const v3, 0x7f1210b1 const/4 v4, 0x1 @@ -186,7 +186,7 @@ move-result-object v1 - const v3, 0x7f1210a1 + const v3, 0x7f1210a7 new-array v4, v4, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali index ca47a18389..1a042a82f4 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali @@ -432,7 +432,7 @@ if-eqz v3, :cond_0 - const v4, 0x7f1210bd + const v4, 0x7f1210c3 const/4 v5, 0x2 @@ -832,7 +832,7 @@ move-result-wide v8 - const p1, 0x7f1210bf + const p1, 0x7f1210c5 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String; @@ -863,7 +863,7 @@ move-result-wide v8 - const p1, 0x7f1210c1 + const p1, 0x7f1210c7 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali index cf5993f57c..7669e098da 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali @@ -127,7 +127,7 @@ invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const v1, 0x7f120d6e + const v1, 0x7f120d72 invoke-virtual {p0, v1}, Lcom/discord/widgets/user/WidgetPruneUsers;->getString(I)Ljava/lang/String; @@ -267,7 +267,7 @@ iget-object v3, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->estimateText:Lcom/discord/app/AppTextView; - const v5, 0x7f12059c + const v5, 0x7f12059b const/4 v6, 0x2 diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali index f9d85469ed..48acb045f8 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali @@ -74,7 +74,7 @@ # virtual methods .method public final call(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/Boolean;)Lcom/discord/widgets/user/WidgetUserMentions$Model; - .locals 33 + .locals 35 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -112,293 +112,305 @@ } .end annotation - move-object/from16 v0, p6 + move-object/from16 v0, p5 - move-object/from16 v1, p7 + move-object/from16 v1, p6 - move-object/from16 v2, p9 + move-object/from16 v2, p7 + + move-object/from16 v3, p9 if-eqz p2, :cond_0 invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getId()J - move-result-wide v3 + move-result-wide v4 goto :goto_0 :cond_0 - const-wide/16 v3, 0x0 + const-wide/16 v4, 0x0 :goto_0 - move-wide v10, v3 + move-wide v12, v4 if-eqz p2, :cond_1 invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String; - move-result-object v3 + move-result-object v4 goto :goto_1 :cond_1 - const/4 v3, 0x0 + const/4 v4, 0x0 :goto_1 - move-object/from16 v21, v3 + move-object/from16 v23, v4 - new-instance v3, Ljava/util/ArrayList; + new-instance v4, Ljava/util/ArrayList; invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->getMentions()Ljava/util/List; - move-result-object v4 - - invoke-interface {v4}, Ljava/util/List;->size()I - - move-result v4 - - mul-int/lit8 v4, v4, 0x2 - - invoke-direct {v3, v4}, Ljava/util/ArrayList;->(I)V - - sget-object v4, Lkotlin/a/z;->bff:Lkotlin/a/z; - - move-object/from16 v16, v4 - - check-cast v16, Ljava/util/Set; - - invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->getMentions()Ljava/util/List; - - move-result-object v4 - - invoke-interface {v4}, Ljava/util/List;->iterator()Ljava/util/Iterator; - - move-result-object v4 - - :goto_2 - invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z - - move-result v5 - - const-string v12, "allowAnimatedEmojis" - - if-eqz v5, :cond_5 - - invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v5 - check-cast v5, Lcom/discord/models/domain/ModelMessage; + invoke-interface {v5}, Ljava/util/List;->size()I - invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J + move-result v5 - move-result-wide v6 + mul-int/lit8 v5, v5, 0x2 - invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-direct {v4, v5}, Ljava/util/ArrayList;->(I)V + + sget-object v5, Lkotlin/a/z;->bff:Lkotlin/a/z; + + move-object/from16 v18, v5 + + check-cast v18, Ljava/util/Set; + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->getMentions()Ljava/util/List; + + move-result-object v5 + + invoke-interface {v5}, Ljava/util/List;->iterator()Ljava/util/Iterator; + + move-result-object v5 + + :goto_2 + invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z + + move-result v6 + + const-string v14, "allowAnimatedEmojis" + + if-eqz v6, :cond_5 + + invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object; move-result-object v6 - move-object/from16 v7, p3 + check-cast v6, Lcom/discord/models/domain/ModelMessage; - invoke-interface {v7, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v6}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J - move-result-object v6 + move-result-wide v7 - check-cast v6, Lcom/discord/models/domain/ModelChannel; + invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - if-nez v6, :cond_2 + move-result-object v7 + + move-object/from16 v8, p3 + + invoke-interface {v8, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v7 + + check-cast v7, Lcom/discord/models/domain/ModelChannel; + + if-nez v7, :cond_2 goto :goto_2 :cond_2 - const-string v8, "members" + const-string v9, "members" - invoke-static {v1, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v2, v9}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J + invoke-virtual {v6}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J - move-result-wide v8 + move-result-wide v9 - invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v8 + move-result-object v9 - invoke-interface {v1, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v2, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v8 + move-result-object v9 - if-nez v8, :cond_3 + if-nez v9, :cond_3 invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map; - move-result-object v8 + move-result-object v9 :cond_3 - move-object/from16 v23, v8 + move-object/from16 v25, v9 - check-cast v23, Ljava/util/Map; + check-cast v25, Ljava/util/Map; - const-string v8, "roles" + const-string v9, "roles" - invoke-static {v0, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v1, v9}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J + invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J - move-result-wide v8 + move-result-wide v9 - invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v8 + move-result-object v9 - invoke-interface {v0, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v1, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v8 + move-result-object v9 - if-nez v8, :cond_4 + if-nez v9, :cond_4 invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map; - move-result-object v8 + move-result-object v9 :cond_4 - move-object/from16 v24, v8 + move-object/from16 v26, v9 - check-cast v24, Ljava/util/Map; + check-cast v26, Ljava/util/Map; - sget-object v8, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->Companion:Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion; + sget-object v9, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->Companion:Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion; - invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J + invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J - move-result-wide v13 + move-result-wide v10 - invoke-static {v13, v14}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v10 + + invoke-interface {v0, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v10 + + check-cast v10, Lcom/discord/models/domain/ModelGuild; + + invoke-virtual {v9, v6, v7, v10}, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion;->create(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry; move-result-object v9 - move-object/from16 v13, p5 + invoke-virtual {v4, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - invoke-interface {v13, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map; - move-result-object v9 - - check-cast v9, Lcom/discord/models/domain/ModelGuild; - - invoke-virtual {v8, v5, v6, v9}, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion;->create(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry; - - move-result-object v8 - - invoke-virtual {v3, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - - invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map; - - move-result-object v22 - - const/16 v26, 0x0 - - const/16 v27, 0x0 + move-result-object v24 const/16 v28, 0x0 const/16 v29, 0x0 - invoke-static {v2, v12}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + const/16 v30, 0x0 + + const/16 v31, 0x0 + + invoke-static {v3, v14}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z - move-result v30 + move-result v32 - invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J + invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J - move-result-wide v31 + move-result-wide v33 - move-object/from16 v25, v5 + move-object/from16 v27, v6 - invoke-static/range {v22 .. v32}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;ZZZZJ)Ljava/util/List; + invoke-static/range {v24 .. v34}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;ZZZZJ)Ljava/util/List; - move-result-object v5 + move-result-object v6 - check-cast v5, Ljava/util/Collection; + check-cast v6, Ljava/util/Collection; - invoke-virtual {v3, v5}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z + invoke-virtual {v4, v6}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z goto/16 :goto_2 :cond_5 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->isLoading()Z - move-result v0 + move-result v1 - if-eqz v0, :cond_6 + if-eqz v1, :cond_6 - new-instance v0, Lcom/discord/widgets/chat/list/entries/LoadingEntry; + new-instance v1, Lcom/discord/widgets/chat/list/entries/LoadingEntry; - invoke-direct {v0}, Lcom/discord/widgets/chat/list/entries/LoadingEntry;->()V + invoke-direct {v1}, Lcom/discord/widgets/chat/list/entries/LoadingEntry;->()V - invoke-virtual {v3, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {v4, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z goto :goto_3 :cond_6 invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->isAllLoaded()Z - move-result v0 + move-result v1 - if-eqz v0, :cond_7 + if-eqz v1, :cond_7 - new-instance v0, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry; + new-instance v1, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry; - invoke-direct {v0}, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry;->()V + invoke-direct {v1}, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry;->()V - invoke-virtual {v3, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {v4, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z :cond_7 :goto_3 - new-instance v0, Lcom/discord/widgets/user/WidgetUserMentions$Model; + new-instance v1, Lcom/discord/widgets/user/WidgetUserMentions$Model; - move-object v5, v0 + move-object v6, v1 - const-string v1, "userId" + const-string v2, "userId" - move-object/from16 v4, p8 + move-object/from16 v5, p8 - invoke-static {v4, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v5, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual/range {p8 .. p8}, Ljava/lang/Long;->longValue()J - move-result-wide v6 + move-result-wide v7 - const-wide/16 v8, -0x1 + const-wide/16 v9, -0x1 - const-string v1, "names" + invoke-static {v12, v13}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-object/from16 v4, p4 + move-result-object v2 - invoke-static {v4, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - const-wide/16 v13, -0x1 + move-result-object v0 - move-object v15, v3 + move-object v11, v0 - check-cast v15, Ljava/util/List; + check-cast v11, Lcom/discord/models/domain/ModelGuild; - const-wide/16 v17, -0x1 + const-string v0, "names" - const/16 v19, 0x0 + move-object/from16 v2, p4 - invoke-static {v2, v12}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v2, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + const-wide/16 v15, -0x1 + + move-object/from16 v17, v4 + + check-cast v17, Ljava/util/List; + + const-wide/16 v19, -0x1 + + const/16 v21, 0x0 + + invoke-static {v3, v14}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z - move-result v20 + move-result v22 - const/16 v22, 0x100 + const/16 v24, 0x200 - const/16 v23, 0x0 + const/16 v25, 0x0 - move-object/from16 v12, p4 + move-object/from16 v14, p4 - invoke-direct/range {v5 .. v23}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v6 .. v25}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - return-object v0 + return-object v1 .end method .method public final 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/user/WidgetUserMentions$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali index b2559ac787..24753c42d3 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali @@ -44,6 +44,8 @@ .end annotation .end field +.field private final guild:Lcom/discord/models/domain/ModelGuild; + .field private final guildId:J .field private final guildName:Ljava/lang/String; @@ -92,11 +94,13 @@ return-void .end method -.method public constructor (JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V +.method public constructor (JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V .locals 6 .annotation system Ldalvik/annotation/Signature; value = { - "(JJJ", + "(JJ", + "Lcom/discord/models/domain/ModelGuild;", + "J", "Ljava/util/Map<", "Ljava/lang/Long;", "Ljava/lang/String;", @@ -114,15 +118,15 @@ move-object v0, p0 - move-object v1, p7 + move-object v1, p8 - move-object/from16 v2, p10 + move-object/from16 v2, p11 - move-object/from16 v3, p11 + move-object/from16 v3, p12 const-string v4, "channelNames" - invoke-static {p7, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {p8, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V const-string v4, "list" @@ -142,13 +146,17 @@ iput-wide v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->channelId:J - move-wide v4, p5 + move-object v4, p5 + + iput-object v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guild:Lcom/discord/models/domain/ModelGuild; + + move-wide v4, p6 iput-wide v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildId:J iput-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->channelNames:Ljava/util/Map; - move-wide v4, p8 + move-wide v4, p9 iput-wide v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->oldestMessageId:J @@ -156,42 +164,42 @@ iput-object v3, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->myRoleIds:Ljava/util/Set; - move-wide/from16 v1, p12 + move-wide/from16 v1, p13 iput-wide v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->newMessagesMarkerMessageId:J - move/from16 v1, p14 + move/from16 v1, p15 iput-boolean v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->isSpoilerClickAllowed:Z - move/from16 v1, p15 + move/from16 v1, p16 iput-boolean v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z - move-object/from16 v1, p16 + move-object/from16 v1, p17 iput-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String; return-void .end method -.method public synthetic constructor (JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 18 +.method public synthetic constructor (JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 19 - move/from16 v0, p17 + move/from16 v0, p18 - and-int/lit16 v0, v0, 0x100 + and-int/lit16 v0, v0, 0x200 if-eqz v0, :cond_0 const/4 v0, 0x0 - const/4 v15, 0x0 + const/16 v16, 0x0 goto :goto_0 :cond_0 - move/from16 v15, p14 + move/from16 v16, p15 :goto_0 move-object/from16 v1, p0 @@ -200,33 +208,35 @@ move-wide/from16 v4, p3 - move-wide/from16 v6, p5 + move-object/from16 v6, p5 - move-object/from16 v8, p7 + move-wide/from16 v7, p6 - move-wide/from16 v9, p8 + move-object/from16 v9, p8 - move-object/from16 v11, p10 + move-wide/from16 v10, p9 move-object/from16 v12, p11 - move-wide/from16 v13, p12 + move-object/from16 v13, p12 - move/from16 v16, p15 + move-wide/from16 v14, p13 - move-object/from16 v17, p16 + move/from16 v17, p16 - invoke-direct/range {v1 .. v17}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V + move-object/from16 v18, p17 + + invoke-direct/range {v1 .. v18}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V return-void .end method -.method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model;JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model; +.method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model;JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model; .locals 16 move-object/from16 v0, p0 - move/from16 v1, p17 + move/from16 v1, p18 and-int/lit8 v2, v1, 0x1 @@ -260,63 +270,63 @@ if-eqz v6, :cond_2 - invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J + invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; - move-result-wide v6 + move-result-object v6 goto :goto_2 :cond_2 - move-wide/from16 v6, p5 + move-object/from16 v6, p5 :goto_2 - and-int/lit8 v8, v1, 0x8 + and-int/lit8 v7, v1, 0x8 - if-eqz v8, :cond_3 + if-eqz v7, :cond_3 - invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getChannelNames()Ljava/util/Map; + invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J - move-result-object v8 + move-result-wide v7 goto :goto_3 :cond_3 - move-object/from16 v8, p7 + move-wide/from16 v7, p6 :goto_3 and-int/lit8 v9, v1, 0x10 if-eqz v9, :cond_4 - invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getOldestMessageId()J + invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getChannelNames()Ljava/util/Map; - move-result-wide v9 + move-result-object v9 goto :goto_4 :cond_4 - move-wide/from16 v9, p8 + move-object/from16 v9, p8 :goto_4 - and-int/lit8 v11, v1, 0x20 + and-int/lit8 v10, v1, 0x20 - if-eqz v11, :cond_5 + if-eqz v10, :cond_5 - invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getList()Ljava/util/List; + invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getOldestMessageId()J - move-result-object v11 + move-result-wide v10 goto :goto_5 :cond_5 - move-object/from16 v11, p10 + move-wide/from16 v10, p9 :goto_5 and-int/lit8 v12, v1, 0x40 if-eqz v12, :cond_6 - invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getMyRoleIds()Ljava/util/Set; + invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getList()Ljava/util/List; move-result-object v12 @@ -330,77 +340,93 @@ if-eqz v13, :cond_7 - invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getNewMessagesMarkerMessageId()J + invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getMyRoleIds()Ljava/util/Set; - move-result-wide v13 + move-result-object v13 goto :goto_7 :cond_7 - move-wide/from16 v13, p12 + move-object/from16 v13, p12 :goto_7 - and-int/lit16 v15, v1, 0x100 + and-int/lit16 v14, v1, 0x100 - if-eqz v15, :cond_8 + if-eqz v14, :cond_8 - invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->isSpoilerClickAllowed()Z + invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getNewMessagesMarkerMessageId()J - move-result v15 + move-result-wide v14 goto :goto_8 :cond_8 - move/from16 v15, p14 + move-wide/from16 v14, p13 :goto_8 - move/from16 p14, v15 + move-wide/from16 p13, v14 - and-int/lit16 v15, v1, 0x200 + and-int/lit16 v14, v1, 0x200 - if-eqz v15, :cond_9 + if-eqz v14, :cond_9 - iget-boolean v15, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z + invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->isSpoilerClickAllowed()Z + + move-result v14 goto :goto_9 :cond_9 - move/from16 v15, p15 + move/from16 v14, p15 :goto_9 - and-int/lit16 v1, v1, 0x400 + and-int/lit16 v15, v1, 0x400 - if-eqz v1, :cond_a + if-eqz v15, :cond_a - iget-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String; + iget-boolean v15, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z goto :goto_a :cond_a - move-object/from16 v1, p16 + move/from16 v15, p16 :goto_a + and-int/lit16 v1, v1, 0x800 + + if-eqz v1, :cond_b + + iget-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String; + + goto :goto_b + + :cond_b + move-object/from16 v1, p17 + + :goto_b move-wide/from16 p1, v2 move-wide/from16 p3, v4 - move-wide/from16 p5, v6 + move-object/from16 p5, v6 - move-object/from16 p7, v8 + move-wide/from16 p6, v7 - move-wide/from16 p8, v9 + move-object/from16 p8, v9 - move-object/from16 p10, v11 + move-wide/from16 p9, v10 move-object/from16 p11, v12 - move-wide/from16 p12, v13 + move-object/from16 p12, v13 - move/from16 p15, v15 + move/from16 p15, v14 - move-object/from16 p16, v1 + move/from16 p16, v15 - invoke-virtual/range {p0 .. p16}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->copy(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserMentions$Model; + move-object/from16 p17, v1 + + invoke-virtual/range {p0 .. p17}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->copy(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserMentions$Model; move-result-object v0 @@ -422,12 +448,22 @@ .method public final component10()Z .locals 1 + invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->isSpoilerClickAllowed()Z + + move-result v0 + + return v0 +.end method + +.method public final component11()Z + .locals 1 + iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z return v0 .end method -.method public final component11()Ljava/lang/String; +.method public final component12()Ljava/lang/String; .locals 1 iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String; @@ -445,7 +481,17 @@ return-wide v0 .end method -.method public final component3()J +.method public final component3()Lcom/discord/models/domain/ModelGuild; + .locals 1 + + invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v0 + + return-object v0 +.end method + +.method public final component4()J .locals 2 invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J @@ -455,7 +501,7 @@ return-wide v0 .end method -.method public final component4()Ljava/util/Map; +.method public final component5()Ljava/util/Map; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { @@ -474,7 +520,7 @@ return-object v0 .end method -.method public final component5()J +.method public final component6()J .locals 2 invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getOldestMessageId()J @@ -484,7 +530,7 @@ return-wide v0 .end method -.method public final component6()Ljava/util/List; +.method public final component7()Ljava/util/List; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { @@ -502,7 +548,7 @@ return-object v0 .end method -.method public final component7()Ljava/util/Set; +.method public final component8()Ljava/util/Set; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { @@ -520,7 +566,7 @@ return-object v0 .end method -.method public final component8()J +.method public final component9()J .locals 2 invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getNewMessagesMarkerMessageId()J @@ -530,21 +576,13 @@ return-wide v0 .end method -.method public final component9()Z - .locals 1 - - invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->isSpoilerClickAllowed()Z - - move-result v0 - - return v0 -.end method - -.method public final copy(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserMentions$Model; - .locals 18 +.method public final copy(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserMentions$Model; + .locals 19 .annotation system Ldalvik/annotation/Signature; value = { - "(JJJ", + "(JJ", + "Lcom/discord/models/domain/ModelGuild;", + "J", "Ljava/util/Map<", "Ljava/lang/Long;", "Ljava/lang/String;", @@ -565,51 +603,53 @@ move-wide/from16 v3, p3 - move-wide/from16 v5, p5 + move-object/from16 v5, p5 - move-object/from16 v7, p7 + move-wide/from16 v6, p6 - move-wide/from16 v8, p8 + move-object/from16 v8, p8 - move-object/from16 v10, p10 + move-wide/from16 v9, p9 move-object/from16 v11, p11 - move-wide/from16 v12, p12 + move-object/from16 v12, p12 - move/from16 v14, p14 + move-wide/from16 v13, p13 move/from16 v15, p15 - move-object/from16 v16, p16 + move/from16 v16, p16 + + move-object/from16 v17, p17 const-string v0, "channelNames" - move-object/from16 v1, p7 + move-object/from16 v1, p8 invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V const-string v0, "list" - move-object/from16 v1, p10 + move-object/from16 v1, p11 invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V const-string v0, "myRoleIds" - move-object/from16 v1, p11 + move-object/from16 v1, p12 invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - new-instance v17, Lcom/discord/widgets/user/WidgetUserMentions$Model; + new-instance v18, Lcom/discord/widgets/user/WidgetUserMentions$Model; - move-object/from16 v0, v17 + move-object/from16 v0, v18 move-wide/from16 v1, p1 - invoke-direct/range {v0 .. v16}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V + invoke-direct/range {v0 .. v17}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V - return-object v17 + return-object v18 .end method .method public final equals(Ljava/lang/Object;)Z @@ -671,6 +711,20 @@ :goto_1 if-eqz v1, :cond_7 + invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v1 + + invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v3 + + invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result v1 + + if-eqz v1, :cond_7 + invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J move-result-wide v3 @@ -868,6 +922,14 @@ return-object v0 .end method +.method public final getGuild()Lcom/discord/models/domain/ModelGuild; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guild:Lcom/discord/models/domain/ModelGuild; + + return-object v0 +.end method + .method public final getGuildId()J .locals 2 @@ -971,21 +1033,7 @@ mul-int/lit8 v1, v1, 0x1f - invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J - - move-result-wide v3 - - ushr-long v5, v3, v2 - - xor-long/2addr v3, v5 - - long-to-int v0, v3 - - add-int/2addr v1, v0 - - mul-int/lit8 v1, v1, 0x1f - - invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getChannelNames()Ljava/util/Map; + invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; move-result-object v0 @@ -1007,6 +1055,40 @@ mul-int/lit8 v1, v1, 0x1f + invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J + + move-result-wide v4 + + ushr-long v6, v4, v2 + + xor-long/2addr v4, v6 + + long-to-int v0, v4 + + add-int/2addr v1, v0 + + mul-int/lit8 v1, v1, 0x1f + + invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getChannelNames()Ljava/util/Map; + + move-result-object v0 + + if-eqz v0, :cond_1 + + invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I + + move-result v0 + + goto :goto_1 + + :cond_1 + const/4 v0, 0x0 + + :goto_1 + add-int/2addr v1, v0 + + mul-int/lit8 v1, v1, 0x1f + invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getOldestMessageId()J move-result-wide v4 @@ -1025,26 +1107,6 @@ move-result-object v0 - if-eqz v0, :cond_1 - - invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I - - move-result v0 - - goto :goto_1 - - :cond_1 - const/4 v0, 0x0 - - :goto_1 - add-int/2addr v1, v0 - - mul-int/lit8 v1, v1, 0x1f - - invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getMyRoleIds()Ljava/util/Set; - - move-result-object v0 - if-eqz v0, :cond_2 invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I @@ -1061,6 +1123,26 @@ mul-int/lit8 v1, v1, 0x1f + invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getMyRoleIds()Ljava/util/Set; + + move-result-object v0 + + if-eqz v0, :cond_3 + + invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I + + move-result v0 + + goto :goto_3 + + :cond_3 + const/4 v0, 0x0 + + :goto_3 + add-int/2addr v1, v0 + + mul-int/lit8 v1, v1, 0x1f + invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getNewMessagesMarkerMessageId()J move-result-wide v4 @@ -1081,17 +1163,6 @@ const/4 v2, 0x1 - if-eqz v0, :cond_3 - - const/4 v0, 0x1 - - :cond_3 - add-int/2addr v1, v0 - - mul-int/lit8 v1, v1, 0x1f - - iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z - if-eqz v0, :cond_4 const/4 v0, 0x1 @@ -1101,15 +1172,26 @@ mul-int/lit8 v1, v1, 0x1f - iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String; + iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z if-eqz v0, :cond_5 + const/4 v0, 0x1 + + :cond_5 + add-int/2addr v1, v0 + + mul-int/lit8 v1, v1, 0x1f + + iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String; + + if-eqz v0, :cond_6 + invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I move-result v3 - :cond_5 + :cond_6 add-int/2addr v1, v3 return v1 @@ -1148,6 +1230,16 @@ invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder; + const-string v1, ", guild=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v1 + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + const-string v1, ", guildId=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali index ef3ea752f6..51908cdc35 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali @@ -478,7 +478,7 @@ move-result-object v0 - const v4, 0x7f120fe5 + const v4, 0x7f120feb new-array v3, v3, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali index a3e25c5311..3fedcb4a23 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali @@ -332,7 +332,7 @@ invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120da3 + const p1, 0x7f120da7 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali index aae2bb62e4..e63186a750 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali @@ -602,7 +602,7 @@ const/4 p1, 0x0 - const v0, 0x7f120654 + const v0, 0x7f120653 invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V @@ -636,7 +636,7 @@ .method public synthetic lambda$configureActionButtons$9$WidgetUserProfile(Landroid/view/View;)V .locals 0 - const p1, 0x7f12064d + const p1, 0x7f12064c invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -659,14 +659,14 @@ goto :goto_0 :pswitch_0 - const p1, 0x7f1210d2 + const p1, 0x7f1210d8 invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V return-void :pswitch_1 - const p1, 0x7f120644 + const p1, 0x7f120643 invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -678,14 +678,14 @@ return-void :pswitch_3 - const p1, 0x7f12064d + const p1, 0x7f12064c invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V return-void :pswitch_4 - const p1, 0x7f12064b + const p1, 0x7f12064a invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -698,7 +698,7 @@ move-result-object p1 - const p2, 0x7f1210d1 + const p2, 0x7f1210d7 invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V @@ -757,7 +757,7 @@ const v2, 0xffff - const v3, 0x7f120439 + const v3, 0x7f120438 invoke-interface {p1, v0, v1, v2, v3}, Landroid/view/Menu;->add(IIII)Landroid/view/MenuItem; @@ -811,7 +811,7 @@ invoke-virtual {p1}, Landroidx/appcompat/app/AlertDialog;->dismiss()V - const p1, 0x7f12064b + const p1, 0x7f12064a invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -938,7 +938,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120d6b + const p1, 0x7f120d6f invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarTitle(I)Lkotlin/Unit; @@ -962,7 +962,7 @@ new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item; - const v4, 0x7f1210d3 + const v4, 0x7f1210d9 invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali index d690f55d41..5bda5a1049 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali @@ -65,7 +65,7 @@ iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;->$fragment:Lcom/discord/app/AppFragment; - const v2, 0x7f120d4e + const v2, 0x7f120d52 invoke-virtual {p1, v2}, Lcom/discord/app/AppFragment;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali index 34e8af9e77..f74270a8be 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali @@ -776,7 +776,7 @@ new-instance v3, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge; - const v6, 0x7f0802d2 + const v6, 0x7f0802dc move-object v5, v0 @@ -788,7 +788,7 @@ move-result v7 - const v5, 0x7f120f3b + const v5, 0x7f120f40 invoke-virtual {v0, v5}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -825,7 +825,7 @@ new-instance v3, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge; - const v6, 0x7f0802cc + const v6, 0x7f0802d6 move-object v5, v0 @@ -874,7 +874,7 @@ new-instance v3, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge; - const v6, 0x7f0802ca + const v6, 0x7f0802d4 move-object v5, v0 @@ -941,16 +941,16 @@ if-eqz v3, :cond_4 - const v3, 0x7f08025c + const v3, 0x7f080264 - const v9, 0x7f08025c + const v9, 0x7f080264 goto :goto_1 :cond_4 - const v3, 0x7f08025b + const v3, 0x7f080263 - const v9, 0x7f08025b + const v9, 0x7f080263 :goto_1 move-object v3, v0 @@ -1028,16 +1028,16 @@ if-eqz v3, :cond_7 - const v3, 0x7f08025e + const v3, 0x7f080266 - const v9, 0x7f08025e + const v9, 0x7f080266 goto :goto_3 :cond_7 - const v3, 0x7f08025d + const v3, 0x7f080265 - const v9, 0x7f08025d + const v9, 0x7f080265 :goto_3 move-object v3, v0 @@ -1113,16 +1113,16 @@ if-eqz v1, :cond_a - const v1, 0x7f080260 + const v1, 0x7f080268 - const v9, 0x7f080260 + const v9, 0x7f080268 goto :goto_5 :cond_a - const v1, 0x7f08025f + const v1, 0x7f080267 - const v9, 0x7f08025f + const v9, 0x7f080267 :goto_5 move-object v1, v0 @@ -1184,7 +1184,7 @@ new-instance v1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge; - const v9, 0x7f0802c9 + const v9, 0x7f0802d3 move-object v3, v0 @@ -1235,7 +1235,7 @@ new-instance v1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge; - const v9, 0x7f0802cd + const v9, 0x7f0802d7 move-object v4, v0 @@ -1245,7 +1245,7 @@ move-result v10 - const v4, 0x7f12051a + const v4, 0x7f120519 invoke-virtual {v0, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1272,13 +1272,13 @@ move-result v1 - const v4, 0x7f120d32 + const v4, 0x7f120d36 if-eqz v1, :cond_e new-instance v1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge; - const v9, 0x7f0802cb + const v9, 0x7f0802d5 move-object v5, v0 @@ -1339,9 +1339,9 @@ if-gez v5, :cond_f - const v1, 0x7f0802ce + const v1, 0x7f0802d8 - const v9, 0x7f0802ce + const v9, 0x7f0802d8 goto :goto_6 @@ -1358,9 +1358,9 @@ if-gez v5, :cond_10 - const v1, 0x7f0802cf + const v1, 0x7f0802d9 - const v9, 0x7f0802cf + const v9, 0x7f0802d9 goto :goto_6 @@ -1377,16 +1377,16 @@ if-gez v1, :cond_11 - const v1, 0x7f0802d0 + const v1, 0x7f0802da - const v9, 0x7f0802d0 + const v9, 0x7f0802da goto :goto_6 :cond_11 - const v1, 0x7f0802d1 + const v1, 0x7f0802db - const v9, 0x7f0802d1 + const v9, 0x7f0802db :goto_6 new-instance v1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge; @@ -1403,7 +1403,7 @@ move-result-object v11 - const v3, 0x7f120d00 + const v3, 0x7f120cfe new-array v4, v7, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali index 240c386e19..f59b99e8ad 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali @@ -464,12 +464,12 @@ if-eqz v0, :cond_3 - const v2, 0x7f0802ea + const v2, 0x7f0802f4 goto :goto_2 :cond_3 - const v2, 0x7f080257 + const v2, 0x7f08025f :goto_2 invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setImageResource(I)V diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali index d983ec29ea..2906cfc76f 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali @@ -453,9 +453,9 @@ move-result-object v2 - const v3, 0x7f0802f8 + const v3, 0x7f080302 - const v4, 0x7f120f4a + const v4, 0x7f120f4f const/4 v5, 0x0 @@ -483,9 +483,9 @@ move-result-object v1 - const v2, 0x7f0802f6 + const v2, 0x7f080300 - const v3, 0x7f120f46 + const v3, 0x7f120f4b const/4 v4, 0x0 @@ -513,15 +513,15 @@ move-result-object p1 - const p2, 0x7f120f45 + const p2, 0x7f120f4a invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object p2 - const v0, 0x7f0802f5 + const v0, 0x7f0802ff - const v1, 0x7f120f44 + const v1, 0x7f120f49 invoke-direct {p0, p1, v0, v1, p2}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V @@ -541,15 +541,15 @@ move-result-object p1 - const p2, 0x7f120f48 + const p2, 0x7f120f4d invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object p2 - const v0, 0x7f0802f7 + const v0, 0x7f080301 - const v1, 0x7f120f47 + const v1, 0x7f120f4c invoke-direct {p0, p1, v0, v1, p2}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V diff --git a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali index 6d09bd955d..2f507eb24d 100644 --- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali +++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali @@ -27,7 +27,7 @@ .method private getBodyText(Landroid/content/Context;)Ljava/lang/CharSequence; .locals 1 - const v0, 0x7f121140 + const v0, 0x7f121146 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -59,7 +59,7 @@ aput-object v0, v1, v2 - const v0, 0x7f121148 + const v0, 0x7f12114e invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali index 811c6ceee6..31d904dd48 100644 --- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali +++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali @@ -448,7 +448,7 @@ if-eqz p1, :cond_0 - const p1, 0x7f1203b3 + const p1, 0x7f1203b2 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali index f1bdabb1ec..9c1663f398 100644 --- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali +++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali @@ -62,7 +62,7 @@ move-result-object p1 - const v1, 0x7f120d09 + const v1, 0x7f120d0d invoke-static {p1, v1, v0}, Lcom/discord/app/g;->a(Landroid/content/Context;II)V @@ -165,7 +165,7 @@ aput-object p1, v0, v1 - const p1, 0x7f121142 + const p1, 0x7f121148 invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/user/email/WidgetUserEmailVerify;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali index c947a0db72..1f6176a035 100644 --- a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali +++ b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali @@ -1008,7 +1008,7 @@ move-result-object v0 - const v1, 0x7f120658 + const v1, 0x7f120657 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali index d1c4ce5ccc..ab43f6c2ae 100644 --- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali +++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali @@ -1158,7 +1158,7 @@ new-array v2, v1, [Lkotlin/Pair; - const v3, 0x7f121134 + const v3, 0x7f12113a invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1174,7 +1174,7 @@ aput-object v3, v2, v4 - const v3, 0x7f120fd9 + const v3, 0x7f120fdf invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1192,7 +1192,7 @@ const/4 v3, 0x2 - const v5, 0x7f120ec8 + const v5, 0x7f120ecc invoke-virtual {p0, v5}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1208,7 +1208,7 @@ sget-object v3, Lcom/discord/a/b;->uK:Lcom/discord/a/b$a; - const v3, 0x7f120577 + const v3, 0x7f120576 invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1416,7 +1416,7 @@ move-result-object p1 - const v0, 0x7f120d83 + const v0, 0x7f120d87 invoke-virtual {p1, v0}, Landroid/widget/EditText;->setHint(I)V diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali index 09f3c7c1c6..043a4d28f4 100644 --- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali +++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali @@ -1263,7 +1263,7 @@ new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v6, 0x7f120f78 + const v6, 0x7f120f7e const/4 v7, 0x0 @@ -1298,7 +1298,7 @@ new-instance v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v7, 0x7f120d80 + const v7, 0x7f120d84 const/4 v8, 0x0 @@ -1326,7 +1326,7 @@ new-instance v11, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v6, 0x7f120f78 + const v6, 0x7f120f7e const/4 v7, 0x0 diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali index 6c2af93579..6fec03480d 100644 --- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali +++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali @@ -1118,7 +1118,7 @@ move-result-object v0 - const v1, 0x7f120dbc + const v1, 0x7f120dc0 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1282,16 +1282,16 @@ if-eqz v0, :cond_7 - const v0, 0x7f080288 + const v0, 0x7f080290 - const v7, 0x7f080288 + const v7, 0x7f080290 goto :goto_6 :cond_7 - const v0, 0x7f08028a + const v0, 0x7f080292 - const v7, 0x7f08028a + const v7, 0x7f080292 :goto_6 const/4 v8, 0x0 @@ -1316,12 +1316,12 @@ if-eqz v1, :cond_8 - const v1, 0x7f120ec5 + const v1, 0x7f120ec9 goto :goto_7 :cond_8 - const v1, 0x7f120eb8 + const v1, 0x7f120ebc :goto_7 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1382,16 +1382,16 @@ if-eqz v0, :cond_a - const v0, 0x7f08024e + const v0, 0x7f080256 - const v7, 0x7f08024e + const v7, 0x7f080256 goto :goto_9 :cond_a - const v0, 0x7f080251 + const v0, 0x7f080259 - const v7, 0x7f080251 + const v7, 0x7f080259 :goto_9 const/4 v8, 0x0 @@ -1416,12 +1416,12 @@ if-eqz v1, :cond_b - const v1, 0x7f120ec4 + const v1, 0x7f120ec8 goto :goto_a :cond_b - const v1, 0x7f120eb3 + const v1, 0x7f120eb7 :goto_a invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1983,7 +1983,7 @@ if-eqz v16, :cond_a - const v0, 0x7f120ecf + const v0, 0x7f120ed3 invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V @@ -2042,7 +2042,7 @@ const/4 v12, 0x2 - const v0, 0x7f120d6b + const v0, 0x7f120d6f invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali index 0d5b15df49..893202a1ea 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali @@ -65,7 +65,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120654 + const v0, 0x7f120653 invoke-static {p1, v0}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali index d471d74541..a820bc641f 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali @@ -416,7 +416,7 @@ move-result-object p1 - const v0, 0x7f120f3e + const v0, 0x7f120f43 invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetCallFailed;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali index a4bdbd2ce3..bb8bc2210c 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali @@ -903,7 +903,7 @@ move-result-object p1 - const v0, 0x7f121185 + const v0, 0x7f12118b invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali index baf0e8cff6..6820f3f80e 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali @@ -313,12 +313,12 @@ if-eqz v1, :cond_0 - const v1, 0x7f080289 + const v1, 0x7f080291 goto :goto_0 :cond_0 - const v1, 0x7f08028d + const v1, 0x7f080295 :goto_0 invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V @@ -381,12 +381,12 @@ if-eqz v0, :cond_2 - const v1, 0x7f08032a + const v1, 0x7f080335 goto :goto_2 :cond_2 - const v1, 0x7f080329 + const v1, 0x7f080334 :goto_2 invoke-virtual {p1, v1}, Landroid/widget/ImageView;->setImageResource(I)V diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali index 6cc0c716ba..a226c0b1ef 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali @@ -458,12 +458,12 @@ if-eqz v8, :cond_6 - const v8, 0x7f121166 + const v8, 0x7f12116c goto :goto_3 :cond_6 - const v8, 0x7f121176 + const v8, 0x7f12117c :goto_3 invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V @@ -521,12 +521,12 @@ if-eqz v0, :cond_8 - const v0, 0x7f08032a + const v0, 0x7f080335 goto :goto_4 :cond_8 - const v0, 0x7f08028d + const v0, 0x7f080295 :goto_4 invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V @@ -541,12 +541,12 @@ if-eqz v0, :cond_9 - const v0, 0x7f120407 + const v0, 0x7f120406 goto :goto_5 :cond_9 - const v0, 0x7f120408 + const v0, 0x7f120407 :goto_5 invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali index 81e1ab7872..11fec42b11 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali @@ -940,7 +940,7 @@ .annotation build Landroidx/annotation/DrawableRes; .end annotation - const v0, 0x7f080332 + const v0, 0x7f08033d if-nez p1, :cond_0 @@ -976,17 +976,17 @@ return v0 :cond_2 - const p1, 0x7f080331 + const p1, 0x7f08033c return p1 :cond_3 - const p1, 0x7f08032f + const p1, 0x7f08033a return p1 :cond_4 - const p1, 0x7f080330 + const p1, 0x7f08033b return p1 .end method @@ -1024,7 +1024,7 @@ if-eqz v0, :cond_0 - const p1, 0x7f120423 + const p1, 0x7f120422 return p1 @@ -1037,7 +1037,7 @@ if-eqz v0, :cond_1 - const p1, 0x7f120426 + const p1, 0x7f120425 return p1 @@ -1050,7 +1050,7 @@ if-eqz v0, :cond_2 - const p1, 0x7f120421 + const p1, 0x7f120420 return p1 @@ -1063,7 +1063,7 @@ if-eqz v0, :cond_3 - const p1, 0x7f120420 + const p1, 0x7f12041f return p1 @@ -1076,7 +1076,7 @@ if-eqz v0, :cond_4 - const p1, 0x7f120427 + const p1, 0x7f120426 return p1 @@ -1089,14 +1089,14 @@ if-eqz v0, :cond_5 - const p1, 0x7f12042b + const p1, 0x7f12042a return p1 :cond_5 instance-of v0, p1, Lcom/discord/rtcconnection/RtcConnection$State$d; - const v1, 0x7f120424 + const v1, 0x7f120423 if-nez v0, :cond_6 diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali index 042078adae..bd5317a1e4 100644 --- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali +++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali @@ -53,7 +53,7 @@ move-result-object p1 - const v0, 0x7f121136 + const v0, 0x7f12113c invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali index aeb6cfa774..ae065fba12 100644 --- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali +++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali @@ -834,7 +834,7 @@ if-eqz v3, :cond_1 - const v3, 0x7f12105b + const v3, 0x7f121061 goto :goto_1 @@ -892,12 +892,12 @@ if-eqz p1, :cond_2 - const p1, 0x7f121053 + const p1, 0x7f121059 goto :goto_2 :cond_2 - const p1, 0x7f120499 + const p1, 0x7f120498 :goto_2 invoke-virtual {v1, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -961,7 +961,7 @@ move-result-object v0 - const v4, 0x7f120408 + const v4, 0x7f120407 invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V @@ -984,7 +984,7 @@ move-result-object v0 - const v4, 0x7f121047 + const v4, 0x7f12104d invoke-direct {p0, v0, v4}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->disableWithToast(Landroid/widget/Button;I)V diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali index e869451d82..3c4acae25b 100644 --- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali +++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali @@ -597,7 +597,7 @@ move-result-object v0 - const v4, 0x7f1205aa + const v4, 0x7f1205a9 invoke-virtual {p0, v4}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getString(I)Ljava/lang/String; @@ -681,7 +681,7 @@ move-result-object v4 - const v5, 0x7f120592 + const v5, 0x7f120591 new-array v1, v1, [Ljava/lang/Object; @@ -928,7 +928,7 @@ aput-object p1, v0, v3 - const p1, 0x7f1204ad + const p1, 0x7f1204ac invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/google/android/gms/base/R$b.smali b/com.discord/smali/com/google/android/gms/base/R$b.smali index e07e2000f9..fd6abea226 100644 --- a/com.discord/smali/com/google/android/gms/base/R$b.smali +++ b/com.discord/smali/com/google/android/gms/base/R$b.smali @@ -15,39 +15,39 @@ # static fields -.field public static final common_google_play_services_enable_button:I = 0x7f1203e4 +.field public static final common_google_play_services_enable_button:I = 0x7f1203e3 -.field public static final common_google_play_services_enable_text:I = 0x7f1203e5 +.field public static final common_google_play_services_enable_text:I = 0x7f1203e4 -.field public static final common_google_play_services_enable_title:I = 0x7f1203e6 +.field public static final common_google_play_services_enable_title:I = 0x7f1203e5 -.field public static final common_google_play_services_install_button:I = 0x7f1203e7 +.field public static final common_google_play_services_install_button:I = 0x7f1203e6 -.field public static final common_google_play_services_install_text:I = 0x7f1203e8 +.field public static final common_google_play_services_install_text:I = 0x7f1203e7 -.field public static final common_google_play_services_install_title:I = 0x7f1203e9 +.field public static final common_google_play_services_install_title:I = 0x7f1203e8 -.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203ea +.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203e9 -.field public static final common_google_play_services_notification_ticker:I = 0x7f1203eb +.field public static final common_google_play_services_notification_ticker:I = 0x7f1203ea -.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ed +.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ec -.field public static final common_google_play_services_update_button:I = 0x7f1203ee +.field public static final common_google_play_services_update_button:I = 0x7f1203ed -.field public static final common_google_play_services_update_text:I = 0x7f1203ef +.field public static final common_google_play_services_update_text:I = 0x7f1203ee -.field public static final common_google_play_services_update_title:I = 0x7f1203f0 +.field public static final common_google_play_services_update_title:I = 0x7f1203ef -.field public static final common_google_play_services_updating_text:I = 0x7f1203f1 +.field public static final common_google_play_services_updating_text:I = 0x7f1203f0 -.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f2 +.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f1 -.field public static final common_open_on_phone:I = 0x7f1203f3 +.field public static final common_open_on_phone:I = 0x7f1203f2 -.field public static final common_signin_button_text:I = 0x7f1203f4 +.field public static final common_signin_button_text:I = 0x7f1203f3 -.field public static final common_signin_button_text_long:I = 0x7f1203f5 +.field public static final common_signin_button_text_long:I = 0x7f1203f4 # direct methods diff --git a/com.discord/smali/com/google/android/gms/common/R$a.smali b/com.discord/smali/com/google/android/gms/common/R$a.smali index 78c2792040..f378579fd4 100644 --- a/com.discord/smali/com/google/android/gms/common/R$a.smali +++ b/com.discord/smali/com/google/android/gms/common/R$a.smali @@ -15,7 +15,7 @@ # static fields -.field public static final common_google_play_services_unknown_issue:I = 0x7f1203ec +.field public static final common_google_play_services_unknown_issue:I = 0x7f1203eb # direct methods diff --git a/com.discord/smali_classes2/com/google/android/material/R$drawable.smali b/com.discord/smali_classes2/com/google/android/material/R$drawable.smali index cad714cb6e..2d999bcc75 100644 --- a/com.discord/smali_classes2/com/google/android/material/R$drawable.smali +++ b/com.discord/smali_classes2/com/google/android/material/R$drawable.smali @@ -199,45 +199,45 @@ .field public static final design_snackbar_background:I = 0x7f0800ab -.field public static final ic_mtrl_chip_checked_black:I = 0x7f08028f +.field public static final ic_mtrl_chip_checked_black:I = 0x7f080297 -.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080290 +.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080298 -.field public static final ic_mtrl_chip_close_circle:I = 0x7f080291 +.field public static final ic_mtrl_chip_close_circle:I = 0x7f080299 -.field public static final mtrl_snackbar_background:I = 0x7f0803b6 +.field public static final mtrl_snackbar_background:I = 0x7f0803c1 -.field public static final mtrl_tabs_default_indicator:I = 0x7f0803b7 +.field public static final mtrl_tabs_default_indicator:I = 0x7f0803c2 -.field public static final navigation_empty_icon:I = 0x7f0803b8 +.field public static final navigation_empty_icon:I = 0x7f0803c3 -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf -.field public static final tooltip_frame_dark:I = 0x7f0803c9 +.field public static final tooltip_frame_dark:I = 0x7f0803d4 -.field public static final tooltip_frame_light:I = 0x7f0803ca +.field public static final tooltip_frame_light:I = 0x7f0803d5 # direct methods diff --git a/com.discord/smali_classes2/com/google/android/material/R$string.smali b/com.discord/smali_classes2/com/google/android/material/R$string.smali index 6ad4fbb608..dc3352dcd7 100644 --- a/com.discord/smali_classes2/com/google/android/material/R$string.smali +++ b/com.discord/smali_classes2/com/google/android/material/R$string.smali @@ -97,13 +97,13 @@ .field public static final bottom_sheet_behavior:I = 0x7f12032b -.field public static final character_counter_content_description:I = 0x7f1203a7 +.field public static final character_counter_content_description:I = 0x7f1203a6 -.field public static final character_counter_pattern:I = 0x7f1203a8 +.field public static final character_counter_pattern:I = 0x7f1203a7 -.field public static final fab_transformation_scrim_behavior:I = 0x7f120568 +.field public static final fab_transformation_scrim_behavior:I = 0x7f120567 -.field public static final fab_transformation_sheet_behavior:I = 0x7f120569 +.field public static final fab_transformation_sheet_behavior:I = 0x7f120568 .field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12089a @@ -119,9 +119,9 @@ .field public static final path_password_strike_through:I = 0x7f120c1a -.field public static final search_menu_title:I = 0x7f120e87 +.field public static final search_menu_title:I = 0x7f120e8b -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 # direct methods diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali index 84441d6403..8e14a4aea2 100644 --- a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali +++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali @@ -231,59 +231,59 @@ .field public static final ic_gif_24dp:I = 0x7f080243 -.field public static final ic_image_24dp:I = 0x7f080261 +.field public static final ic_image_24dp:I = 0x7f080269 -.field public static final ic_insert_emoticon_24dp:I = 0x7f080269 +.field public static final ic_insert_emoticon_24dp:I = 0x7f080271 -.field public static final ic_keyboard_24dp:I = 0x7f08026f +.field public static final ic_keyboard_24dp:I = 0x7f080277 -.field public static final ic_launch_24dp:I = 0x7f080270 +.field public static final ic_launch_24dp:I = 0x7f080278 -.field public static final ic_movie_24dp:I = 0x7f08028e +.field public static final ic_movie_24dp:I = 0x7f080296 -.field public static final ic_mtrl_chip_checked_black:I = 0x7f08028f +.field public static final ic_mtrl_chip_checked_black:I = 0x7f080297 -.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080290 +.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080298 -.field public static final ic_mtrl_chip_close_circle:I = 0x7f080291 +.field public static final ic_mtrl_chip_close_circle:I = 0x7f080299 -.field public static final ic_send_24dp:I = 0x7f0802e4 +.field public static final ic_send_24dp:I = 0x7f0802ee -.field public static final ic_take_photo:I = 0x7f080300 +.field public static final ic_take_photo:I = 0x7f08030a -.field public static final mtrl_snackbar_background:I = 0x7f0803b6 +.field public static final mtrl_snackbar_background:I = 0x7f0803c1 -.field public static final mtrl_tabs_default_indicator:I = 0x7f0803b7 +.field public static final mtrl_tabs_default_indicator:I = 0x7f0803c2 -.field public static final navigation_empty_icon:I = 0x7f0803b8 +.field public static final navigation_empty_icon:I = 0x7f0803c3 -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf -.field public static final tooltip_frame_dark:I = 0x7f0803c9 +.field public static final tooltip_frame_dark:I = 0x7f0803d4 -.field public static final tooltip_frame_light:I = 0x7f0803ca +.field public static final tooltip_frame_light:I = 0x7f0803d5 # direct methods diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali index 1cba66fe09..52413fc627 100644 --- a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali +++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali @@ -117,27 +117,27 @@ .field public static final camera_unknown_error:I = 0x7f120357 -.field public static final character_counter_content_description:I = 0x7f1203a7 +.field public static final character_counter_content_description:I = 0x7f1203a6 -.field public static final character_counter_pattern:I = 0x7f1203a8 +.field public static final character_counter_pattern:I = 0x7f1203a7 -.field public static final choose_an_application:I = 0x7f1203b2 +.field public static final choose_an_application:I = 0x7f1203b1 -.field public static final clear_attachments:I = 0x7f1203bb +.field public static final clear_attachments:I = 0x7f1203ba -.field public static final emoji_keyboard_toggle:I = 0x7f12053b +.field public static final emoji_keyboard_toggle:I = 0x7f12053a -.field public static final fab_transformation_scrim_behavior:I = 0x7f120568 +.field public static final fab_transformation_scrim_behavior:I = 0x7f120567 -.field public static final fab_transformation_sheet_behavior:I = 0x7f120569 +.field public static final fab_transformation_sheet_behavior:I = 0x7f120568 -.field public static final files_permission_reason_msg:I = 0x7f120574 +.field public static final files_permission_reason_msg:I = 0x7f120573 -.field public static final flash_auto:I = 0x7f120579 +.field public static final flash_auto:I = 0x7f120578 -.field public static final flash_off:I = 0x7f12057a +.field public static final flash_off:I = 0x7f120579 -.field public static final flash_on:I = 0x7f12057b +.field public static final flash_on:I = 0x7f12057a .field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12089a @@ -153,17 +153,17 @@ .field public static final path_password_strike_through:I = 0x7f120c1a -.field public static final request_permission_msg:I = 0x7f120dcc +.field public static final request_permission_msg:I = 0x7f120dd0 -.field public static final search_menu_title:I = 0x7f120e87 +.field public static final search_menu_title:I = 0x7f120e8b -.field public static final selection_shrink_scale:I = 0x7f120e9e +.field public static final selection_shrink_scale:I = 0x7f120ea2 -.field public static final send_contents:I = 0x7f120ea9 +.field public static final send_contents:I = 0x7f120ead -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 -.field public static final storage_permission_denied_msg:I = 0x7f120f52 +.field public static final storage_permission_denied_msg:I = 0x7f120f57 # direct methods diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali index b699ae05e2..b7c2973ebd 100644 --- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali +++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali @@ -183,57 +183,57 @@ .field public static final abc_vector_test:I = 0x7f080064 -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf -.field public static final tooltip_frame_dark:I = 0x7f0803c9 +.field public static final tooltip_frame_dark:I = 0x7f0803d4 -.field public static final tooltip_frame_light:I = 0x7f0803ca +.field public static final tooltip_frame_light:I = 0x7f0803d5 -.field public static final ucrop_ic_angle:I = 0x7f0803cb +.field public static final ucrop_ic_angle:I = 0x7f0803d6 -.field public static final ucrop_ic_crop:I = 0x7f0803cc +.field public static final ucrop_ic_crop:I = 0x7f0803d7 -.field public static final ucrop_ic_cross:I = 0x7f0803cd +.field public static final ucrop_ic_cross:I = 0x7f0803d8 -.field public static final ucrop_ic_done:I = 0x7f0803ce +.field public static final ucrop_ic_done:I = 0x7f0803d9 -.field public static final ucrop_ic_next:I = 0x7f0803cf +.field public static final ucrop_ic_next:I = 0x7f0803da -.field public static final ucrop_ic_reset:I = 0x7f0803d0 +.field public static final ucrop_ic_reset:I = 0x7f0803db -.field public static final ucrop_ic_rotate:I = 0x7f0803d1 +.field public static final ucrop_ic_rotate:I = 0x7f0803dc -.field public static final ucrop_ic_scale:I = 0x7f0803d2 +.field public static final ucrop_ic_scale:I = 0x7f0803dd -.field public static final ucrop_shadow_upside:I = 0x7f0803d3 +.field public static final ucrop_shadow_upside:I = 0x7f0803de -.field public static final ucrop_vector_ic_crop:I = 0x7f0803d4 +.field public static final ucrop_vector_ic_crop:I = 0x7f0803df -.field public static final ucrop_vector_loader:I = 0x7f0803d5 +.field public static final ucrop_vector_loader:I = 0x7f0803e0 -.field public static final ucrop_vector_loader_animated:I = 0x7f0803d6 +.field public static final ucrop_vector_loader_animated:I = 0x7f0803e1 # direct methods diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali index 36712f11ea..b72e9f01be 100644 --- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali +++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali @@ -93,19 +93,19 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120e87 +.field public static final search_menu_title:I = 0x7f120e8b -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 -.field public static final ucrop_error_input_data_is_absent:I = 0x7f121041 +.field public static final ucrop_error_input_data_is_absent:I = 0x7f121047 -.field public static final ucrop_label_edit_photo:I = 0x7f121042 +.field public static final ucrop_label_edit_photo:I = 0x7f121048 -.field public static final ucrop_label_original:I = 0x7f121043 +.field public static final ucrop_label_original:I = 0x7f121049 -.field public static final ucrop_menu_crop:I = 0x7f121044 +.field public static final ucrop_menu_crop:I = 0x7f12104a -.field public static final ucrop_mutate_exception_hint:I = 0x7f121045 +.field public static final ucrop_mutate_exception_hint:I = 0x7f12104b # direct methods diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali index 88d13e1847..7e70bc5e66 100644 --- a/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali +++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali @@ -181,57 +181,57 @@ .field public static final abc_vector_test:I = 0x7f080064 -.field public static final notification_action_background:I = 0x7f0803b9 +.field public static final notification_action_background:I = 0x7f0803c4 -.field public static final notification_bg:I = 0x7f0803ba +.field public static final notification_bg:I = 0x7f0803c5 -.field public static final notification_bg_low:I = 0x7f0803bb +.field public static final notification_bg_low:I = 0x7f0803c6 -.field public static final notification_bg_low_normal:I = 0x7f0803bc +.field public static final notification_bg_low_normal:I = 0x7f0803c7 -.field public static final notification_bg_low_pressed:I = 0x7f0803bd +.field public static final notification_bg_low_pressed:I = 0x7f0803c8 -.field public static final notification_bg_normal:I = 0x7f0803be +.field public static final notification_bg_normal:I = 0x7f0803c9 -.field public static final notification_bg_normal_pressed:I = 0x7f0803bf +.field public static final notification_bg_normal_pressed:I = 0x7f0803ca -.field public static final notification_icon_background:I = 0x7f0803c0 +.field public static final notification_icon_background:I = 0x7f0803cb -.field public static final notification_template_icon_bg:I = 0x7f0803c1 +.field public static final notification_template_icon_bg:I = 0x7f0803cc -.field public static final notification_template_icon_low_bg:I = 0x7f0803c2 +.field public static final notification_template_icon_low_bg:I = 0x7f0803cd -.field public static final notification_tile_bg:I = 0x7f0803c3 +.field public static final notification_tile_bg:I = 0x7f0803ce -.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4 +.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf -.field public static final tooltip_frame_dark:I = 0x7f0803c9 +.field public static final tooltip_frame_dark:I = 0x7f0803d4 -.field public static final tooltip_frame_light:I = 0x7f0803ca +.field public static final tooltip_frame_light:I = 0x7f0803d5 -.field public static final ucrop_ic_angle:I = 0x7f0803cb +.field public static final ucrop_ic_angle:I = 0x7f0803d6 -.field public static final ucrop_ic_crop:I = 0x7f0803cc +.field public static final ucrop_ic_crop:I = 0x7f0803d7 -.field public static final ucrop_ic_cross:I = 0x7f0803cd +.field public static final ucrop_ic_cross:I = 0x7f0803d8 -.field public static final ucrop_ic_done:I = 0x7f0803ce +.field public static final ucrop_ic_done:I = 0x7f0803d9 -.field public static final ucrop_ic_next:I = 0x7f0803cf +.field public static final ucrop_ic_next:I = 0x7f0803da -.field public static final ucrop_ic_reset:I = 0x7f0803d0 +.field public static final ucrop_ic_reset:I = 0x7f0803db -.field public static final ucrop_ic_rotate:I = 0x7f0803d1 +.field public static final ucrop_ic_rotate:I = 0x7f0803dc -.field public static final ucrop_ic_scale:I = 0x7f0803d2 +.field public static final ucrop_ic_scale:I = 0x7f0803dd -.field public static final ucrop_shadow_upside:I = 0x7f0803d3 +.field public static final ucrop_shadow_upside:I = 0x7f0803de -.field public static final ucrop_vector_ic_crop:I = 0x7f0803d4 +.field public static final ucrop_vector_ic_crop:I = 0x7f0803df -.field public static final ucrop_vector_loader:I = 0x7f0803d5 +.field public static final ucrop_vector_loader:I = 0x7f0803e0 -.field public static final ucrop_vector_loader_animated:I = 0x7f0803d6 +.field public static final ucrop_vector_loader_animated:I = 0x7f0803e1 # direct methods diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali index 390f1f6d40..e4c249f1cd 100644 --- a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali +++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali @@ -73,19 +73,19 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120e87 +.field public static final search_menu_title:I = 0x7f120e8b -.field public static final status_bar_notification_info_overflow:I = 0x7f120f43 +.field public static final status_bar_notification_info_overflow:I = 0x7f120f48 -.field public static final ucrop_error_input_data_is_absent:I = 0x7f121041 +.field public static final ucrop_error_input_data_is_absent:I = 0x7f121047 -.field public static final ucrop_label_edit_photo:I = 0x7f121042 +.field public static final ucrop_label_edit_photo:I = 0x7f121048 -.field public static final ucrop_label_original:I = 0x7f121043 +.field public static final ucrop_label_original:I = 0x7f121049 -.field public static final ucrop_menu_crop:I = 0x7f121044 +.field public static final ucrop_menu_crop:I = 0x7f12104a -.field public static final ucrop_mutate_exception_hint:I = 0x7f121045 +.field public static final ucrop_mutate_exception_hint:I = 0x7f12104b # direct methods