From 082337727f2ac028e873fdd957529c151c0b054f Mon Sep 17 00:00:00 2001 From: DisTok Date: Mon, 4 Feb 2019 21:26:12 +0100 Subject: [PATCH] Changes of com.discord v830 --- com.discord/AndroidManifest.xml | 2 +- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 27696 -> 27696 bytes com.discord/res/values/plurals.xml | 14 +- com.discord/res/values/public.xml | 4797 +++++++++-------- com.discord/res/values/strings.xml | 4 +- .../smali/androidx/appcompat/R$string.smali | 4 +- .../asynclayoutinflater/R$string.smali | 2 +- .../smali/androidx/browser/R$string.smali | 2 +- .../androidx/coordinatorlayout/R$string.smali | 2 +- .../smali/androidx/core/R$string.smali | 2 +- .../smali/androidx/customview/R$string.smali | 2 +- .../androidx/drawerlayout/R$string.smali | 2 +- .../smali/androidx/fragment/R$string.smali | 2 +- .../androidx/legacy/coreui/R$string.smali | 2 +- .../androidx/legacy/coreutils/R$string.smali | 2 +- .../smali/androidx/legacy/v13/R$string.smali | 2 +- .../smali/androidx/legacy/v4/R$string.smali | 2 +- .../lifecycle/extensions/R$string.smali | 2 +- .../smali/androidx/loader/R$string.smali | 2 +- .../smali/androidx/media/R$string.smali | 2 +- .../androidx/recyclerview/R$string.smali | 2 +- .../smali/androidx/room/R$string.smali | 2 +- .../androidx/slidingpanelayout/R$string.smali | 2 +- .../swiperefreshlayout/R$string.smali | 2 +- .../smali/androidx/transition/R$string.smali | 2 +- .../androidx/vectordrawable/R$string.smali | 2 +- .../smali/androidx/viewpager/R$string.smali | 2 +- .../smali/androidx/work/R$string.smali | 2 +- .../smali/androidx/work/ktx/R$string.smali | 2 +- com.discord/smali/butterknife/R$string.smali | 2 +- .../smali/com/discord/BuildConfig.smali | 6 +- com.discord/smali/com/discord/a/b.smali | 2 +- .../smali/com/discord/app/AppFragment$c.smali | 2 +- .../com/discord/app/AppPermissions.smali | 6 +- .../smali/com/discord/gateway/R$string.smali | 18 +- .../smali/com/discord/restapi/R$string.smali | 18 +- ...MembersLazy$makeGroup$textResolver$1.smali | 4 +- .../discord/stores/StoreClientVersion.smali | 2 +- .../StoreMediaNotification$init$3.smali | 2 +- .../stores/StoreNavigation$init$6.smali | 2 +- .../com/discord/stores/StoreSpotify.smali | 182 +- .../stores/StoreUserGuildSettings.smali | 6 +- .../discord/stores/StoreUserSettings.smali | 8 +- .../utilities/analytics/AnalyticsUtils.smali | 6 +- .../auditlogs/AuditLogChangeUtils.smali | 246 +- .../utilities/auditlogs/AuditLogUtils.smali | 304 +- .../utilities/channel/ChannelUtils.smali | 6 +- .../com/discord/utilities/error/Error.smali | 26 +- .../utilities/fcm/NotificationData.smali | 26 +- .../utilities/fcm/NotificationRenderer.smali | 10 +- .../images/MGImages$requestAvatarCrop$1.smali | 2 +- .../utilities/intent/IntentUtils.smali | 2 +- .../utilities/notices/NoticeBuilders.smali | 8 +- .../PresenceUtils$getActivity$1.smali | 8 +- .../utilities/presence/PresenceUtils.smali | 16 +- .../rest/AttachmentRequestBody.smali | 25 + .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../discord/utilities/rest/SendUtils.smali | 4 +- .../strings/ContextSearchStringProvider.smali | 20 +- ...ulViews$FragmentOnBackPressedHandler.smali | 2 +- ...processor$processSpoilerChildren$3$1.smali | 6 +- .../textprocessing/MessagePreprocessor.smali | 69 +- .../textprocessing/MessageUtils.smali | 2 +- .../textprocessing/node/CodeNode.smali | 254 +- ...$renderPlaceHolder$placeholderSpan$1.smali | 96 - .../textprocessing/node/EmojiNode.smali | 70 +- .../textprocessing/node/SpoilerNode.smali | 32 +- .../textprocessing/node/Spoilerable.smali | 10 + ...oregroundService$NotificationBuilder.smali | 6 +- .../widgets/auth/WidgetAuthInviteInfo.smali | 4 +- .../WidgetAuthLogin$onViewBound$5$1.smali | 2 +- .../auth/WidgetAuthLogin$onViewBound$5.smali | 6 +- .../widgets/auth/WidgetAuthLogin.smali | 2 +- .../discord/widgets/auth/WidgetAuthMfa.smali | 6 +- ...thRegister$configureRegisterButton$2.smali | 6 +- .../widgets/auth/WidgetAuthRegister.smali | 12 +- ...vite$configureOnPostRegistration$1$2.smali | 4 +- ...sterInvite$configureRegisterButton$2.smali | 4 +- ...dgetAuthRegisterInvite$onViewBound$5.smali | 2 +- .../auth/WidgetAuthRegisterInvite.smali | 10 +- .../WidgetChannelGroupDMSettings.smali | 10 +- .../WidgetChannelNotificationSettings.smali | 6 +- ...etChannelSettingsPermissionsOverview.smali | 2 +- ...etChannelTopic$Model$Companion$get$2.smali | 16 +- ...etChannelTopic$Model$Companion$get$3.smali | 45 +- .../WidgetChannelTopic$Model$Companion.smali | 160 +- .../channels/WidgetCreateChannel.smali | 8 +- .../channels/WidgetGroupInviteFriends.smali | 16 +- ...getTextChannelSettings$configureUI$6.smali | 2 +- .../list/WidgetChannelListUnreads.smali | 8 +- .../WidgetChannelsList$onViewBound$5$1.smali | 2 +- ...annelsListAdapter$ItemChannelPrivate.smali | 2 +- ...WidgetChannelsListAdapter$ItemHeader.smali | 6 +- .../WidgetChannelsListAdapter$ItemMFA.smali | 2 +- ...ChannelsListItemChannelActions$Model.smali | 4 +- ...WidgetChannelsListItemChannelActions.smali | 2 +- ...ivateChannelMembersListModelProvider.smali | 2 +- ...putAttachments$DiscordCameraFragment.smali | 2 +- ...achments$PermissionsEmptyListAdapter.smali | 2 +- .../chat/input/WidgetChatInputModel.smali | 16 +- ...atInputSend$configureSendListeners$5.smali | 2 +- ...dgetChatInputEmojiAdapter$HeaderItem.smali | 2 +- .../chat/list/WidgetChatListActions.smali | 10 +- ...WidgetChatListAdapterItemCallMessage.smali | 4 +- .../WidgetChatListAdapterItemGameInvite.smali | 12 +- ...idgetChatListAdapterItemGuildWelcome.smali | 4 +- .../WidgetChatListAdapterItemInvite.smali | 30 +- ...getChatListAdapterItemListenTogether.smali | 4 +- ...WidgetChatListAdapterItemNewMessages.smali | 2 +- .../list/WidgetChatListAdapterItemStart.smali | 2 +- ...ItemSystemMessage$getSystemMessage$1.smali | 12 +- ...getChatListAdapterItemUploadProgress.smali | 4 +- .../WidgetManageReactions.smali | 2 +- .../WidgetChannelPinnedMessages$Model.smali | 4 +- .../pins/WidgetChannelPinnedMessages.smali | 2 +- .../chat/typing/WidgetChatTypingUsers.smali | 8 +- .../widgets/debugging/WidgetFatalCrash.smali | 4 +- ...FriendsAddUserAdapter$UserViewHolder.smali | 4 +- .../widgets/friends/WidgetFriendsList.smali | 2 +- .../WidgetFriendsListAdapter$ItemUser.smali | 4 +- .../actions/WidgetGuildActionsSheet.smali | 6 +- .../guilds/create/WidgetGuildCreate.smali | 6 +- .../invite/ViewInviteSettingsSheet.smali | 2 +- .../guilds/invite/WidgetGuildInvite.smali | 2 +- .../invite/WidgetGuildInviteShare.smali | 6 +- .../guilds/invite/WidgetInviteInfo.smali | 14 +- .../join/WidgetGuildJoin$ToolbarButton.smali | 2 +- .../list/WidgetGuildsList$onViewBound$2.smali | 2 +- .../list/WidgetGuildsListAdapter$Item.smali | 4 +- .../management/WidgetGuildManagement.smali | 2 +- .../widgets/main/WidgetMainSurveyDialog.smali | 8 +- .../discord/widgets/media/WidgetMedia.smali | 2 +- ...uxPostRegistrationJoin$onViewBound$2.smali | 4 +- .../widgets/search/WidgetSearch$Model.smali | 6 +- .../results/WidgetSearchResults$Model.smali | 2 +- ...hSuggestionsAdapter$FilterViewHolder.smali | 20 +- ...hSuggestionsAdapter$HeaderViewHolder.smali | 18 +- ...sChannelListAdapter$CategoryListItem.smali | 2 +- .../servers/WidgetServerNotifications.smali | 2 +- ...tServerNotificationsOverrideSelector.smali | 6 +- .../servers/WidgetServerSettings.smali | 2 +- .../WidgetServerSettingsChannels.smali | 2 +- .../WidgetServerSettingsEditIntegration.smali | 8 +- .../WidgetServerSettingsEditMember.smali | 8 +- ...sEditMemberRolesAdapter$RoleListItem.smali | 2 +- .../WidgetServerSettingsEditRole.smali | 12 +- .../WidgetServerSettingsInstantInvites.smali | 2 +- ...ingsInstantInvitesActions$onResume$3.smali | 2 +- ...ServerSettingsInstantInvitesListItem.smali | 4 +- .../WidgetServerSettingsIntegrations.smali | 2 +- .../servers/WidgetServerSettingsMembers.smali | 2 +- .../WidgetServerSettingsModeration.smali | 8 +- ...erSettingsOverview$configureIcon$1$1.smali | 2 +- .../WidgetServerSettingsOverview.smali | 10 +- .../WidgetServerSettingsRolesList.smali | 4 +- ...ettingsRolesListAdapter$RoleListItem.smali | 4 +- .../WidgetServerSettingsSecurity.smali | 6 +- ...idgetServerSettingsTransferOwnership.smali | 2 +- .../WidgetServerSettingsVanityUrl.smali | 4 +- ...ttingsAuditLog$Model$Companion$get$1.smali | 2 +- .../WidgetServerSettingsAuditLog.smali | 2 +- ...LogFilterSheet$Model$Companion$get$2.smali | 2 +- ...getServerSettingsAuditLogFilterSheet.smali | 10 +- .../widgets/settings/WidgetChangeLog.smali | 2 +- .../widgets/settings/WidgetSettings.smali | 8 +- ...idgetSettingsAccount$configureUI$6$1.smali | 2 +- .../WidgetSettingsAccount$configureUI$7.smali | 2 +- .../settings/WidgetSettingsAccount.smali | 4 +- .../settings/WidgetSettingsAppearance.smali | 2 +- .../settings/WidgetSettingsBehavior.smali | 2 +- ...$configureUI$$inlined$apply$lambda$2.smali | 2 +- .../settings/WidgetSettingsGames.smali | 10 +- .../settings/WidgetSettingsLanguage.smali | 38 +- .../settings/WidgetSettingsMedia.smali | 6 +- .../WidgetSettingsNotifications.smali | 4 +- ...Privacy$configurePrivacyControls$1$1.smali | 8 +- ...Privacy$configurePrivacyControls$2$1.smali | 8 +- ...SettingsPrivacy$onRequestDataClick$1.smali | 2 +- ...SettingsPrivacy$onRequestDataClick$2.smali | 2 +- ...SettingsPrivacy$onRequestDataClick$4.smali | 2 +- .../settings/WidgetSettingsPrivacy.smali | 8 +- ...gsUserConnections$Adapter$ViewHolder.smali | 2 +- .../WidgetSettingsUserConnections.smali | 2 +- ...WidgetSettingsUserConnectionsAddXbox.smali | 2 +- .../settings/WidgetSettingsVoice.smali | 12 +- .../widgets/share/WidgetIncomingShare.smali | 4 +- .../discord/widgets/status/WidgetStatus.smali | 8 +- .../discord/widgets/tos/WidgetTosAccept.smali | 4 +- .../user/ViewHolderGameRichPresence.smali | 2 +- .../user/ViewHolderMusicRichPresence.smali | 8 +- .../user/ViewHolderPlatformRichPresence.smali | 4 +- .../user/ViewHolderUserRichPresence.smali | 6 +- ...etKickUser$onViewBoundOrOnResume$2$1.smali | 2 +- .../widgets/user/WidgetPruneUsers.smali | 4 +- ...UserMentions$WidgetUserMentionFilter.smali | 2 +- .../widgets/user/WidgetUserMentions.smali | 2 +- ...erMutualFriends$MutualFriendsAdapter.smali | 2 +- .../user/WidgetUserMutualGuilds$Adapter.smali | 2 +- .../widgets/user/WidgetUserProfile.smali | 14 +- .../user/WidgetUserProfileHeader.smali | 18 +- .../widgets/user/WidgetUserStatusSheet.smali | 12 +- .../account/WidgetUserAccountVerify.smali | 4 +- .../user/email/WidgetUserEmailVerify.smali | 4 +- .../user/search/WidgetGlobalSearch.smali | 8 +- .../WidgetGlobalSearchModel$Companion.smali | 6 +- ...t$configureAdministrativeSection$9$1.smali | 2 +- .../user/usersheet/WidgetUserSheet.smali | 16 +- .../widgets/voice/call/WidgetCallFailed.smali | 4 +- .../voice/call/WidgetPrivateCall.smali | 2 +- .../voice/call/WidgetVoiceCallIncoming.smali | 8 +- .../voice/call/WidgetVoiceCallInline.smali | 2 +- .../VoiceControlsView$configureUI$1.smali | 2 +- .../voice/fullscreen/VoiceControlsView.smali | 10 +- .../voice/model/CallModel$Companion.smali | 4 +- .../settings/WidgetVoiceChannelSettings.smali | 4 +- .../google/android/material/R$string.smali | 18 +- .../com/lytefast/flexinput/R$g.smali | 26 +- .../miguelgaeta/media_picker/R$string.smali | 14 +- .../com/yalantis/ucrop/R$g.smali | 14 +- 221 files changed, 3714 insertions(+), 3764 deletions(-) delete mode 100644 com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1.smali create mode 100644 com.discord/smali/com/discord/utilities/textprocessing/node/Spoilerable.smali diff --git a/com.discord/AndroidManifest.xml b/com.discord/AndroidManifest.xml index 6c93819526..4645c83081 100644 --- a/com.discord/AndroidManifest.xml +++ b/com.discord/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index ef6617eee9..3cf2763577 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-829.apk +apkFileName: com.discord-830.apk compressionType: false doNotCompress: - arsc @@ -350,5 +350,5 @@ usesFramework: tag: null version: 2.4.0-896569-SNAPSHOT versionInfo: - versionCode: '829' - versionName: 8.2.9 + versionCode: '830' + versionName: 8.3.0 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index dd4a459f23..379c6c4a15 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! # -#Wed Jan 16 19:22:05 UTC 2019 -version_name=8.2.9 +#Thu Jan 17 03:55:37 UTC 2019 +version_name=8.3.0 package_name=com.discord -build_id=9f30468e-7a4c-4586-bff6-f5eca3e24405 -version_code=829 +build_id=070a715d-dd38-4a06-a869-c05445298637 +version_code=830 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 57f1b6473b4190a4a7d68b35d712014554a260d7..bcce14448a51835615f46a3a86fc31426366968b 100644 GIT binary patch delta 33 ncmdmRgK+~8>9MmKGw3lGY&K>u)nT-oywbRw(QdP%3BLsZxbX?k delta 33 ncmdmRgK+~8>9MmKG3YT^ZZ>8w)nT-qywbRw(RQ<<3BLsZxpN8C diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml index 4c4e18c1fb..20d15c471b 100644 --- a/com.discord/res/values/plurals.xml +++ b/com.discord/res/values/plurals.xml @@ -304,6 +304,10 @@ %d copies %d copy + + %d hours + %d hour + %d months %d month @@ -564,11 +568,11 @@ false false false - false - false - false + false + false false - false - false + false + false false + false diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 11cf162b1e..7265f732a3 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -4904,82 +4904,83 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - + + + @@ -8538,2335 +8539,2337 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 842f282260..5bd62e6d81 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -873,7 +873,7 @@ SIDE TO SIDE {progress} Unable to sync cloud saves OR Collapse Category - 9f30468e-7a4c-4586-bff6-f5eca3e24405 + 070a715d-dd38-4a06-a869-c05445298637 Coming Soon Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings. COMING SOON! @@ -1749,6 +1749,7 @@ SIDE TO SIDE {progress} Unknown User Gift Inventory %1$s + Link expires in %1$s You have more gifts! Make another link? Generate Link Gift code hidden. Use copy button. @@ -3918,6 +3919,7 @@ To keep your sub, go to Settings and update your payment." Save yourself a few clicks and let Discord greet you when you get home like a good boy Open Discord Check out our [Terms of Service](%1$s) and [Privacy Policy](%2$s). + Restart the app for your new settings to take effect. Save Discord starts in the background like a good boy and remains out of your way Start Minimized diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali index 777198cd74..c4767990c2 100644 --- a/com.discord/smali/androidx/appcompat/R$string.smali +++ b/com.discord/smali/androidx/appcompat/R$string.smali @@ -92,9 +92,9 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120cd2 +.field public static final search_menu_title:I = 0x7f120cd3 -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali index 45000230bf..5714d78fba 100644 --- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali +++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali index c9ce99d606..593519d34f 100644 --- a/com.discord/smali/androidx/browser/R$string.smali +++ b/com.discord/smali/androidx/browser/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali index 6b6b5aa6b5..1484216f80 100644 --- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali +++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali index 02c8c9e55e..2a2eb1df97 100644 --- a/com.discord/smali/androidx/core/R$string.smali +++ b/com.discord/smali/androidx/core/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali index 610e498142..a68bca8b68 100644 --- a/com.discord/smali/androidx/customview/R$string.smali +++ b/com.discord/smali/androidx/customview/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali index b6d3e8d2a6..9cf9f444e7 100644 --- a/com.discord/smali/androidx/drawerlayout/R$string.smali +++ b/com.discord/smali/androidx/drawerlayout/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali index 7215d36b93..e9c3ba9252 100644 --- a/com.discord/smali/androidx/fragment/R$string.smali +++ b/com.discord/smali/androidx/fragment/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # 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 9c966f8fb0..747ddb29a2 100644 --- a/com.discord/smali/androidx/legacy/coreui/R$string.smali +++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # 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 bfa6c31c49..b5a1853a48 100644 --- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali +++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # 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 72eaf01a48..2a712332fe 100644 --- a/com.discord/smali/androidx/legacy/v13/R$string.smali +++ b/com.discord/smali/androidx/legacy/v13/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # 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 9473fa1894..9b27e8059f 100644 --- a/com.discord/smali/androidx/legacy/v4/R$string.smali +++ b/com.discord/smali/androidx/legacy/v4/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # 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 66fb8d5734..5a0fe801fc 100644 --- a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali +++ b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali index cc36617dbe..e6b2b4ba7a 100644 --- a/com.discord/smali/androidx/loader/R$string.smali +++ b/com.discord/smali/androidx/loader/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali index 82ee595ea9..b63afce7b1 100644 --- a/com.discord/smali/androidx/media/R$string.smali +++ b/com.discord/smali/androidx/media/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali index 40a2b3cfa0..1174339d34 100644 --- a/com.discord/smali/androidx/recyclerview/R$string.smali +++ b/com.discord/smali/androidx/recyclerview/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali index 9baebb87de..8a12961d37 100644 --- a/com.discord/smali/androidx/room/R$string.smali +++ b/com.discord/smali/androidx/room/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali index 92d267def1..3c039726af 100644 --- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali +++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali index 761648f833..76d00449ed 100644 --- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali +++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali index 6f65f5a5b2..c259e03500 100644 --- a/com.discord/smali/androidx/transition/R$string.smali +++ b/com.discord/smali/androidx/transition/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali index 3d6c63e680..a7a3dbf4fd 100644 --- a/com.discord/smali/androidx/vectordrawable/R$string.smali +++ b/com.discord/smali/androidx/vectordrawable/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali index 769cce4120..0c75ac7ab3 100644 --- a/com.discord/smali/androidx/viewpager/R$string.smali +++ b/com.discord/smali/androidx/viewpager/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali index 6291fd92f7..1c7ff99c2e 100644 --- a/com.discord/smali/androidx/work/R$string.smali +++ b/com.discord/smali/androidx/work/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # 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 f468a330b9..67483f4724 100644 --- a/com.discord/smali/androidx/work/ktx/R$string.smali +++ b/com.discord/smali/androidx/work/ktx/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/butterknife/R$string.smali b/com.discord/smali/butterknife/R$string.smali index af8d9bd5fd..dd1786b9eb 100644 --- a/com.discord/smali/butterknife/R$string.smali +++ b/com.discord/smali/butterknife/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # direct methods diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index fa3343c6d1..915c693b8f 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -29,11 +29,11 @@ .field public static final LOCAL_VOICE:Ljava/lang/String; = "" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/829" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/830" -.field public static final VERSION_CODE:I = 0x33d +.field public static final VERSION_CODE:I = 0x33e -.field public static final VERSION_NAME:Ljava/lang/String; = "8.2.9" +.field public static final VERSION_NAME:Ljava/lang/String; = "8.3.0" # direct methods diff --git a/com.discord/smali/com/discord/a/b.smali b/com.discord/smali/com/discord/a/b.smali index 52c57e6707..519ea05c82 100644 --- a/com.discord/smali/com/discord/a/b.smali +++ b/com.discord/smali/com/discord/a/b.smali @@ -358,7 +358,7 @@ if-eqz v1, :cond_0 - const v2, 0x7f120c2a + const v2, 0x7f120c2b invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; diff --git a/com.discord/smali/com/discord/app/AppFragment$c.smali b/com.discord/smali/com/discord/app/AppFragment$c.smali index 3aaeb949b4..a7b5985995 100644 --- a/com.discord/smali/com/discord/app/AppFragment$c.smali +++ b/com.discord/smali/com/discord/app/AppFragment$c.smali @@ -71,7 +71,7 @@ aput-object p1, v2, v3 - const p1, 0x7f120eb5 + const p1, 0x7f120eb6 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/AppPermissions.smali b/com.discord/smali/com/discord/app/AppPermissions.smali index 042e79e390..516a7f3e84 100644 --- a/com.discord/smali/com/discord/app/AppPermissions.smali +++ b/com.discord/smali/com/discord/app/AppPermissions.smali @@ -414,7 +414,7 @@ if-ne p1, v2, :cond_0 - const p1, 0x7f120b1e + const p1, 0x7f120b1f invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->u(I)Lkotlin/jvm/functions/Function0; @@ -427,7 +427,7 @@ if-ne p1, v2, :cond_1 - const p1, 0x7f120b1c + const p1, 0x7f120b1d invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->u(I)Lkotlin/jvm/functions/Function0; @@ -440,7 +440,7 @@ if-ne p1, v2, :cond_2 - const p1, 0x7f120b1d + const p1, 0x7f120b1e invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->u(I)Lkotlin/jvm/functions/Function0; diff --git a/com.discord/smali/com/discord/gateway/R$string.smali b/com.discord/smali/com/discord/gateway/R$string.smali index bfff4d5f0a..bc2fae2d8a 100644 --- a/com.discord/smali/com/discord/gateway/R$string.smali +++ b/com.discord/smali/com/discord/gateway/R$string.smali @@ -142,23 +142,23 @@ .field public static final fab_transformation_sheet_behavior:I = 0x7f1204d6 -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1207a0 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1207a1 -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209bb +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209bc -.field public static final password_toggle_content_description:I = 0x7f120ae5 +.field public static final password_toggle_content_description:I = 0x7f120ae6 -.field public static final path_password_eye:I = 0x7f120ae8 +.field public static final path_password_eye:I = 0x7f120ae9 -.field public static final path_password_eye_mask_strike_through:I = 0x7f120ae9 +.field public static final path_password_eye_mask_strike_through:I = 0x7f120aea -.field public static final path_password_eye_mask_visible:I = 0x7f120aea +.field public static final path_password_eye_mask_visible:I = 0x7f120aeb -.field public static final path_password_strike_through:I = 0x7f120aeb +.field public static final path_password_strike_through:I = 0x7f120aec -.field public static final search_menu_title:I = 0x7f120cd2 +.field public static final search_menu_title:I = 0x7f120cd3 -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # 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 a2d9780127..2e0b8ff3cb 100644 --- a/com.discord/smali/com/discord/restapi/R$string.smali +++ b/com.discord/smali/com/discord/restapi/R$string.smali @@ -140,23 +140,23 @@ .field public static final fab_transformation_sheet_behavior:I = 0x7f1204d6 -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1207a0 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1207a1 -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209bb +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209bc -.field public static final password_toggle_content_description:I = 0x7f120ae5 +.field public static final password_toggle_content_description:I = 0x7f120ae6 -.field public static final path_password_eye:I = 0x7f120ae8 +.field public static final path_password_eye:I = 0x7f120ae9 -.field public static final path_password_eye_mask_strike_through:I = 0x7f120ae9 +.field public static final path_password_eye_mask_strike_through:I = 0x7f120aea -.field public static final path_password_eye_mask_visible:I = 0x7f120aea +.field public static final path_password_eye_mask_visible:I = 0x7f120aeb -.field public static final path_password_strike_through:I = 0x7f120aeb +.field public static final path_password_strike_through:I = 0x7f120aec -.field public static final search_menu_title:I = 0x7f120cd2 +.field public static final search_menu_title:I = 0x7f120cd3 -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # 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 1a2405ce5b..dcd84c4a5e 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 @@ -100,12 +100,12 @@ goto :goto_1 :pswitch_1 - const v0, 0x7f120d87 + const v0, 0x7f120d88 goto :goto_0 :pswitch_2 - const v0, 0x7f120d88 + const v0, 0x7f120d89 :goto_0 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 1c2201a13b..e49625de1c 100644 --- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali +++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali @@ -27,7 +27,7 @@ invoke-direct {p0}, Lcom/discord/stores/Store;->()V - const/16 v0, 0x33d + const/16 v0, 0x33e iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion: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 7764c73c6e..b3e99afef6 100644 --- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali +++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali @@ -70,7 +70,7 @@ iget-object p1, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context; - const v0, 0x7f120f4a + const v0, 0x7f120f4c invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V 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 5aaef919b0..7a8db5bcae 100644 --- a/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali +++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali @@ -86,7 +86,7 @@ const v2, 0x7f120339 - const v3, 0x7f120a4c + const v3, 0x7f120a4d const v4, 0x7f08027a diff --git a/com.discord/smali/com/discord/stores/StoreSpotify.smali b/com.discord/smali/com/discord/stores/StoreSpotify.smali index 92a804ddc4..7aa2c55eb3 100644 --- a/com.discord/smali/com/discord/stores/StoreSpotify.smali +++ b/com.discord/smali/com/discord/stores/StoreSpotify.smali @@ -130,9 +130,9 @@ iget-object v1, v0, Lcom/discord/stores/StoreSpotify;->spotifyState:Lcom/discord/stores/StoreSpotify$SpotifyState; - const/4 v2, 0x0 + const/4 v2, 0x1 - const/4 v3, 0x1 + const/4 v3, 0x0 if-nez v1, :cond_1 @@ -141,7 +141,7 @@ iget-object v1, v1, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence; - invoke-virtual {v1, v2, v3}, Lcom/discord/stores/StoreUserPresence;->updateActivity(Lcom/discord/models/domain/ModelPresence$Activity;Z)V + invoke-virtual {v1, v3, v2}, Lcom/discord/stores/StoreUserPresence;->updateActivity(Lcom/discord/models/domain/ModelPresence$Activity;Z)V return-void @@ -154,7 +154,7 @@ move-result v1 - if-eqz v1, :cond_d + if-eqz v1, :cond_e iget-object v1, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream; @@ -242,7 +242,7 @@ :goto_1 if-nez v1, :cond_6 - goto/16 :goto_5 + goto/16 :goto_6 :cond_6 iget-object v1, v0, Lcom/discord/stores/StoreSpotify;->spotifyState:Lcom/discord/stores/StoreSpotify$SpotifyState; @@ -280,7 +280,7 @@ if-eqz v1, :cond_8 - invoke-static {v1}, Lkotlin/a/l;->as(Ljava/util/List;)Ljava/lang/Object; + invoke-static {v1}, Lkotlin/a/l;->at(Ljava/util/List;)Ljava/lang/Object; move-result-object v1 @@ -296,7 +296,7 @@ check-cast v1, Ljava/lang/CharSequence; - new-array v6, v3, [Ljava/lang/String; + new-array v6, v2, [Ljava/lang/String; const-string v9, "/" @@ -317,12 +317,44 @@ goto :goto_2 :cond_8 - move-object v1, v2 + move-object v1, v3 :goto_2 - sget-object v6, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform; + const/16 v6, 0x3a - invoke-virtual {v6}, Lcom/discord/utilities/platform/Platform;->getProperName()Ljava/lang/String; + if-eqz v1, :cond_9 + + new-instance v9, Ljava/lang/StringBuilder; + + invoke-direct {v9}, Ljava/lang/StringBuilder;->()V + + sget-object v10, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform; + + invoke-virtual {v10}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String; + + move-result-object v10 + + invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; + + invoke-virtual {v9, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v1 + + move-object v13, v1 + + goto :goto_3 + + :cond_9 + move-object v13, v3 + + :goto_3 + sget-object v1, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform; + + invoke-virtual {v1}, Lcom/discord/utilities/platform/Platform;->getProperName()Ljava/lang/String; move-result-object v9 @@ -336,49 +368,27 @@ invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getAlbum()Lcom/discord/models/domain/spotify/ModelSpotifyAlbum; - move-result-object v6 + move-result-object v1 - if-eqz v6, :cond_9 + if-eqz v1, :cond_a - invoke-virtual {v6}, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->getName()Ljava/lang/String; - - move-result-object v6 - - move-object v12, v6 - - goto :goto_3 - - :cond_9 - move-object v12, v2 - - :goto_3 - new-instance v6, Ljava/lang/StringBuilder; - - invoke-direct {v6}, Ljava/lang/StringBuilder;->()V - - sget-object v13, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform; - - invoke-virtual {v13}, Lcom/discord/utilities/platform/Platform;->getPlatformId()Ljava/lang/String; - - move-result-object v13 - - invoke-virtual {v6, v13}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - const/16 v13, 0x3a - - invoke-virtual {v6, v13}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; - - invoke-virtual {v6, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v1}, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->getName()Ljava/lang/String; move-result-object v1 + move-object v12, v1 + + goto :goto_4 + + :cond_a + move-object v12, v3 + + :goto_4 invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getArtists()Ljava/util/List; - move-result-object v6 + move-result-object v1 - move-object v14, v6 + move-object v14, v1 check-cast v14, Ljava/lang/Iterable; @@ -392,9 +402,9 @@ const/16 v19, 0x0 - sget-object v6, Lcom/discord/stores/StoreSpotify$publishState$activity$1;->INSTANCE:Lcom/discord/stores/StoreSpotify$publishState$activity$1; + sget-object v1, Lcom/discord/stores/StoreSpotify$publishState$activity$1;->INSTANCE:Lcom/discord/stores/StoreSpotify$publishState$activity$1; - move-object/from16 v20, v6 + move-object/from16 v20, v1 check-cast v20, Lkotlin/jvm/functions/Function1; @@ -406,9 +416,9 @@ invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getArtists()Ljava/util/List; - move-result-object v6 + move-result-object v1 - move-object v15, v6 + move-object v15, v1 check-cast v15, Ljava/lang/Iterable; @@ -418,9 +428,9 @@ const/16 v20, 0x0 - sget-object v6, Lcom/discord/stores/StoreSpotify$publishState$activity$2;->INSTANCE:Lcom/discord/stores/StoreSpotify$publishState$activity$2; + sget-object v1, Lcom/discord/stores/StoreSpotify$publishState$activity$2;->INSTANCE:Lcom/discord/stores/StoreSpotify$publishState$activity$2; - move-object/from16 v21, v6 + move-object/from16 v21, v1 check-cast v21, Lkotlin/jvm/functions/Function1; @@ -444,9 +454,9 @@ move-result-object v17 - new-instance v6, Ljava/lang/StringBuilder; + new-instance v1, Ljava/lang/StringBuilder; - invoke-direct {v6}, Ljava/lang/StringBuilder;->()V + invoke-direct {v1}, Ljava/lang/StringBuilder;->()V sget-object v7, Lcom/discord/utilities/platform/Platform;->SPOTIFY:Lcom/discord/utilities/platform/Platform; @@ -454,80 +464,78 @@ move-result-object v7 - invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v6, v13}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; + invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; - iget-object v7, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream; + iget-object v6, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream; - iget-object v7, v7, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser; + iget-object v6, v6, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser; - iget-object v7, v7, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me; + iget-object v6, v6, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me; - if-eqz v7, :cond_a + if-eqz v6, :cond_b - invoke-virtual {v7}, Lcom/discord/models/domain/ModelUser$Me;->getId()J + invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser$Me;->getId()J - move-result-wide v7 + move-result-wide v6 - invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v7 + move-result-object v6 - goto :goto_4 + goto :goto_5 - :cond_a - move-object v7, v2 + :cond_b + move-object v6, v3 - :goto_4 - invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + :goto_5 + invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v18 invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getAlbum()Lcom/discord/models/domain/spotify/ModelSpotifyAlbum; - move-result-object v6 + move-result-object v1 - if-eqz v6, :cond_b + if-eqz v1, :cond_c - invoke-virtual {v6}, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->getId()Ljava/lang/String; + invoke-virtual {v1}, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->getId()Ljava/lang/String; - move-result-object v2 + move-result-object v3 - :cond_b - move-object/from16 v19, v2 - - move-object v13, v1 + :cond_c + move-object/from16 v19, v3 invoke-static/range {v9 .. v19}, Lcom/discord/models/domain/ModelPresence$Activity;->createForListening(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;)Lcom/discord/models/domain/ModelPresence$Activity; move-result-object v1 - iget-object v2, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream; + iget-object v3, v0, Lcom/discord/stores/StoreSpotify;->stream:Lcom/discord/stores/StoreStream; - iget-object v2, v2, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence; + iget-object v3, v3, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence; - invoke-virtual {v2, v1, v3}, Lcom/discord/stores/StoreUserPresence;->updateActivity(Lcom/discord/models/domain/ModelPresence$Activity;Z)V + invoke-virtual {v3, v1, v2}, Lcom/discord/stores/StoreUserPresence;->updateActivity(Lcom/discord/models/domain/ModelPresence$Activity;Z)V sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker; invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getId()Ljava/lang/String; - move-result-object v2 + move-result-object v3 invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyTrack;->getAlbum()Lcom/discord/models/domain/spotify/ModelSpotifyAlbum; move-result-object v4 - if-eqz v4, :cond_c + if-eqz v4, :cond_d invoke-virtual {v4}, Lcom/discord/models/domain/spotify/ModelSpotifyAlbum;->getImages()Ljava/util/List; move-result-object v4 - if-eqz v4, :cond_c + if-eqz v4, :cond_d check-cast v4, Ljava/util/Collection; @@ -537,11 +545,11 @@ xor-int/lit8 v5, v4, 0x1 - :cond_c - invoke-virtual {v1, v2, v5}, Lcom/discord/utilities/analytics/AnalyticsTracker;->activityUpdatedSpotify(Ljava/lang/String;Z)V - :cond_d - :goto_5 + invoke-virtual {v1, v3, v5}, Lcom/discord/utilities/analytics/AnalyticsTracker;->activityUpdatedSpotify(Ljava/lang/String;Z)V + + :cond_e + :goto_6 return-void .end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali index 7aa18fbbfd..33a8425d8f 100644 --- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali @@ -300,7 +300,7 @@ .method static synthetic lambda$setGroupMuted$6(Landroid/content/Context;Lcom/discord/models/domain/ModelUserGuildSettings;)V .locals 0 - const p1, 0x7f1206e1 + const p1, 0x7f1206e2 invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -804,7 +804,7 @@ invoke-direct {v4, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(I)V - const v5, 0x7f120d07 + const v5, 0x7f120d08 move-object v0, p0 @@ -834,7 +834,7 @@ invoke-direct {v4, p3, p4, p5}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V - const v5, 0x7f120d07 + const v5, 0x7f120d08 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 6bd5f8fea2..d71701ac9b 100644 --- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali +++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali @@ -1299,7 +1299,7 @@ move-result-object v0 - const v1, 0x7f120e01 + const v1, 0x7f120e02 invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1438,7 +1438,7 @@ move-result-object p2 - const v0, 0x7f12092a + const v0, 0x7f12092b invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1715,7 +1715,7 @@ move-result-object p2 - const v0, 0x7f120e01 + const v0, 0x7f120e02 :goto_1 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1749,7 +1749,7 @@ move-result-object p2 - const v0, 0x7f120e00 + const v0, 0x7f120e01 goto :goto_1 diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali index 2ed7b4a519..623467feb5 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali @@ -193,7 +193,7 @@ const-string v1, "browser_user_agent" - const-string v2, "Discord-Android/829" + const-string v2, "Discord-Android/830" invoke-static {v1, v2}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; @@ -205,7 +205,7 @@ const-string v1, "client_build_number" - const/16 v2, 0x33d + const/16 v2, 0x33e invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -221,7 +221,7 @@ const-string v1, "client_version" - const-string v2, "8.2.9" + const-string v2, "8.3.0" invoke-static {v1, v2}, Lkotlin/q;->w(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 36c404ddf6..6b94cc7406 100644 --- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali +++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali @@ -819,7 +819,7 @@ move-result-object v2 - const v5, 0x7f100058 + const v5, 0x7f100059 invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object; @@ -1025,7 +1025,7 @@ move-result-object v2 - const v5, 0x7f10005c + const v5, 0x7f10005d invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object; @@ -1327,9 +1327,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f12071a + const v0, 0x7f12071b - const v1, 0x7f120719 + const v1, 0x7f12071a :goto_0 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1347,9 +1347,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f120718 + const v0, 0x7f120719 - const v1, 0x7f120717 + const v1, 0x7f120718 goto :goto_0 @@ -1362,9 +1362,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f12071d + const v0, 0x7f12071e - const v1, 0x7f12071c + const v1, 0x7f12071d goto :goto_0 @@ -1377,7 +1377,7 @@ if-eqz p1, :cond_4 - const p1, 0x7f120716 + const p1, 0x7f120717 return p1 @@ -1404,7 +1404,7 @@ if-nez p1, :cond_1 - const p1, 0x7f12070f + const p1, 0x7f120710 return p1 @@ -1413,7 +1413,7 @@ if-ne p1, v0, :cond_2 - const p1, 0x7f120710 + const p1, 0x7f120711 return p1 @@ -1442,9 +1442,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f12070e + const v0, 0x7f12070f - const v1, 0x7f12070d + const v1, 0x7f12070e goto :goto_0 @@ -1457,7 +1457,7 @@ if-eqz p1, :cond_4 - const p1, 0x7f120715 + const p1, 0x7f120716 return p1 @@ -1470,9 +1470,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f12070a + const v0, 0x7f12070b - const v1, 0x7f120709 + const v1, 0x7f12070a goto/16 :goto_0 @@ -1485,7 +1485,7 @@ if-eqz p1, :cond_4 - const p1, 0x7f120720 + const p1, 0x7f120721 return p1 @@ -1546,9 +1546,9 @@ if-eqz v0, :cond_3 - const v0, 0x7f120724 + const v0, 0x7f120725 - const v1, 0x7f120723 + const v1, 0x7f120724 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1565,7 +1565,7 @@ if-eqz p1, :cond_3 - const p1, 0x7f120720 + const p1, 0x7f120721 return p1 @@ -1717,7 +1717,7 @@ return-object p1 :cond_5 - const p1, 0x7f120a16 + const p1, 0x7f120a17 invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1775,14 +1775,14 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f120742 + const p1, 0x7f120743 return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f120741 + const p1, 0x7f120742 return p1 @@ -1811,7 +1811,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120732 + const p1, 0x7f120733 return p1 @@ -1824,9 +1824,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f120740 + const v0, 0x7f120741 - const v1, 0x7f12073f + const v1, 0x7f120740 :goto_0 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1844,9 +1844,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f120739 + const v0, 0x7f12073a - const v1, 0x7f120738 + const v1, 0x7f120739 goto :goto_0 @@ -1878,12 +1878,12 @@ return v1 :pswitch_0 - const p1, 0x7f12072a + const p1, 0x7f12072b return p1 :pswitch_1 - const p1, 0x7f120729 + const p1, 0x7f12072a return p1 @@ -1924,12 +1924,12 @@ return v1 :pswitch_2 - const p1, 0x7f120730 + const p1, 0x7f120731 return p1 :pswitch_3 - const p1, 0x7f12072f + const p1, 0x7f120730 return p1 @@ -1951,7 +1951,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120734 + const p1, 0x7f120735 return p1 @@ -1964,7 +1964,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120731 + const p1, 0x7f120732 return p1 @@ -1977,7 +1977,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120728 + const p1, 0x7f120729 return p1 @@ -2009,30 +2009,30 @@ return v1 :pswitch_4 - const p1, 0x7f12073e + const p1, 0x7f12073f return p1 :pswitch_5 - const p1, 0x7f12073a - - return p1 - - :pswitch_6 - const p1, 0x7f12073c - - return p1 - - :pswitch_7 const p1, 0x7f12073b return p1 - :pswitch_8 + :pswitch_6 const p1, 0x7f12073d return p1 + :pswitch_7 + const p1, 0x7f12073c + + return p1 + + :pswitch_8 + const p1, 0x7f12073e + + return p1 + :cond_6 new-instance p1, Lkotlin/r; @@ -2051,7 +2051,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120733 + const p1, 0x7f120734 return p1 @@ -2064,7 +2064,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120720 + const p1, 0x7f120721 return p1 @@ -2077,9 +2077,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f120736 + const v0, 0x7f120737 - const v1, 0x7f120735 + const v1, 0x7f120736 goto/16 :goto_0 @@ -2092,7 +2092,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f12072e + const p1, 0x7f12072f return p1 @@ -2105,9 +2105,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f120727 + const v0, 0x7f120728 - const v1, 0x7f120726 + const v1, 0x7f120727 goto/16 :goto_0 @@ -2139,17 +2139,17 @@ return v1 :pswitch_9 - const p1, 0x7f12072b + const p1, 0x7f12072c return p1 :pswitch_a - const p1, 0x7f12072d + const p1, 0x7f12072e return p1 :pswitch_b - const p1, 0x7f12072c + const p1, 0x7f12072d return p1 @@ -2262,14 +2262,14 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f12074c + const p1, 0x7f12074d return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f12074b + const p1, 0x7f12074c return p1 @@ -2314,12 +2314,12 @@ if-eqz p1, :cond_4 - const p1, 0x7f120747 + const p1, 0x7f120748 return p1 :cond_4 - const p1, 0x7f120748 + const p1, 0x7f120749 return p1 @@ -2357,12 +2357,12 @@ if-eqz p1, :cond_6 - const p1, 0x7f120749 + const p1, 0x7f12074a return p1 :cond_6 - const p1, 0x7f12074a + const p1, 0x7f12074b return p1 @@ -2384,7 +2384,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120744 + const p1, 0x7f120745 return p1 @@ -2397,7 +2397,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120720 + const p1, 0x7f120721 return p1 @@ -2410,7 +2410,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120743 + const p1, 0x7f120744 return p1 @@ -2768,7 +2768,7 @@ if-eqz p2, :cond_7 - const p2, 0x7f120716 + const p2, 0x7f120717 new-array p3, v1, [Ljava/lang/Object; @@ -2776,7 +2776,7 @@ move-result-object p4 - const v1, 0x7f100057 + const v1, 0x7f100058 invoke-interface {v0}, Ljava/util/Collection;->size()I @@ -2822,7 +2822,7 @@ if-eqz p2, :cond_7 - const p2, 0x7f120715 + const p2, 0x7f120716 new-array p3, v1, [Ljava/lang/Object; @@ -2830,7 +2830,7 @@ move-result-object p4 - const v1, 0x7f100056 + const v1, 0x7f100057 invoke-interface {v0}, Ljava/util/Collection;->size()I @@ -2986,7 +2986,7 @@ move-result-object p1 - const p2, 0x7f10005e + const p2, 0x7f10005f invoke-interface {v0}, Ljava/util/Collection;->size()I @@ -3028,7 +3028,7 @@ move-result-object p1 - const p2, 0x7f100057 + const p2, 0x7f100058 invoke-interface {v0}, Ljava/util/Collection;->size()I @@ -3061,7 +3061,7 @@ move-result-object p1 - const p2, 0x7f100056 + const p2, 0x7f100057 invoke-interface {v0}, Ljava/util/Collection;->size()I @@ -3094,7 +3094,7 @@ move-result-object p1 - const p2, 0x7f10005d + const p2, 0x7f10005e invoke-interface {v0}, Ljava/util/Collection;->size()I @@ -3177,14 +3177,14 @@ if-ne p1, v2, :cond_1 - const p1, 0x7f120765 + const p1, 0x7f120766 return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f120764 + const p1, 0x7f120765 return p1 @@ -3231,12 +3231,12 @@ if-nez p1, :cond_4 - const p1, 0x7f120761 + const p1, 0x7f120762 return p1 :cond_4 - const p1, 0x7f120760 + const p1, 0x7f120761 return p1 @@ -3258,7 +3258,7 @@ if-eqz p1, :cond_9 - const p1, 0x7f12076b + const p1, 0x7f12076c return p1 @@ -3285,14 +3285,14 @@ if-ne p1, v2, :cond_6 - const p1, 0x7f120767 + const p1, 0x7f120768 return p1 :cond_6 if-nez p1, :cond_7 - const p1, 0x7f120766 + const p1, 0x7f120767 return p1 @@ -3321,9 +3321,9 @@ if-eqz v0, :cond_9 - const v0, 0x7f120769 + const v0, 0x7f12076a - const v1, 0x7f120768 + const v1, 0x7f120769 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -3340,7 +3340,7 @@ if-eqz p1, :cond_9 - const p1, 0x7f12076a + const p1, 0x7f12076b return p1 @@ -3353,7 +3353,7 @@ if-eqz p1, :cond_9 - const p1, 0x7f120720 + const p1, 0x7f120721 return p1 @@ -3389,22 +3389,22 @@ return p1 :sswitch_0 - const p1, 0x7f120954 + const p1, 0x7f120955 return p1 :sswitch_1 - const p1, 0x7f120960 + const p1, 0x7f120961 return p1 :sswitch_2 - const p1, 0x7f12095b + const p1, 0x7f12095c return p1 :sswitch_3 - const p1, 0x7f120957 + const p1, 0x7f120958 return p1 @@ -3414,12 +3414,12 @@ return p1 :sswitch_5 - const p1, 0x7f120ec2 + const p1, 0x7f120ec3 return p1 :sswitch_6 - const p1, 0x7f1209b7 + const p1, 0x7f1209b8 return p1 @@ -3429,12 +3429,12 @@ return p1 :sswitch_8 - const p1, 0x7f1209c1 + const p1, 0x7f1209c2 return p1 :sswitch_9 - const p1, 0x7f120d61 + const p1, 0x7f120d62 return p1 @@ -3444,17 +3444,17 @@ return p1 :sswitch_b - const p1, 0x7f120ebf + const p1, 0x7f120ec0 return p1 :sswitch_c - const p1, 0x7f12097c + const p1, 0x7f12097d return p1 :sswitch_d - const p1, 0x7f120bee + const p1, 0x7f120bef return p1 @@ -3469,32 +3469,32 @@ return p1 :sswitch_10 - const p1, 0x7f120955 + const p1, 0x7f120956 return p1 :sswitch_11 - const p1, 0x7f120cf9 + const p1, 0x7f120cfa return p1 :sswitch_12 - const p1, 0x7f120cf8 + const p1, 0x7f120cf9 return p1 :sswitch_13 - const p1, 0x7f120bef + const p1, 0x7f120bf0 return p1 :sswitch_14 - const p1, 0x7f120bb5 + const p1, 0x7f120bb6 return p1 :sswitch_15 - const p1, 0x7f120f83 + const p1, 0x7f120f85 return p1 @@ -3504,7 +3504,7 @@ return p1 :sswitch_17 - const p1, 0x7f12095d + const p1, 0x7f12095e return p1 @@ -3517,12 +3517,12 @@ if-ne p1, p2, :cond_0 - const p1, 0x7f120950 + const p1, 0x7f120951 return p1 :cond_0 - const p1, 0x7f120952 + const p1, 0x7f120953 return p1 @@ -3537,7 +3537,7 @@ return p1 :sswitch_1b - const p1, 0x7f120920 + const p1, 0x7f120921 return p1 @@ -3674,7 +3674,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f12075d + const p1, 0x7f12075e return p1 @@ -3687,19 +3687,19 @@ if-eqz v0, :cond_7 - const v0, 0x7f120756 + const v0, 0x7f120757 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v3 - const v0, 0x7f120757 + const v0, 0x7f120758 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v4 - const v0, 0x7f120758 + const v0, 0x7f120759 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -3744,14 +3744,14 @@ if-ne p1, v2, :cond_1 - const p1, 0x7f120755 + const p1, 0x7f120756 return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f120754 + const p1, 0x7f120755 return p1 @@ -3794,14 +3794,14 @@ if-ne p1, v2, :cond_4 - const p1, 0x7f120752 + const p1, 0x7f120753 return p1 :cond_4 if-nez p1, :cond_5 - const p1, 0x7f120751 + const p1, 0x7f120752 return p1 @@ -3830,7 +3830,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f12075c + const p1, 0x7f12075d return p1 @@ -3843,7 +3843,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f120720 + const p1, 0x7f120721 return p1 @@ -3856,7 +3856,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f12075a + const p1, 0x7f12075b return p1 @@ -3923,7 +3923,7 @@ if-eqz p1, :cond_5 - const p1, 0x7f12076e + const p1, 0x7f12076f return p1 @@ -3936,9 +3936,9 @@ if-eqz v0, :cond_5 - const v0, 0x7f120774 + const v0, 0x7f120775 - const v1, 0x7f120773 + const v1, 0x7f120774 :goto_0 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -3956,7 +3956,7 @@ if-eqz p1, :cond_5 - const p1, 0x7f120720 + const p1, 0x7f120721 return p1 @@ -3969,9 +3969,9 @@ if-eqz v0, :cond_5 - const v0, 0x7f120770 + const v0, 0x7f120771 - const v1, 0x7f12076f + const v1, 0x7f120770 goto :goto_0 diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali index 8acf83b1c2..ecec1c266b 100644 --- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali +++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali @@ -103,117 +103,117 @@ goto/16 :goto_0 :pswitch_0 - const p1, 0x7f120722 + const p1, 0x7f120723 return p1 :pswitch_1 - const p1, 0x7f120725 + const p1, 0x7f120726 return p1 :pswitch_2 - const p1, 0x7f120721 + const p1, 0x7f120722 return p1 :pswitch_3 - const p1, 0x7f120772 + const p1, 0x7f120773 return p1 :pswitch_4 - const p1, 0x7f120775 + const p1, 0x7f120776 return p1 :pswitch_5 - const p1, 0x7f120771 + const p1, 0x7f120772 return p1 :pswitch_6 - const p1, 0x7f120746 + const p1, 0x7f120747 return p1 :pswitch_7 - const p1, 0x7f12074d + const p1, 0x7f12074e return p1 :pswitch_8 - const p1, 0x7f120745 + const p1, 0x7f120746 return p1 :pswitch_9 - const p1, 0x7f120763 + const p1, 0x7f120764 return p1 :pswitch_a - const p1, 0x7f12076c + const p1, 0x7f12076d return p1 :pswitch_b - const p1, 0x7f120762 + const p1, 0x7f120763 return p1 :pswitch_c - const p1, 0x7f12075b + const p1, 0x7f12075c return p1 :pswitch_d - const p1, 0x7f12075e + const p1, 0x7f12075f return p1 :pswitch_e - const p1, 0x7f120750 + const p1, 0x7f120751 return p1 :pswitch_f - const p1, 0x7f12074f + const p1, 0x7f120750 return p1 :pswitch_10 - const p1, 0x7f120759 + const p1, 0x7f12075a return p1 :pswitch_11 - const p1, 0x7f120753 + const p1, 0x7f120754 return p1 :pswitch_12 - const p1, 0x7f120712 - - return p1 - - :pswitch_13 const p1, 0x7f120713 return p1 + :pswitch_13 + const p1, 0x7f120714 + + return p1 + :pswitch_14 - const p1, 0x7f120711 + const p1, 0x7f120712 return p1 :pswitch_15 - const p1, 0x7f12070c + const p1, 0x7f12070d return p1 :pswitch_16 - const p1, 0x7f12071e + const p1, 0x7f12071f return p1 @@ -293,17 +293,17 @@ if-eq p1, v0, :cond_3 - const p1, 0x7f12071b + const p1, 0x7f12071c return p1 :cond_3 - const p1, 0x7f12070b + const p1, 0x7f12070c return p1 :cond_4 - const p1, 0x7f12071f + const p1, 0x7f120720 return p1 @@ -323,12 +323,12 @@ return p1 :cond_7 - const p1, 0x7f12075f + const p1, 0x7f120760 return p1 :cond_8 - const p1, 0x7f120737 + const p1, 0x7f120738 return p1 @@ -944,7 +944,7 @@ if-gez v5, :cond_0 - const v0, 0x7f12076d + const v0, 0x7f12076e const/4 v1, 0x2 @@ -1034,137 +1034,137 @@ return p1 :pswitch_0 - const p1, 0x7f1206f6 - - return p1 - - :pswitch_1 const p1, 0x7f1206f7 return p1 - :pswitch_2 - const p1, 0x7f1206f5 - - return p1 - - :pswitch_3 - const p1, 0x7f120707 - - return p1 - - :pswitch_4 - const p1, 0x7f120708 - - return p1 - - :pswitch_5 - const p1, 0x7f120706 - - return p1 - - :pswitch_6 - const p1, 0x7f1206fa - - return p1 - - :pswitch_7 - const p1, 0x7f1206fb - - return p1 - - :pswitch_8 - const p1, 0x7f1206f9 - - return p1 - - :pswitch_9 - const p1, 0x7f120704 - - return p1 - - :pswitch_a - const p1, 0x7f120705 - - return p1 - - :pswitch_b - const p1, 0x7f120703 - - return p1 - - :pswitch_c - const p1, 0x7f120700 - - return p1 - - :pswitch_d - const p1, 0x7f120701 - - return p1 - - :pswitch_e - const p1, 0x7f1206fd - - return p1 - - :pswitch_f - const p1, 0x7f1206fc - - return p1 - - :pswitch_10 - const p1, 0x7f1206ff - - return p1 - - :pswitch_11 - const p1, 0x7f1206fe - - return p1 - - :pswitch_12 - const p1, 0x7f1206f2 - - return p1 - - :pswitch_13 - const p1, 0x7f1206f3 - - return p1 - - :pswitch_14 - const p1, 0x7f1206f1 - - return p1 - - :pswitch_15 - const p1, 0x7f1206f0 - - return p1 - - :pswitch_16 - const p1, 0x7f1206f4 - - return p1 - - :pswitch_17 - const p1, 0x7f1206ef - - return p1 - - :pswitch_18 + :pswitch_1 const p1, 0x7f1206f8 return p1 + :pswitch_2 + const p1, 0x7f1206f6 + + return p1 + + :pswitch_3 + const p1, 0x7f120708 + + return p1 + + :pswitch_4 + const p1, 0x7f120709 + + return p1 + + :pswitch_5 + const p1, 0x7f120707 + + return p1 + + :pswitch_6 + const p1, 0x7f1206fb + + return p1 + + :pswitch_7 + const p1, 0x7f1206fc + + return p1 + + :pswitch_8 + const p1, 0x7f1206fa + + return p1 + + :pswitch_9 + const p1, 0x7f120705 + + return p1 + + :pswitch_a + const p1, 0x7f120706 + + return p1 + + :pswitch_b + const p1, 0x7f120704 + + return p1 + + :pswitch_c + const p1, 0x7f120701 + + return p1 + + :pswitch_d + const p1, 0x7f120702 + + return p1 + + :pswitch_e + const p1, 0x7f1206fe + + return p1 + + :pswitch_f + const p1, 0x7f1206fd + + return p1 + + :pswitch_10 + const p1, 0x7f120700 + + return p1 + + :pswitch_11 + const p1, 0x7f1206ff + + return p1 + + :pswitch_12 + const p1, 0x7f1206f3 + + return p1 + + :pswitch_13 + const p1, 0x7f1206f4 + + return p1 + + :pswitch_14 + const p1, 0x7f1206f2 + + return p1 + + :pswitch_15 + const p1, 0x7f1206f1 + + return p1 + + :pswitch_16 + const p1, 0x7f1206f5 + + return p1 + + :pswitch_17 + const p1, 0x7f1206f0 + + return p1 + + :pswitch_18 + const p1, 0x7f1206f9 + + return p1 + :pswitch_19 - const p1, 0x7f12077d + const p1, 0x7f12077e return p1 :cond_0 - const p1, 0x7f120702 + const p1, 0x7f120703 return p1 @@ -1501,7 +1501,7 @@ move-result-object p2 - const v6, 0x7f10005f + const v6, 0x7f100060 invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options; @@ -1733,7 +1733,7 @@ move-result-object p2 - const v0, 0x7f10005b + const v0, 0x7f10005c invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options; diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali index 9f6eca788d..6317e43aa9 100644 --- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali +++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali @@ -287,7 +287,7 @@ :pswitch_1 if-eqz v0, :cond_0 - const p2, 0x7f1206cd + const p2, 0x7f1206ce invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -301,7 +301,7 @@ :pswitch_2 if-eqz v0, :cond_1 - const p2, 0x7f12086f + const p2, 0x7f120870 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -345,7 +345,7 @@ if-eqz v0, :cond_3 - const p2, 0x7f12086e + const p2, 0x7f12086f 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 1a9a23cf2c..8a1afa00fc 100644 --- a/com.discord/smali/com/discord/utilities/error/Error.smali +++ b/com.discord/smali/com/discord/utilities/error/Error.smali @@ -734,7 +734,7 @@ packed-switch v0, :pswitch_data_0 - const v0, 0x7f1209cf + const v0, 0x7f1209d0 :goto_0 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -749,39 +749,39 @@ return-object p1 :pswitch_0 - const v0, 0x7f120867 + const v0, 0x7f120868 goto :goto_0 :pswitch_1 - const v0, 0x7f1209ce + const v0, 0x7f1209cf goto :goto_0 :pswitch_2 - const v0, 0x7f1209cb + const v0, 0x7f1209cc goto :goto_0 :pswitch_3 - const v0, 0x7f120e06 + const v0, 0x7f120e07 goto :goto_0 :pswitch_4 - const v0, 0x7f1209cd + const v0, 0x7f1209ce goto :goto_0 :pswitch_5 - const v0, 0x7f1209c9 + const v0, 0x7f1209ca goto :goto_0 :pswitch_6 iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response; - const v1, 0x7f1209c6 + const v1, 0x7f1209c7 :goto_2 invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String; @@ -793,22 +793,22 @@ :pswitch_7 iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response; - const v1, 0x7f1209ca + const v1, 0x7f1209cb goto :goto_2 :pswitch_8 - const v0, 0x7f120be2 + const v0, 0x7f120be3 goto :goto_0 :pswitch_9 - const v0, 0x7f1209c8 + const v0, 0x7f1209c9 goto :goto_0 :pswitch_a - const v0, 0x7f1209c7 + const v0, 0x7f1209c8 goto :goto_0 @@ -816,7 +816,7 @@ :pswitch_b iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response; - const v1, 0x7f1209cc + const v1, 0x7f1209cd goto :goto_2 diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali index 1a97ff6fc1..74cf3788f1 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali @@ -1276,7 +1276,7 @@ if-eqz v0, :cond_9 - const v0, 0x7f120aad + const v0, 0x7f120aae new-array v1, v5, [Ljava/lang/Object; @@ -1369,7 +1369,7 @@ if-ne v0, v3, :cond_1 - const v0, 0x7f120a5b + const v0, 0x7f120a5c new-array v1, v3, [Ljava/lang/Object; @@ -1394,7 +1394,7 @@ if-ne v0, v5, :cond_2 - const v0, 0x7f120a59 + const v0, 0x7f120a5a new-array v1, v3, [Ljava/lang/Object; @@ -1445,7 +1445,7 @@ return-object p1 :pswitch_2 - const v0, 0x7f120a55 + const v0, 0x7f120a56 new-array v1, v3, [Ljava/lang/Object; @@ -1466,7 +1466,7 @@ return-object p1 :pswitch_3 - const v0, 0x7f120a53 + const v0, 0x7f120a54 new-array v1, v3, [Ljava/lang/Object; @@ -1502,7 +1502,7 @@ if-nez v0, :cond_6 - const v0, 0x7f120a52 + const v0, 0x7f120a53 new-array v1, v3, [Ljava/lang/Object; @@ -1602,12 +1602,12 @@ goto :goto_2 :cond_7 - const v0, 0x7f120a5d + const v0, 0x7f120a5e goto :goto_1 :cond_8 - const v0, 0x7f120a50 + const v0, 0x7f120a51 :goto_1 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1923,7 +1923,7 @@ invoke-direct {p2, v0}, Landroidx/core/app/RemoteInput$Builder;->(Ljava/lang/String;)V - const v0, 0x7f120cf6 + const v0, 0x7f120cf7 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1973,7 +1973,7 @@ const v3, 0x7f0802c4 - const v4, 0x7f120a5e + const v4, 0x7f120a5f invoke-virtual {p1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2383,7 +2383,7 @@ const v2, 0x7f0801d5 - const v3, 0x7f120963 + const v3, 0x7f120964 invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -3141,7 +3141,7 @@ goto :goto_0 :cond_0 - const v0, 0x7f120831 + const v0, 0x7f120832 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -3251,7 +3251,7 @@ if-nez v0, :cond_2 - const v0, 0x7f120a63 + const v0, 0x7f120a64 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 61462d229d..1fb1bd69bb 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali @@ -431,7 +431,7 @@ invoke-direct {v0}, Landroidx/core/app/Person$Builder;->()V - const v1, 0x7f120971 + const v1, 0x7f120972 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -821,12 +821,12 @@ if-eqz p5, :cond_0 - const p5, 0x7f120a60 + const p5, 0x7f120a61 goto :goto_0 :cond_0 - const p5, 0x7f120a5f + const p5, 0x7f120a60 :goto_0 sget-object v0, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion; @@ -966,7 +966,7 @@ const-string v3, "Media Connections" - const v5, 0x7f120f89 + const v5, 0x7f120f8b invoke-virtual {p1, v5}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -982,7 +982,7 @@ const-string v5, "Messages" - const v7, 0x7f120994 + const v7, 0x7f120995 invoke-virtual {p1, v7}, Landroid/app/Application;->getString(I)Ljava/lang/String; 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 7b647b7487..9e6d88f2a1 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 @@ -42,7 +42,7 @@ if-eqz v1, :cond_0 - const v2, 0x7f120e7c + const v2, 0x7f120e7d const/4 v3, 0x1 diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali index 0e290a7643..6c4a8d7908 100644 --- a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali +++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali @@ -348,7 +348,7 @@ if-eqz p3, :cond_0 - const p2, 0x7f120d40 + const p2, 0x7f120d41 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 c7ac479aa8..2a185d4316 100644 --- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali +++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali @@ -221,7 +221,7 @@ new-instance p2, Lcom/discord/utilities/notices/NoticeBuilders$DialogData; - const v0, 0x7f120be4 + const v0, 0x7f120be5 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -231,7 +231,7 @@ invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120be3 + const v0, 0x7f120be4 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -285,13 +285,13 @@ move-result-object v5 - const v0, 0x7f120a94 + const v0, 0x7f120a95 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; move-result-object v3 - const v0, 0x7f120a15 + const v0, 0x7f120a16 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; 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 a1e2f8a3ae..d8f5fcc47f 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 @@ -88,7 +88,7 @@ return-object p1 :pswitch_0 - const p2, 0x7f120f9d + const p2, 0x7f120f9f :goto_0 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -98,17 +98,17 @@ return-object p1 :pswitch_1 - const p2, 0x7f120940 + const p2, 0x7f120941 goto :goto_0 :pswitch_2 - const p2, 0x7f120d95 + const p2, 0x7f120d96 goto :goto_0 :pswitch_3 - const p2, 0x7f120b46 + const p2, 0x7f120b47 goto :goto_0 diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali index 612f4ee3bc..945d640e88 100644 --- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali +++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali @@ -42,7 +42,7 @@ move-result v0 - const v1, 0x7f120eda + const v1, 0x7f120edb const/4 v2, 0x0 @@ -58,7 +58,7 @@ goto :goto_1 :pswitch_1 - const v0, 0x7f120edc + const v0, 0x7f120edd new-array v1, v3, [Ljava/lang/Object; @@ -71,7 +71,7 @@ goto :goto_0 :pswitch_2 - const v0, 0x7f120ed8 + const v0, 0x7f120ed9 new-array v1, v3, [Ljava/lang/Object; @@ -84,7 +84,7 @@ goto :goto_0 :pswitch_3 - const v0, 0x7f120ed9 + const v0, 0x7f120eda new-array v1, v3, [Ljava/lang/Object; @@ -215,7 +215,7 @@ if-ne v0, v1, :cond_2 - const p1, 0x7f120d88 + const p1, 0x7f120d89 return p1 @@ -234,7 +234,7 @@ if-ne v0, v1, :cond_4 - const p1, 0x7f120d84 + const p1, 0x7f120d85 return p1 @@ -253,13 +253,13 @@ if-ne p1, v0, :cond_6 - const p1, 0x7f120d82 + const p1, 0x7f120d83 return p1 :cond_6 :goto_3 - const p1, 0x7f120d87 + const p1, 0x7f120d88 return p1 .end method diff --git a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali index f2834582b4..21d767eeca 100644 --- a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali +++ b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali @@ -43,10 +43,35 @@ iput-object p2, p0, Lcom/discord/utilities/rest/AttachmentRequestBody;->attachment:Lcom/lytefast/flexinput/model/Attachment; + iget-object p1, p0, Lcom/discord/utilities/rest/AttachmentRequestBody;->attachment:Lcom/lytefast/flexinput/model/Attachment; + + invoke-virtual {p1}, Lcom/lytefast/flexinput/model/Attachment;->getData()Ljava/lang/Object; + + move-result-object p1 + + instance-of p2, p1, Ljava/io/File; + + if-nez p2, :cond_0 + + const/4 p1, 0x0 + + :cond_0 + check-cast p1, Ljava/io/File; + + if-eqz p1, :cond_1 + + invoke-virtual {p1}, Ljava/io/File;->length()J + + move-result-wide p1 + + goto :goto_0 + + :cond_1 invoke-direct {p0}, Lcom/discord/utilities/rest/AttachmentRequestBody;->computeSize()J move-result-wide p1 + :goto_0 iput-wide p1, p0, Lcom/discord/utilities/rest/AttachmentRequestBody;->size:J return-void 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 8f35b05221..2de1be2280 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali @@ -166,7 +166,7 @@ .method public final getUserAgent()Ljava/lang/String; .locals 1 - const-string v0, "Discord-Android/829" + const-string v0, "Discord-Android/830" 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 3cebf8bfcc..0dc10cabd9 100644 --- a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali +++ b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali @@ -883,7 +883,7 @@ if-eqz p3, :cond_1 - const p3, 0x7f120eb6 + const p3, 0x7f120eb7 :goto_0 invoke-static {p2, p3}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -916,7 +916,7 @@ goto :goto_1 :cond_2 - const p3, 0x7f1209c6 + const p3, 0x7f1209c7 goto :goto_0 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 8e853dd3a5..016733f8bb 100644 --- a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali +++ b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali @@ -37,7 +37,7 @@ invoke-direct {p0}, Ljava/lang/Object;->()V - const v0, 0x7f120cb9 + const v0, 0x7f120cba invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -49,7 +49,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fromFilterString:Ljava/lang/String; - const v0, 0x7f120cbb + const v0, 0x7f120cbc invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -61,7 +61,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->inFilterString:Ljava/lang/String; - const v0, 0x7f120cbd + const v0, 0x7f120cbe invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -73,7 +73,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->mentionsFilterString:Ljava/lang/String; - const v0, 0x7f120cba + const v0, 0x7f120cbb invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -85,7 +85,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->hasFilterString:Ljava/lang/String; - const v0, 0x7f120ca6 + const v0, 0x7f120ca7 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -97,7 +97,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->linkAnswerString:Ljava/lang/String; - const v0, 0x7f120ca4 + const v0, 0x7f120ca5 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -109,7 +109,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->embedAnswerString:Ljava/lang/String; - const v0, 0x7f120ca3 + const v0, 0x7f120ca4 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -121,7 +121,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fileAnswerString:Ljava/lang/String; - const v0, 0x7f120ca8 + const v0, 0x7f120ca9 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -133,7 +133,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->videoAnswerString:Ljava/lang/String; - const v0, 0x7f120ca5 + const v0, 0x7f120ca6 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -145,7 +145,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->imageAnswerString:Ljava/lang/String; - const v0, 0x7f120ca7 + const v0, 0x7f120ca8 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 b8ec75083a..84d7e1aee0 100644 --- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali +++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali @@ -205,7 +205,7 @@ invoke-virtual {v4, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - const v2, 0x7f120a94 + const v2, 0x7f120a95 invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processSpoilerChildren$3$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processSpoilerChildren$3$1.smali index fef3372ae1..445763bb07 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processSpoilerChildren$3$1.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor$processSpoilerChildren$3$1.smali @@ -54,15 +54,15 @@ } .end annotation - instance-of v0, p1, Lcom/discord/utilities/textprocessing/node/EmojiNode; + instance-of v0, p1, Lcom/discord/utilities/textprocessing/node/Spoilerable; if-eqz v0, :cond_0 - check-cast p1, Lcom/discord/utilities/textprocessing/node/EmojiNode; + check-cast p1, Lcom/discord/utilities/textprocessing/node/Spoilerable; const/4 v0, 0x0 - invoke-virtual {p1, v0}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->updateState(Z)V + invoke-interface {p1, v0}, Lcom/discord/utilities/textprocessing/node/Spoilerable;->setRevealed(Z)V :cond_0 return-void diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali index 6bf50d0be6..ef692b53a1 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali @@ -26,8 +26,6 @@ .field private isFoundSelfMention:Z -.field private final messageState:Lcom/discord/stores/StoreMessageState$State; - .field private final myUserId:J .field private shouldJumboify:Z @@ -42,6 +40,16 @@ .end annotation .end field +.field private final visibleSpoilerNodeIndices:Ljava/util/Collection; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/Collection<", + "Ljava/lang/Integer;", + ">;" + } + .end annotation +.end field + # direct methods .method static constructor ()V @@ -61,11 +69,41 @@ .method public constructor (JLcom/discord/stores/StoreMessageState$State;)V .locals 0 + if-eqz p3, :cond_0 + + invoke-virtual {p3}, Lcom/discord/stores/StoreMessageState$State;->getVisibleSpoilerNodeIndices()Ljava/util/Set; + + move-result-object p3 + + goto :goto_0 + + :cond_0 + const/4 p3, 0x0 + + :goto_0 + check-cast p3, Ljava/util/Collection; + + invoke-direct {p0, p1, p2, p3}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->(JLjava/util/Collection;)V + + return-void +.end method + +.method public constructor (JLjava/util/Collection;)V + .locals 0 + .annotation system Ldalvik/annotation/Signature; + value = { + "(J", + "Ljava/util/Collection<", + "Ljava/lang/Integer;", + ">;)V" + } + .end annotation + invoke-direct {p0}, Ljava/lang/Object;->()V iput-wide p1, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->myUserId:J - iput-object p3, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->messageState:Lcom/discord/stores/StoreMessageState$State; + iput-object p3, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->visibleSpoilerNodeIndices:Ljava/util/Collection; const/4 p1, 0x1 @@ -74,6 +112,21 @@ return-void .end method +.method public synthetic constructor (JLjava/util/Collection;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 0 + + and-int/lit8 p4, p4, 0x2 + + if-eqz p4, :cond_0 + + const/4 p3, 0x0 + + :cond_0 + invoke-direct {p0, p1, p2, p3}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->(JLjava/util/Collection;)V + + return-void +.end method + .method private final processSpoilerChildren()V .locals 5 @@ -478,13 +531,7 @@ invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z - iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->messageState:Lcom/discord/stores/StoreMessageState$State; - - if-eqz v0, :cond_7 - - invoke-virtual {v0}, Lcom/discord/stores/StoreMessageState$State;->getVisibleSpoilerNodeIndices()Ljava/util/Set; - - move-result-object v0 + iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->visibleSpoilerNodeIndices:Ljava/util/Collection; if-eqz v0, :cond_7 @@ -492,7 +539,7 @@ move-result-object v1 - invoke-interface {v0, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z + invoke-interface {v0, v1}, Ljava/util/Collection;->contains(Ljava/lang/Object;)Z move-result v1 diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali index 9864ccb74e..8034945244 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali @@ -32,7 +32,6 @@ :array_0 .array-data 4 - 0x7f120db9 0x7f120dba 0x7f120dbb 0x7f120dbc @@ -71,6 +70,7 @@ 0x7f120ddd 0x7f120dde 0x7f120ddf + 0x7f120de0 .end array-data .end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali index cdb0d62b62..c109bc0f2a 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali @@ -1,6 +1,9 @@ .class public final Lcom/discord/utilities/textprocessing/node/CodeNode; .super Lcom/discord/simpleast/core/node/a; +# interfaces +.implements Lcom/discord/utilities/textprocessing/node/Spoilerable; + # annotations .annotation system Ldalvik/annotation/Signature; @@ -9,7 +12,8 @@ "Lcom/discord/utilities/textprocessing/node/BasicRenderContext;", ">", "Lcom/discord/simpleast/core/node/a<", - "TT;>;" + "TT;>;", + "Lcom/discord/utilities/textprocessing/node/Spoilerable;" } .end annotation @@ -17,6 +21,8 @@ # instance fields .field private final inline:Z +.field private isRevealed:Z + .field private final language:Ljava/lang/String; @@ -34,6 +40,10 @@ iput-object p3, p0, Lcom/discord/utilities/textprocessing/node/CodeNode;->language:Ljava/lang/String; + const/4 p1, 0x1 + + iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/node/CodeNode;->isRevealed:Z + return-void .end method @@ -88,8 +98,16 @@ return p1 .end method +.method public final isRevealed()Z + .locals 1 + + iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/node/CodeNode;->isRevealed:Z + + return v0 +.end method + .method public final render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/BasicRenderContext;)V - .locals 9 + .locals 10 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -112,150 +130,184 @@ invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/BasicRenderContext;->getContext()Landroid/content/Context; - move-result-object p2 - - const/high16 v1, 0x7f090000 - - invoke-static {p2, v1}, Landroidx/core/content/res/ResourcesCompat;->getFont(Landroid/content/Context;I)Landroid/graphics/Typeface; - move-result-object v1 - const/4 v2, 0x0 + const/high16 v2, 0x7f090000 - invoke-static {v1, v2}, Landroid/graphics/Typeface;->create(Landroid/graphics/Typeface;I)Landroid/graphics/Typeface; + invoke-static {v1, v2}, Landroidx/core/content/res/ResourcesCompat;->getFont(Landroid/content/Context;I)Landroid/graphics/Typeface; - move-result-object v1 + move-result-object v2 - new-instance v3, Lcom/discord/utilities/spans/TypefaceSpan; + const/4 v3, 0x0 - const-string v4, "codeTypeface" + invoke-static {v2, v3}, Landroid/graphics/Typeface;->create(Landroid/graphics/Typeface;I)Landroid/graphics/Typeface; - invoke-static {v1, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + move-result-object v2 - invoke-direct {v3, v1}, Lcom/discord/utilities/spans/TypefaceSpan;->(Landroid/graphics/Typeface;)V + new-instance v4, Lcom/discord/utilities/spans/TypefaceSpan; - invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + const-string v5, "codeTypeface" - new-instance v1, Landroid/text/style/RelativeSizeSpan; + invoke-static {v2, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v3, 0x3f59999a # 0.85f + invoke-direct {v4, v2}, Lcom/discord/utilities/spans/TypefaceSpan;->(Landroid/graphics/Typeface;)V - invoke-direct {v1, v3}, Landroid/text/style/RelativeSizeSpan;->(F)V + invoke-virtual {v0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + new-instance v2, Landroid/text/style/RelativeSizeSpan; - new-instance v1, Landroid/text/style/ForegroundColorSpan; + const v4, 0x3f59999a # 0.85f - const v3, 0x7f06004b + invoke-direct {v2, v4}, Landroid/text/style/RelativeSizeSpan;->(F)V - invoke-static {p2, v3}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I + invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + + new-instance v2, Landroid/text/style/ForegroundColorSpan; + + const v4, 0x7f06004b + + invoke-static {v1, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I + + move-result v4 + + invoke-direct {v2, v4}, Landroid/text/style/ForegroundColorSpan;->(I)V + + invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + + iget-boolean v2, p0, Lcom/discord/utilities/textprocessing/node/CodeNode;->inline:Z + + const/4 v4, 0x5 + + const v5, 0x7f04033f + + const/16 v6, 0xa + + const/4 v7, 0x1 + + if-eqz v2, :cond_0 + + new-instance v2, Landroid/text/style/BackgroundColorSpan; + + invoke-static {v1, v5}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I move-result v3 - invoke-direct {v1, v3}, Landroid/text/style/ForegroundColorSpan;->(I)V + invoke-direct {v2, v3}, Landroid/text/style/BackgroundColorSpan;->(I)V - invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - - iget-boolean v1, p0, Lcom/discord/utilities/textprocessing/node/CodeNode;->inline:Z - - const/4 v3, 0x5 - - const v4, 0x7f04033f - - const/16 v5, 0xa - - const/4 v6, 0x1 - - if-eqz v1, :cond_0 - - new-instance v1, Landroid/text/style/BackgroundColorSpan; - - invoke-static {p2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I - - move-result v2 - - invoke-direct {v1, v2}, Landroid/text/style/BackgroundColorSpan;->(I)V - - invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z goto :goto_1 :cond_0 - move-object v1, p1 + move-object v2, p1 - check-cast v1, Ljava/lang/CharSequence; + check-cast v2, Ljava/lang/CharSequence; - invoke-interface {v1}, Ljava/lang/CharSequence;->length()I + invoke-interface {v2}, Ljava/lang/CharSequence;->length()I - move-result v1 + move-result v2 - if-lez v1, :cond_1 + if-lez v2, :cond_1 - const/4 v1, 0x1 + const/4 v2, 0x1 goto :goto_0 :cond_1 - const/4 v1, 0x0 + const/4 v2, 0x0 :goto_0 - if-eqz v1, :cond_2 + if-eqz v2, :cond_2 - new-array v1, v3, [C - - invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I - - move-result v7 - - sub-int/2addr v7, v6 + new-array v2, v4, [C invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I move-result v8 - invoke-virtual {p1, v7, v8, v1, v2}, Landroid/text/SpannableStringBuilder;->getChars(II[CI)V + sub-int/2addr v8, v7 - aget-char v1, v1, v2 + invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I - if-eq v1, v5, :cond_2 + move-result v9 - invoke-virtual {p1, v5}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder; + invoke-virtual {p1, v8, v9, v2, v3}, Landroid/text/SpannableStringBuilder;->getChars(II[CI)V + + aget-char v2, v2, v3 + + if-eq v2, v6, :cond_2 + + invoke-virtual {p1, v6}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder; :cond_2 :goto_1 invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I - move-result v1 + move-result v2 invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/node/CodeNode;->getContent()Ljava/lang/String; - move-result-object v2 + move-result-object v3 - check-cast v2, Ljava/lang/CharSequence; + check-cast v3, Ljava/lang/CharSequence; - invoke-virtual {p1, v2}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder; + invoke-virtual {p1, v3}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder; - iget-boolean v2, p0, Lcom/discord/utilities/textprocessing/node/CodeNode;->inline:Z + iget-boolean v3, p0, Lcom/discord/utilities/textprocessing/node/CodeNode;->inline:Z - const/16 v7, 0x21 + const/16 v8, 0x21 - if-nez v2, :cond_3 + if-nez v3, :cond_6 - invoke-virtual {p1, v5}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder; + invoke-virtual {p1, v6}, Landroid/text/SpannableStringBuilder;->append(C)Landroid/text/SpannableStringBuilder; - invoke-static {p2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I + invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/node/CodeNode;->isRevealed()Z - move-result v2 + move-result v3 - const v4, 0x7f040340 + if-eqz v3, :cond_3 - invoke-static {p2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I + invoke-static {v1, v5}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I move-result p2 - new-instance v4, Lcom/discord/utilities/spans/BlockBackgroundSpan; + goto :goto_2 - invoke-static {v6}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I + :cond_3 + instance-of v3, p2, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext; + + if-nez v3, :cond_4 + + const/4 p2, 0x0 + + :cond_4 + check-cast p2, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext; + + if-eqz p2, :cond_5 + + invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;->getSpoilerColorRes()I + + move-result p2 + + goto :goto_2 + + :cond_5 + const p2, 0x7f040354 + + invoke-static {v1, p2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I + + move-result p2 + + :goto_2 + const v3, 0x7f040340 + + invoke-static {v1, v3}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I + + move-result v1 + + new-instance v3, Lcom/discord/utilities/spans/BlockBackgroundSpan; + + invoke-static {v7}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I move-result v5 @@ -265,53 +317,53 @@ move-result v6 - invoke-direct {v4, v2, p2, v5, v6}, Lcom/discord/utilities/spans/BlockBackgroundSpan;->(IIII)V + invoke-direct {v3, p2, v1, v5, v6}, Lcom/discord/utilities/spans/BlockBackgroundSpan;->(IIII)V invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I move-result p2 - invoke-virtual {p1, v4, v1, p2, v7}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V + invoke-virtual {p1, v3, v2, p2, v8}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V new-instance p2, Landroid/text/style/LeadingMarginSpan$Standard; - const/16 v2, 0xf + const/16 v1, 0xf - invoke-direct {p2, v2}, Landroid/text/style/LeadingMarginSpan$Standard;->(I)V + invoke-direct {p2, v1}, Landroid/text/style/LeadingMarginSpan$Standard;->(I)V invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I - move-result v2 + move-result v1 - invoke-virtual {p1, p2, v1, v2, v7}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V + invoke-virtual {p1, p2, v2, v1, v8}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V - invoke-static {v3}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I + invoke-static {v4}, Lcom/discord/utilities/dimen/DimenUtils;->dpToPixels(I)I move-result p2 - new-instance v2, Lcom/discord/utilities/spans/VerticalPaddingSpan; + new-instance v1, Lcom/discord/utilities/spans/VerticalPaddingSpan; - invoke-direct {v2, p2, p2}, Lcom/discord/utilities/spans/VerticalPaddingSpan;->(II)V + invoke-direct {v1, p2, p2}, Lcom/discord/utilities/spans/VerticalPaddingSpan;->(II)V invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I move-result p2 - invoke-virtual {p1, v2, v1, p2, v7}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V + invoke-virtual {p1, v1, v2, p2, v8}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V - :cond_3 + :cond_6 check-cast v0, Ljava/lang/Iterable; invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; move-result-object p2 - :goto_2 + :goto_3 invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z move-result v0 - if-eqz v0, :cond_4 + if-eqz v0, :cond_7 invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -321,13 +373,13 @@ invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I - move-result v2 + move-result v1 - invoke-virtual {p1, v0, v1, v2, v7}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V + invoke-virtual {p1, v0, v2, v1, v8}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V - goto :goto_2 + goto :goto_3 - :cond_4 + :cond_7 return-void .end method @@ -340,3 +392,11 @@ return-void .end method + +.method public final setRevealed(Z)V + .locals 0 + + iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/node/CodeNode;->isRevealed:Z + + return-void +.end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1.smali deleted file mode 100644 index 5657a06485..0000000000 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1.smali +++ /dev/null @@ -1,96 +0,0 @@ -.class public final Lcom/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1; -.super Landroid/text/style/ReplacementSpan; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/utilities/textprocessing/node/EmojiNode;->renderPlaceHolder(Landroid/text/SpannableStringBuilder;I)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x19 - name = null -.end annotation - - -# instance fields -.field final synthetic $color:I - -.field final synthetic this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode; - - -# direct methods -.method constructor (Lcom/discord/utilities/textprocessing/node/EmojiNode;I)V - .locals 0 - .annotation system Ldalvik/annotation/Signature; - value = { - "(I)V" - } - .end annotation - - iput-object p1, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode; - - iput p2, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1;->$color:I - - invoke-direct {p0}, Landroid/text/style/ReplacementSpan;->()V - - return-void -.end method - - -# virtual methods -.method public final draw(Landroid/graphics/Canvas;Ljava/lang/CharSequence;IIFIIILandroid/graphics/Paint;)V - .locals 6 - - const-string p2, "canvas" - - invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - - const-string p2, "paint" - - invoke-static {p9, p2}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - - iget p2, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1;->$color:I - - invoke-virtual {p9, p2}, Landroid/graphics/Paint;->setColor(I)V - - int-to-float v2, p6 - - iget-object p2, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode; - - invoke-static {p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->access$getWidth$p(Lcom/discord/utilities/textprocessing/node/EmojiNode;)I - - move-result p2 - - int-to-float p2, p2 - - add-float v3, p5, p2 - - int-to-float v4, p8 - - move-object v0, p1 - - move v1, p5 - - move-object v5, p9 - - invoke-virtual/range {v0 .. v5}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V - - return-void -.end method - -.method public final getSize(Landroid/graphics/Paint;Ljava/lang/CharSequence;IILandroid/graphics/Paint$FontMetricsInt;)I - .locals 0 - - const-string p2, "paint" - - invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - - iget-object p1, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1;->this$0:Lcom/discord/utilities/textprocessing/node/EmojiNode; - - invoke-static {p1}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->access$getWidth$p(Lcom/discord/utilities/textprocessing/node/EmojiNode;)I - - move-result p1 - - return p1 -.end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali index 6b46156397..452425b772 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/EmojiNode.smali @@ -1,6 +1,9 @@ .class public final Lcom/discord/utilities/textprocessing/node/EmojiNode; .super Lcom/discord/simpleast/core/node/a; +# interfaces +.implements Lcom/discord/utilities/textprocessing/node/Spoilerable; + # annotations .annotation system Ldalvik/annotation/MemberClasses; @@ -16,7 +19,8 @@ "Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext;", ">", "Lcom/discord/simpleast/core/node/a<", - "TT;>;" + "TT;>;", + "Lcom/discord/utilities/textprocessing/node/Spoilerable;" } .end annotation @@ -32,7 +36,7 @@ # instance fields .field private height:I -.field private isVisible:Z +.field private isRevealed:Z .field private final urlProvider:Lkotlin/jvm/functions/Function2; .annotation system Ldalvik/annotation/Signature; @@ -182,7 +186,7 @@ const/4 p1, 0x1 - iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isVisible:Z + iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isRevealed:Z return-void .end method @@ -265,14 +269,6 @@ return-void .end method -.method private final setVisible(Z)V - .locals 0 - - iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isVisible:Z - - return-void -.end method - # virtual methods .method public final equals(Ljava/lang/Object;)Z @@ -320,10 +316,10 @@ return p1 .end method -.method public final isVisible()Z +.method public final isRevealed()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isVisible:Z + iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isRevealed:Z return v0 .end method @@ -384,7 +380,9 @@ invoke-virtual {p1, v0}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder; - iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isVisible:Z + invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isRevealed()Z + + move-result v0 const/4 v1, 0x1 @@ -530,50 +528,10 @@ return-void .end method -.method public final renderPlaceHolder(Landroid/text/SpannableStringBuilder;I)V - .locals 3 - .param p2 # I - .annotation build Landroidx/annotation/ColorInt; - .end annotation - .end param - - const-string v0, "builder" - - invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I - - move-result v0 - - invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/node/EmojiNode;->getContent()Ljava/lang/String; - - move-result-object v1 - - check-cast v1, Ljava/lang/CharSequence; - - invoke-virtual {p1, v1}, Landroid/text/SpannableStringBuilder;->append(Ljava/lang/CharSequence;)Landroid/text/SpannableStringBuilder; - - new-instance v1, Lcom/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1; - - invoke-direct {v1, p0, p2}, Lcom/discord/utilities/textprocessing/node/EmojiNode$renderPlaceHolder$placeholderSpan$1;->(Lcom/discord/utilities/textprocessing/node/EmojiNode;I)V - - invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I - - move-result p2 - - add-int/lit8 p2, p2, -0x1 - - const/16 v2, 0x21 - - invoke-virtual {p1, v1, v0, p2, v2}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V - - return-void -.end method - -.method public final updateState(Z)V +.method public final setRevealed(Z)V .locals 0 - iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isVisible:Z + iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/node/EmojiNode;->isRevealed:Z return-void .end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali index ce0d0d3e0c..318f01f340 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali @@ -1,6 +1,9 @@ .class public final Lcom/discord/utilities/textprocessing/node/SpoilerNode; .super Lcom/discord/simpleast/core/node/Node; +# interfaces +.implements Lcom/discord/utilities/textprocessing/node/Spoilerable; + # annotations .annotation system Ldalvik/annotation/MemberClasses; @@ -15,7 +18,8 @@ "Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;", ">", "Lcom/discord/simpleast/core/node/Node<", - "TT;>;" + "TT;>;", + "Lcom/discord/utilities/textprocessing/node/Spoilerable;" } .end annotation @@ -62,7 +66,9 @@ move-result-object v0 - iget-boolean v1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z + invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed()Z + + move-result v1 if-eqz v1, :cond_0 @@ -176,14 +182,6 @@ return-void .end method -.method private final setRevealed(Z)V - .locals 0 - - iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z - - return-void -.end method - # virtual methods .method public final getContent()Ljava/lang/String; @@ -262,7 +260,9 @@ goto :goto_0 :cond_0 - iget-boolean v1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z + invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed()Z + + move-result v1 if-nez v1, :cond_1 @@ -343,12 +343,20 @@ return-void .end method +.method public final setRevealed(Z)V + .locals 0 + + iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z + + return-void +.end method + .method public final updateState(IZ)V .locals 0 iput p1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->id:I - iput-boolean p2, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z + invoke-virtual {p0, p2}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->setRevealed(Z)V return-void .end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/Spoilerable.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/Spoilerable.smali new file mode 100644 index 0000000000..4d1ca224ae --- /dev/null +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/Spoilerable.smali @@ -0,0 +1,10 @@ +.class public interface abstract Lcom/discord/utilities/textprocessing/node/Spoilerable; +.super Ljava/lang/Object; + + +# virtual methods +.method public abstract isRevealed()Z +.end method + +.method public abstract setRevealed(Z)V +.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 c4de27aa68..9574525025 100644 --- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali +++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali @@ -346,7 +346,7 @@ move-result-object v2 - const v9, 0x7f120e8d + const v9, 0x7f120e8e :goto_1 invoke-virtual {v2, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -360,7 +360,7 @@ move-result-object v2 - const v9, 0x7f1209bc + const v9, 0x7f1209bd goto :goto_1 @@ -389,7 +389,7 @@ move-result-object p0 - const v6, 0x7f120e86 + const v6, 0x7f120e87 :goto_4 invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali index 99d08e3f92..55c47adf37 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali @@ -578,7 +578,7 @@ :cond_5 :goto_3 - const p1, 0x7f12085f + const p1, 0x7f120860 invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthInviteInfo;->getString(I)Ljava/lang/String; @@ -614,7 +614,7 @@ goto :goto_6 :cond_7 - const p1, 0x7f12085d + const p1, 0x7f12085e invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthInviteInfo;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali index 338fc5ddaa..3647028c2a 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali @@ -88,7 +88,7 @@ return-void :catch_0 - const v0, 0x7f120ae2 + const v0, 0x7f120ae3 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali index 95bac8a674..30f456f576 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali @@ -50,13 +50,13 @@ invoke-direct {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v0, 0x7f120adf + const v0, 0x7f120ae0 invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object p1 - const v0, 0x7f120ae0 + const v0, 0x7f120ae1 invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -66,7 +66,7 @@ check-cast v0, Lkotlin/jvm/functions/Function1; - const v1, 0x7f120ae1 + const v1, 0x7f120ae2 invoke-virtual {p1, v1, v0}, 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/auth/WidgetAuthLogin.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali index ce7a0f12a3..78b049b583 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali @@ -955,7 +955,7 @@ const/4 v3, 0x0 :goto_0 - const v6, 0x7f120ae4 + const v6, 0x7f120ae5 if-eqz v3, :cond_2 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali index 146465c4af..8237c30929 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali @@ -192,7 +192,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const p2, 0x7f120e4a + const p2, 0x7f120e4b invoke-static {p1, p2}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V @@ -223,7 +223,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120e6e + const v0, 0x7f120e6f invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V @@ -465,7 +465,7 @@ move-result-object v1 - const v4, 0x7f120e53 + const v4, 0x7f120e54 const/4 v5, 0x2 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali index f6ab6eb552..38f2a74bf8 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali @@ -76,7 +76,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister; - const v1, 0x7f120f47 + const v1, 0x7f120f49 invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getString(I)Ljava/lang/String; @@ -175,7 +175,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister; - const v1, 0x7f120ae4 + const v1, 0x7f120ae5 invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getString(I)Ljava/lang/String; @@ -214,7 +214,7 @@ move-result-object p1 - const v0, 0x7f120df3 + const v0, 0x7f120df4 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali index a3855865ae..050ffe995d 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali @@ -863,7 +863,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120df0 + const v1, 0x7f120df1 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -873,7 +873,7 @@ aput-object v1, v0, v2 - const v1, 0x7f120bba + const v1, 0x7f120bbb invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1244,7 +1244,7 @@ move-result-object p1 - const v0, 0x7f120f47 + const v0, 0x7f120f49 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1353,7 +1353,7 @@ move-result-object p1 - const v0, 0x7f120ae4 + const v0, 0x7f120ae5 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1829,12 +1829,12 @@ if-eqz v2, :cond_1 - const v2, 0x7f120df2 + const v2, 0x7f120df3 goto :goto_1 :cond_1 - const v2, 0x7f120df1 + const v2, 0x7f120df2 :goto_1 invoke-direct {p0, v4, v2}, 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 118f61b584..17eafe2701 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 @@ -80,9 +80,9 @@ check-cast v9, Lkotlin/jvm/functions/Function1; - const v2, 0x7f120847 + const v2, 0x7f120848 - const v3, 0x7f120844 + const v3, 0x7f120845 const v4, 0x7f0802ee 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 e3df8f1bc0..f018e5fdad 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 @@ -64,7 +64,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegisterInvite; - const v1, 0x7f120f47 + const v1, 0x7f120f49 invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite;->getString(I)Ljava/lang/String; @@ -103,7 +103,7 @@ move-result-object p1 - const v0, 0x7f120df3 + const v0, 0x7f120df4 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali index 2df61bafc4..1f43e4d7ee 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali @@ -134,7 +134,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120847 + const v0, 0x7f120848 invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;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 1df1cb29e9..6328420aeb 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali @@ -733,7 +733,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120df0 + const v1, 0x7f120df1 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -743,7 +743,7 @@ aput-object v1, v0, v2 - const v1, 0x7f120bba + const v1, 0x7f120bbb invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -996,7 +996,7 @@ move-result-object p1 - const v0, 0x7f120f47 + const v0, 0x7f120f49 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1372,12 +1372,12 @@ if-eqz p1, :cond_1 - const p1, 0x7f120df2 + const p1, 0x7f120df3 goto :goto_1 :cond_1 - const p1, 0x7f120df1 + const p1, 0x7f120df2 :goto_1 invoke-direct {p0, v1, p1}, 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 9bff3bc5b5..fd9bb4c508 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali @@ -366,7 +366,7 @@ invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const p1, 0x7f120934 + const p1, 0x7f120935 const/4 v2, 0x1 @@ -384,7 +384,7 @@ move-result-object p1 - const v1, 0x7f120931 + const v1, 0x7f120932 new-array v2, v2, [Ljava/lang/Object; @@ -404,7 +404,7 @@ move-result-object p1 - const p3, 0x7f120930 + const p3, 0x7f120931 new-instance v1, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$6AsRxaqRqhNYQJ0hn1n5sKLRA50; @@ -451,7 +451,7 @@ .method private handleUpdate()V .locals 2 - const v0, 0x7f1206e1 + const v0, 0x7f1206e2 invoke-static {p0, v0}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -693,7 +693,7 @@ const v0, 0x7f120338 - const v1, 0x7f120e7c + const v1, 0x7f120e7d 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/WidgetChannelNotificationSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali index be6d32339e..4edd22be37 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali @@ -385,7 +385,7 @@ if-eqz v2, :cond_0 - const v2, 0x7f1209be + const v2, 0x7f1209bf const/4 v3, 0x1 @@ -429,7 +429,7 @@ goto :goto_1 :cond_0 - const v1, 0x7f1209bd + const v1, 0x7f1209be invoke-virtual {p0, v1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->getString(I)Ljava/lang/String; @@ -648,7 +648,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, 0x7f120a61 + const p1, 0x7f120a62 invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali index 5a691d675e..5c2b6fbfa8 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali @@ -361,7 +361,7 @@ return-void :cond_0 - const p1, 0x7f120ad4 + const p1, 0x7f120ad5 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2.smali index f17264bd73..45a834adae 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2.smali @@ -61,34 +61,28 @@ .method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Ljava/util/List; + check-cast p1, Ljava/lang/String; check-cast p2, Ljava/util/Set; - invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2;->call(Ljava/util/List;Ljava/util/Set;)Lkotlin/Pair; + invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2;->call(Ljava/lang/String;Ljava/util/Set;)Lkotlin/Pair; move-result-object p1 return-object p1 .end method -.method public final call(Ljava/util/List;Ljava/util/Set;)Lkotlin/Pair; +.method public final call(Ljava/lang/String;Ljava/util/Set;)Lkotlin/Pair; .locals 0 .annotation system Ldalvik/annotation/Signature; value = { "(", - "Ljava/util/List<", - "Lcom/discord/simpleast/core/node/Node<", - "Lcom/discord/utilities/textprocessing/MessageRenderContext;", - ">;>;", + "Ljava/lang/String;", "Ljava/util/Set<", "Ljava/lang/Integer;", ">;)", "Lkotlin/Pair<", - "Ljava/util/List<", - "Lcom/discord/simpleast/core/node/Node<", - "Lcom/discord/utilities/textprocessing/MessageRenderContext;", - ">;>;", + "Ljava/lang/String;", "Ljava/util/Set<", "Ljava/lang/Integer;", ">;>;" diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3.smali index e119a6c65e..29bd66a12a 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3.smali @@ -38,16 +38,20 @@ .field final synthetic $revealedIndicesObs:Lrx/subjects/BehaviorSubject; +.field final synthetic $topicParser:Lcom/discord/simpleast/core/parser/Parser; + # direct methods -.method constructor (Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;Lrx/subjects/BehaviorSubject;)V +.method constructor (Lcom/discord/simpleast/core/parser/Parser;Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;Lrx/subjects/BehaviorSubject;)V .locals 0 - iput-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3;->$channel:Lcom/discord/models/domain/ModelChannel; + iput-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3;->$topicParser:Lcom/discord/simpleast/core/parser/Parser; - iput-object p2, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3;->$context:Landroid/content/Context; + iput-object p2, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3;->$channel:Lcom/discord/models/domain/ModelChannel; - iput-object p3, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3;->$revealedIndicesObs:Lrx/subjects/BehaviorSubject; + iput-object p3, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3;->$context:Landroid/content/Context; + + iput-object p4, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3;->$revealedIndicesObs:Lrx/subjects/BehaviorSubject; invoke-direct {p0}, Ljava/lang/Object;->()V @@ -74,11 +78,8 @@ value = { "(", "Lkotlin/Pair<", + "Ljava/lang/String;", "+", - "Ljava/util/List<", - "Lcom/discord/simpleast/core/node/Node<", - "Lcom/discord/utilities/textprocessing/MessageRenderContext;", - ">;>;+", "Ljava/util/Set<", "Ljava/lang/Integer;", ">;>;)", @@ -90,18 +91,26 @@ iget-object v0, p1, Lkotlin/Pair;->first:Ljava/lang/Object; - check-cast v0, Ljava/util/List; + check-cast v0, Ljava/lang/String; iget-object p1, p1, Lkotlin/Pair;->second:Ljava/lang/Object; check-cast p1, Ljava/util/Set; + iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3;->$topicParser:Lcom/discord/simpleast/core/parser/Parser; + + check-cast v0, Ljava/lang/CharSequence; + + const/4 v2, 0x0 + + const/4 v3, 0x2 + + invoke-static {v1, v0, v2, v3, 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; + + move-result-object v0 + sget-object v1, Lcom/discord/utilities/textprocessing/TagsBuilder;->Companion:Lcom/discord/utilities/textprocessing/TagsBuilder$Companion; - const-string v2, "ast" - - invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - move-object v2, v0 check-cast v2, Ljava/util/Collection; @@ -110,13 +119,15 @@ move-result-object v1 - sget-object v2, Lcom/discord/widgets/channels/WidgetChannelTopic$Model;->Companion:Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion; + new-instance v3, Lcom/discord/utilities/textprocessing/MessagePreprocessor; - const-string v3, "revealedIndices" + check-cast p1, Ljava/util/Collection; - invoke-static {p1, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + const-wide/16 v4, -0x1 - invoke-static {v2, v0, p1}, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion;->access$preprocessSpoilers(Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion;Ljava/util/List;Ljava/util/Set;)V + invoke-direct {v3, v4, v5, p1}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->(JLjava/util/Collection;)V + + invoke-virtual {v3, v2}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->process(Ljava/util/Collection;)V invoke-static {}, Lcom/discord/stores/StoreStream;->getChannels()Lcom/discord/stores/StoreChannels; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali index a711e39270..97efd31c09 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali @@ -40,14 +40,6 @@ return-object p0 .end method -.method public static final synthetic access$preprocessSpoilers(Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion;Ljava/util/List;Ljava/util/Set;)V - .locals 0 - - invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion;->preprocessSpoilers(Ljava/util/List;Ljava/util/Set;)V - - return-void -.end method - .method private final get(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Lcom/discord/simpleast/core/parser/Parser;)Lrx/Observable; .locals 4 .annotation system Ldalvik/annotation/Signature; @@ -66,97 +58,87 @@ } .end annotation - const/4 v0, 0x0 - if-eqz p2, :cond_4 invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z - move-result v1 + move-result v0 - if-eqz v1, :cond_0 + if-eqz v0, :cond_0 goto :goto_3 :cond_0 invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getTopic()Ljava/lang/String; - move-result-object v1 + move-result-object v0 - if-eqz v1, :cond_3 + if-eqz v0, :cond_3 invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getTopic()Ljava/lang/String; - move-result-object v1 + move-result-object v0 - const-string v2, "channel.topic" + const-string v1, "channel.topic" - invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - check-cast v1, Ljava/lang/CharSequence; + check-cast v0, Ljava/lang/CharSequence; - invoke-interface {v1}, Ljava/lang/CharSequence;->length()I + invoke-interface {v0}, Ljava/lang/CharSequence;->length()I - move-result v1 + move-result v0 - if-nez v1, :cond_1 + if-nez v0, :cond_1 - const/4 v1, 0x1 + const/4 v0, 0x1 goto :goto_0 :cond_1 - const/4 v1, 0x0 + const/4 v0, 0x0 :goto_0 - if-eqz v1, :cond_2 + if-eqz v0, :cond_2 goto :goto_2 :cond_2 - sget-object v1, Lkotlin/a/z;->bPD:Lkotlin/a/z; + sget-object v0, Lkotlin/a/z;->bPD:Lkotlin/a/z; - check-cast v1, Ljava/util/Set; + check-cast v0, Ljava/util/Set; - invoke-static {v1}, Lrx/subjects/BehaviorSubject;->cl(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject; + invoke-static {v0}, Lrx/subjects/BehaviorSubject;->cl(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject; - move-result-object v1 + move-result-object v0 invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getTopic()Ljava/lang/String; - move-result-object v2 + move-result-object v1 - check-cast v2, Ljava/lang/CharSequence; + invoke-static {v1}, Lrx/Observable;->ca(Ljava/lang/Object;)Lrx/Observable; - const/4 v3, 0x2 + move-result-object v1 - invoke-static {p3, v2, v0, v3, v0}, 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-object v2, v0 - move-result-object p3 + check-cast v2, Lrx/Observable; - invoke-static {p3}, Lrx/Observable;->ca(Ljava/lang/Object;)Lrx/Observable; + sget-object v3, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2; - move-result-object p3 + check-cast v3, Lrx/functions/Func2; - move-object v0, v1 + invoke-static {v1, v2, v3}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable; - check-cast v0, Lrx/Observable; + move-result-object v1 - sget-object v2, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2; + new-instance v2, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3; - check-cast v2, Lrx/functions/Func2; + invoke-direct {v2, p3, p2, p1, v0}, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3;->(Lcom/discord/simpleast/core/parser/Parser;Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;Lrx/subjects/BehaviorSubject;)V - invoke-static {p3, v0, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable; + check-cast v2, Lrx/functions/b; - move-result-object p3 - - new-instance v0, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3; - - invoke-direct {v0, p2, p1, v1}, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3;->(Lcom/discord/models/domain/ModelChannel;Landroid/content/Context;Lrx/subjects/BehaviorSubject;)V - - check-cast v0, Lrx/functions/b; - - invoke-virtual {p3, v0}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable; + invoke-virtual {v1, v2}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable; move-result-object p1 @@ -193,7 +175,9 @@ :goto_3 new-instance p1, Lcom/discord/widgets/channels/WidgetChannelTopic$Model; - invoke-direct {p1, v0}, Lcom/discord/widgets/channels/WidgetChannelTopic$Model;->(Ljava/lang/CharSequence;)V + const/4 p2, 0x0 + + invoke-direct {p1, p2}, Lcom/discord/widgets/channels/WidgetChannelTopic$Model;->(Ljava/lang/CharSequence;)V invoke-static {p1}, Lrx/Observable;->ca(Ljava/lang/Object;)Lrx/Observable; @@ -204,82 +188,6 @@ goto :goto_1 .end method -.method private final preprocessSpoilers(Ljava/util/List;Ljava/util/Set;)V - .locals 4 - .annotation system Ldalvik/annotation/Signature; - value = { - "(", - "Ljava/util/List<", - "Lcom/discord/simpleast/core/node/Node<", - "Lcom/discord/utilities/textprocessing/MessageRenderContext;", - ">;>;", - "Ljava/util/Set<", - "Ljava/lang/Integer;", - ">;)V" - } - .end annotation - - new-instance v0, Lcom/discord/utilities/textprocessing/MessagePreprocessor; - - const-wide/16 v1, -0x1 - - const/4 v3, 0x0 - - invoke-direct {v0, v1, v2, v3}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->(JLcom/discord/stores/StoreMessageState$State;)V - - check-cast p1, Ljava/util/Collection; - - invoke-virtual {v0, p1}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->process(Ljava/util/Collection;)V - - invoke-virtual {v0}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->getSpoilers()Ljava/util/List; - - move-result-object p1 - - if-eqz p1, :cond_0 - - check-cast p1, Ljava/lang/Iterable; - - invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - - move-result-object p1 - - :goto_0 - invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z - - move-result v0 - - if-eqz v0, :cond_0 - - invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; - - move-result-object v0 - - check-cast v0, Lcom/discord/utilities/textprocessing/node/SpoilerNode; - - invoke-virtual {v0}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->getId()I - - move-result v1 - - invoke-virtual {v0}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->getId()I - - move-result v2 - - invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v2 - - invoke-interface {p2, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z - - move-result v2 - - invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->updateState(IZ)V - - goto :goto_0 - - :cond_0 - return-void -.end method - # virtual methods .method public final get(Landroid/content/Context;)Lrx/Observable; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali index 673d15e11b..7837d4561c 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali @@ -879,12 +879,12 @@ if-ne v1, v2, :cond_4 - const v1, 0x7f120bbc + const v1, 0x7f120bbd goto :goto_2 :cond_4 - const v1, 0x7f120bbe + const v1, 0x7f120bbf :goto_2 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -895,12 +895,12 @@ if-ne v1, v2, :cond_5 - const v1, 0x7f120bbd + const v1, 0x7f120bbe goto :goto_3 :cond_5 - const v1, 0x7f120bbf + const v1, 0x7f120bc0 :goto_3 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(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 8f426af5e6..2b4cbc8bfa 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali @@ -376,7 +376,7 @@ if-nez p1, :cond_0 - const p1, 0x7f1206cd + const p1, 0x7f1206ce invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String; @@ -421,7 +421,7 @@ if-lt p1, p3, :cond_0 - const p1, 0x7f1206d3 + const p1, 0x7f1206d4 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -504,7 +504,7 @@ move-result-object p1 - const v0, 0x7f1206d3 + const v0, 0x7f1206d4 invoke-static {p1, v0}, Lcom/discord/app/f;->d(Landroid/content/Context;I)V @@ -754,7 +754,7 @@ aput-object v2, v1, v3 - const v2, 0x7f1206dc + const v2, 0x7f1206dd invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -786,7 +786,7 @@ if-lt v1, v2, :cond_0 - const p1, 0x7f1206d2 + const p1, 0x7f1206d3 invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String; @@ -813,7 +813,7 @@ move-result-object p1 - const v1, 0x7f100054 + const v1, 0x7f100055 new-array v0, v0, [Ljava/lang/Object; @@ -833,7 +833,7 @@ :cond_1 if-nez v2, :cond_2 - const p1, 0x7f1206db + const p1, 0x7f1206dc invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String; @@ -848,7 +848,7 @@ move-result-object p1 - const v1, 0x7f100055 + const v1, 0x7f100056 new-array v0, v0, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali index 27985ef19c..19c9370af9 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali @@ -54,7 +54,7 @@ move-result-object p1 - const v0, 0x7f120b3b + const v0, 0x7f120b3c invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali index e83a723cc8..5eb03f5438 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali @@ -225,9 +225,9 @@ if-eqz p7, :cond_0 - const p3, 0x7f1209d6 + const p3, 0x7f1209d7 - const v3, 0x7f1209d6 + const v3, 0x7f1209d7 goto :goto_0 @@ -239,9 +239,9 @@ if-eqz p3, :cond_1 - const p4, 0x7f1209e2 + const p4, 0x7f1209e3 - const v4, 0x7f1209e2 + const v4, 0x7f1209e3 goto :goto_1 diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali index 5dbeed14ff..6df9418562 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali @@ -94,7 +94,7 @@ check-cast p1, Ljava/lang/CharSequence; - const v1, 0x7f1208aa + const v1, 0x7f1208ab invoke-static {v0, p1, v1}, Lcom/discord/app/f;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali index fdf9e98b1a..8d0efdae92 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali @@ -386,7 +386,7 @@ add-int/lit8 p1, p1, 0x1 - const v0, 0x7f120977 + const v0, 0x7f120978 invoke-virtual {p2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; 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 534ac545dd..d1194ac13f 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 @@ -183,17 +183,17 @@ if-eqz v0, :cond_2 - const v0, 0x7f120aa1 + const v0, 0x7f120aa2 if-eq p1, v0, :cond_2 - const p2, 0x7f120df8 + const p2, 0x7f120df9 const/4 v0, 0x0 if-eq p1, p2, :cond_1 - const p2, 0x7f120f91 + const p2, 0x7f120f93 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 7877a145e0..9f282e2c11 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 @@ -116,7 +116,7 @@ .method private final getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence; .locals 3 - const v0, 0x7f120e60 + const v0, 0x7f120e61 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 ececae58a3..f190118403 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 @@ -330,7 +330,7 @@ if-eqz v0, :cond_0 - const v0, 0x7f120e8d + const v0, 0x7f120e8e invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -342,7 +342,7 @@ return-object p1 :cond_0 - const v0, 0x7f1209be + const v0, 0x7f1209bf const/4 v1, 0x1 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 7ef3bd05d7..bd2ebe03fe 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali @@ -954,7 +954,7 @@ goto :goto_0 :cond_2 - const p1, 0x7f120c4b + const p1, 0x7f120c4c :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/PrivateChannelMembersListModelProvider.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali index e6aea7a2b0..75dfe5a555 100644 --- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali +++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali @@ -423,7 +423,7 @@ invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const v1, 0x7f120977 + const v1, 0x7f120978 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; 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 8cb1b66d2a..25603bfe35 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 @@ -139,7 +139,7 @@ new-array v1, v1, [Ljava/lang/Object; - const v2, 0x7f120de9 + const v2, 0x7f120dea 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 fa02b15fcc..9c5526388f 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 @@ -73,7 +73,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120dea + const v1, 0x7f120deb 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/WidgetChatInputModel.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali index 17b4b8a195..0eaed0ea70 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali @@ -109,7 +109,7 @@ :cond_0 if-nez p3, :cond_1 - const p1, 0x7f120a12 + const p1, 0x7f120a13 invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -122,7 +122,7 @@ move-result-object p1 - const p2, 0x7f120dfb + const p2, 0x7f120dfc invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -785,7 +785,7 @@ return-object p1 :cond_0 - const v0, 0x7f120f76 + const v0, 0x7f120f78 :goto_0 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -795,7 +795,7 @@ return-object p1 :cond_1 - const v0, 0x7f120f6c + const v0, 0x7f120f6e goto :goto_0 .end method @@ -816,7 +816,7 @@ return-object p1 :pswitch_0 - const v0, 0x7f120794 + const v0, 0x7f120795 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -825,7 +825,7 @@ return-object p1 :pswitch_1 - const v0, 0x7f120792 + const v0, 0x7f120793 new-array v2, v2, [Ljava/lang/Object; @@ -840,7 +840,7 @@ return-object p1 :pswitch_2 - const v0, 0x7f120791 + const v0, 0x7f120792 new-array v2, v2, [Ljava/lang/Object; @@ -855,7 +855,7 @@ return-object p1 :pswitch_3 - const v0, 0x7f120793 + const v0, 0x7f120794 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$5.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali index 0607a78187..3ee37da31d 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 @@ -135,7 +135,7 @@ :cond_2 iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2; - const p2, 0x7f120a12 + const p2, 0x7f120a13 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 faa6aa1ecc..619f41d1fd 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 @@ -94,7 +94,7 @@ packed-switch p1, :pswitch_data_0 - const p1, 0x7f120d8a + const p1, 0x7f120d8b return p1 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 01f2975ecb..3bfe3cebf7 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali @@ -399,12 +399,12 @@ if-eqz v3, :cond_f - const v3, 0x7f120e90 + const v3, 0x7f120e91 goto :goto_8 :cond_f - const v3, 0x7f120b2c + const v3, 0x7f120b2d :goto_8 invoke-virtual {v0, v3}, Landroid/widget/TextView;->setText(I)V @@ -756,7 +756,7 @@ move-result-object p2 - const v0, 0x7f120d45 + const v0, 0x7f120d46 invoke-virtual {p0, v0}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String; @@ -1070,12 +1070,12 @@ if-eqz p1, :cond_1 - const p1, 0x7f120991 + const p1, 0x7f120992 goto :goto_1 :cond_1 - const p1, 0x7f120988 + const p1, 0x7f120989 :goto_1 invoke-static {}, Lcom/discord/app/g;->dx()Lrx/Observable$Transformer; 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 f0a526464a..3b03f7813b 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali @@ -245,7 +245,7 @@ move-result-object v0 - const v3, 0x7f120db6 + const v3, 0x7f120db7 new-array v2, v2, [Ljava/lang/Object; @@ -268,7 +268,7 @@ move-result-object v0 - const v3, 0x7f120db5 + const v3, 0x7f120db6 new-array v2, v2, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali index f0a9fae1e4..2f622d9847 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali @@ -404,7 +404,7 @@ if-eqz v1, :cond_3 - const v3, 0x7f120885 + const v3, 0x7f120886 goto :goto_1 @@ -425,19 +425,19 @@ if-ne v5, v6, :cond_4 - const v3, 0x7f120896 + const v3, 0x7f120897 goto :goto_1 :cond_4 if-eqz v3, :cond_5 - const v3, 0x7f120883 + const v3, 0x7f120884 goto :goto_1 :cond_5 - const v3, 0x7f12088e + const v3, 0x7f12088f :goto_1 invoke-virtual {v4, v3}, Landroid/widget/TextView;->setText(I)V @@ -683,12 +683,12 @@ if-eq v0, v1, :cond_0 - const v0, 0x7f12088a + const v0, 0x7f12088b goto :goto_0 :cond_0 - const v0, 0x7f12088c + const v0, 0x7f12088d :goto_0 invoke-virtual {p1, v0}, Landroid/widget/TextView;->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 e978469fb1..442209fc77 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali @@ -309,7 +309,7 @@ check-cast v2, Landroid/view/View; - const v5, 0x7f120fbd + const v5, 0x7f120fbf new-array v6, v4, [Ljava/lang/Object; @@ -331,7 +331,7 @@ check-cast v2, Landroid/view/View; - const v5, 0x7f120fc2 + const v5, 0x7f120fc4 new-array v6, 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 bc4c74eed1..59e510aed9 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali @@ -616,7 +616,7 @@ if-eqz v2, :cond_2 - const v4, 0x7f120880 + const v4, 0x7f120881 :goto_2 invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -628,7 +628,7 @@ goto :goto_3 :cond_2 - const v4, 0x7f12087d + const v4, 0x7f12087e goto :goto_2 @@ -639,7 +639,7 @@ move-result-object v3 - const v4, 0x7f120877 + const v4, 0x7f120878 invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(I)V @@ -695,7 +695,7 @@ :goto_4 if-eqz v3, :cond_4 - const v3, 0x7f120845 + const v3, 0x7f120846 const/4 v6, 0x1 @@ -734,14 +734,14 @@ :goto_5 if-nez v3, :cond_6 - const v3, 0x7f120844 + const v3, 0x7f120845 goto :goto_6 :cond_6 if-eqz v2, :cond_7 - const v3, 0x7f120878 + const v3, 0x7f120879 :goto_6 invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -806,7 +806,7 @@ goto :goto_9 :cond_8 - const v3, 0x7f12097b + const v3, 0x7f12097c goto :goto_8 @@ -869,7 +869,7 @@ move-result-object v1 - const v2, 0x7f12085a + const v2, 0x7f12085b invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V @@ -1077,7 +1077,7 @@ if-eqz v2, :cond_4 - const v2, 0x7f12087f + const v2, 0x7f120880 :goto_4 invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1089,7 +1089,7 @@ :cond_4 if-eqz v2, :cond_5 - const v2, 0x7f12087e + const v2, 0x7f12087f goto :goto_4 @@ -1098,7 +1098,7 @@ if-nez v2, :cond_6 - const v2, 0x7f12087c + const v2, 0x7f12087d goto :goto_4 @@ -1111,7 +1111,7 @@ if-eqz v2, :cond_8 - const v2, 0x7f12085e + const v2, 0x7f12085f new-array v3, v8, [Ljava/lang/Object; @@ -1140,7 +1140,7 @@ goto :goto_6 :cond_8 - const v2, 0x7f12087b + const v2, 0x7f12087c goto :goto_4 @@ -1395,7 +1395,7 @@ move-result-object v2 - const v3, 0x7f12084d + const v3, 0x7f12084e new-array v10, v8, [Ljava/lang/Object; @@ -1459,7 +1459,7 @@ move-result-object v3 - const v10, 0x7f100063 + const v10, 0x7f100064 invoke-virtual {v1}, Lcom/discord/models/domain/ModelInvite;->getApproximateMemberCount()I 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 9f6e674064..8a8ac2bdce 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali @@ -419,7 +419,7 @@ aput-object v6, v5, v7 - const v6, 0x7f12088b + const v6, 0x7f12088c invoke-virtual {v3, v6, v5}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -551,7 +551,7 @@ move-result-object v3 - const v6, 0x7f120ee5 + const v6, 0x7f120ee6 new-array v4, v4, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali index a5478a40fe..24bd30ef41 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali @@ -192,7 +192,7 @@ move-result-object v0 - const v1, 0x7f1209d8 + const v1, 0x7f1209d9 invoke-virtual {v0, v1}, 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 d07fb9c1fd..43055f3dc0 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali @@ -192,7 +192,7 @@ move-result-object p1 - const v3, 0x7f120e8f + const v3, 0x7f120e90 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 0397c5d912..1693518fb9 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 @@ -126,7 +126,7 @@ return-object p1 :pswitch_2 - const v0, 0x7f120de2 + const v0, 0x7f120de3 new-array v1, v2, [Ljava/lang/Object; @@ -137,7 +137,7 @@ goto :goto_0 :pswitch_3 - const v0, 0x7f120db7 + const v0, 0x7f120db8 new-array v1, v2, [Ljava/lang/Object; @@ -148,7 +148,7 @@ goto :goto_0 :pswitch_4 - const v0, 0x7f120db8 + const v0, 0x7f120db9 new-array v1, v1, [Ljava/lang/Object; @@ -196,7 +196,7 @@ if-nez v0, :cond_1 - const v0, 0x7f120de7 + const v0, 0x7f120de8 new-array v1, v2, [Ljava/lang/Object; @@ -208,7 +208,7 @@ :cond_1 :goto_1 - const v0, 0x7f120de6 + const v0, 0x7f120de7 new-array v1, v1, [Ljava/lang/Object; @@ -223,7 +223,7 @@ goto :goto_0 :pswitch_6 - const v0, 0x7f120de5 + const v0, 0x7f120de6 new-array v1, v1, [Ljava/lang/Object; 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 b3e760f3e8..4f8677e3c3 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali @@ -616,7 +616,7 @@ check-cast p2, Landroid/view/View; - const v0, 0x7f120eb7 + const v0, 0x7f120eb8 invoke-static {p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; @@ -647,7 +647,7 @@ const/4 v5, 0x1 - const v6, 0x7f10008d + const v6, 0x7f10008e const/4 v7, -0x1 diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali index 9a36072bc6..c6cba82b62 100644 --- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali +++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali @@ -207,7 +207,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/chat/manage_reactions/WidgetManageReactions;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120bec + const p1, 0x7f120bed invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/manage_reactions/WidgetManageReactions;->setActionBarTitle(I)Lkotlin/Unit; 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 f2195f9456..eb11b2ac20 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 @@ -172,12 +172,12 @@ if-eqz v1, :cond_3 - const v1, 0x7f120a0e + const v1, 0x7f120a0f goto :goto_1 :cond_3 - const v1, 0x7f120a0d + const v1, 0x7f120a0e :goto_1 invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali index fc7765ce7a..33c1df45dd 100644 --- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali +++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali @@ -180,7 +180,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120b36 + const p1, 0x7f120b37 invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->setActionBarTitle(I)Lkotlin/Unit; 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 b8a0310002..cc64911086 100644 --- a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali +++ b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali @@ -439,7 +439,7 @@ packed-switch v0, :pswitch_data_0 - const p2, 0x7f120d3f + const p2, 0x7f120d40 invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -450,7 +450,7 @@ :pswitch_0 sget-object v0, Lkotlin/jvm/internal/x;->bQg:Lkotlin/jvm/internal/x; - const v0, 0x7f120e05 + const v0, 0x7f120e06 invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -499,7 +499,7 @@ :pswitch_1 sget-object v0, Lkotlin/jvm/internal/x;->bQg:Lkotlin/jvm/internal/x; - const v0, 0x7f120e73 + const v0, 0x7f120e74 invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -540,7 +540,7 @@ :pswitch_2 sget-object v0, Lkotlin/jvm/internal/x;->bQg:Lkotlin/jvm/internal/x; - const v0, 0x7f120a96 + const v0, 0x7f120a97 invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index cf8fe19e77..8cf1feedd6 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -530,7 +530,7 @@ const-string v5, "INTENT_EXTRA_CRASH_SOURCE" - const v6, 0x7f120d8a + const v6, 0x7f120d8b invoke-virtual {p0, v6}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I)Ljava/lang/String; @@ -593,7 +593,7 @@ new-array v2, v0, [Ljava/lang/Object; - const-string v4, "8.2.9" + const-string v4, "8.3.0" aput-object v4, v2, v3 diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali index 26577b9c3b..dbf709d519 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali @@ -460,7 +460,7 @@ move-result-object p1 - const p2, 0x7f1208a4 + const p2, 0x7f1208a5 goto :goto_4 @@ -475,7 +475,7 @@ move-result-object p1 - const p2, 0x7f120971 + const p2, 0x7f120972 goto :goto_4 diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali index 64a8ec150c..8e90633864 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali @@ -101,7 +101,7 @@ if-eq p2, v2, :cond_1 - const v2, 0x7f120d99 + const v2, 0x7f120d9a if-eq p2, v2, :cond_0 diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali index 59f81d6f2e..522f2e947b 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali @@ -731,7 +731,7 @@ move-result-object v1 - const v5, 0x7f120aa5 + const v5, 0x7f120aa6 goto :goto_2 @@ -748,7 +748,7 @@ move-result-object v1 - const v5, 0x7f120833 + const v5, 0x7f120834 :goto_2 invoke-virtual {v1, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String; 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 2b461ad623..c5b2190171 100644 --- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali +++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali @@ -927,7 +927,7 @@ invoke-virtual {p0, v1, v4}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->setOnClickAndDismissListener(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V - const v1, 0x7f120d08 + const v1, 0x7f120d09 new-array v2, v2, [Ljava/lang/Object; @@ -985,12 +985,12 @@ if-eqz p1, :cond_2 - const p1, 0x7f120d4d + const p1, 0x7f120d4e goto :goto_2 :cond_2 - const p1, 0x7f1207a4 + const p1, 0x7f1207a5 :goto_2 invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->getString(I)Ljava/lang/String; 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 f19dc1bf3b..ff6093a15b 100644 --- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali +++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali @@ -424,7 +424,7 @@ if-eqz v1, :cond_0 - const p1, 0x7f120d01 + const p1, 0x7f120d02 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -437,7 +437,7 @@ if-eqz v1, :cond_1 - const p1, 0x7f120e8b + const p1, 0x7f120e8c invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -544,7 +544,7 @@ const v0, 0x7f120338 - const v1, 0x7f120e7c + const v1, 0x7f120e7d 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/guilds/invite/ViewInviteSettingsSheet.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali index bdea0ab71c..f3bb61f6cd 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali @@ -978,7 +978,7 @@ return-object p1 :cond_5 - const p1, 0x7f120a16 + const p1, 0x7f120a17 invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali index 382a0470b3..da335104c9 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali @@ -388,7 +388,7 @@ aput-object p1, v0, v1 - const p1, 0x7f1208b5 + const p1, 0x7f1208b6 invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->getString(I[Ljava/lang/Object;)Ljava/lang/String; 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 bb00005bae..25fa3b8d26 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali @@ -1088,7 +1088,7 @@ check-cast p2, Ljava/lang/CharSequence; - const v0, 0x7f1208aa + const v0, 0x7f1208ab invoke-static {p1, p2, v0}, Lcom/discord/app/f;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V @@ -1576,7 +1576,7 @@ invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v1, 0x7f120e19 + const v1, 0x7f120e1a invoke-virtual {p0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getString(I)Ljava/lang/String; @@ -1791,7 +1791,7 @@ :cond_1 invoke-static {p0, v0, v3, v2, v3}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v0, 0x7f1208bc + const v0, 0x7f1208bd invoke-virtual {p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->setActionBarTitle(I)Lkotlin/Unit; 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 c682225f20..7fea5e6345 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali @@ -964,7 +964,7 @@ if-nez p1, :cond_0 - const p1, 0x7f12085d + const p1, 0x7f12085e invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; @@ -1030,7 +1030,7 @@ return-object p1 :cond_0 - const p1, 0x7f12085f + const p1, 0x7f120860 invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; @@ -1080,7 +1080,7 @@ aput-object v3, v0, v4 - const v3, 0x7f100063 + const v3, 0x7f100064 invoke-virtual {v2, v3, p1, v0}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String; @@ -1092,7 +1092,7 @@ aput-object p1, v1, v4 - const p1, 0x7f12084e + const p1, 0x7f12084f invoke-static {p0, p1, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; @@ -1124,7 +1124,7 @@ aput-object p1, v0, v1 - const p1, 0x7f12084d + const p1, 0x7f12084e invoke-static {p0, p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; @@ -1428,7 +1428,7 @@ move-result-object v0 - const v1, 0x7f120847 + const v1, 0x7f120848 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1436,7 +1436,7 @@ move-result-object v0 - const v1, 0x7f120875 + const v1, 0x7f120876 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali index 146bec3ac7..7f97274eac 100644 --- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali +++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali @@ -113,7 +113,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 v0, 0x7f1208d2 + const v0, 0x7f1208d3 invoke-virtual {p0, v0}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2.smali index 61bcfe86d5..a86bd98803 100644 --- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2.smali +++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsList$onViewBound$2.smali @@ -157,7 +157,7 @@ move-result-object p1 - const v0, 0x7f10007d + const v0, 0x7f10007e invoke-virtual {p3}, Lcom/discord/widgets/guilds/list/WidgetGuildsListModel$Item;->getUnavailableGuildCount()I diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali index ebb2873c14..39d2cebe86 100644 --- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali +++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali @@ -235,7 +235,7 @@ if-eqz p3, :cond_6 - const p2, 0x7f1207a8 + const p2, 0x7f1207a9 invoke-virtual {p3, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -296,7 +296,7 @@ invoke-virtual {p1, v2}, Landroid/widget/TextView;->setBackgroundResource(I)V - const v2, 0x7f120985 + const v2, 0x7f120986 const/4 v3, 0x1 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 b0cfd1b5b6..682cc34d58 100644 --- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali +++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali @@ -300,7 +300,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/guilds/management/WidgetGuildManagement;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120d0f + const p1, 0x7f120d10 invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/management/WidgetGuildManagement;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali index 9ad7b1130e..e38300e5f4 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali @@ -393,7 +393,7 @@ move-result-object p1 - const v0, 0x7f120a48 + const v0, 0x7f120a49 invoke-virtual {p0, v0}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String; @@ -407,7 +407,7 @@ move-result-object p1 - const v0, 0x7f120a49 + const v0, 0x7f120a4a invoke-virtual {p0, v0}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String; @@ -421,7 +421,7 @@ move-result-object p1 - const v0, 0x7f120a15 + const v0, 0x7f120a16 invoke-virtual {p0, v0}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String; @@ -447,7 +447,7 @@ move-result-object p1 - const v0, 0x7f120a94 + const v0, 0x7f120a95 invoke-virtual {p0, v0}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->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 b49ff903a3..43910def27 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, 0x7f120f86 + const v4, 0x7f120f88 invoke-virtual {p0, v4}, Lcom/discord/widgets/media/WidgetMedia;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali index 762aa576e5..a447dd8844 100644 --- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali +++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali @@ -68,12 +68,12 @@ :goto_1 if-eqz p1, :cond_2 - const p1, 0x7f120a8a + const p1, 0x7f120a8b goto :goto_2 :cond_2 - const p1, 0x7f1208cd + const p1, 0x7f1208ce :goto_2 invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatButton;->setText(I)V 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 13ae9241ba..f4371228df 100644 --- a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali +++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali @@ -241,7 +241,7 @@ aput-object p1, v0, v1 - const p1, 0x7f120ccf + const p1, 0x7f120cd0 invoke-virtual {p0, p1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -276,7 +276,7 @@ goto :goto_1 :cond_0 - const p1, 0x7f120ccf + const p1, 0x7f120cd0 new-array v2, v2, [Ljava/lang/Object; @@ -290,7 +290,7 @@ return-object p0 :cond_1 - const p1, 0x7f120cb2 + const p1, 0x7f120cb3 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 570f2b33b6..4d1cd359a6 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 @@ -269,7 +269,7 @@ move-result-object v7 - const v14, 0x7f10008c + const v14, 0x7f10008d new-array v12, v12, [Ljava/lang/Object; 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 6fe28a8052..6477f556d9 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 @@ -70,27 +70,27 @@ packed-switch p1, :pswitch_data_0 - const p1, 0x7f120c4b + const p1, 0x7f120c4c return p1 :pswitch_0 - const p1, 0x7f120ca9 + const p1, 0x7f120caa return p1 :pswitch_1 - const p1, 0x7f120ca2 + const p1, 0x7f120ca3 return p1 :pswitch_2 - const p1, 0x7f120cab + const p1, 0x7f120cac return p1 :pswitch_3 - const p1, 0x7f120ca1 + const p1, 0x7f120ca2 return p1 @@ -120,27 +120,27 @@ packed-switch p1, :pswitch_data_0 - const p1, 0x7f120c4b + const p1, 0x7f120c4c return p1 :pswitch_0 - const p1, 0x7f120cbb + const p1, 0x7f120cbc return p1 :pswitch_1 - const p1, 0x7f120cba + const p1, 0x7f120cbb return p1 :pswitch_2 - const p1, 0x7f120cbd + const p1, 0x7f120cbe return p1 :pswitch_3 - const p1, 0x7f120cb9 + const p1, 0x7f120cba return p1 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 f98fbf33de..d697624654 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 @@ -70,32 +70,32 @@ throw v0 :pswitch_0 - const p1, 0x7f120cc3 - - return p1 - - :pswitch_1 const p1, 0x7f120cc4 return p1 + :pswitch_1 + const p1, 0x7f120cc5 + + return p1 + :pswitch_2 - const p1, 0x7f120cc8 + const p1, 0x7f120cc9 return p1 :pswitch_3 - const p1, 0x7f120cc7 + const p1, 0x7f120cc8 return p1 :pswitch_4 - const p1, 0x7f120ccb + const p1, 0x7f120ccc return p1 :pswitch_5 - const p1, 0x7f120ccc + const p1, 0x7f120ccd 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 93b05345b5..65d31c94fa 100644 --- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali @@ -174,7 +174,7 @@ move-result-object p1 - const v0, 0x7f120e83 + const v0, 0x7f120e84 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 e3418be3ee..d99de0ff67 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali @@ -487,7 +487,7 @@ invoke-static {p0, v2, v1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v0, 0x7f120a61 + const v0, 0x7f120a62 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali index 4feea9781b..db17ce64ea 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali @@ -315,11 +315,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 v1, 0x7f120a5c + const v1, 0x7f120a5d invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarTitle(I)Lkotlin/Unit; - const v1, 0x7f120ce6 + const v1, 0x7f120ce7 const/4 v2, 0x2 @@ -329,7 +329,7 @@ move-result-object p1 - const v1, 0x7f120c9c + const v1, 0x7f120c9d 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 ae3838b790..730c95ac77 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali @@ -1772,7 +1772,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, 0x7f120d06 + const p1, 0x7f120d07 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettings;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali index 038c362628..bd07730c0b 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali @@ -78,7 +78,7 @@ goto :goto_0 :cond_0 - const v0, 0x7f120d51 + const v0, 0x7f120d52 :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/WidgetServerSettingsEditIntegration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali index 83c31000f5..7ca92827fd 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali @@ -185,7 +185,7 @@ goto/16 :goto_4 :cond_0 - const v0, 0x7f120861 + const v0, 0x7f120862 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->setActionBarTitle(I)Lkotlin/Unit; @@ -630,12 +630,12 @@ if-eqz p1, :cond_0 - const p1, 0x7f100079 + const p1, 0x7f10007a goto :goto_0 :cond_0 - const p1, 0x7f100078 + const p1, 0x7f100079 :goto_0 iget-object p2, p2, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration$Model;->integration:Lcom/discord/models/domain/ModelGuildIntegration; @@ -949,7 +949,7 @@ move-result-object v3 - const v4, 0x7f100072 + const v4, 0x7f100073 const/4 v5, 0x1 diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali index d2cf6383ec..96630da258 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali @@ -271,7 +271,7 @@ iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->kickButton:Landroid/widget/TextView; - const v6, 0x7f120925 + const v6, 0x7f120926 new-array v7, v2, [Ljava/lang/Object; @@ -710,7 +710,7 @@ if-nez v0, :cond_0 - const v0, 0x7f1209e5 + const v0, 0x7f1209e6 const/4 v1, 0x1 @@ -727,7 +727,7 @@ goto :goto_0 :cond_0 - const p1, 0x7f1209e6 + const p1, 0x7f1209e7 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->getString(I)Ljava/lang/String; @@ -766,7 +766,7 @@ aput-object p1, v1, v2 - const p1, 0x7f1206e3 + const p1, 0x7f1206e4 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/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali index adcf1a290d..88a120d71d 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali @@ -139,7 +139,7 @@ iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;->roleCheckedSetting:Lcom/discord/views/CheckedSetting; - const p2, 0x7f120962 + const p2, 0x7f120963 invoke-virtual {p1, p2}, Lcom/discord/views/CheckedSetting;->A(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali index 79ff0aee21..8aa02db1f8 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali @@ -354,22 +354,22 @@ return-object p1 :pswitch_0 - const p1, 0x7f120e61 + const p1, 0x7f120e62 goto :goto_0 :pswitch_1 - const p1, 0x7f12079e + const p1, 0x7f12079f goto :goto_0 :pswitch_2 - const p1, 0x7f12079d + const p1, 0x7f12079e goto :goto_0 :pswitch_3 - const p1, 0x7f12079b + const p1, 0x7f12079c goto :goto_0 @@ -1534,7 +1534,7 @@ aget v5, v5, v6 - const v6, 0x7f12079f + const v6, 0x7f1207a0 packed-switch v5, :pswitch_data_0 @@ -1589,7 +1589,7 @@ :cond_1 if-nez v4, :cond_2 - const v2, 0x7f12079c + const v2, 0x7f12079d invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->A(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali index 314f06b42a..30f470e7df 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali @@ -47,7 +47,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120860 + const v0, 0x7f120861 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites;->setActionBarTitle(I)Lkotlin/Unit; 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 802fa53e82..a326438061 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 @@ -66,7 +66,7 @@ aput-object v3, v2, v4 - const v3, 0x7f120d43 + const v3, 0x7f120d44 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/WidgetServerSettingsInstantInvitesListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali index acd1f64ade..08ae656c13 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali @@ -263,7 +263,7 @@ iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView; - const v0, 0x7f12096c + const v0, 0x7f12096d invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V @@ -439,7 +439,7 @@ :cond_3 iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteUserName:Landroid/widget/TextView; - const v1, 0x7f12084b + const v1, 0x7f12084c invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali index 9bcd0abaf7..49b11e04f2 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali @@ -138,7 +138,7 @@ .method private final configureToolbar(Ljava/lang/String;)V .locals 3 - const v0, 0x7f120862 + const v0, 0x7f120863 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali index 4edf64e06e..4e369fd7b2 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali @@ -142,7 +142,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120975 + const v0, 0x7f120976 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali index 5c3192dfb0..1bec981788 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali @@ -294,7 +294,7 @@ .method public static synthetic lambda$updateGuild$2(Lcom/discord/widgets/servers/WidgetServerSettingsModeration;Lcom/discord/models/domain/ModelGuild;)V .locals 0 - const p1, 0x7f120d07 + const p1, 0x7f120d08 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -390,7 +390,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f1209b4 + const p1, 0x7f1209b5 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->setActionBarTitle(I)Lkotlin/Unit; @@ -442,7 +442,7 @@ aput-object v2, v1, v3 - const v2, 0x7f120f61 + const v2, 0x7f120f63 invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -466,7 +466,7 @@ aput-object v1, v0, v3 - const v1, 0x7f120f5d + const v1, 0x7f120f5f 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$configureIcon$1$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$1.smali index 213316ec21..4474bce335 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$1.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$1.smali @@ -44,7 +44,7 @@ const v1, 0x7f120338 - const v2, 0x7f120e7c + const v2, 0x7f120e7d 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 8468c74b52..d5a724bfa5 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali @@ -926,7 +926,7 @@ move-result-object v0 - const v1, 0x7f1209e9 + const v1, 0x7f1209ea const v2, 0x7f0801cc @@ -1287,7 +1287,7 @@ move-result-object v0 - const v1, 0x7f120a13 + const v1, 0x7f120a14 const v2, 0x7f0801c4 @@ -1442,7 +1442,7 @@ goto :goto_1 :cond_1 - const v1, 0x7f120d05 + const v1, 0x7f120d06 invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getString(I)Ljava/lang/String; @@ -1770,7 +1770,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120d07 + const v0, 0x7f120d08 invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V @@ -2578,7 +2578,7 @@ invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->initChannelSelectedHandler()V - const v0, 0x7f120ad1 + const v0, 0x7f120ad2 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali index d2b746cf26..780da59fd2 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali @@ -96,7 +96,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120c32 + const v0, 0x7f120c33 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->setActionBarTitle(I)Lkotlin/Unit; @@ -428,7 +428,7 @@ .method public static synthetic lambda$processRoleDrop$3(Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;Ljava/lang/Void;)V .locals 0 - const p1, 0x7f120c31 + const p1, 0x7f120c32 invoke-static {p0, p1}, Lcom/discord/app/f;->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 f0e4aba89e..a060e92cf1 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali @@ -104,7 +104,7 @@ move-result-object p0 - const v0, 0x7f12079b + const v0, 0x7f12079c invoke-static {p0, v0}, Lcom/discord/app/f;->d(Landroid/content/Context;I)V @@ -120,7 +120,7 @@ move-result-object p0 - const v0, 0x7f120e61 + const v0, 0x7f120e62 invoke-static {p0, v0}, Lcom/discord/app/f;->d(Landroid/content/Context;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 049518a1a7..71242d1d2f 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali @@ -46,7 +46,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120ce4 + const v0, 0x7f120ce5 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->setActionBarTitle(I)Lkotlin/Unit; @@ -77,7 +77,7 @@ iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->toggleMfaButton:Landroid/widget/Button; - const v1, 0x7f1206ed + const v1, 0x7f1206ee invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V @@ -93,7 +93,7 @@ :cond_1 iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->toggleMfaButton:Landroid/widget/Button; - const v1, 0x7f1206ee + const v1, 0x7f1206ef invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali index dceef52cc8..9e60726ca9 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali @@ -133,7 +133,7 @@ move-result-object v0 - const v2, 0x7f120e3d + const v2, 0x7f120e3e 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 2dbdf9940e..512e5db9ae 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali @@ -99,7 +99,7 @@ iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView; - const v4, 0x7f120f4f + const v4, 0x7f120f51 const/4 v5, 0x1 @@ -149,7 +149,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120d3e + const v0, 0x7f120d3f 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$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.smali index 319cbf3c1c..ed36ffaff0 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.smali @@ -937,7 +937,7 @@ :cond_1a iget-object v1, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context; - const v2, 0x7f12077e + const v2, 0x7f12077f invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; 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 26a40369cf..1e778c8705 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali @@ -662,7 +662,7 @@ invoke-virtual {v0}, Lcom/discord/app/AppActivity;->finish()V :cond_0 - const v0, 0x7f120783 + const v0, 0x7f120784 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali index 727c615335..a0fe10b84c 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali @@ -101,7 +101,7 @@ iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;->$context:Landroid/content/Context; - const v4, 0x7f12077e + const v4, 0x7f12077f invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; 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 de5ec81b1e..6144bceeaf 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali @@ -552,7 +552,7 @@ iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->adapter:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter; - const p1, 0x7f120783 + const p1, 0x7f120784 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->setActionBarTitle(I)Lkotlin/Unit; @@ -569,13 +569,13 @@ if-nez p1, :cond_1 - const p1, 0x7f12077f + const p1, 0x7f120780 goto :goto_1 :cond_1 :goto_0 - const p1, 0x7f12077b + const p1, 0x7f12077c :goto_1 const/4 p2, 0x0 @@ -603,13 +603,13 @@ if-nez p2, :cond_3 - const p2, 0x7f120cd0 + const p2, 0x7f120cd1 goto :goto_3 :cond_3 :goto_2 - const p2, 0x7f120c9d + const p2, 0x7f120c9e :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 5800ebdf9b..98ef1bd6c4 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali @@ -800,7 +800,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, 0x7f120fc4 + const v1, 0x7f120fc6 invoke-virtual {p0, v1}, 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 4bb65aa05c..17dfd1b63d 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1157,13 +1157,13 @@ invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const p1, 0x7f12094d + const p1, 0x7f12094e invoke-virtual {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v1 - const v2, 0x7f120f14 + const v2, 0x7f120f15 invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -1297,7 +1297,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f120f06 + const p1, 0x7f120f07 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->setActionBarTitle(I)Lkotlin/Unit; @@ -1345,7 +1345,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 8.2.9 (829)" + const-string v0, " - 8.3.0 (830)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali index 5a2fd23a08..53563351f9 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali @@ -44,7 +44,7 @@ const v1, 0x7f120338 - const v2, 0x7f120e7c + const v2, 0x7f120e7d 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/WidgetSettingsAccount$configureUI$7.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7.smali index 37bfdbe589..0089a0d600 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7.smali @@ -96,7 +96,7 @@ iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAccount$configureUI$7;->this$0:Lcom/discord/widgets/settings/WidgetSettingsAccount; - const v1, 0x7f120ae4 + const v1, 0x7f120ae5 invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsAccount;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali index fe5bde3c6f..1ba43271d3 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali @@ -1763,13 +1763,13 @@ const/4 v0, 0x0 - const v1, 0x7f120f06 + const v1, 0x7f120f07 const/4 v2, 0x2 invoke-static {p0, v1, p1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v1, 0x7f120f2a + const v1, 0x7f120f2b invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/WidgetSettingsAccount;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali index fbdf3eae38..36c4590f00 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali @@ -428,7 +428,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f120f06 + const p1, 0x7f120f07 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 ffb9903522..6de7039404 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali @@ -366,7 +366,7 @@ const/4 v0, 0x0 - const v1, 0x7f120f06 + const v1, 0x7f120f07 const/4 v2, 0x2 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 6a863cf8d9..cb4e4a0671 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 @@ -72,7 +72,7 @@ iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames; - const v3, 0x7f120eba + const v3, 0x7f120ebb invoke-virtual {v0, v3}, 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 10732b3991..ebf33072c4 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali @@ -316,7 +316,7 @@ move-result-object v0 - const v1, 0x7f120d27 + const v1, 0x7f120d28 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -349,7 +349,7 @@ move-result-object v0 - const v1, 0x7f120d22 + const v1, 0x7f120d23 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -357,7 +357,7 @@ move-result-object v0 - const v1, 0x7f120d24 + const v1, 0x7f120d25 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -648,7 +648,7 @@ move-result-object v0 - const v1, 0x7f120b25 + const v1, 0x7f120b26 const/4 v2, 0x1 @@ -747,7 +747,7 @@ const/4 v0, 0x0 - const v1, 0x7f120f06 + const v1, 0x7f120f07 const/4 v2, 0x2 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali index 1ad00b0bab..b125a28a64 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali @@ -1583,22 +1583,22 @@ return v0 :pswitch_0 - const p0, 0x7f120fd6 + const p0, 0x7f120fd8 return p0 :pswitch_1 - const p0, 0x7f120c30 + const p0, 0x7f120c31 return p0 :pswitch_2 - const p0, 0x7f1207ab + const p0, 0x7f1207ac return p0 :pswitch_3 - const p0, 0x7f12094e + const p0, 0x7f12094f return p0 @@ -1608,7 +1608,7 @@ return p0 :pswitch_5 - const p0, 0x7f1209e8 + const p0, 0x7f1209e9 return p0 @@ -1618,32 +1618,32 @@ return p0 :pswitch_7 - const p0, 0x7f1207aa + const p0, 0x7f1207ab return p0 :pswitch_8 - const p0, 0x7f120926 + const p0, 0x7f120927 return p0 :pswitch_9 - const p0, 0x7f120fd7 + const p0, 0x7f120fd9 return p0 :pswitch_a - const p0, 0x7f1208cc + const p0, 0x7f1208cd return p0 :pswitch_b - const p0, 0x7f120e79 + const p0, 0x7f120e7a return p0 :pswitch_c - const p0, 0x7f120c44 + const p0, 0x7f120c45 return p0 @@ -1658,32 +1658,32 @@ return p0 :pswitch_f - const p0, 0x7f120e3a + const p0, 0x7f120e3b return p0 :pswitch_10 - const p0, 0x7f120d9f + const p0, 0x7f120da0 return p0 :pswitch_11 - const p0, 0x7f120bc4 + const p0, 0x7f120bc5 return p0 :pswitch_12 - const p0, 0x7f120b3c + const p0, 0x7f120b3d return p0 :pswitch_13 - const p0, 0x7f1209e7 + const p0, 0x7f1209e8 return p0 :pswitch_14 - const p0, 0x7f1208cb + const p0, 0x7f1208cc return p0 @@ -1827,11 +1827,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f120f06 + const p1, 0x7f120f07 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f120927 + const p1, 0x7f120928 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarTitle(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 9d0c0d72da..2f32df166a 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali @@ -453,13 +453,13 @@ const/4 v0, 0x0 - const v1, 0x7f120f06 + const v1, 0x7f120f07 const/4 v2, 0x2 invoke-static {p0, v1, p1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v1, 0x7f120df6 + const v1, 0x7f120df7 invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarTitle(I)Lkotlin/Unit; @@ -524,7 +524,7 @@ sget-object v0, Lkotlin/jvm/internal/x;->bQg:Lkotlin/jvm/internal/x; - const v0, 0x7f120838 + const v0, 0x7f120839 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali index 2042358b8e..6fa567ba00 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali @@ -618,13 +618,13 @@ const/4 v0, 0x0 - const v1, 0x7f120f06 + const v1, 0x7f120f07 const/4 v2, 0x2 invoke-static {p0, v1, p1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v1, 0x7f120a64 + const v1, 0x7f120a65 invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->setActionBarTitle(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 503712e012..13c3c9d9c6 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 @@ -108,15 +108,15 @@ invoke-static {p5, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120ebe + const v0, 0x7f120ebf invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120ebb + const p2, 0x7f120ebc invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120ebc + const p2, 0x7f120ebd invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V @@ -128,7 +128,7 @@ invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - const p2, 0x7f120ebd + const p2, 0x7f120ebe invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali index 3a06f61bc4..cba2c056f5 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali @@ -108,15 +108,15 @@ invoke-static {p5, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120b29 + const v0, 0x7f120b2a invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120b26 + const p2, 0x7f120b27 invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120b27 + const p2, 0x7f120b28 invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V @@ -128,7 +128,7 @@ invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - const p2, 0x7f120b28 + const p2, 0x7f120b29 invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(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 a43ea5f9a4..33315b4a86 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 @@ -88,7 +88,7 @@ const/4 v1, 0x0 - const v2, 0x7f120a94 + const v2, 0x7f120a95 const/4 v3, 0x2 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 2c6d3fd85d..35765dc116 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 @@ -110,7 +110,7 @@ move-result-object p1 - const v0, 0x7f120a94 + const v0, 0x7f120a95 const/4 v1, 0x2 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 3ed499bc15..0ba959568c 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 @@ -89,7 +89,7 @@ check-cast v1, Lkotlin/jvm/functions/Function1; - const v2, 0x7f120a94 + const v2, 0x7f120a95 invoke-virtual {v0, v2, 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/settings/WidgetSettingsPrivacy.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali index 3d6b14a38a..b44e4ba7b6 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali @@ -1754,7 +1754,7 @@ move-result-object p1 - const p2, 0x7f120a94 + const p2, 0x7f120a95 const/4 v0, 0x2 @@ -2138,13 +2138,13 @@ 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 v2, 0x7f120f06 + const v2, 0x7f120f07 const/4 v3, 0x2 invoke-static {p0, v2, v1, v3, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v0, 0x7f120bb8 + const v0, 0x7f120bb9 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarTitle(I)Lkotlin/Unit; @@ -2315,7 +2315,7 @@ invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V - const v4, 0x7f120a4f + const v4, 0x7f120a50 invoke-virtual {p0, v4}, 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 29115cddb1..2e724eab3e 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 @@ -939,7 +939,7 @@ move-result-object v0 - const v1, 0x7f120d6a + const v1, 0x7f120d6b 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 3298fe0825..933c7d3968 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali @@ -451,7 +451,7 @@ invoke-static {p0, v0, v1, p1, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120f06 + const p1, 0x7f120f07 const/4 v2, 0x2 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali index ee42f66f5c..be0a14c92e 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali @@ -440,7 +440,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, 0x7f120f06 + const v1, 0x7f120f07 const/4 v2, 0x2 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali index e335458710..a60656d0eb 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali @@ -2069,6 +2069,14 @@ invoke-virtual {v1, v0}, Lcom/discord/stores/StoreMediaEngine;->setOpenSLESConfig(Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;)V :cond_3 + move-object v0, p0 + + check-cast v0, Landroidx/fragment/app/Fragment; + + const v1, 0x7f120f33 + + invoke-static {v0, v1}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V + return-void .end method @@ -2161,13 +2169,13 @@ const/4 v0, 0x0 - const v1, 0x7f120f06 + const v1, 0x7f120f07 const/4 v2, 0x2 invoke-static {p0, v1, p1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v1, 0x7f120f89 + const v1, 0x7f120f8b invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali index 7002cb25f5..60357906b1 100644 --- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali +++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali @@ -681,7 +681,7 @@ goto :goto_0 :cond_3 - const v0, 0x7f120ea9 + const v0, 0x7f120eaa :goto_0 invoke-virtual {p1, v0}, Landroid/widget/TextView;->setHint(I)V @@ -1711,7 +1711,7 @@ return-void :cond_0 - const v0, 0x7f120d40 + const v0, 0x7f120d41 invoke-virtual {p0, v0}, Lcom/discord/widgets/share/WidgetIncomingShare;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali index 7c88f81245..a63871fca5 100644 --- a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali @@ -412,7 +412,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f1209d1 + const p1, 0x7f1209d2 invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -465,7 +465,7 @@ move-result-object p1 - const v2, 0x7f1209d9 + const v2, 0x7f1209da new-array p4, p4, [Ljava/lang/Object; @@ -488,7 +488,7 @@ move-result-object p1 - const v2, 0x7f100073 + const v2, 0x7f100074 new-array v3, v0, [Ljava/lang/Object; @@ -506,7 +506,7 @@ move-result-object p2 - const v2, 0x7f1209d7 + const v2, 0x7f1209d8 new-array p4, p4, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali index 5f0ca14bc7..e3fae99b49 100644 --- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali +++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali @@ -225,7 +225,7 @@ if-eqz v0, :cond_1 - const v2, 0x7f120df0 + const v2, 0x7f120df1 invoke-direct {p0, v0, v2}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence; @@ -249,7 +249,7 @@ if-eqz v0, :cond_2 - const v1, 0x7f120bba + const v1, 0x7f120bbb 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 3f82d323d9..35df213a20 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali @@ -64,7 +64,7 @@ if-eqz v5, :cond_0 - const v6, 0x7f120eeb + const v6, 0x7f120eec new-array v7, v1, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali index e7285eb587..de5878388c 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali @@ -225,7 +225,7 @@ invoke-static {v5, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v6, 0x7f120ee5 + const v6, 0x7f120ee6 const/4 v7, 0x1 @@ -251,7 +251,7 @@ invoke-static {v3, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f120ee4 + const v5, 0x7f120ee5 new-array v8, v7, [Ljava/lang/Object; @@ -323,7 +323,7 @@ invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v3, 0x7f120ecd + const v3, 0x7f120ece invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -350,7 +350,7 @@ invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v3, 0x7f120ee8 + const v3, 0x7f120ee9 new-array v4, v7, [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 7c99eb4965..b5378030d6 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali @@ -99,7 +99,7 @@ move-result-object v2 - const v3, 0x7f120edb + const v3, 0x7f120edc const/4 v4, 0x1 @@ -187,7 +187,7 @@ move-result-object v1 - const v2, 0x7f120ed1 + const v2, 0x7f120ed2 new-array v3, 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 13256eb739..760d71cd94 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali @@ -451,7 +451,7 @@ if-eqz v5, :cond_0 - const v6, 0x7f120eeb + const v6, 0x7f120eec new-array v7, v1, [Ljava/lang/Object; @@ -854,7 +854,7 @@ move-result-wide v8 - const p1, 0x7f120eed + const p1, 0x7f120eee :goto_0 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String; @@ -886,7 +886,7 @@ move-result-wide v8 - const p1, 0x7f120eef + const p1, 0x7f120ef0 goto :goto_0 diff --git a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali index 8fa78fec67..233634ac9e 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali @@ -80,7 +80,7 @@ aput-object v2, v1, v3 - const v2, 0x7f120923 + const v2, 0x7f120924 invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/user/WidgetKickUser;->getString(I[Ljava/lang/Object;)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 9ed096c865..f72a5bb32c 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali @@ -144,7 +144,7 @@ invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const v1, 0x7f120bc3 + const v1, 0x7f120bc4 invoke-virtual {p0, v1}, Lcom/discord/widgets/user/WidgetPruneUsers;->getString(I)Ljava/lang/String; @@ -613,7 +613,7 @@ aput-object v7, v6, v3 - const v7, 0x7f10006c + const v7, 0x7f10006d invoke-virtual {v4, v7, v5, v6}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String; 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 708f943032..87ea6ebc58 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali @@ -559,7 +559,7 @@ move-result-object v0 - const v3, 0x7f120e03 + const v3, 0x7f120e04 new-array v2, v2, [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 744709b830..c2fe8266c4 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali @@ -421,7 +421,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, 0x7f120bf3 + const p1, 0x7f120bf4 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali index 297c196f10..3d17d60695 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali @@ -86,7 +86,7 @@ const v0, 0x7f0401be - const v1, 0x7f120a08 + const v1, 0x7f120a09 invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali index 41424cc59e..64450ab171 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali @@ -100,7 +100,7 @@ const v0, 0x7f0401bf - const v1, 0x7f120a09 + const v1, 0x7f120a0a invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali index d02385be15..c606c17116 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali @@ -466,7 +466,7 @@ goto :goto_0 :pswitch_0 - const p1, 0x7f120f00 + const p1, 0x7f120f01 invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -505,7 +505,7 @@ move-result-object p1 - const p2, 0x7f120eff + const p2, 0x7f120f00 invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V @@ -770,7 +770,7 @@ aput-object p1, v3, v4 - const p1, 0x7f120aa6 + const p1, 0x7f120aa7 invoke-virtual {v2, p1, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -885,7 +885,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120bc0 + const p1, 0x7f120bc1 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarTitle(I)Lkotlin/Unit; @@ -909,7 +909,7 @@ new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item; - const v4, 0x7f120f01 + const v4, 0x7f120f02 invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String; @@ -925,7 +925,7 @@ new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item; - const v4, 0x7f1209c3 + const v4, 0x7f1209c4 invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String; @@ -941,7 +941,7 @@ new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item; - const v4, 0x7f1209c2 + const v4, 0x7f1209c3 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.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali index 772e96aa34..eeb2f485f0 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali @@ -782,7 +782,7 @@ const/4 v5, 0x0 - const v2, 0x7f120d79 + const v2, 0x7f120d7a invoke-virtual {p0, v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -831,7 +831,7 @@ const/4 v5, 0x0 - const v2, 0x7f120ada + const v2, 0x7f120adb invoke-virtual {p0, v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -880,7 +880,7 @@ const/4 v5, 0x0 - const v2, 0x7f1207ad + const v2, 0x7f1207ae invoke-virtual {p0, v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -911,7 +911,7 @@ move-result v1 - const v2, 0x7f1207be + const v2, 0x7f1207bf const/4 v3, 0x0 @@ -943,7 +943,7 @@ move-result v7 - const v5, 0x7f1207b5 + const v5, 0x7f1207b6 invoke-virtual {p0, v5}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1008,7 +1008,7 @@ move-result v7 - const v5, 0x7f1207b6 + const v5, 0x7f1207b7 invoke-virtual {p0, v5}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1073,7 +1073,7 @@ move-result v7 - const p2, 0x7f1207b7 + const p2, 0x7f1207b8 invoke-virtual {p0, p2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1216,13 +1216,13 @@ const/4 v8, 0x0 - const v1, 0x7f120b9d + const v1, 0x7f120b9e invoke-virtual {p0, v1}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; move-result-object v9 - const v1, 0x7f120b4e + const v1, 0x7f120b4f new-array v2, v4, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali index 3321712392..0add3fd3b3 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali @@ -546,7 +546,7 @@ const v3, 0x7f060104 - const v4, 0x7f120d88 + const v4, 0x7f120d89 const/4 v5, 0x0 @@ -576,7 +576,7 @@ const v2, 0x7f060126 - const v3, 0x7f120d84 + const v3, 0x7f120d85 const/4 v4, 0x0 @@ -604,7 +604,7 @@ move-result-object p1 - const p2, 0x7f120d83 + const p2, 0x7f120d84 invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -612,7 +612,7 @@ const v0, 0x7f06011b - const v1, 0x7f120d82 + const v1, 0x7f120d83 invoke-direct {p0, p1, v0, v1, p2}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V @@ -632,7 +632,7 @@ move-result-object p1 - const p2, 0x7f120d86 + const p2, 0x7f120d87 invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -640,7 +640,7 @@ const v0, 0x7f06010f - const v1, 0x7f120d85 + const v1, 0x7f120d86 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 9362681672..1f788e9cc7 100644 --- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali +++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali @@ -41,7 +41,7 @@ .method private getBodyText(Landroid/content/Context;)Ljava/lang/CharSequence; .locals 1 - const v0, 0x7f120f54 + const v0, 0x7f120f56 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -73,7 +73,7 @@ aput-object v0, v1, v2 - const v0, 0x7f120f5c + const v0, 0x7f120f5e 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/WidgetUserEmailVerify.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali index 218c3be5ed..2de9a696b3 100644 --- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali +++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali @@ -67,7 +67,7 @@ move-result-object p1 - const v1, 0x7f120b7d + const v1, 0x7f120b7e invoke-static {p1, v1, v0}, Lcom/discord/app/f;->a(Landroid/content/Context;II)V @@ -242,7 +242,7 @@ aput-object p1, v0, v1 - const p1, 0x7f120f56 + const p1, 0x7f120f58 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/WidgetGlobalSearch.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali index c96717b970..3ae494930a 100644 --- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali +++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali @@ -1148,7 +1148,7 @@ new-array v2, v1, [Lkotlin/Pair; - const v3, 0x7f120f48 + const v3, 0x7f120f4a invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1164,7 +1164,7 @@ aput-object v3, v2, v4 - const v3, 0x7f120df8 + const v3, 0x7f120df9 invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1182,7 +1182,7 @@ const/4 v3, 0x2 - const v5, 0x7f120d0e + const v5, 0x7f120d0f invoke-virtual {p0, v5}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1530,7 +1530,7 @@ move-result-object p1 - const v0, 0x7f120bd4 + const v0, 0x7f120bd5 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 5f63357109..dda440d440 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 @@ -1261,7 +1261,7 @@ new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v5, 0x7f120d99 + const v5, 0x7f120d9a const/4 v6, 0x0 @@ -1294,7 +1294,7 @@ new-instance v13, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v7, 0x7f120bd1 + const v7, 0x7f120bd2 const/4 v8, 0x0 @@ -1322,7 +1322,7 @@ new-instance v11, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v6, 0x7f120d99 + const v6, 0x7f120d9a const/4 v7, 0x0 diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali index 2782133a5d..054dda94f9 100644 --- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali +++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali @@ -66,7 +66,7 @@ move-result-object p1 - const v0, 0x7f1209ba + const v0, 0x7f1209bb invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V 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 26b600b50d..058dbb23a0 100644 --- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali +++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali @@ -1115,7 +1115,7 @@ move-result-object v0 - const v1, 0x7f120c0c + const v1, 0x7f120c0d invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1167,7 +1167,7 @@ move-result-object v0 - const v1, 0x7f12091e + const v1, 0x7f12091f invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1312,12 +1312,12 @@ if-eqz v1, :cond_8 - const v1, 0x7f120d0b + const v1, 0x7f120d0c goto :goto_8 :cond_8 - const v1, 0x7f120cfe + const v1, 0x7f120cff :goto_8 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1412,12 +1412,12 @@ if-eqz v1, :cond_b - const v1, 0x7f120d0a + const v1, 0x7f120d0b goto :goto_b :cond_b - const v1, 0x7f120cfb + const v1, 0x7f120cfc :goto_b invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -2007,7 +2007,7 @@ if-eqz v10, :cond_c - const v0, 0x7f120d15 + const v0, 0x7f120d16 invoke-virtual {v11, v0}, Landroid/widget/TextView;->setText(I)V @@ -2059,7 +2059,7 @@ :cond_c move-object/from16 v18, v5 - const v0, 0x7f120bc0 + const v0, 0x7f120bc1 invoke-virtual {v11, v0}, Landroid/widget/TextView;->setText(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 600a321d28..550e33845b 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali @@ -499,7 +499,7 @@ move-result-object p1 - const v0, 0x7f120d7c + const v0, 0x7f120d7d invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetCallFailed;->getString(I)Ljava/lang/String; @@ -527,7 +527,7 @@ move-result-object p1 - const v0, 0x7f120a94 + const v0, 0x7f120a95 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 63760ac9d5..4685569c2f 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali @@ -899,7 +899,7 @@ move-result-object p1 - const v0, 0x7f120f98 + const v0, 0x7f120f9a invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(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 e61e59ee94..080179266b 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali @@ -435,12 +435,12 @@ if-eqz v5, :cond_5 - const v5, 0x7f120834 + const v5, 0x7f120835 goto :goto_2 :cond_5 - const v5, 0x7f120831 + const v5, 0x7f120832 :goto_2 invoke-virtual {v0, v5}, Landroid/widget/TextView;->setText(I)V @@ -455,12 +455,12 @@ if-eqz v5, :cond_6 - const v5, 0x7f120f79 + const v5, 0x7f120f7b goto :goto_3 :cond_6 - const v5, 0x7f120f89 + const v5, 0x7f120f8b :goto_3 invoke-virtual {v0, v5}, Landroid/widget/TextView;->setText(I)V 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 f9e6e42dee..6f1efa5166 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali @@ -92,7 +92,7 @@ iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceOngoingUserCountLabel:Landroid/widget/TextView; - const v1, 0x7f120a98 + const v1, 0x7f120a99 const/4 v2, 0x1 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 c4e8e7c69c..9395b02656 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 @@ -52,7 +52,7 @@ move-result-object p1 - const v0, 0x7f120f4a + const v0, 0x7f120f4c invoke-static {p1, v0}, Lcom/discord/app/f;->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 e31b0b337c..540b411f7e 100644 --- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali +++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali @@ -894,12 +894,12 @@ if-eqz v3, :cond_1 - const v3, 0x7f120e8d + const v3, 0x7f120e8e goto :goto_1 :cond_1 - const v3, 0x7f1209bc + const v3, 0x7f1209bd :goto_1 invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -952,7 +952,7 @@ if-eqz p1, :cond_2 - const p1, 0x7f120e86 + const p1, 0x7f120e87 goto :goto_2 @@ -1044,7 +1044,7 @@ move-result-object v0 - const v4, 0x7f120e7a + const v4, 0x7f120e7b goto :goto_5 @@ -1117,7 +1117,7 @@ move-result-object v3 - const v4, 0x7f120a98 + const v4, 0x7f120a99 new-array v1, v1, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali index f1e6f51fa9..9dd1db51a8 100644 --- a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali +++ b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali @@ -191,7 +191,7 @@ new-instance v3, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader; - const v4, 0x7f120830 + const v4, 0x7f120831 invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -270,7 +270,7 @@ new-instance v0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader; - const v3, 0x7f120a1b + const v3, 0x7f120a1c invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; 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 e04a3979cc..03f824a7d4 100644 --- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali +++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali @@ -1121,7 +1121,7 @@ move-result-object p1 - const v0, 0x7f120a16 + const v0, 0x7f120a17 invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -1134,7 +1134,7 @@ move-result-object v0 - const v1, 0x7f10007a + const v1, 0x7f10007b const/4 v2, 0x1 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 8a6c2c5a9f..7fe3ed9413 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 @@ -104,23 +104,23 @@ .field public static final fab_transformation_sheet_behavior:I = 0x7f1204d6 -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1207a0 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1207a1 -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209bb +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209bc -.field public static final password_toggle_content_description:I = 0x7f120ae5 +.field public static final password_toggle_content_description:I = 0x7f120ae6 -.field public static final path_password_eye:I = 0x7f120ae8 +.field public static final path_password_eye:I = 0x7f120ae9 -.field public static final path_password_eye_mask_strike_through:I = 0x7f120ae9 +.field public static final path_password_eye_mask_strike_through:I = 0x7f120aea -.field public static final path_password_eye_mask_visible:I = 0x7f120aea +.field public static final path_password_eye_mask_visible:I = 0x7f120aeb -.field public static final path_password_strike_through:I = 0x7f120aeb +.field public static final path_password_strike_through:I = 0x7f120aec -.field public static final search_menu_title:I = 0x7f120cd2 +.field public static final search_menu_title:I = 0x7f120cd3 -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 # 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 84595e3d46..8fc197780f 100644 --- a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali +++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali @@ -138,31 +138,31 @@ .field public static final flash_on:I = 0x7f1204e7 -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1207a0 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1207a1 -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209bb +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209bc -.field public static final password_toggle_content_description:I = 0x7f120ae5 +.field public static final password_toggle_content_description:I = 0x7f120ae6 -.field public static final path_password_eye:I = 0x7f120ae8 +.field public static final path_password_eye:I = 0x7f120ae9 -.field public static final path_password_eye_mask_strike_through:I = 0x7f120ae9 +.field public static final path_password_eye_mask_strike_through:I = 0x7f120aea -.field public static final path_password_eye_mask_visible:I = 0x7f120aea +.field public static final path_password_eye_mask_visible:I = 0x7f120aeb -.field public static final path_password_strike_through:I = 0x7f120aeb +.field public static final path_password_strike_through:I = 0x7f120aec -.field public static final request_permission_msg:I = 0x7f120c1b +.field public static final request_permission_msg:I = 0x7f120c1c -.field public static final search_menu_title:I = 0x7f120cd2 +.field public static final search_menu_title:I = 0x7f120cd3 -.field public static final selection_shrink_scale:I = 0x7f120ce8 +.field public static final selection_shrink_scale:I = 0x7f120ce9 -.field public static final send_contents:I = 0x7f120cf3 +.field public static final send_contents:I = 0x7f120cf4 -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 -.field public static final storage_permission_denied_msg:I = 0x7f120d8e +.field public static final storage_permission_denied_msg:I = 0x7f120d8f # 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 e2bfc3749a..cb5ac1107b 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 @@ -72,19 +72,19 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120cd2 +.field public static final search_menu_title:I = 0x7f120cd3 -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 -.field public static final ucrop_error_input_data_is_absent:I = 0x7f120e74 +.field public static final ucrop_error_input_data_is_absent:I = 0x7f120e75 -.field public static final ucrop_label_edit_photo:I = 0x7f120e75 +.field public static final ucrop_label_edit_photo:I = 0x7f120e76 -.field public static final ucrop_label_original:I = 0x7f120e76 +.field public static final ucrop_label_original:I = 0x7f120e77 -.field public static final ucrop_menu_crop:I = 0x7f120e77 +.field public static final ucrop_menu_crop:I = 0x7f120e78 -.field public static final ucrop_mutate_exception_hint:I = 0x7f120e78 +.field public static final ucrop_mutate_exception_hint:I = 0x7f120e79 # 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 59331011fc..90fead61b6 100644 --- a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali +++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali @@ -72,19 +72,19 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120cd2 +.field public static final search_menu_title:I = 0x7f120cd3 -.field public static final status_bar_notification_info_overflow:I = 0x7f120d81 +.field public static final status_bar_notification_info_overflow:I = 0x7f120d82 -.field public static final ucrop_error_input_data_is_absent:I = 0x7f120e74 +.field public static final ucrop_error_input_data_is_absent:I = 0x7f120e75 -.field public static final ucrop_label_edit_photo:I = 0x7f120e75 +.field public static final ucrop_label_edit_photo:I = 0x7f120e76 -.field public static final ucrop_label_original:I = 0x7f120e76 +.field public static final ucrop_label_original:I = 0x7f120e77 -.field public static final ucrop_menu_crop:I = 0x7f120e77 +.field public static final ucrop_menu_crop:I = 0x7f120e78 -.field public static final ucrop_mutate_exception_hint:I = 0x7f120e78 +.field public static final ucrop_mutate_exception_hint:I = 0x7f120e79 # direct methods