From 36f9d846fac84003c724e59376c281d80eb2ff49 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 19 Mar 2019 00:03:40 +0100 Subject: [PATCH] Changes of com.discord v860 --- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 27548 -> 27548 bytes .../res/drawable-xxhdpi/bg_nitro_classic.png | Bin 103373 -> 103374 bytes .../res/layout-v17/premium_upsell_dialog.xml | 2 +- .../res/layout/premium_upsell_dialog.xml | 2 +- com.discord/res/values-bg/strings.xml | 1 - com.discord/res/values-cs/strings.xml | 1 - com.discord/res/values-da/strings.xml | 1 - com.discord/res/values-de/strings.xml | 1 - com.discord/res/values-el/strings.xml | 1 - com.discord/res/values-es-rES/strings.xml | 1 - com.discord/res/values-fi/strings.xml | 1 - com.discord/res/values-fr/strings.xml | 1 - com.discord/res/values-hr/strings.xml | 1 - com.discord/res/values-hu/strings.xml | 1 - com.discord/res/values-it/strings.xml | 1 - com.discord/res/values-ja/strings.xml | 1 - com.discord/res/values-ko/strings.xml | 1 - com.discord/res/values-lt/strings.xml | 1 - com.discord/res/values-nl/strings.xml | 1 - com.discord/res/values-no/strings.xml | 1 - com.discord/res/values-pl/strings.xml | 1 - com.discord/res/values-pt-rBR/strings.xml | 1 - com.discord/res/values-ro/strings.xml | 1 - com.discord/res/values-ru/strings.xml | 1 - com.discord/res/values-sv-rSE/strings.xml | 1 - com.discord/res/values-th/strings.xml | 3 - com.discord/res/values-tr/strings.xml | 1 - com.discord/res/values-uk/strings.xml | 1 - com.discord/res/values-vi/strings.xml | 3 - com.discord/res/values-zh-rCN/strings.xml | 1 - com.discord/res/values-zh-rTW/strings.xml | 1 - com.discord/res/values/public.xml | 8013 ++++++++--------- com.discord/res/values/strings.xml | 7 +- .../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/a.smali | 28 +- com.discord/smali/com/discord/a/c.smali | 62 +- .../smali/com/discord/app/AppFragment$b.smali | 2 +- .../smali/com/discord/app/AppFragment$c.smali | 2 +- .../com/discord/app/AppPermissions.smali | 6 +- com.discord/smali/com/discord/app/a/a.smali | 20 +- com.discord/smali/com/discord/app/e.smali | 62 +- com.discord/smali/com/discord/app/f.smali | 4 +- .../smali/com/discord/gateway/R$string.smali | 64 +- .../smali/com/discord/restapi/R$string.smali | 64 +- .../com/discord/stores/StoreChangeLog.smali | 4 +- ...MembersLazy$makeGroup$textResolver$1.smali | 4 +- .../com/discord/stores/StoreChannels.smali | 4 +- .../discord/stores/StoreClientVersion.smali | 2 +- ...reMediaNotification$NotificationData.smali | 62 +- .../StoreMediaNotification$init$3.smali | 2 +- .../stores/StoreNavigation$init$6.smali | 4 +- .../com/discord/stores/StoreNavigation.smali | 4 +- .../stores/StoreUserGuildSettings.smali | 18 +- .../discord/stores/StoreUserSettings.smali | 8 +- .../analytics/AnalyticSuperProperties.smali | 6 +- .../auditlogs/AuditLogChangeUtils.smali | 266 +- .../utilities/auditlogs/AuditLogUtils.smali | 324 +- ...Helper$ensurePlayServicesAvailable$2.smali | 2 +- .../captcha/CaptchaHelper$showCaptcha$2.smali | 2 +- .../utilities/captcha/CaptchaHelper.smali | 10 +- .../utilities/channel/ChannelUtils.smali | 8 +- .../com/discord/utilities/error/Error.smali | 26 +- .../utilities/fcm/NotificationData.smali | 34 +- .../utilities/fcm/NotificationRenderer.smali | 18 +- .../GameDetectionService$Companion.smali | 6 +- .../images/MGImages$requestAvatarCrop$1.smali | 2 +- .../discord/utilities/images/MGImages.smali | 2 +- .../utilities/intent/IntentUtils.smali | 2 +- .../utilities/notices/NoticeBuilders.smali | 14 +- .../ManageGuildContext$Companion.smali | 172 +- .../permissions/ManageGuildContext.smali | 9 +- .../PresenceUtils$getActivity$1.smali | 8 +- .../utilities/presence/PresenceUtils.smali | 16 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../utilities/rest/RestAPIAbortMessages.smali | 8 +- .../discord/utilities/rest/SendUtils.smali | 6 +- .../strings/ContextSearchStringProvider.smali | 20 +- ...ulViews$FragmentOnBackPressedHandler.smali | 6 +- .../textprocessing/MessageUtils.smali | 10 +- .../utilities/textprocessing/Rules.smali | 24 +- .../textprocessing/node/InviteNode.smali | 2 +- ...oregroundService$NotificationBuilder.smali | 10 +- .../views/ActiveSubscriptionView$a.smali | 6 +- .../discord/views/steps/StepsView$b$a.smali | 12 +- .../discord/views/steps/StepsView$b$b.smali | 18 +- .../widgets/auth/WidgetAuthInviteInfo.smali | 6 +- .../WidgetAuthLogin$onViewBound$5$1.smali | 2 +- .../auth/WidgetAuthLogin$onViewBound$5.smali | 8 +- .../widgets/auth/WidgetAuthLogin.smali | 6 +- .../discord/widgets/auth/WidgetAuthMfa.smali | 6 +- ...thRegister$configureRegisterButton$2.smali | 10 +- .../widgets/auth/WidgetAuthRegister.smali | 16 +- ...vite$configureOnPostRegistration$1$2.smali | 4 +- ...sterInvite$configureRegisterButton$2.smali | 4 +- ...dgetAuthRegisterInvite$onViewBound$6.smali | 2 +- .../auth/WidgetAuthRegisterInvite.smali | 10 +- .../WidgetChannelGroupDMSettings.smali | 16 +- .../WidgetChannelNotificationSettings.smali | 6 +- ...SettingsEditPermissions$ModelForRole.smali | 4 +- ...SettingsEditPermissions$ModelForUser.smali | 4 +- ...WidgetChannelSettingsEditPermissions.smali | 4 +- ...etChannelSettingsPermissionsOverview.smali | 6 +- .../WidgetChannelTopic$Model$Companion.smali | 2 +- .../channels/WidgetCreateChannel.smali | 20 +- .../channels/WidgetGroupInviteFriends.smali | 12 +- ...getTextChannelSettings$configureUI$6.smali | 2 +- ...getTextChannelSettings$saveChannel$1.smali | 4 +- .../channels/WidgetTextChannelSettings.smali | 22 +- ...el$Companion$getPrivateChannelList$1.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 | 8 +- ...ivateChannelMembersListModelProvider.smali | 2 +- ...putAttachments$DiscordCameraFragment.smali | 2 +- ...achments$PermissionsEmptyListAdapter.smali | 2 +- .../input/WidgetChatInputAttachments.smali | 8 +- .../chat/input/WidgetChatInputModel.smali | 18 +- ...putSend$configureSendListeners$1$1$1.smali | 2 +- ...atInputSend$configureSendListeners$5.smali | 6 +- ...dgetChatInputEmojiAdapter$HeaderItem.smali | 66 +- .../WidgetChatListActions$configureUI$8.smali | 2 +- .../chat/list/WidgetChatListActions.smali | 16 +- .../WidgetChatListAdapterItemBlocked.smali | 2 +- ...WidgetChatListAdapterItemCallMessage.smali | 4 +- .../WidgetChatListAdapterItemGameInvite.smali | 12 +- .../list/WidgetChatListAdapterItemGift.smali | 32 +- ...idgetChatListAdapterItemGuildWelcome.smali | 4 +- .../WidgetChatListAdapterItemInvite.smali | 30 +- ...getChatListAdapterItemListenTogether.smali | 6 +- ...WidgetChatListAdapterItemNewMessages.smali | 2 +- .../list/WidgetChatListAdapterItemStart.smali | 10 +- ...ItemSystemMessage$getSystemMessage$1.smali | 12 +- ...getChatListAdapterItemUploadProgress.smali | 2 +- .../WidgetManageReactions.smali | 2 +- .../WidgetChannelPinnedMessages$Model.smali | 4 +- .../pins/WidgetChannelPinnedMessages.smali | 2 +- .../chat/typing/WidgetChatTypingUsers.smali | 10 +- .../widgets/debugging/WidgetDebugging.smali | 2 +- .../widgets/debugging/WidgetFatalCrash.smali | 16 +- .../widgets/friends/WidgetFriendsAdd.smali | 2 +- ...FriendsAddUserAdapter$UserViewHolder.smali | 4 +- .../widgets/friends/WidgetFriendsList.smali | 14 +- .../WidgetFriendsListAdapter$ItemUser.smali | 4 +- ...ldActionsSheet$Model$Companion$get$2.smali | 80 +- .../actions/WidgetGuildActionsSheet.smali | 6 +- .../guilds/create/WidgetGuildCreate.smali | 12 +- .../invite/ViewInviteSettingsSheet.smali | 2 +- .../guilds/invite/WidgetGuildInvite.smali | 2 +- .../invite/WidgetGuildInviteShare.smali | 6 +- .../guilds/invite/WidgetInviteInfo.smali | 16 +- .../join/WidgetGuildJoin$ToolbarButton.smali | 2 +- .../list/WidgetGuildsListAdapter$Item.smali | 4 +- .../management/WidgetGuildManagement.smali | 2 +- .../main/WidgetMainHeaderManager.smali | 4 +- .../main/WidgetMainPanelNoChannels.smali | 4 +- .../widgets/main/WidgetMainSurveyDialog.smali | 8 +- ...getMedia$onViewBoundOrOnResume$1$1$1.smali | 2 +- ...getMedia$onViewBoundOrOnResume$1$1$2.smali | 2 +- .../discord/widgets/media/WidgetMedia.smali | 2 +- .../notice/WidgetNoticeDialog$Companion.smali | 2 +- ...uxPostRegistrationJoin$onViewBound$2.smali | 4 +- .../widgets/search/WidgetSearch$Model.smali | 6 +- ...hSuggestionsAdapter$FilterViewHolder.smali | 20 +- ...hSuggestionsAdapter$HeaderViewHolder.smali | 12 +- ...ewHolder$CategoryOverridesViewHolder.smali | 2 +- ...iewHolder$ChannelOverridesViewHolder.smali | 2 +- ...ficationsOverridesAdapter$ViewHolder.smali | 6 +- ...sChannelListAdapter$CategoryListItem.smali | 2 +- .../servers/WidgetServerNotifications.smali | 8 +- ...tServerNotificationsOverrideSelector.smali | 6 +- ...ServerSettings$Model$Companion$get$1.smali | 16 +- .../servers/WidgetServerSettings.smali | 2 +- .../servers/WidgetServerSettingsBans.smali | 10 +- .../WidgetServerSettingsChannels.smali | 6 +- .../WidgetServerSettingsEditIntegration.smali | 2 +- .../WidgetServerSettingsEditMember.smali | 10 +- ...sEditMemberRolesAdapter$RoleListItem.smali | 2 +- .../WidgetServerSettingsEditRole.smali | 18 +- ...Emojis$Adapter$EmojiHeaderViewHolder.smali | 2 +- ...mojis$Adapter$EmojiSectionViewHolder.smali | 4 +- ...ServerSettingsEmojis$Model$Companion.smali | 2 +- ...rverSettingsEmojis$showMediaPicker$1.smali | 4 +- .../servers/WidgetServerSettingsEmojis.smali | 2 +- .../WidgetServerSettingsEmojisEdit.smali | 4 +- .../WidgetServerSettingsInstantInvites.smali | 2 +- ...ingsInstantInvitesActions$onResume$3.smali | 2 +- ...ServerSettingsInstantInvitesListItem.smali | 4 +- .../WidgetServerSettingsIntegrations.smali | 2 +- ...etServerSettingsIntegrationsListItem.smali | 4 +- .../servers/WidgetServerSettingsMembers.smali | 8 +- .../WidgetServerSettingsModeration.smali | 8 +- ...erSettingsOverview$configureIcon$1$1.smali | 4 +- .../WidgetServerSettingsOverview.smali | 10 +- .../WidgetServerSettingsRolesList.smali | 4 +- ...ettingsRolesListAdapter$RoleListItem.smali | 6 +- ...rverSettingsSecurity$ToggleMfaDialog.smali | 4 +- .../WidgetServerSettingsSecurity.smali | 6 +- ...idgetServerSettingsTransferOwnership.smali | 2 +- .../WidgetServerSettingsVanityUrl.smali | 4 +- ...ttingsAuditLog$Model$Companion$get$1.smali | 2 +- .../WidgetServerSettingsAuditLog.smali | 4 +- ...LogFilterSheet$Model$Companion$get$2.smali | 2 +- ...getServerSettingsAuditLogFilterSheet.smali | 10 +- .../widgets/settings/WidgetChangeLog.smali | 8 +- .../widgets/settings/WidgetSettings.smali | 10 +- .../settings/WidgetSettingsAppearance.smali | 2 +- .../settings/WidgetSettingsBehavior.smali | 6 +- .../settings/WidgetSettingsDeveloper.smali | 2 +- ...$configureUI$$inlined$apply$lambda$2.smali | 6 +- .../settings/WidgetSettingsGames.smali | 12 +- .../settings/WidgetSettingsLanguage.smali | 62 +- .../settings/WidgetSettingsMedia.smali | 6 +- .../WidgetSettingsNotifications.smali | 4 +- ...Privacy$configurePrivacyControls$1$1.smali | 8 +- ...Privacy$configurePrivacyControls$2$1.smali | 8 +- ...Privacy$configureRequestDataButton$1.smali | 2 +- ...SettingsPrivacy$onRequestDataClick$1.smali | 6 +- ...SettingsPrivacy$onRequestDataClick$2.smali | 6 +- ...SettingsPrivacy$onRequestDataClick$4.smali | 8 +- .../settings/WidgetSettingsPrivacy.smali | 16 +- ...gsUserConnections$Adapter$ViewHolder.smali | 4 +- .../WidgetSettingsUserConnections.smali | 4 +- ...WidgetSettingsUserConnectionsAddXbox.smali | 6 +- .../settings/WidgetSettingsVoice.smali | 6 +- .../WidgetSettingsAccount$configureUI$4.smali | 2 +- ...idgetSettingsAccount$configureUI$6$1.smali | 4 +- ...ttingsAccount$showRemove2FAModal$1$1.smali | 2 +- .../account/WidgetSettingsAccount.smali | 10 +- ...r$BackupCodeViewHolder$onConfigure$1.smali | 2 +- ...upCodes$Adapter$BackupCodeViewHolder.smali | 2 +- ...sAccountBackupCodes$getBackupCodes$1.smali | 4 +- .../WidgetSettingsAccountBackupCodes.smali | 10 +- .../WidgetSettingsAccountChangePassword.smali | 10 +- ...getSettingsAccountEdit$configureUI$1.smali | 2 +- .../account/WidgetSettingsAccountEdit.smali | 12 +- .../account/mfa/WidgetEnableMFADownload.smali | 2 +- .../account/mfa/WidgetEnableMFAKey.smali | 8 +- .../account/mfa/WidgetEnableMFASteps.smali | 2 +- ...dapter$PaymentSourceHeaderViewHolder.smali | 2 +- .../settings/billing/PaymentSourceView.smali | 6 +- ...urceEditDialog$deletePaymentSource$1.smali | 2 +- ...ceEditDialog$initPaymentSourceInfo$2.smali | 6 +- ...urceEditDialog$updatePaymentSource$1.smali | 2 +- .../WidgetPaymentSourceEditDialog.smali | 150 +- .../billing/WidgetSettingsBilling.smali | 6 +- .../nitro/WidgetCancelPremiumDialog.smali | 14 +- .../nitro/WidgetSettingsPremium.smali | 52 +- .../nitro/WidgetUpgradePremiumDialog.smali | 14 +- ...idgetIncomingShare$onSendClicked$3$2.smali | 2 +- .../widgets/share/WidgetIncomingShare.smali | 6 +- .../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 +- .../user/WidgetBanUser$onViewBound$3$1.smali | 2 +- ...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 | 28 +- ...$Model$Badge$getBadgeClickListener$1.smali | 2 +- .../user/WidgetUserProfileHeader.smali | 26 +- .../widgets/user/WidgetUserStatusSheet.smali | 12 +- .../account/WidgetUserAccountVerify.smali | 4 +- .../user/email/WidgetUserEmailUpdate.smali | 2 +- .../user/email/WidgetUserEmailVerify.smali | 4 +- .../user/search/ViewGlobalSearchItem.smali | 2 +- .../user/search/WidgetGlobalSearch.smali | 10 +- .../WidgetGlobalSearchModel$Companion.smali | 6 +- ...t$configureAdministrativeSection$9$1.smali | 2 +- .../user/usersheet/WidgetUserSheet.smali | 16 +- ...WidgetCallFailed$sendFriendRequest$1.smali | 2 +- .../widgets/voice/call/WidgetCallFailed.smali | 6 +- .../voice/call/WidgetPrivateCall.smali | 2 +- .../voice/call/WidgetVoiceCallIncoming.smali | 12 +- .../voice/call/WidgetVoiceCallInline.smali | 16 +- .../VoiceControlsView$configureUI$1.smali | 2 +- .../voice/fullscreen/VoiceControlsView.smali | 18 +- .../voice/model/CallModel$Companion.smali | 4 +- ...etVoiceChannelSettings$saveChannel$1.smali | 2 +- .../settings/WidgetVoiceChannelSettings.smali | 10 +- .../com/google/android/gms/base/R$b.smali | 34 +- .../com/google/android/gms/common/R$a.smali | 2 +- .../google/android/material/R$string.smali | 28 +- .../com/google/firebase/messaging/R$a.smali | 2 +- .../com/lytefast/flexinput/R$g.smali | 66 +- .../miguelgaeta/media_picker/R$string.smali | 14 +- .../com/yalantis/ucrop/R$g.smali | 14 +- 323 files changed, 5712 insertions(+), 5720 deletions(-) diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 5582967476..0e5591b232 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-859.apk +apkFileName: com.discord-860.apk compressionType: false doNotCompress: - arsc @@ -469,5 +469,5 @@ usesFramework: tag: null version: 2.4.1-cc194d-SNAPSHOT versionInfo: - versionCode: '859' - versionName: 8.5.9 + versionCode: '860' + versionName: 8.6.0 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 9561620bc9..39f469ab31 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! # -#Sat Mar 16 01:14:07 UTC 2019 -version_name=8.5.9 +#Mon Mar 18 21:23:24 UTC 2019 +version_name=8.6.0 package_name=com.discord -build_id=7dc6f21a-b718-4669-a77e-d9e1a83e5415 -version_code=859 +build_id=4cb5a3cd-6928-4a26-945f-b8df83954e19 +version_code=860 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 3cc71f7a25a8696855af51bb39ab3c33ebbc04d4..dc15d1ea467acad5036d0b909d60805218070fc3 100644 GIT binary patch delta 41 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 delta 15240 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 - diff --git a/com.discord/res/layout/premium_upsell_dialog.xml b/com.discord/res/layout/premium_upsell_dialog.xml index 9d08a83e81..ad692a3374 100644 --- a/com.discord/res/layout/premium_upsell_dialog.xml +++ b/com.discord/res/layout/premium_upsell_dialog.xml @@ -1,5 +1,5 @@ - diff --git a/com.discord/res/values-bg/strings.xml b/com.discord/res/values-bg/strings.xml index a87c942d82..5b593e5ea7 100644 --- a/com.discord/res/values-bg/strings.xml +++ b/com.discord/res/values-bg/strings.xml @@ -131,7 +131,6 @@ Ранен достъп Можете да получите моментален достъп за игра и да ни помогнете да разработим играта, но това е незавършена версия, която може да се промени или не. Покажи всички DLC - всички игри Първо в Discord Безплатно за игра Безплатно с Nitro diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml index b8c259573f..c542b5e33c 100644 --- a/com.discord/res/values-cs/strings.xml +++ b/com.discord/res/values-cs/strings.xml @@ -130,7 +130,6 @@ Předběžný přístup Můžeš získat okamžitý přístup a začít hrát a pomáhat tak s vývojem hry. Ale nezapomeň, že se jedná o neúplný zážitek, který se může a nemusí dále měnit. Zobrazit veškerý obsah ke stažení - všechny hry První na Discordu Zdarma S Nitrem zdarma diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml index 0ecd203310..7227100fdd 100644 --- a/com.discord/res/values-da/strings.xml +++ b/com.discord/res/values-da/strings.xml @@ -120,7 +120,6 @@ Tidlig adgang Du kan få øjeblikkelig adgang til at begynde at spille og hjælpe med at udvikle spillet, men bemærk, at det er en ufuldstændig oplevelse, og at det kun måske ændrer sig i fremtiden. Vis alle DLC - alle spil Først på Discord Gratis at spille Gratis med Nitro diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml index d5ead88113..a6b2e750f9 100644 --- a/com.discord/res/values-de/strings.xml +++ b/com.discord/res/values-de/strings.xml @@ -168,7 +168,6 @@ Herunterladbare Inhalte Du kannst sofort mit dem Spielen loslegen und bei der Entwicklung des Spiels helfen. Bedenke, dass es sich nicht um eine finale Spielversion handelt und es noch Änderungen geben kann. Alle DLC anzeigen - Alle Spiele Premiere bei Discord Kostenfrei spielbar Kostenfrei mit Nitro diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml index 9f9c1a810c..d7ab1f5d9d 100644 --- a/com.discord/res/values-el/strings.xml +++ b/com.discord/res/values-el/strings.xml @@ -167,7 +167,6 @@ Πρώιμη Πρόσβαση Μπορείτε να αποκτήσετε άμεση πρόσβαση για να ξεκινήσετε να παίζετε το παιχνίδι και να βοηθήσετε στην ανάπτυξη του παιχνιδιού, αλλά σημειώστε ότι είναι μια ατελής εμπειρία και μπορεί να αλλάξει ή να μην αλλάξει στο μέλλον. Δες το σύνολο του Περιεχομένου προς λήψη (DLC) - όλα τα παιχνίδια Πρώτα Στη Discord Παιχνίδι χωρίς χρέωση Δωρεάν με το Nitro diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml index ff7a1a7b44..d55725585b 100644 --- a/com.discord/res/values-es-rES/strings.xml +++ b/com.discord/res/values-es-rES/strings.xml @@ -159,7 +159,6 @@ peligroso de otorgar." Acceso anticipado Puedes obtener acceso inmediato para empezar a jugar y ayudar al desarrollo del juego, pero no olvides que se trata de una experiencia incompleta que podría o no cambiar más adelante. Mostrar todo el contenido descargable - todos los juegos Gratis Gratis con Nitro Acción diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml index af23592dcf..7189c1602b 100644 --- a/com.discord/res/values-fi/strings.xml +++ b/com.discord/res/values-fi/strings.xml @@ -186,7 +186,6 @@ Ennakkojulkaisu Pääset heti pelaamaan ja voit auttaa pelin kehittämisessä. Huomaa kuitenkin, että pelikokemus ei ole viimeistelty ja julkaisuversio voi ehkä olla erilainen. Näytä kaikki ladattava sisältö - kaikki pelit Ensimmäisenä Discordissa Ilmaiseksi pelattava Ilmainen Nitron kanssa diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml index 0c829ecfb4..b3ec564911 100644 --- a/com.discord/res/values-fr/strings.xml +++ b/com.discord/res/values-fr/strings.xml @@ -183,7 +183,6 @@ Accès anticipé "Tu peux obtenir un accès instantané pour commencer à jouer au jeu et aider à le développer, mais note bien qu'il s'agit d'une expérience incomplète et qu'il est possible que le jeu soit soumis ou non à des changements." Montrer tous les DLC - tous les jeux Découvert sur Discord Gratuit avec Nitro Action-aventure diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml index 2f2a74e0e3..c718ca3c74 100644 --- a/com.discord/res/values-hr/strings.xml +++ b/com.discord/res/values-hr/strings.xml @@ -179,7 +179,6 @@ Rani pristup Možeš momentalno dobiti pristup za početak igranja i da nam pomogneš u razvoju igre, no napominjemo da je to nepotpuno iskustvo i možda se promijeni, ali možda se i neće promijeniti. Prikaži sve DLC - sve igre Premijerno na Discordu Besplatno igranje Besplatno s Nitrom diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml index 614c0f8600..9536884908 100644 --- a/com.discord/res/values-hu/strings.xml +++ b/com.discord/res/values-hu/strings.xml @@ -187,7 +187,6 @@ Korai hozzáférés Azonnali hozzáférést kaphatsz a játékhoz és segíthetsz a fejlesztésben, de vedd figyelembe, hogy ez egy hiányos tapasztalat, amely változhat vagy sem a jövőben. Az összes letölthető tartalom megjelenítése - összes játék Elsőként a Discordon Ingyenesen játszható Ingyenes a Nitróval diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml index 1c414e027a..69643da206 100644 --- a/com.discord/res/values-it/strings.xml +++ b/com.discord/res/values-it/strings.xml @@ -185,7 +185,6 @@ Accesso anticipato "Ottieni l'accesso immediato al gioco e contribuisci al suo sviluppo, ma tieni a mente che si tratta di un gioco incompleto e che in futuro potrebbe subire o meno dei cambiamenti." Mostra tutti i DLC - tutti i giochi Per primo su Discord Gratis con Nitro Azione diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml index ca02a4ceed..a5ec6f2db5 100644 --- a/com.discord/res/values-ja/strings.xml +++ b/com.discord/res/values-ja/strings.xml @@ -161,7 +161,6 @@ 早期アクセス 瞬時にプレイを開始してゲームの開発に貢献することができますが、本作はまだ未完成であるため、今後変更が発生するか発生しないかもしれないことを承知してください。 全DLCを表示する - すべてのゲーム 初めてのDiscord プレイ無料 Nitroで無料 diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml index 12fe04f812..841f3a0d4f 100644 --- a/com.discord/res/values-ko/strings.xml +++ b/com.discord/res/values-ko/strings.xml @@ -153,7 +153,6 @@ 얼리 액세스 게임에 즉시 접속하여 게임을 플레이하고, 게임 개발을 도울 수 있습니다. 하지만 개발이 완료된 게임이 아니기 때문에 플레이 경험이 부족하다고 느낄 수 있으며 더 이상 업데이트가 없을 수 있습니다. 모든 DLC 보기 - 모든 게임 Discord에서 최초 공개 무료로 플레이 가능 Nitro가 있으면 무료 diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml index 0743e560d2..32cf681360 100644 --- a/com.discord/res/values-lt/strings.xml +++ b/com.discord/res/values-lt/strings.xml @@ -178,7 +178,6 @@ WumpusWizard #9349" Išankstinė Prieiga Gali gauti tiesioginę prieigą, kad pradėtum žaisti ir padėtum mums tobulinti žaidimą, tačiau atmink, kad tai nėra galutinė versija ir ateityje ji gali keistis (arba ne). Rodyti Visą Reikiamą Atsisiųsti Turinį - visi žaidimai Pirmą Kartą Discord Galima žaisti nemokamai Nemokama su Nitro diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml index e1016fc5f9..3bc24e1388 100644 --- a/com.discord/res/values-nl/strings.xml +++ b/com.discord/res/values-nl/strings.xml @@ -144,7 +144,6 @@ Vroegtijdige toegang Je kan directe toegang krijgen tot het spelen van de game en hem verder helpen te ontwikkelen, maar wees je er van bewust dat dit een onvolledige ervaring is die wel of niet verder kan worden aangepast. Toon alle DLC - alle games Eerst op Discord Gratis om te spelen Gratis met Nitro diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml index 309b4cfead..f08341dfbc 100644 --- a/com.discord/res/values-no/strings.xml +++ b/com.discord/res/values-no/strings.xml @@ -100,7 +100,6 @@ Tidlig tilgang Du kan få øyeblikkelig tilgang til å spille og hjelpe med å utvikle spillet, men merk deg at det er en ufullstendig opplevelse som muligens endres senere. Vis alle DLC - alle spill Først på Discord Gratis å spille Gratis med Nitro diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml index 0223d9ec39..d7905c653b 100644 --- a/com.discord/res/values-pl/strings.xml +++ b/com.discord/res/values-pl/strings.xml @@ -185,7 +185,6 @@ Wczesny dostęp Możesz natychmiast zacząć grać w grę i pomóc w jej rozwoju, ale uwaga: gra nie jest ukończona i może (ale nie musi) ulec zmianie. Pokaż całą zawartość do pobrania - wszystkie gry Nowości dostępne tylko u nas w Discordzie Darmowe Darmowe z Nitro diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml index 2e528bced1..9b740de8c6 100644 --- a/com.discord/res/values-pt-rBR/strings.xml +++ b/com.discord/res/values-pt-rBR/strings.xml @@ -187,7 +187,6 @@ ainda podem reagir usando reações já presentes nas mensagens." Acesso antecipado Você pode acessar imediatamente o jogo para jogá-lo e ajudar a desenvolvê-lo, mas tenha em mente que ele será uma experiência incompleta e que pode (ou não) sofrer alterações. Mostrar todos os DLCs - todos os jogos Primeiro no Discord Grátis para jogar Grátis com o Nitro diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml index 32235d0ded..b0ce8a849b 100644 --- a/com.discord/res/values-ro/strings.xml +++ b/com.discord/res/values-ro/strings.xml @@ -187,7 +187,6 @@ acorzi această permisiune." Acces timpuriu Poți obține acces instant ca să începi să joci și să contribui la dezvoltarea jocului, însă nu uita că e o experienţă incompletă care ar putea suferi schimbări. Afișează toate DLC-urile - toate jocurile Mai întâi pe Discord Gratuit cu Nitro Acțiune diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml index 6a570d9ba7..aa0acb3b9d 100644 --- a/com.discord/res/values-ru/strings.xml +++ b/com.discord/res/values-ru/strings.xml @@ -187,7 +187,6 @@ Ранний доступ Вы можете немедленно получить доступ к игре и попробовать её уже сейчас. Этим вы поможете студии в разработке, но учтите, что игра пока не готова и ещё может измениться. Показать все дополнения - все игры Впервые — в Discord! Бесплатно Бесплатно с подпиской Nitro diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml index a9045d116b..a0b69c71e8 100644 --- a/com.discord/res/values-sv-rSE/strings.xml +++ b/com.discord/res/values-sv-rSE/strings.xml @@ -160,7 +160,6 @@ Tidig tillgång Du kan omedelbart få börja spela spelet och hjälpa till att utveckla det, men tänk på att det är en inkomplett version som kan komma att ändras. Visa allt nedladdningsbart - alla spel Först på Discord Free-to-play Gratis med Nitro diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml index 9a4093655f..c122146091 100644 --- a/com.discord/res/values-th/strings.xml +++ b/com.discord/res/values-th/strings.xml @@ -218,9 +218,6 @@ คุณจะได้รับสิทธิทันที เพื่อเริ่มเล่นและช่วยพัฒนาเกม แต่โปรดทราบว่า การเล่นเกมนี้จะเป็นประสบการณ์ที่ยังไม่สมบูรณ์แบบ และอาจมีหรือไม่มีการเปลี่ยนแปลงในภายหลัง แสดง DLC ทั้งหมด ประเภทเกมทั้งหมด - เกมทั้งหมด - เกมในร้านค้าทั้งหมด - เกม Nitro ทั้งหมด ใช้งาน Discord ครั้งแรก เล่นฟรี ฟรีกับ Nitro diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml index 722606fcc7..979e8f34a7 100644 --- a/com.discord/res/values-tr/strings.xml +++ b/com.discord/res/values-tr/strings.xml @@ -176,7 +176,6 @@ Erken Erişim Oyunu oynamak ve geliştirme çalışmalarına yardımcı olmak için anında erişim kazanabilirsin, ama bu oyunun hala yapım aşamasında olduğunu ve ileride değişebileceğini unutma. "Tüm DLC'leri göster" - tüm oyunlar "Discord'da İlk Kez" Oynaması Ücretsiz Nitro ile ücretsiz diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml index 7559f5451c..63c1b6ea5b 100644 --- a/com.discord/res/values-uk/strings.xml +++ b/com.discord/res/values-uk/strings.xml @@ -170,7 +170,6 @@ Ранній доступ "Ти можеш миттєво отримати доступ і почати грати та допомогти розробникам. Слід пам'ятати, що гра може бути не повною та змінюватися в майбутньому." Показати весь контент для завантаження - всі ігри Спочатку в Discord Безкоштовно Безкоштовно з Nitro diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml index 8ea0819962..b3017e693c 100644 --- a/com.discord/res/values-vi/strings.xml +++ b/com.discord/res/values-vi/strings.xml @@ -219,9 +219,6 @@ nguy hiểm." Bạn có thể truy cập ngay lập tức để bắt đầu chơi và giúp phát triển trò chơi, nhưng hãy lưu ý rằng trải nghiệm sẽ không thực sự hoàn hảo và trò chơi trong tương lai có thể sẽ có hoặc không có các sự thay đổi khác. Hiển thị tất cả DLC Tất cả các thể loại - Tất cả trò chơi - tất cả trò chơi trên cửa hàng - tất cả trò chơi Nitro Lần đầu trên Discord Miễn phí Ưu đãi miễn phí cùng Nitro diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml index 2d0eeba2b4..ef2b5916f0 100644 --- a/com.discord/res/values-zh-rCN/strings.xml +++ b/com.discord/res/values-zh-rCN/strings.xml @@ -167,7 +167,6 @@ 提前访问 您可即刻开始游戏，并为游戏的开发出谋划策。请注意，游戏体验将不完整，而且未来可能不会改变。 显示所有 DLC - 全部游戏 Discord 首次推出 免费游戏 在 Nitro 中免费 diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml index d5de8998b1..d60939ec09 100644 --- a/com.discord/res/values-zh-rTW/strings.xml +++ b/com.discord/res/values-zh-rTW/strings.xml @@ -157,7 +157,6 @@ 先睹為快 你可以立即取得遊戲並開始遊玩，幫助開發這款遊戲。只是請注意，遊戲尚在開發中，遊戲體驗之後可能會有改變。 顯示所有可下載內容 - 所有遊戲 Discord 搶先亮相 免費遊玩 Nitro 免費 diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 8d38410544..dd1f269d70 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -7446,4015 +7446,4010 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index ef31d3b8c2..f063abcdf9 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -333,11 +333,6 @@ You can get instant access to start playing and help develop the game, but note that it is an incomplete experience and it may or may not change further. Show All DLC All genres - All games - Games for purchase - Early Access games - On sale now - Nitro games First On Discord Free Free Nitro Content @@ -964,7 +959,7 @@ HERE ARE MORE THINGS {progress} Unable to sync cloud saves OR Collapse Category - 7dc6f21a-b718-4669-a77e-d9e1a83e5415 + 4cb5a3cd-6928-4a26-945f-b8df83954e19 Coming Soon Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings. COMING SOON! diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali index 8d36838740..14e1999fba 100644 --- a/com.discord/smali/androidx/appcompat/R$string.smali +++ b/com.discord/smali/androidx/appcompat/R$string.smali @@ -93,9 +93,9 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120dc5 +.field public static final search_menu_title:I = 0x7f120dc0 -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali index 672dcbaed1..fb434cc269 100644 --- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali +++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali index 13995c25e2..64ca2c52a5 100644 --- a/com.discord/smali/androidx/browser/R$string.smali +++ b/com.discord/smali/androidx/browser/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali index f3069c940a..37d43bb2a1 100644 --- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali +++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali index 2396d666b2..6abf2a4700 100644 --- a/com.discord/smali/androidx/core/R$string.smali +++ b/com.discord/smali/androidx/core/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali index 0a949eeefc..0a1846232e 100644 --- a/com.discord/smali/androidx/customview/R$string.smali +++ b/com.discord/smali/androidx/customview/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali index 8d16927ee2..219730862e 100644 --- a/com.discord/smali/androidx/drawerlayout/R$string.smali +++ b/com.discord/smali/androidx/drawerlayout/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali index 3f9bdd80d7..86c710371c 100644 --- a/com.discord/smali/androidx/fragment/R$string.smali +++ b/com.discord/smali/androidx/fragment/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # 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 99e9e007a7..e26710ad39 100644 --- a/com.discord/smali/androidx/legacy/coreui/R$string.smali +++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # 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 159b3b2cab..9291a9502c 100644 --- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali +++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # 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 2f4aa87df7..e47516dc35 100644 --- a/com.discord/smali/androidx/legacy/v13/R$string.smali +++ b/com.discord/smali/androidx/legacy/v13/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # 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 b7f9b60304..31e994764f 100644 --- a/com.discord/smali/androidx/legacy/v4/R$string.smali +++ b/com.discord/smali/androidx/legacy/v4/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # 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 ded3f8effa..dd097357ac 100644 --- a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali +++ b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali index 5399198c29..ec2fdd119a 100644 --- a/com.discord/smali/androidx/loader/R$string.smali +++ b/com.discord/smali/androidx/loader/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali index 974bed9085..c0bee38b23 100644 --- a/com.discord/smali/androidx/media/R$string.smali +++ b/com.discord/smali/androidx/media/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali index e132785c07..fde6ed2957 100644 --- a/com.discord/smali/androidx/recyclerview/R$string.smali +++ b/com.discord/smali/androidx/recyclerview/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali index 570603e32f..3096c6dcff 100644 --- a/com.discord/smali/androidx/room/R$string.smali +++ b/com.discord/smali/androidx/room/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali index 210585e925..448006b8ef 100644 --- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali +++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali index a9a480f040..93f95c61a2 100644 --- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali +++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali index 1881a8bb9f..6860f6a053 100644 --- a/com.discord/smali/androidx/transition/R$string.smali +++ b/com.discord/smali/androidx/transition/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali index 573e10da0e..68220738c1 100644 --- a/com.discord/smali/androidx/vectordrawable/R$string.smali +++ b/com.discord/smali/androidx/vectordrawable/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali index fef836c81b..07cf99695a 100644 --- a/com.discord/smali/androidx/viewpager/R$string.smali +++ b/com.discord/smali/androidx/viewpager/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali index 097a1cbb09..fc002093db 100644 --- a/com.discord/smali/androidx/work/R$string.smali +++ b/com.discord/smali/androidx/work/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # 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 7146c99ad5..4aa77395da 100644 --- a/com.discord/smali/androidx/work/ktx/R$string.smali +++ b/com.discord/smali/androidx/work/ktx/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/butterknife/R$string.smali b/com.discord/smali/butterknife/R$string.smali index 82a5eb6f84..44c6eba710 100644 --- a/com.discord/smali/butterknife/R$string.smali +++ b/com.discord/smali/butterknife/R$string.smali @@ -15,7 +15,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 87974aa8e4..dab69a5ce8 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -30,11 +30,11 @@ .field public static final LOCAL_VOICE:Ljava/lang/String; = "" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/859" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/860" -.field public static final VERSION_CODE:I = 0x35b +.field public static final VERSION_CODE:I = 0x35c -.field public static final VERSION_NAME:Ljava/lang/String; = "8.5.9" +.field public static final VERSION_NAME:Ljava/lang/String; = "8.6.0" # direct methods diff --git a/com.discord/smali/com/discord/a/a.smali b/com.discord/smali/com/discord/a/a.smali index 341f640662..07a6bd2f2e 100644 --- a/com.discord/smali/com/discord/a/a.smali +++ b/com.discord/smali/com/discord/a/a.smali @@ -228,7 +228,7 @@ new-instance v0, Lcom/discord/a/a$b; - const v1, 0x7f120c99 + const v1, 0x7f120c94 invoke-virtual {p0, v1}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -238,7 +238,7 @@ invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v2, 0x7f120c98 + const v2, 0x7f120c93 invoke-virtual {p0, v2}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -258,7 +258,7 @@ new-instance v0, Lcom/discord/a/a$b; - const v2, 0x7f120c96 + const v2, 0x7f120c91 invoke-virtual {p0, v2}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -268,7 +268,7 @@ invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v3, 0x7f120c95 + const v3, 0x7f120c90 invoke-virtual {p0, v3}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -288,7 +288,7 @@ new-instance v0, Lcom/discord/a/a$b; - const v3, 0x7f120c90 + const v3, 0x7f120c8b invoke-virtual {p0, v3}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -298,7 +298,7 @@ invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v4, 0x7f120c8f + const v4, 0x7f120c8a invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -318,7 +318,7 @@ new-instance v0, Lcom/discord/a/a$b; - const v4, 0x7f120c9c + const v4, 0x7f120c97 invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -330,7 +330,7 @@ new-array v3, v3, [Ljava/lang/Object; - const v5, 0x7f12054f + const v5, 0x7f12054a invoke-virtual {p0, v5}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -338,7 +338,7 @@ aput-object v5, v3, v1 - const v5, 0x7f12054e + const v5, 0x7f120549 invoke-virtual {p0, v5}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -346,7 +346,7 @@ aput-object v5, v3, v2 - const v5, 0x7f120c9b + const v5, 0x7f120c96 invoke-virtual {p0, v5, v3}, Lcom/discord/a/a;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -366,7 +366,7 @@ new-instance v0, Lcom/discord/a/a$b; - const v3, 0x7f120c8d + const v3, 0x7f120c88 invoke-virtual {p0, v3}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -376,7 +376,7 @@ invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v4, 0x7f120c8c + const v4, 0x7f120c87 invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -396,7 +396,7 @@ new-instance v0, Lcom/discord/a/a$b; - const v3, 0x7f120c93 + const v3, 0x7f120c8e invoke-virtual {p0, v3}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; @@ -406,7 +406,7 @@ invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v4, 0x7f120c92 + const v4, 0x7f120c8d invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/a/c.smali b/com.discord/smali/com/discord/a/c.smali index 32ddf0dc64..42d4e75004 100644 --- a/com.discord/smali/com/discord/a/c.smali +++ b/com.discord/smali/com/discord/a/c.smali @@ -225,7 +225,7 @@ move-result-object p1 - const v0, 0x7f12070a + const v0, 0x7f120705 invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -239,7 +239,7 @@ move-result-object p1 - const v0, 0x7f1206ed + const v0, 0x7f1206e8 invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -259,7 +259,7 @@ if-eqz v0, :cond_0 - const v1, 0x7f120702 + const v1, 0x7f1206fd invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -301,7 +301,7 @@ move-result-object v0 - const v1, 0x7f12070a + const v1, 0x7f120705 invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -315,7 +315,7 @@ move-result-object v0 - const v1, 0x7f1206fe + const v1, 0x7f1206f9 invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -357,7 +357,7 @@ if-eqz v1, :cond_0 - const v2, 0x7f120d1a + const v2, 0x7f120d15 invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -402,7 +402,7 @@ move-result-object p1 - const v0, 0x7f1206f1 + const v0, 0x7f1206ec invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V @@ -427,7 +427,7 @@ move-result-object p1 - const v0, 0x7f1206ed + const v0, 0x7f1206e8 invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V @@ -452,7 +452,7 @@ move-result-object p1 - const v0, 0x7f1206ee + const v0, 0x7f1206e9 invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V @@ -477,7 +477,7 @@ move-result-object p1 - const v0, 0x7f1206ec + const v0, 0x7f1206e7 invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V @@ -493,7 +493,7 @@ if-eqz v0, :cond_a - const v1, 0x7f120702 + const v1, 0x7f1206fd invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -720,7 +720,7 @@ throw p1 :pswitch_2 - const v1, 0x7f12070e + const v1, 0x7f120709 new-array v2, v2, [Ljava/lang/Object; @@ -747,7 +747,7 @@ return-object p1 :pswitch_3 - const v1, 0x7f12070d + const v1, 0x7f120708 new-array v2, v2, [Ljava/lang/Object; @@ -817,7 +817,7 @@ if-eqz v2, :cond_0 - const v2, 0x7f12070c + const v2, 0x7f120707 new-array v5, v3, [Ljava/lang/Object; @@ -830,7 +830,7 @@ goto :goto_0 :cond_0 - const v2, 0x7f12070b + const v2, 0x7f120706 invoke-virtual {p0, v2}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -847,7 +847,7 @@ if-eqz v5, :cond_1 - const p1, 0x7f1206f9 + const p1, 0x7f1206f4 new-array v0, v3, [Ljava/lang/Object; @@ -866,7 +866,7 @@ if-eqz p1, :cond_2 - const p1, 0x7f1206f8 + const p1, 0x7f1206f3 new-array v0, v3, [Ljava/lang/Object; @@ -879,7 +879,7 @@ goto :goto_1 :cond_2 - const p1, 0x7f1206f7 + const p1, 0x7f1206f2 new-array v1, v3, [Ljava/lang/Object; @@ -920,7 +920,7 @@ if-eqz v0, :cond_3 - const v1, 0x7f120706 + const v1, 0x7f120701 invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -958,7 +958,7 @@ move-result-object p1 - const v0, 0x7f12070a + const v0, 0x7f120705 invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -972,7 +972,7 @@ move-result-object p1 - const v0, 0x7f1206e9 + const v0, 0x7f1206e4 invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -994,7 +994,7 @@ if-eqz v0, :cond_0 - const v1, 0x7f120702 + const v1, 0x7f1206fd invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -1050,7 +1050,7 @@ if-eqz v1, :cond_0 - const v1, 0x7f120709 + const v1, 0x7f120704 new-array v4, v2, [Ljava/lang/Object; @@ -1063,7 +1063,7 @@ goto :goto_0 :cond_0 - const v1, 0x7f120708 + const v1, 0x7f120703 invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -1080,7 +1080,7 @@ if-eqz v4, :cond_1 - const v4, 0x7f1206eb + const v4, 0x7f1206e6 const/4 v5, 0x2 @@ -1101,7 +1101,7 @@ goto :goto_1 :cond_1 - const v4, 0x7f1206ea + const v4, 0x7f1206e5 new-array v2, v2, [Ljava/lang/Object; @@ -1142,7 +1142,7 @@ if-eqz v1, :cond_2 - const v2, 0x7f120700 + const v2, 0x7f1206fb invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -1312,7 +1312,7 @@ if-eqz v1, :cond_0 - const v1, 0x7f120709 + const v1, 0x7f120704 new-array v4, v3, [Ljava/lang/Object; @@ -1325,7 +1325,7 @@ goto :goto_0 :cond_0 - const v1, 0x7f120708 + const v1, 0x7f120703 invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String; @@ -1342,7 +1342,7 @@ if-eqz v4, :cond_1 - const v4, 0x7f1206eb + const v4, 0x7f1206e6 const/4 v5, 0x2 @@ -1363,7 +1363,7 @@ goto :goto_1 :cond_1 - const p1, 0x7f1206ea + const p1, 0x7f1206e5 new-array v3, v3, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/app/AppFragment$b.smali b/com.discord/smali/com/discord/app/AppFragment$b.smali index 66269d3ac4..ea06d1187e 100644 --- a/com.discord/smali/com/discord/app/AppFragment$b.smali +++ b/com.discord/smali/com/discord/app/AppFragment$b.smali @@ -84,7 +84,7 @@ iget-object v2, p0, Lcom/discord/app/AppFragment$b;->this$0:Lcom/discord/app/AppFragment; - const v3, 0x7f1204c9 + const v3, 0x7f1204c4 invoke-virtual {v2, v3}, Lcom/discord/app/AppFragment;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/app/AppFragment$c.smali b/com.discord/smali/com/discord/app/AppFragment$c.smali index fa08ac105a..9d72c6d4fd 100644 --- a/com.discord/smali/com/discord/app/AppFragment$c.smali +++ b/com.discord/smali/com/discord/app/AppFragment$c.smali @@ -72,7 +72,7 @@ aput-object p1, v2, v3 - const p1, 0x7f120fb6 + const p1, 0x7f120fb1 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 2f11dbbced..7f5d15b236 100644 --- a/com.discord/smali/com/discord/app/AppPermissions.smali +++ b/com.discord/smali/com/discord/app/AppPermissions.smali @@ -417,7 +417,7 @@ if-ne p1, v2, :cond_0 - const p1, 0x7f120bd8 + const p1, 0x7f120bd3 invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->u(I)Lkotlin/jvm/functions/Function0; @@ -430,7 +430,7 @@ if-ne p1, v2, :cond_1 - const p1, 0x7f120bd6 + const p1, 0x7f120bd1 invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->u(I)Lkotlin/jvm/functions/Function0; @@ -443,7 +443,7 @@ if-ne p1, v2, :cond_2 - const p1, 0x7f120bd7 + const p1, 0x7f120bd2 invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->u(I)Lkotlin/jvm/functions/Function0; diff --git a/com.discord/smali/com/discord/app/a/a.smali b/com.discord/smali/com/discord/app/a/a.smali index cf304d94af..8bdd5e3230 100644 --- a/com.discord/smali/com/discord/app/a/a.smali +++ b/com.discord/smali/com/discord/app/a/a.smali @@ -4,11 +4,11 @@ # static fields -.field private static HOST:Ljava/lang/String; +.field private static final HOST:Ljava/lang/String; -.field private static HOST_GIFT:Ljava/lang/String; +.field private static final HOST_GIFT:Ljava/lang/String; -.field private static HOST_INVITE:Ljava/lang/String; +.field private static final HOST_INVITE:Ljava/lang/String; .field private static final uD:Lkotlin/text/Regex; @@ -87,7 +87,7 @@ new-instance v0, Ljava/lang/StringBuilder; - const-string v1, "https?://(?:(?:" + const-string v1, "(?:https?://(?:(?:" invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V @@ -95,7 +95,7 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v1, "/invite)|(?:" + const-string v1, ")|(?:" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; @@ -103,7 +103,15 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v1, "))/((?:invite\\/)?([\\w-]+))/?" + const-string v1, "))|(?:" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + sget-object v1, Lcom/discord/app/a/a;->HOST_INVITE:Ljava/lang/String; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + const-string v1, "))/(?:invite\\/)?([\\w-]+)/?" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/app/e.smali b/com.discord/smali/com/discord/app/e.smali index 0bd661b758..9562c3fd74 100644 --- a/com.discord/smali/com/discord/app/e.smali +++ b/com.discord/smali/com/discord/app/e.smali @@ -145,7 +145,7 @@ sput-object v1, Lcom/discord/app/e;->tn:Ljava/util/List; - const/16 v1, 0x20 + const/16 v1, 0x21 new-array v1, v1, [Lkotlin/reflect/b; @@ -205,7 +205,7 @@ aput-object v2, v1, v9 - const-class v2, Lcom/discord/widgets/settings/WidgetSettingsLanguage; + const-class v2, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling; invoke-static {v2}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -213,7 +213,7 @@ aput-object v2, v1, v0 - const-class v0, Lcom/discord/widgets/settings/WidgetSettingsMedia; + const-class v0, Lcom/discord/widgets/settings/WidgetSettingsLanguage; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -223,7 +223,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium; + const-class v0, Lcom/discord/widgets/settings/WidgetSettingsMedia; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -233,7 +233,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/settings/WidgetSettingsNotifications; + const-class v0, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -243,7 +243,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections; + const-class v0, Lcom/discord/widgets/settings/WidgetSettingsNotifications; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -253,7 +253,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/settings/WidgetSettingsVoice; + const-class v0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -263,7 +263,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy; + const-class v0, Lcom/discord/widgets/settings/WidgetSettingsVoice; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -273,7 +273,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerNotifications; + const-class v0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -283,7 +283,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview; + const-class v0, Lcom/discord/widgets/servers/WidgetServerNotifications; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -293,7 +293,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -303,7 +303,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsChannels; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -313,7 +313,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -323,7 +323,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsModeration; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -333,7 +333,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsModeration; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -343,7 +343,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -353,7 +353,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -363,7 +363,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsMembers; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -373,7 +373,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -383,7 +383,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -393,7 +393,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -403,7 +403,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsBans; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -413,7 +413,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions; + const-class v0, Lcom/discord/widgets/servers/WidgetServerSettingsBans; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -423,7 +423,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview; + const-class v0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -433,7 +433,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/auth/WidgetAuthRegister; + const-class v0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -443,7 +443,7 @@ aput-object v0, v1, v2 - const-class v0, Lcom/discord/widgets/auth/WidgetAuthLogin; + const-class v0, Lcom/discord/widgets/auth/WidgetAuthRegister; invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; @@ -453,6 +453,16 @@ aput-object v0, v1, v2 + const-class v0, Lcom/discord/widgets/auth/WidgetAuthLogin; + + invoke-static {v0}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; + + move-result-object v0 + + const/16 v2, 0x20 + + aput-object v0, v1, v2 + invoke-static {v1}, Lkotlin/a/l;->i([Ljava/lang/Object;)Ljava/util/List; move-result-object v0 diff --git a/com.discord/smali/com/discord/app/f.smali b/com.discord/smali/com/discord/app/f.smali index 5c7fe85b7b..7b46c62cfd 100644 --- a/com.discord/smali/com/discord/app/f.smali +++ b/com.discord/smali/com/discord/app/f.smali @@ -254,7 +254,7 @@ .method public static synthetic c(Landroid/content/Context;Ljava/lang/CharSequence;)V .locals 1 - const v0, 0x7f120417 + const v0, 0x7f120412 invoke-static {p0, p1, v0}, Lcom/discord/app/f;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V @@ -278,7 +278,7 @@ .method public static final d(Landroid/content/Context;Ljava/lang/CharSequence;)V .locals 1 - const v0, 0x7f120417 + const v0, 0x7f120412 invoke-static {p0, p1, v0}, Lcom/discord/app/f;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V diff --git a/com.discord/smali/com/discord/gateway/R$string.smali b/com.discord/smali/com/discord/gateway/R$string.smali index df3e6b74fa..00313a6de0 100644 --- a/com.discord/smali/com/discord/gateway/R$string.smali +++ b/com.discord/smali/com/discord/gateway/R$string.smali @@ -97,69 +97,69 @@ .field public static final appbar_scrolling_view_behavior:I = 0x7f1200c3 -.field public static final bottom_sheet_behavior:I = 0x7f120316 +.field public static final bottom_sheet_behavior:I = 0x7f120311 -.field public static final character_counter_content_description:I = 0x7f12038e +.field public static final character_counter_content_description:I = 0x7f120389 -.field public static final character_counter_pattern:I = 0x7f12038f +.field public static final character_counter_pattern:I = 0x7f12038a -.field public static final common_google_play_services_enable_button:I = 0x7f1203c8 +.field public static final common_google_play_services_enable_button:I = 0x7f1203c3 -.field public static final common_google_play_services_enable_text:I = 0x7f1203c9 +.field public static final common_google_play_services_enable_text:I = 0x7f1203c4 -.field public static final common_google_play_services_enable_title:I = 0x7f1203ca +.field public static final common_google_play_services_enable_title:I = 0x7f1203c5 -.field public static final common_google_play_services_install_button:I = 0x7f1203cb +.field public static final common_google_play_services_install_button:I = 0x7f1203c6 -.field public static final common_google_play_services_install_text:I = 0x7f1203cc +.field public static final common_google_play_services_install_text:I = 0x7f1203c7 -.field public static final common_google_play_services_install_title:I = 0x7f1203cd +.field public static final common_google_play_services_install_title:I = 0x7f1203c8 -.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203ce +.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203c9 -.field public static final common_google_play_services_notification_ticker:I = 0x7f1203cf +.field public static final common_google_play_services_notification_ticker:I = 0x7f1203ca -.field public static final common_google_play_services_unknown_issue:I = 0x7f1203d0 +.field public static final common_google_play_services_unknown_issue:I = 0x7f1203cb -.field public static final common_google_play_services_unsupported_text:I = 0x7f1203d1 +.field public static final common_google_play_services_unsupported_text:I = 0x7f1203cc -.field public static final common_google_play_services_update_button:I = 0x7f1203d2 +.field public static final common_google_play_services_update_button:I = 0x7f1203cd -.field public static final common_google_play_services_update_text:I = 0x7f1203d3 +.field public static final common_google_play_services_update_text:I = 0x7f1203ce -.field public static final common_google_play_services_update_title:I = 0x7f1203d4 +.field public static final common_google_play_services_update_title:I = 0x7f1203cf -.field public static final common_google_play_services_updating_text:I = 0x7f1203d5 +.field public static final common_google_play_services_updating_text:I = 0x7f1203d0 -.field public static final common_google_play_services_wear_update_text:I = 0x7f1203d6 +.field public static final common_google_play_services_wear_update_text:I = 0x7f1203d1 -.field public static final common_open_on_phone:I = 0x7f1203d7 +.field public static final common_open_on_phone:I = 0x7f1203d2 -.field public static final common_signin_button_text:I = 0x7f1203d8 +.field public static final common_signin_button_text:I = 0x7f1203d3 -.field public static final common_signin_button_text_long:I = 0x7f1203d9 +.field public static final common_signin_button_text_long:I = 0x7f1203d4 -.field public static final fab_transformation_scrim_behavior:I = 0x7f120545 +.field public static final fab_transformation_scrim_behavior:I = 0x7f120540 -.field public static final fab_transformation_sheet_behavior:I = 0x7f120546 +.field public static final fab_transformation_sheet_behavior:I = 0x7f120541 -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120831 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12082c -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120a58 +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120a53 -.field public static final password_toggle_content_description:I = 0x7f120b90 +.field public static final password_toggle_content_description:I = 0x7f120b8b -.field public static final path_password_eye:I = 0x7f120b93 +.field public static final path_password_eye:I = 0x7f120b8e -.field public static final path_password_eye_mask_strike_through:I = 0x7f120b94 +.field public static final path_password_eye_mask_strike_through:I = 0x7f120b8f -.field public static final path_password_eye_mask_visible:I = 0x7f120b95 +.field public static final path_password_eye_mask_visible:I = 0x7f120b90 -.field public static final path_password_strike_through:I = 0x7f120b96 +.field public static final path_password_strike_through:I = 0x7f120b91 -.field public static final search_menu_title:I = 0x7f120dc5 +.field public static final search_menu_title:I = 0x7f120dc0 -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # 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 5c02fe0706..17406157b1 100644 --- a/com.discord/smali/com/discord/restapi/R$string.smali +++ b/com.discord/smali/com/discord/restapi/R$string.smali @@ -95,69 +95,69 @@ .field public static final appbar_scrolling_view_behavior:I = 0x7f1200c3 -.field public static final bottom_sheet_behavior:I = 0x7f120316 +.field public static final bottom_sheet_behavior:I = 0x7f120311 -.field public static final character_counter_content_description:I = 0x7f12038e +.field public static final character_counter_content_description:I = 0x7f120389 -.field public static final character_counter_pattern:I = 0x7f12038f +.field public static final character_counter_pattern:I = 0x7f12038a -.field public static final common_google_play_services_enable_button:I = 0x7f1203c8 +.field public static final common_google_play_services_enable_button:I = 0x7f1203c3 -.field public static final common_google_play_services_enable_text:I = 0x7f1203c9 +.field public static final common_google_play_services_enable_text:I = 0x7f1203c4 -.field public static final common_google_play_services_enable_title:I = 0x7f1203ca +.field public static final common_google_play_services_enable_title:I = 0x7f1203c5 -.field public static final common_google_play_services_install_button:I = 0x7f1203cb +.field public static final common_google_play_services_install_button:I = 0x7f1203c6 -.field public static final common_google_play_services_install_text:I = 0x7f1203cc +.field public static final common_google_play_services_install_text:I = 0x7f1203c7 -.field public static final common_google_play_services_install_title:I = 0x7f1203cd +.field public static final common_google_play_services_install_title:I = 0x7f1203c8 -.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203ce +.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203c9 -.field public static final common_google_play_services_notification_ticker:I = 0x7f1203cf +.field public static final common_google_play_services_notification_ticker:I = 0x7f1203ca -.field public static final common_google_play_services_unknown_issue:I = 0x7f1203d0 +.field public static final common_google_play_services_unknown_issue:I = 0x7f1203cb -.field public static final common_google_play_services_unsupported_text:I = 0x7f1203d1 +.field public static final common_google_play_services_unsupported_text:I = 0x7f1203cc -.field public static final common_google_play_services_update_button:I = 0x7f1203d2 +.field public static final common_google_play_services_update_button:I = 0x7f1203cd -.field public static final common_google_play_services_update_text:I = 0x7f1203d3 +.field public static final common_google_play_services_update_text:I = 0x7f1203ce -.field public static final common_google_play_services_update_title:I = 0x7f1203d4 +.field public static final common_google_play_services_update_title:I = 0x7f1203cf -.field public static final common_google_play_services_updating_text:I = 0x7f1203d5 +.field public static final common_google_play_services_updating_text:I = 0x7f1203d0 -.field public static final common_google_play_services_wear_update_text:I = 0x7f1203d6 +.field public static final common_google_play_services_wear_update_text:I = 0x7f1203d1 -.field public static final common_open_on_phone:I = 0x7f1203d7 +.field public static final common_open_on_phone:I = 0x7f1203d2 -.field public static final common_signin_button_text:I = 0x7f1203d8 +.field public static final common_signin_button_text:I = 0x7f1203d3 -.field public static final common_signin_button_text_long:I = 0x7f1203d9 +.field public static final common_signin_button_text_long:I = 0x7f1203d4 -.field public static final fab_transformation_scrim_behavior:I = 0x7f120545 +.field public static final fab_transformation_scrim_behavior:I = 0x7f120540 -.field public static final fab_transformation_sheet_behavior:I = 0x7f120546 +.field public static final fab_transformation_sheet_behavior:I = 0x7f120541 -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120831 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12082c -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120a58 +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120a53 -.field public static final password_toggle_content_description:I = 0x7f120b90 +.field public static final password_toggle_content_description:I = 0x7f120b8b -.field public static final path_password_eye:I = 0x7f120b93 +.field public static final path_password_eye:I = 0x7f120b8e -.field public static final path_password_eye_mask_strike_through:I = 0x7f120b94 +.field public static final path_password_eye_mask_strike_through:I = 0x7f120b8f -.field public static final path_password_eye_mask_visible:I = 0x7f120b95 +.field public static final path_password_eye_mask_visible:I = 0x7f120b90 -.field public static final path_password_strike_through:I = 0x7f120b96 +.field public static final path_password_strike_through:I = 0x7f120b91 -.field public static final search_menu_title:I = 0x7f120dc5 +.field public static final search_menu_title:I = 0x7f120dc0 -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog.smali b/com.discord/smali/com/discord/stores/StoreChangeLog.smali index d785076257..bcdfc65dc0 100644 --- a/com.discord/smali/com/discord/stores/StoreChangeLog.smali +++ b/com.discord/smali/com/discord/stores/StoreChangeLog.smali @@ -244,7 +244,7 @@ goto :goto_2 :cond_3 - const p2, 0x7f120369 + const p2, 0x7f120364 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -344,7 +344,7 @@ invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120369 + const v0, 0x7f120364 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; 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 da28e2e803..2f79657dc7 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 @@ -101,7 +101,7 @@ goto :goto_0 :pswitch_1 - const v0, 0x7f120e81 + const v0, 0x7f120e7c invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -110,7 +110,7 @@ goto :goto_0 :pswitch_2 - const v0, 0x7f120e82 + const v0, 0x7f120e7d invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/stores/StoreChannels.smali b/com.discord/smali/com/discord/stores/StoreChannels.smali index 34a07ea444..2c474fdd34 100644 --- a/com.discord/smali/com/discord/stores/StoreChannels.smali +++ b/com.discord/smali/com/discord/stores/StoreChannels.smali @@ -523,12 +523,12 @@ if-eqz p1, :cond_0 - const p1, 0x7f120354 + const p1, 0x7f12034f goto :goto_0 :cond_0 - const p1, 0x7f120378 + const p1, 0x7f120373 :goto_0 invoke-static {p0, p1}, Lcom/discord/app/f;->d(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index ad2848897a..bb31f76278 100644 --- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali +++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali @@ -28,7 +28,7 @@ invoke-direct {p0}, Lcom/discord/stores/Store;->()V - const/16 v0, 0x35b + const/16 v0, 0x35c iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali index 54e4179d90..833128a0ac 100644 --- a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali +++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali @@ -70,42 +70,42 @@ throw p1 :pswitch_0 - const p1, 0x7f12040a - - goto :goto_0 - - :pswitch_1 - const p1, 0x7f120406 - - goto :goto_0 - - :pswitch_2 - const p1, 0x7f12040b - - goto :goto_0 - - :pswitch_3 - const p1, 0x7f12040c - - goto :goto_0 - - :pswitch_4 - const p1, 0x7f120407 - - goto :goto_0 - - :pswitch_5 - const p1, 0x7f120404 - - goto :goto_0 - - :pswitch_6 const p1, 0x7f120405 goto :goto_0 + :pswitch_1 + const p1, 0x7f120401 + + goto :goto_0 + + :pswitch_2 + const p1, 0x7f120406 + + goto :goto_0 + + :pswitch_3 + const p1, 0x7f120407 + + goto :goto_0 + + :pswitch_4 + const p1, 0x7f120402 + + goto :goto_0 + + :pswitch_5 + const p1, 0x7f1203ff + + goto :goto_0 + + :pswitch_6 + const p1, 0x7f120400 + + goto :goto_0 + :pswitch_7 - const p1, 0x7f120408 + const p1, 0x7f120403 :goto_0 iput p1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->stateString:I diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali index 0cc459b24a..a4dff687b2 100644 --- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali +++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali @@ -71,7 +71,7 @@ iget-object p1, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context; - const v0, 0x7f121066 + const v0, 0x7f121061 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 7794bd530c..616bf6acce 100644 --- a/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali +++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali @@ -85,9 +85,9 @@ const-string v1, "UNCLAIMED_USER" - const v2, 0x7f120399 + const v2, 0x7f120394 - const v3, 0x7f120aec + const v3, 0x7f120ae7 const v4, 0x7f0802b3 diff --git a/com.discord/smali/com/discord/stores/StoreNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation.smali index bb4a5ebd87..6fffaad56e 100644 --- a/com.discord/smali/com/discord/stores/StoreNavigation.smali +++ b/com.discord/smali/com/discord/stores/StoreNavigation.smali @@ -167,9 +167,9 @@ check-cast v9, Lkotlin/jvm/functions/Function1; - const v2, 0x7f1203ff + const v2, 0x7f1203fa - const v3, 0x7f120403 + const v3, 0x7f1203fe const v4, 0x7f080326 diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali index da1d6406a3..13878f3471 100644 --- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali @@ -301,7 +301,7 @@ .method static synthetic lambda$setGroupMuted$6(Landroid/content/Context;Lcom/discord/models/domain/ModelUserGuildSettings;)V .locals 0 - const p1, 0x7f120761 + const p1, 0x7f12075c invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -615,7 +615,7 @@ invoke-direct {v4, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V - const v5, 0x7f120384 + const v5, 0x7f12037f move-object v0, p0 @@ -663,16 +663,16 @@ if-eqz p2, :cond_0 - const p2, 0x7f120384 + const p2, 0x7f12037f - const v5, 0x7f120384 + const v5, 0x7f12037f goto :goto_0 :cond_0 - const p2, 0x7f120357 + const p2, 0x7f120352 - const v5, 0x7f120357 + const v5, 0x7f120352 :goto_0 move-object v0, p0 @@ -719,7 +719,7 @@ invoke-direct {v4, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V - const v5, 0x7f120384 + const v5, 0x7f12037f move-object v0, p0 @@ -805,7 +805,7 @@ invoke-direct {v4, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(I)V - const v5, 0x7f120dfc + const v5, 0x7f120df7 move-object v0, p0 @@ -835,7 +835,7 @@ invoke-direct {v4, p3, p4, p5}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V - const v5, 0x7f120dfc + const v5, 0x7f120df7 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 1ac335984e..c775b4dded 100644 --- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali +++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali @@ -1302,7 +1302,7 @@ move-result-object v0 - const v1, 0x7f120efc + const v1, 0x7f120ef7 invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1441,7 +1441,7 @@ move-result-object p2 - const v0, 0x7f1209c3 + const v0, 0x7f1209be invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1718,7 +1718,7 @@ move-result-object p2 - const v0, 0x7f120efc + const v0, 0x7f120ef7 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1751,7 +1751,7 @@ move-result-object p2 - const v0, 0x7f120efb + const v0, 0x7f120ef6 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index 04066a2b1c..6be0e08e77 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali @@ -181,7 +181,7 @@ const-string v1, "browser_user_agent" - const-string v2, "Discord-Android/859" + const-string v2, "Discord-Android/860" invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; @@ -193,7 +193,7 @@ const-string v1, "client_build_number" - const/16 v2, 0x35b + const/16 v2, 0x35c invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -209,7 +209,7 @@ const-string v1, "client_version" - const-string v2, "8.5.9" + const-string v2, "8.6.0" invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali index 41aa90bc6f..1fd3e1cf6e 100644 --- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali +++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali @@ -1328,9 +1328,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f1207a6 + const v0, 0x7f1207a1 - const v1, 0x7f1207a5 + const v1, 0x7f1207a0 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1347,6 +1347,25 @@ if-eqz v0, :cond_4 + const v0, 0x7f12079f + + const v1, 0x7f12079e + + invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I + + move-result p1 + + return p1 + + :sswitch_2 + const-string v1, "topic" + + invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :cond_4 + const v0, 0x7f1207a4 const v1, 0x7f1207a3 @@ -1357,25 +1376,6 @@ return p1 - :sswitch_2 - const-string v1, "topic" - - invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - - move-result v0 - - if-eqz v0, :cond_4 - - const v0, 0x7f1207a9 - - const v1, 0x7f1207a8 - - invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I - - move-result p1 - - return p1 - :sswitch_3 const-string p1, "allow" @@ -1385,7 +1385,7 @@ if-eqz p1, :cond_4 - const p1, 0x7f1207a2 + const p1, 0x7f12079d return p1 @@ -1412,7 +1412,7 @@ if-nez p1, :cond_1 - const p1, 0x7f12079b + const p1, 0x7f120796 return p1 @@ -1421,7 +1421,7 @@ if-ne p1, v0, :cond_2 - const p1, 0x7f12079c + const p1, 0x7f120797 return p1 @@ -1450,9 +1450,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f12079a + const v0, 0x7f120795 - const v1, 0x7f120799 + const v1, 0x7f120794 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1469,7 +1469,7 @@ if-eqz p1, :cond_4 - const p1, 0x7f1207a1 + const p1, 0x7f12079c return p1 @@ -1482,9 +1482,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f120796 + const v0, 0x7f120791 - const v1, 0x7f120795 + const v1, 0x7f120790 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1501,7 +1501,7 @@ if-eqz p1, :cond_4 - const p1, 0x7f1207ac + const p1, 0x7f1207a7 return p1 @@ -1564,9 +1564,9 @@ if-eqz v0, :cond_3 - const v0, 0x7f1207b0 + const v0, 0x7f1207ab - const v1, 0x7f1207af + const v1, 0x7f1207aa invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1583,7 +1583,7 @@ if-eqz p1, :cond_3 - const p1, 0x7f1207ac + const p1, 0x7f1207a7 return p1 @@ -1735,7 +1735,7 @@ return-object p1 :cond_5 - const p1, 0x7f120ab6 + const p1, 0x7f120ab1 invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1793,14 +1793,14 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f1207d1 + const p1, 0x7f1207cc return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f1207d0 + const p1, 0x7f1207cb return p1 @@ -1829,7 +1829,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f1207c1 + const p1, 0x7f1207bc return p1 @@ -1842,9 +1842,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f1207cf + const v0, 0x7f1207ca - const v1, 0x7f1207ce + const v1, 0x7f1207c9 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1861,9 +1861,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f1207c8 + const v0, 0x7f1207c3 - const v1, 0x7f1207c7 + const v1, 0x7f1207c2 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1899,12 +1899,12 @@ return v1 :pswitch_0 - const p1, 0x7f1207b7 + const p1, 0x7f1207b2 return p1 :pswitch_1 - const p1, 0x7f1207b6 + const p1, 0x7f1207b1 return p1 @@ -1945,12 +1945,12 @@ return v1 :pswitch_2 - const p1, 0x7f1207bf + const p1, 0x7f1207ba return p1 :pswitch_3 - const p1, 0x7f1207be + const p1, 0x7f1207b9 return p1 @@ -1972,7 +1972,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f1207c3 + const p1, 0x7f1207be return p1 @@ -1985,7 +1985,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f1207c0 + const p1, 0x7f1207bb return p1 @@ -1998,7 +1998,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f1207b4 + const p1, 0x7f1207af return p1 @@ -2030,27 +2030,27 @@ return v1 :pswitch_4 - const p1, 0x7f1207cd + const p1, 0x7f1207c8 return p1 :pswitch_5 - const p1, 0x7f1207c9 + const p1, 0x7f1207c4 return p1 :pswitch_6 - const p1, 0x7f1207cb + const p1, 0x7f1207c6 return p1 :pswitch_7 - const p1, 0x7f1207ca + const p1, 0x7f1207c5 return p1 :pswitch_8 - const p1, 0x7f1207cc + const p1, 0x7f1207c7 return p1 @@ -2072,7 +2072,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f1207c2 + const p1, 0x7f1207bd return p1 @@ -2085,7 +2085,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f1207ac + const p1, 0x7f1207a7 return p1 @@ -2098,9 +2098,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f1207c5 + const v0, 0x7f1207c0 - const v1, 0x7f1207c4 + const v1, 0x7f1207bf invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -2117,7 +2117,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f1207bd + const p1, 0x7f1207b8 return p1 @@ -2130,9 +2130,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f1207b3 + const v0, 0x7f1207ae - const v1, 0x7f1207b2 + const v1, 0x7f1207ad invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -2168,17 +2168,17 @@ return v1 :pswitch_9 - const p1, 0x7f1207ba + const p1, 0x7f1207b5 return p1 :pswitch_a - const p1, 0x7f1207bc + const p1, 0x7f1207b7 return p1 :pswitch_b - const p1, 0x7f1207bb + const p1, 0x7f1207b6 return p1 @@ -2291,14 +2291,14 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f1207db + const p1, 0x7f1207d6 return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f1207da + const p1, 0x7f1207d5 return p1 @@ -2343,12 +2343,12 @@ if-eqz p1, :cond_4 - const p1, 0x7f1207d6 + const p1, 0x7f1207d1 return p1 :cond_4 - const p1, 0x7f1207d7 + const p1, 0x7f1207d2 return p1 @@ -2386,12 +2386,12 @@ if-eqz p1, :cond_6 - const p1, 0x7f1207d8 + const p1, 0x7f1207d3 return p1 :cond_6 - const p1, 0x7f1207d9 + const p1, 0x7f1207d4 return p1 @@ -2413,7 +2413,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f1207d3 + const p1, 0x7f1207ce return p1 @@ -2426,7 +2426,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f1207ac + const p1, 0x7f1207a7 return p1 @@ -2439,7 +2439,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f1207d2 + const p1, 0x7f1207cd return p1 @@ -2797,7 +2797,7 @@ if-eqz p2, :cond_7 - const p2, 0x7f1207a2 + const p2, 0x7f12079d new-array p3, v1, [Ljava/lang/Object; @@ -2850,7 +2850,7 @@ if-eqz p2, :cond_7 - const p2, 0x7f1207a1 + const p2, 0x7f12079c new-array p3, v1, [Ljava/lang/Object; @@ -3234,14 +3234,14 @@ if-ne p1, v2, :cond_1 - const p1, 0x7f1207f4 + const p1, 0x7f1207ef return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f1207f3 + const p1, 0x7f1207ee return p1 @@ -3288,12 +3288,12 @@ if-nez p1, :cond_4 - const p1, 0x7f1207f0 + const p1, 0x7f1207eb return p1 :cond_4 - const p1, 0x7f1207ef + const p1, 0x7f1207ea return p1 @@ -3315,7 +3315,7 @@ if-eqz p1, :cond_9 - const p1, 0x7f1207fa + const p1, 0x7f1207f5 return p1 @@ -3342,14 +3342,14 @@ if-ne p1, v2, :cond_6 - const p1, 0x7f1207f6 + const p1, 0x7f1207f1 return p1 :cond_6 if-nez p1, :cond_7 - const p1, 0x7f1207f5 + const p1, 0x7f1207f0 return p1 @@ -3378,9 +3378,9 @@ if-eqz v0, :cond_9 - const v0, 0x7f1207f8 + const v0, 0x7f1207f3 - const v1, 0x7f1207f7 + const v1, 0x7f1207f2 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -3397,7 +3397,7 @@ if-eqz p1, :cond_9 - const p1, 0x7f1207f9 + const p1, 0x7f1207f4 return p1 @@ -3410,7 +3410,7 @@ if-eqz p1, :cond_9 - const p1, 0x7f1207ac + const p1, 0x7f1207a7 return p1 @@ -3446,112 +3446,112 @@ return p1 :sswitch_0 - const p1, 0x7f1209f1 + const p1, 0x7f1209ec return p1 :sswitch_1 - const p1, 0x7f1209fd - - return p1 - - :sswitch_2 const p1, 0x7f1209f8 return p1 + :sswitch_2 + const p1, 0x7f1209f3 + + return p1 + :sswitch_3 - const p1, 0x7f1209f4 + const p1, 0x7f1209ef return p1 :sswitch_4 - const p1, 0x7f12036c + const p1, 0x7f120367 return p1 :sswitch_5 - const p1, 0x7f120fc3 + const p1, 0x7f120fbe return p1 :sswitch_6 - const p1, 0x7f120a54 + const p1, 0x7f120a4f return p1 :sswitch_7 - const p1, 0x7f12047c + const p1, 0x7f120477 return p1 :sswitch_8 - const p1, 0x7f120a5e + const p1, 0x7f120a59 return p1 :sswitch_9 - const p1, 0x7f120e5b + const p1, 0x7f120e56 return p1 :sswitch_a - const p1, 0x7f1203e4 + const p1, 0x7f1203df return p1 :sswitch_b - const p1, 0x7f120fc0 + const p1, 0x7f120fbb return p1 :sswitch_c - const p1, 0x7f120a19 + const p1, 0x7f120a14 return p1 :sswitch_d - const p1, 0x7f120cdd + const p1, 0x7f120cd8 return p1 :sswitch_e - const p1, 0x7f120259 + const p1, 0x7f120254 return p1 :sswitch_f - const p1, 0x7f12050c + const p1, 0x7f120507 return p1 :sswitch_10 - const p1, 0x7f1209f2 + const p1, 0x7f1209ed return p1 :sswitch_11 - const p1, 0x7f120ded + const p1, 0x7f120de8 return p1 :sswitch_12 - const p1, 0x7f120deb + const p1, 0x7f120de6 return p1 :sswitch_13 - const p1, 0x7f120cde + const p1, 0x7f120cd9 return p1 :sswitch_14 - const p1, 0x7f120ca3 + const p1, 0x7f120c9e return p1 :sswitch_15 - const p1, 0x7f1210a0 + const p1, 0x7f12109b return p1 @@ -3561,7 +3561,7 @@ return p1 :sswitch_17 - const p1, 0x7f1209fa + const p1, 0x7f1209f5 return p1 @@ -3574,12 +3574,12 @@ if-ne p1, p2, :cond_0 - const p1, 0x7f1209ed + const p1, 0x7f1209e8 return p1 :cond_0 - const p1, 0x7f1209ef + const p1, 0x7f1209ea return p1 @@ -3589,17 +3589,17 @@ return p1 :sswitch_1a - const p1, 0x7f120289 + const p1, 0x7f120284 return p1 :sswitch_1b - const p1, 0x7f1209b9 + const p1, 0x7f1209b4 return p1 :sswitch_1c - const p1, 0x7f120434 + const p1, 0x7f12042f return p1 @@ -3742,7 +3742,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f1207ec + const p1, 0x7f1207e7 return p1 @@ -3755,19 +3755,19 @@ if-eqz v0, :cond_7 - const v0, 0x7f1207e5 + const v0, 0x7f1207e0 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v3 - const v0, 0x7f1207e6 + const v0, 0x7f1207e1 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v4 - const v0, 0x7f1207e7 + const v0, 0x7f1207e2 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -3812,14 +3812,14 @@ if-ne p1, v2, :cond_1 - const p1, 0x7f1207e4 + const p1, 0x7f1207df return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f1207e3 + const p1, 0x7f1207de return p1 @@ -3862,14 +3862,14 @@ if-ne p1, v2, :cond_4 - const p1, 0x7f1207e1 + const p1, 0x7f1207dc return p1 :cond_4 if-nez p1, :cond_5 - const p1, 0x7f1207e0 + const p1, 0x7f1207db return p1 @@ -3898,7 +3898,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f1207eb + const p1, 0x7f1207e6 return p1 @@ -3911,7 +3911,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f1207ac + const p1, 0x7f1207a7 return p1 @@ -3924,7 +3924,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f1207e9 + const p1, 0x7f1207e4 return p1 @@ -3991,7 +3991,7 @@ if-eqz p1, :cond_5 - const p1, 0x7f1207fd + const p1, 0x7f1207f8 return p1 @@ -4004,9 +4004,9 @@ if-eqz v0, :cond_5 - const v0, 0x7f120803 + const v0, 0x7f1207fe - const v1, 0x7f120802 + const v1, 0x7f1207fd invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -4023,7 +4023,7 @@ if-eqz p1, :cond_5 - const p1, 0x7f1207ac + const p1, 0x7f1207a7 return p1 @@ -4036,9 +4036,9 @@ if-eqz v0, :cond_5 - const v0, 0x7f1207ff + const v0, 0x7f1207fa - const v1, 0x7f1207fe + const v1, 0x7f1207f9 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali index 6a7e70c629..d6a1489383 100644 --- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali +++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali @@ -104,117 +104,117 @@ goto/16 :goto_0 :pswitch_0 - const p1, 0x7f1207ae + const p1, 0x7f1207a9 return p1 :pswitch_1 - const p1, 0x7f1207b1 + const p1, 0x7f1207ac return p1 :pswitch_2 - const p1, 0x7f1207ad + const p1, 0x7f1207a8 return p1 :pswitch_3 - const p1, 0x7f120801 + const p1, 0x7f1207fc return p1 :pswitch_4 - const p1, 0x7f120804 + const p1, 0x7f1207ff return p1 :pswitch_5 - const p1, 0x7f120800 - - return p1 - - :pswitch_6 - const p1, 0x7f1207d5 - - return p1 - - :pswitch_7 - const p1, 0x7f1207dc - - return p1 - - :pswitch_8 - const p1, 0x7f1207d4 - - return p1 - - :pswitch_9 - const p1, 0x7f1207f2 - - return p1 - - :pswitch_a const p1, 0x7f1207fb return p1 - :pswitch_b - const p1, 0x7f1207f1 + :pswitch_6 + const p1, 0x7f1207d0 return p1 - :pswitch_c - const p1, 0x7f1207ea + :pswitch_7 + const p1, 0x7f1207d7 return p1 - :pswitch_d + :pswitch_8 + const p1, 0x7f1207cf + + return p1 + + :pswitch_9 const p1, 0x7f1207ed return p1 - :pswitch_e - const p1, 0x7f1207df + :pswitch_a + const p1, 0x7f1207f6 return p1 - :pswitch_f - const p1, 0x7f1207de + :pswitch_b + const p1, 0x7f1207ec return p1 - :pswitch_10 + :pswitch_c + const p1, 0x7f1207e5 + + return p1 + + :pswitch_d const p1, 0x7f1207e8 return p1 + :pswitch_e + const p1, 0x7f1207da + + return p1 + + :pswitch_f + const p1, 0x7f1207d9 + + return p1 + + :pswitch_10 + const p1, 0x7f1207e3 + + return p1 + :pswitch_11 - const p1, 0x7f1207e2 + const p1, 0x7f1207dd return p1 :pswitch_12 - const p1, 0x7f12079e + const p1, 0x7f120799 return p1 :pswitch_13 - const p1, 0x7f12079f + const p1, 0x7f12079a return p1 :pswitch_14 - const p1, 0x7f12079d - - return p1 - - :pswitch_15 const p1, 0x7f120798 return p1 + :pswitch_15 + const p1, 0x7f120793 + + return p1 + :pswitch_16 - const p1, 0x7f1207aa + const p1, 0x7f1207a5 return p1 @@ -294,17 +294,17 @@ if-eq p1, v0, :cond_3 - const p1, 0x7f1207a7 + const p1, 0x7f1207a2 return p1 :cond_3 - const p1, 0x7f120797 + const p1, 0x7f120792 return p1 :cond_4 - const p1, 0x7f1207ab + const p1, 0x7f1207a6 return p1 @@ -324,12 +324,12 @@ return p1 :cond_7 - const p1, 0x7f1207ee + const p1, 0x7f1207e9 return p1 :cond_8 - const p1, 0x7f1207c6 + const p1, 0x7f1207c1 return p1 @@ -971,7 +971,7 @@ if-gez v5, :cond_0 - const v0, 0x7f1207fc + const v0, 0x7f1207f7 const/4 v1, 0x2 @@ -1061,137 +1061,137 @@ return p1 :pswitch_0 - const p1, 0x7f120782 - - return p1 - - :pswitch_1 - const p1, 0x7f120783 - - return p1 - - :pswitch_2 - const p1, 0x7f120781 - - return p1 - - :pswitch_3 - const p1, 0x7f120793 - - return p1 - - :pswitch_4 - const p1, 0x7f120794 - - return p1 - - :pswitch_5 - const p1, 0x7f120792 - - return p1 - - :pswitch_6 - const p1, 0x7f120786 - - return p1 - - :pswitch_7 - const p1, 0x7f120787 - - return p1 - - :pswitch_8 - const p1, 0x7f120785 - - return p1 - - :pswitch_9 - const p1, 0x7f120790 - - return p1 - - :pswitch_a - const p1, 0x7f120791 - - return p1 - - :pswitch_b - const p1, 0x7f12078f - - return p1 - - :pswitch_c - const p1, 0x7f12078c - - return p1 - - :pswitch_d - const p1, 0x7f12078d - - return p1 - - :pswitch_e - const p1, 0x7f120789 - - return p1 - - :pswitch_f - const p1, 0x7f120788 - - return p1 - - :pswitch_10 - const p1, 0x7f12078b - - return p1 - - :pswitch_11 - const p1, 0x7f12078a - - return p1 - - :pswitch_12 - const p1, 0x7f12077e - - return p1 - - :pswitch_13 - const p1, 0x7f12077f - - return p1 - - :pswitch_14 const p1, 0x7f12077d return p1 - :pswitch_15 + :pswitch_1 + const p1, 0x7f12077e + + return p1 + + :pswitch_2 const p1, 0x7f12077c return p1 - :pswitch_16 + :pswitch_3 + const p1, 0x7f12078e + + return p1 + + :pswitch_4 + const p1, 0x7f12078f + + return p1 + + :pswitch_5 + const p1, 0x7f12078d + + return p1 + + :pswitch_6 + const p1, 0x7f120781 + + return p1 + + :pswitch_7 + const p1, 0x7f120782 + + return p1 + + :pswitch_8 const p1, 0x7f120780 return p1 - :pswitch_17 - const p1, 0x7f12077b + :pswitch_9 + const p1, 0x7f12078b return p1 - :pswitch_18 + :pswitch_a + const p1, 0x7f12078c + + return p1 + + :pswitch_b + const p1, 0x7f12078a + + return p1 + + :pswitch_c + const p1, 0x7f120787 + + return p1 + + :pswitch_d + const p1, 0x7f120788 + + return p1 + + :pswitch_e const p1, 0x7f120784 return p1 + :pswitch_f + const p1, 0x7f120783 + + return p1 + + :pswitch_10 + const p1, 0x7f120786 + + return p1 + + :pswitch_11 + const p1, 0x7f120785 + + return p1 + + :pswitch_12 + const p1, 0x7f120779 + + return p1 + + :pswitch_13 + const p1, 0x7f12077a + + return p1 + + :pswitch_14 + const p1, 0x7f120778 + + return p1 + + :pswitch_15 + const p1, 0x7f120777 + + return p1 + + :pswitch_16 + const p1, 0x7f12077b + + return p1 + + :pswitch_17 + const p1, 0x7f120776 + + return p1 + + :pswitch_18 + const p1, 0x7f12077f + + return p1 + :pswitch_19 - const p1, 0x7f12080d + const p1, 0x7f120808 return p1 :cond_0 - const p1, 0x7f12078e + const p1, 0x7f120789 return p1 diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali index 3f910425ac..24c4bd6e96 100644 --- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali +++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali @@ -47,7 +47,7 @@ const-string v1, "missing_dependencies" - const v2, 0x7f12034c + const v2, 0x7f120347 invoke-direct {v0, v2, v1}, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;->(ILjava/lang/String;)V diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali index 010add7aed..72230c5c99 100644 --- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali +++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali @@ -47,7 +47,7 @@ const-string v1, "expired" - const v2, 0x7f12034b + const v2, 0x7f120346 invoke-direct {v0, v2, v1}, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;->(ILjava/lang/String;)V diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali index 213b1320ef..5c7bee7ed8 100644 --- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali +++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali @@ -136,7 +136,7 @@ :cond_1 new-instance p1, Lcom/discord/utilities/captcha/CaptchaHelper$Failure; - const p2, 0x7f12034d + const p2, 0x7f120348 const-string p3, "unsupported_device" @@ -238,19 +238,19 @@ invoke-direct {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v2, 0x7f120350 + const v2, 0x7f12034b invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v1 - const v2, 0x7f120351 + const v2, 0x7f12034c invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v1 - const v2, 0x7f12034f + const v2, 0x7f12034a new-instance v3, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1; @@ -262,7 +262,7 @@ move-result-object p1 - const p2, 0x7f120343 + const p2, 0x7f12033e const/4 v1, 0x2 diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali index aa6d44dd20..a2a2caa71e 100644 --- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali +++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali @@ -290,7 +290,7 @@ :pswitch_1 if-eqz v0, :cond_0 - const p2, 0x7f12074b + const p2, 0x7f120746 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -304,7 +304,7 @@ :pswitch_2 if-eqz v0, :cond_1 - const p2, 0x7f120900 + const p2, 0x7f1208fb invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -324,7 +324,7 @@ if-eqz v0, :cond_2 - const p2, 0x7f1204b1 + const p2, 0x7f1204ac invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -348,7 +348,7 @@ if-eqz v0, :cond_3 - const p2, 0x7f1208ff + const p2, 0x7f1208fa 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 d393afb138..21f55ac1ff 100644 --- a/com.discord/smali/com/discord/utilities/error/Error.smali +++ b/com.discord/smali/com/discord/utilities/error/Error.smali @@ -845,7 +845,7 @@ packed-switch v0, :pswitch_data_0 - const v0, 0x7f120a6c + const v0, 0x7f120a67 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -858,7 +858,7 @@ return-object p1 :pswitch_0 - const v0, 0x7f1208f8 + const v0, 0x7f1208f3 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -871,7 +871,7 @@ return-object p1 :pswitch_1 - const v0, 0x7f120a6b + const v0, 0x7f120a66 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -884,7 +884,7 @@ return-object p1 :pswitch_2 - const v0, 0x7f120a68 + const v0, 0x7f120a63 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -897,7 +897,7 @@ return-object p1 :pswitch_3 - const v0, 0x7f120f01 + const v0, 0x7f120efc invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -910,7 +910,7 @@ return-object p1 :pswitch_4 - const v0, 0x7f120a6a + const v0, 0x7f120a65 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -923,7 +923,7 @@ return-object p1 :pswitch_5 - const v0, 0x7f120a66 + const v0, 0x7f120a61 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -938,7 +938,7 @@ :pswitch_6 iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response; - const v1, 0x7f120a63 + const v1, 0x7f120a5e 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; @@ -953,7 +953,7 @@ :pswitch_7 iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response; - const v1, 0x7f120a67 + const v1, 0x7f120a62 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; @@ -966,7 +966,7 @@ return-object p1 :pswitch_8 - const v0, 0x7f120cd1 + const v0, 0x7f120ccc invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -979,7 +979,7 @@ return-object p1 :pswitch_9 - const v0, 0x7f120a65 + const v0, 0x7f120a60 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -992,7 +992,7 @@ return-object p1 :pswitch_a - const v0, 0x7f120a64 + const v0, 0x7f120a5f invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1008,7 +1008,7 @@ :pswitch_b iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response; - const v1, 0x7f120a69 + const v1, 0x7f120a64 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; diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali index a186743488..2f7b0c09b5 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali @@ -1286,7 +1286,7 @@ if-eqz v0, :cond_a - const v0, 0x7f120b57 + const v0, 0x7f120b52 new-array v1, v5, [Ljava/lang/Object; @@ -1384,7 +1384,7 @@ if-ne v0, v3, :cond_2 - const v0, 0x7f120afb + const v0, 0x7f120af6 new-array v1, v3, [Ljava/lang/Object; @@ -1407,7 +1407,7 @@ :cond_2 if-ne v0, v5, :cond_3 - const v0, 0x7f120af9 + const v0, 0x7f120af4 new-array v1, v3, [Ljava/lang/Object; @@ -1458,7 +1458,7 @@ return-object p1 :pswitch_2 - const v0, 0x7f120af5 + const v0, 0x7f120af0 new-array v1, v3, [Ljava/lang/Object; @@ -1479,7 +1479,7 @@ return-object p1 :pswitch_3 - const v0, 0x7f120af3 + const v0, 0x7f120aee new-array v1, v3, [Ljava/lang/Object; @@ -1515,7 +1515,7 @@ if-nez v0, :cond_7 - const v0, 0x7f120af2 + const v0, 0x7f120aed new-array v1, v3, [Ljava/lang/Object; @@ -1550,7 +1550,7 @@ if-eqz v0, :cond_a - const v0, 0x7f120623 + const v0, 0x7f12061e new-array v1, v3, [Ljava/lang/Object; @@ -1579,7 +1579,7 @@ if-eqz v0, :cond_a - const v0, 0x7f12069d + const v0, 0x7f120698 new-array v1, v5, [Ljava/lang/Object; @@ -1615,7 +1615,7 @@ goto :goto_1 :cond_8 - const v0, 0x7f120afd + const v0, 0x7f120af8 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1624,7 +1624,7 @@ goto :goto_1 :cond_9 - const v0, 0x7f120af0 + const v0, 0x7f120aeb invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1941,7 +1941,7 @@ invoke-direct {p2, v0}, Landroidx/core/app/RemoteInput$Builder;->(Ljava/lang/String;)V - const v0, 0x7f120de9 + const v0, 0x7f120de4 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1991,7 +1991,7 @@ const v3, 0x7f0802fb - const v4, 0x7f120afe + const v4, 0x7f120af9 invoke-virtual {p1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2415,7 +2415,7 @@ const v2, 0x7f0801f8 - const v3, 0x7f120a00 + const v3, 0x7f1209fb invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2805,7 +2805,7 @@ goto :goto_0 :cond_0 - const v0, 0x7f1204c9 + const v0, 0x7f1204c4 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -3171,7 +3171,7 @@ goto :goto_0 :cond_0 - const v0, 0x7f1208c2 + const v0, 0x7f1208bd invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -3286,7 +3286,7 @@ if-nez v0, :cond_3 - const v0, 0x7f120b03 + const v0, 0x7f120afe invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -3322,7 +3322,7 @@ if-eqz v0, :cond_4 - const v0, 0x7f12069e + const v0, 0x7f120699 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 28b90fea8d..1c08c357aa 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali @@ -432,7 +432,7 @@ invoke-direct {v0}, Landroidx/core/app/Person$Builder;->()V - const v1, 0x7f120a0e + const v1, 0x7f120a09 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -822,12 +822,12 @@ if-eqz p5, :cond_0 - const p5, 0x7f120b00 + const p5, 0x7f120afb goto :goto_0 :cond_0 - const p5, 0x7f120aff + const p5, 0x7f120afa :goto_0 sget-object v0, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion; @@ -951,7 +951,7 @@ const-string v1, "Calls" - const v2, 0x7f120331 + const v2, 0x7f12032c invoke-virtual {p1, v2}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -967,7 +967,7 @@ const-string v3, "Media Connections" - const v5, 0x7f1210a6 + const v5, 0x7f1210a1 invoke-virtual {p1, v5}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -983,7 +983,7 @@ const-string v5, "Messages" - const v7, 0x7f120a31 + const v7, 0x7f120a2c invoke-virtual {p1, v7}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -999,7 +999,7 @@ const-string v7, "DirectMessages" - const v9, 0x7f1204b2 + const v9, 0x7f1204ad invoke-virtual {p1, v9}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -1013,7 +1013,7 @@ const-string v9, "Social" - const v10, 0x7f120625 + const v10, 0x7f120620 invoke-virtual {p1, v10}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -1027,7 +1027,7 @@ const-string v10, "Game Detection" - const v11, 0x7f12065d + const v11, 0x7f120658 invoke-virtual {p1, v11}, Landroid/app/Application;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali index 8a4eab62d0..823e585757 100644 --- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali +++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali @@ -112,7 +112,7 @@ move-result-object v2 - const v3, 0x7f1204c9 + const v3, 0x7f1204c4 invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -126,7 +126,7 @@ if-nez p2, :cond_0 - const p2, 0x7f12065d + const p2, 0x7f120658 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -135,7 +135,7 @@ goto :goto_0 :cond_0 - const v3, 0x7f120658 + const v3, 0x7f120653 const/4 v4, 0x1 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 652e3b2a2b..f1e5f57d16 100644 --- a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali +++ b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali @@ -41,7 +41,7 @@ if-eqz v0, :cond_0 - const v1, 0x7f120f7c + const v1, 0x7f120f77 const/4 v2, 0x1 diff --git a/com.discord/smali/com/discord/utilities/images/MGImages.smali b/com.discord/smali/com/discord/utilities/images/MGImages.smali index 542f255d47..f53e0e4692 100644 --- a/com.discord/smali/com/discord/utilities/images/MGImages.smali +++ b/com.discord/smali/com/discord/utilities/images/MGImages.smali @@ -284,7 +284,7 @@ const/4 v1, 0x1 - const v2, 0x7f120280 + const v2, 0x7f12027b const/4 v3, 0x0 diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali index 22cc16c766..acf308d29a 100644 --- a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali +++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali @@ -346,7 +346,7 @@ if-eqz p3, :cond_0 - const p2, 0x7f120e35 + const p2, 0x7f120e30 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 78aacac26f..258c8324bf 100644 --- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali +++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali @@ -137,7 +137,7 @@ aput-object v1, v0, v2 - const v1, 0x7f1204c7 + const v1, 0x7f1204c2 invoke-virtual {p1, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -157,7 +157,7 @@ invoke-static {v3, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f1204c6 + const v0, 0x7f1204c1 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -185,7 +185,7 @@ move-result-object v7 - const p2, 0x7f1204c4 + const p2, 0x7f1204bf invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -222,7 +222,7 @@ new-instance p2, Lcom/discord/utilities/notices/NoticeBuilders$DialogData; - const v0, 0x7f120cd3 + const v0, 0x7f120cce invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -232,7 +232,7 @@ invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120cd2 + const v0, 0x7f120ccd invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -286,13 +286,13 @@ move-result-object v5 - const v0, 0x7f120b3e + const v0, 0x7f120b39 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; move-result-object v3 - const v0, 0x7f120ab5 + const v0, 0x7f120ab0 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext$Companion.smali b/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext$Companion.smali index 737e33b97f..4182731b4e 100644 --- a/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext$Companion.smali +++ b/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext$Companion.smali @@ -33,7 +33,7 @@ # virtual methods -.method public final from(Ljava/util/List;ZILjava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext; +.method public final from(Ljava/util/List;ZLjava/lang/Integer;Ljava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext; .locals 13 .annotation system Ldalvik/annotation/Signature; value = { @@ -41,7 +41,8 @@ "Ljava/util/List<", "+", "Lcom/discord/models/domain/ModelChannel;", - ">;ZI", + ">;Z", + "Ljava/lang/Integer;", "Ljava/util/Map<", "Ljava/lang/Long;", "Ljava/lang/Integer;", @@ -54,41 +55,43 @@ move v8, p2 - move-object/from16 v1, p4 + move-object/from16 v1, p3 - move/from16 v2, p5 + move-object/from16 v2, p4 - move/from16 v3, p6 + move/from16 v3, p5 - const-string v4, "categories" + move/from16 v4, p6 - invoke-static {p1, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + const-string v5, "categories" - const-string v4, "channelPermissions" + invoke-static {p1, v5}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v1, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + const-string v5, "channelPermissions" + + invoke-static {v2, v5}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V check-cast v0, Ljava/lang/Iterable; - instance-of v4, v0, Ljava/util/Collection; + instance-of v5, v0, Ljava/util/Collection; - const/16 v5, 0x10 + const/16 v6, 0x10 - const/4 v6, 0x1 + const/4 v7, 0x1 - const/4 v7, 0x0 + const/4 v9, 0x0 - if-eqz v4, :cond_0 + if-eqz v5, :cond_0 - move-object v4, v0 + move-object v5, v0 - check-cast v4, Ljava/util/Collection; + check-cast v5, Ljava/util/Collection; - invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z + invoke-interface {v5}, Ljava/util/Collection;->isEmpty()Z - move-result v4 + move-result v5 - if-nez v4, :cond_2 + if-nez v5, :cond_2 :cond_0 invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; @@ -98,35 +101,35 @@ :cond_1 invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z - move-result v4 + move-result v5 - if-eqz v4, :cond_2 + if-eqz v5, :cond_2 invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v4 + move-result-object v5 - check-cast v4, Lcom/discord/models/domain/ModelChannel; + check-cast v5, Lcom/discord/models/domain/ModelChannel; - invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getId()J + invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getId()J - move-result-wide v9 + move-result-wide v10 - invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v4 + move-result-object v5 - invoke-interface {v1, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v2, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v4 + move-result-object v5 - check-cast v4, Ljava/lang/Integer; + check-cast v5, Ljava/lang/Integer; - invoke-static {v5, v4}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z + invoke-static {v6, v5}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z - move-result v4 + move-result v5 - if-eqz v4, :cond_1 + if-eqz v5, :cond_1 const/4 v0, 0x1 @@ -138,65 +141,53 @@ :goto_0 if-nez v8, :cond_4 - const/16 v1, 0x20 + const/16 v2, 0x20 - invoke-static/range {p3 .. p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v2, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z - move-result-object v4 + move-result v2 - invoke-static {v1, v4, v3, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z - - move-result v1 - - if-eqz v1, :cond_3 + if-eqz v2, :cond_3 goto :goto_1 :cond_3 - const/4 v1, 0x0 + const/4 v2, 0x0 goto :goto_2 :cond_4 :goto_1 - const/4 v1, 0x1 + const/4 v2, 0x1 :goto_2 if-nez v8, :cond_6 - invoke-static/range {p3 .. p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v6, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z - move-result-object v4 + move-result v5 - invoke-static {v5, v4, v3, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z - - move-result v4 - - if-nez v4, :cond_6 + if-nez v5, :cond_6 if-eqz v0, :cond_5 goto :goto_3 :cond_5 - const/4 v4, 0x0 + const/4 v5, 0x0 goto :goto_4 :cond_6 :goto_3 - const/4 v4, 0x1 + const/4 v5, 0x1 :goto_4 if-nez v8, :cond_8 const/high16 v0, 0x10000000 - invoke-static/range {p3 .. p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v5 - - invoke-static {v0, v5, v3, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z + invoke-static {v0, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z move-result v0 @@ -205,24 +196,20 @@ goto :goto_5 :cond_7 - const/4 v5, 0x0 + const/4 v6, 0x0 goto :goto_6 :cond_8 :goto_5 - const/4 v5, 0x1 + const/4 v6, 0x1 :goto_6 if-nez v8, :cond_a const/4 v0, 0x4 - invoke-static/range {p3 .. p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v9 - - invoke-static {v0, v9, v3, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z + invoke-static {v0, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z move-result v0 @@ -231,24 +218,20 @@ goto :goto_7 :cond_9 - const/4 v9, 0x0 + const/4 v10, 0x0 goto :goto_8 :cond_a :goto_7 - const/4 v9, 0x1 + const/4 v10, 0x1 :goto_8 if-nez v8, :cond_c const/high16 v0, 0x40000000 # 2.0f - invoke-static/range {p3 .. p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v10 - - invoke-static {v0, v10, v3, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z + invoke-static {v0, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z move-result v0 @@ -257,22 +240,18 @@ goto :goto_9 :cond_b - const/4 v10, 0x0 + const/4 v11, 0x0 goto :goto_a :cond_c :goto_9 - const/4 v10, 0x1 + const/4 v11, 0x1 :goto_a if-nez v8, :cond_e - invoke-static/range {p3 .. p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v0 - - invoke-static {p2, v3, v2, v0}, Lcom/discord/utilities/permissions/PermissionUtils;->canManageGuildMembers(ZZILjava/lang/Integer;)Z + invoke-static {p2, v4, v3, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->canManageGuildMembers(ZZILjava/lang/Integer;)Z move-result v0 @@ -281,50 +260,51 @@ goto :goto_b :cond_d - const/4 v11, 0x0 + const/4 v12, 0x0 goto :goto_c :cond_e :goto_b - const/4 v11, 0x1 + const/4 v12, 0x1 :goto_c - if-nez v8, :cond_f + if-nez v8, :cond_10 const/16 v0, 0x80 - invoke-static/range {p3 .. p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v12 - - invoke-static {v0, v12, v3, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z + invoke-static {v0, v1, v4, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->canAndIsElevated(ILjava/lang/Integer;ZI)Z move-result v0 - if-eqz v0, :cond_10 + if-eqz v0, :cond_f + + goto :goto_d :cond_f - const/4 v7, 0x1 + const/4 v7, 0x0 :cond_10 - new-instance v12, Lcom/discord/utilities/permissions/ManageGuildContext; + :goto_d + new-instance v9, Lcom/discord/utilities/permissions/ManageGuildContext; - move-object v0, v12 + move-object v0, v9 - move v2, v4 + move v1, v2 - move v3, v5 + move v2, v5 - move v4, v9 + move v3, v6 - move v5, v10 + move v4, v10 - move v6, v11 + move v5, v11 + + move v6, v12 move v8, p2 invoke-direct/range {v0 .. v8}, Lcom/discord/utilities/permissions/ManageGuildContext;->(ZZZZZZZZ)V - return-object v12 + return-object v9 .end method diff --git a/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext.smali b/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext.smali index 822d041419..6b53587e1b 100644 --- a/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext.smali +++ b/com.discord/smali/com/discord/utilities/permissions/ManageGuildContext.smali @@ -198,7 +198,7 @@ return-object v0 .end method -.method public static final from(Ljava/util/List;ZILjava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext; +.method public static final from(Ljava/util/List;ZLjava/lang/Integer;Ljava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext; .locals 7 .annotation system Ldalvik/annotation/Signature; value = { @@ -206,7 +206,8 @@ "Ljava/util/List<", "+", "Lcom/discord/models/domain/ModelChannel;", - ">;ZI", + ">;Z", + "Ljava/lang/Integer;", "Ljava/util/Map<", "Ljava/lang/Long;", "Ljava/lang/Integer;", @@ -221,7 +222,7 @@ move v2, p1 - move v3, p2 + move-object v3, p2 move-object v4, p3 @@ -229,7 +230,7 @@ move v6, p5 - invoke-virtual/range {v0 .. v6}, Lcom/discord/utilities/permissions/ManageGuildContext$Companion;->from(Ljava/util/List;ZILjava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext; + invoke-virtual/range {v0 .. v6}, Lcom/discord/utilities/permissions/ManageGuildContext$Companion;->from(Ljava/util/List;ZLjava/lang/Integer;Ljava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext; move-result-object p0 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 9af45b1e4a..24833085cd 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 @@ -89,7 +89,7 @@ return-object p1 :pswitch_0 - const p2, 0x7f1210ba + const p2, 0x7f1210b5 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -98,7 +98,7 @@ return-object p1 :pswitch_1 - const p2, 0x7f1209da + const p2, 0x7f1209d5 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -107,7 +107,7 @@ return-object p1 :pswitch_2 - const p2, 0x7f120e8f + const p2, 0x7f120e8a invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -116,7 +116,7 @@ return-object p1 :pswitch_3 - const p2, 0x7f120c00 + const p2, 0x7f120bfb invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali index 1496d6913b..fbfd3d70e4 100644 --- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali +++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali @@ -43,7 +43,7 @@ move-result v0 - const v1, 0x7f120fdd + const v1, 0x7f120fd8 const/4 v2, 0x0 @@ -58,7 +58,7 @@ goto :goto_0 :pswitch_0 - const v0, 0x7f120fdf + const v0, 0x7f120fda new-array v1, v3, [Ljava/lang/Object; @@ -75,7 +75,7 @@ goto :goto_0 :pswitch_1 - const v0, 0x7f120fdb + const v0, 0x7f120fd6 new-array v1, v3, [Ljava/lang/Object; @@ -92,7 +92,7 @@ goto :goto_0 :pswitch_2 - const v0, 0x7f120fdc + const v0, 0x7f120fd7 new-array v1, v3, [Ljava/lang/Object; @@ -231,7 +231,7 @@ if-ne v0, v1, :cond_2 - const p1, 0x7f120e82 + const p1, 0x7f120e7d return p1 @@ -250,7 +250,7 @@ if-ne v0, v1, :cond_4 - const p1, 0x7f120e7e + const p1, 0x7f120e79 return p1 @@ -269,13 +269,13 @@ if-ne p1, v0, :cond_6 - const p1, 0x7f120e7c + const p1, 0x7f120e77 return p1 :cond_6 :goto_3 - const p1, 0x7f120e81 + const p1, 0x7f120e7c return p1 .end method diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali index bc12fb6a77..1c243efe84 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali @@ -167,7 +167,7 @@ .method public final getUserAgent()Ljava/lang/String; .locals 1 - const-string v0, "Discord-Android/859" + const-string v0, "Discord-Android/860" return-object v0 .end method diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali index 8b105b8323..bb795bbb85 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali @@ -38,7 +38,7 @@ move-result-object v2 - const v3, 0x7f120313 + const v3, 0x7f12030e invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -58,7 +58,7 @@ move-result-object v2 - const v3, 0x7f12030f + const v3, 0x7f12030a invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -78,7 +78,7 @@ move-result-object v2 - const v3, 0x7f12030e + const v3, 0x7f120309 invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -98,7 +98,7 @@ move-result-object v2 - const v3, 0x7f120310 + const v3, 0x7f12030b invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali index d1c0be2bf7..2bdedb9c5e 100644 --- a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali +++ b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali @@ -808,7 +808,7 @@ if-eqz p3, :cond_1 - const p3, 0x7f120fb7 + const p3, 0x7f120fb2 invoke-static {p2, p3}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -840,7 +840,7 @@ goto :goto_0 :cond_2 - const p3, 0x7f120a63 + const p3, 0x7f120a5e invoke-static {p2, p3}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -897,7 +897,7 @@ new-array v2, v2, [Ljava/lang/Object; - const v3, 0x7f12054e + const v3, 0x7f120549 invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; 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 043005d551..43a4f84daa 100644 --- a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali +++ b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali @@ -38,7 +38,7 @@ invoke-direct {p0}, Ljava/lang/Object;->()V - const v0, 0x7f120dac + const v0, 0x7f120da7 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -50,7 +50,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fromFilterString:Ljava/lang/String; - const v0, 0x7f120dae + const v0, 0x7f120da9 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -62,7 +62,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->inFilterString:Ljava/lang/String; - const v0, 0x7f120db0 + const v0, 0x7f120dab invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -74,7 +74,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->mentionsFilterString:Ljava/lang/String; - const v0, 0x7f120dad + const v0, 0x7f120da8 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -86,7 +86,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->hasFilterString:Ljava/lang/String; - const v0, 0x7f120d99 + const v0, 0x7f120d94 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -98,7 +98,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->linkAnswerString:Ljava/lang/String; - const v0, 0x7f120d97 + const v0, 0x7f120d92 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -110,7 +110,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->embedAnswerString:Ljava/lang/String; - const v0, 0x7f120d96 + const v0, 0x7f120d91 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -122,7 +122,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fileAnswerString:Ljava/lang/String; - const v0, 0x7f120d9b + const v0, 0x7f120d96 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -134,7 +134,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->videoAnswerString:Ljava/lang/String; - const v0, 0x7f120d98 + const v0, 0x7f120d93 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -146,7 +146,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->imageAnswerString:Ljava/lang/String; - const v0, 0x7f120d9a + const v0, 0x7f120d95 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 45b325e6cd..9fdfda25ea 100644 --- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali +++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali @@ -190,11 +190,11 @@ check-cast v0, Landroid/widget/TextView; - const v5, 0x7f1204c2 + const v5, 0x7f1204bd invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V - const v2, 0x7f1204c3 + const v2, 0x7f1204be invoke-virtual {v3, v2}, Landroid/widget/TextView;->setText(I)V @@ -206,7 +206,7 @@ invoke-virtual {v4, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - const v2, 0x7f120b3e + const v2, 0x7f120b39 invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali index 762d569a7c..9a6bd071bd 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali @@ -33,6 +33,11 @@ :array_0 .array-data 4 + 0x7f120eae + 0x7f120eaf + 0x7f120eb0 + 0x7f120eb1 + 0x7f120eb2 0x7f120eb3 0x7f120eb4 0x7f120eb5 @@ -67,11 +72,6 @@ 0x7f120ed2 0x7f120ed3 0x7f120ed4 - 0x7f120ed5 - 0x7f120ed6 - 0x7f120ed7 - 0x7f120ed8 - 0x7f120ed9 .end array-data .end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali index 7dba05b773..6db6cb86c8 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali @@ -197,7 +197,29 @@ sput-object v0, Lcom/discord/utilities/textprocessing/Rules;->PATTERN_URL_NO_EMBED:Ljava/util/regex/Pattern; - const-string v0, "^(:?discord.gg|https://discord.gg|https://discordapp.com/invite)/([\\w|-]++)$" + sget-object v0, Lcom/discord/app/a/a;->uF:Lkotlin/text/Regex; + + new-instance v2, Ljava/lang/StringBuilder; + + const-string v3, "^" + + invoke-direct {v2, v3}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V + + iget-object v0, v0, Lkotlin/text/Regex;->nativePattern:Ljava/util/regex/Pattern; + + invoke-virtual {v0}, Ljava/util/regex/Pattern;->pattern()Ljava/lang/String; + + move-result-object v0 + + const-string v3, "nativePattern.pattern()" + + invoke-static {v0, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v0 const/4 v2, 0x2 diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali index a4499242e7..9aa0a6c043 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali @@ -84,7 +84,7 @@ check-cast v2, Lkotlin/jvm/functions/Function1; - const/4 v0, 0x1 + const/4 v0, 0x0 invoke-direct {v1, p2, v0, v2}, Lcom/discord/utilities/spans/ClickableSpan;->(Ljava/lang/Integer;ZLkotlin/jvm/functions/Function1;)V 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 e6b72ef300..1449365e37 100644 --- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali +++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali @@ -317,7 +317,7 @@ move-result-object v10 - const v11, 0x7f1204c4 + const v11, 0x7f1204bf invoke-virtual {v10, v11}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -347,7 +347,7 @@ move-result-object v2 - const v9, 0x7f120f8e + const v9, 0x7f120f89 invoke-virtual {v2, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -360,7 +360,7 @@ move-result-object v2 - const v9, 0x7f120a59 + const v9, 0x7f120a54 invoke-virtual {v2, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -391,7 +391,7 @@ move-result-object p0 - const v6, 0x7f120f86 + const v6, 0x7f120f81 invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -404,7 +404,7 @@ move-result-object p0 - const v6, 0x7f12047b + const v6, 0x7f120476 invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$a.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$a.smali index f8fb4c60a0..81a3dd7780 100644 --- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$a.smali +++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$a.smali @@ -131,7 +131,7 @@ invoke-static {p2, p1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const p1, 0x7f1202a1 + const p1, 0x7f12029c invoke-static {p2, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; @@ -158,7 +158,7 @@ invoke-static {p2, p1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const p1, 0x7f12025a + const p1, 0x7f120255 invoke-static {p2, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; @@ -221,7 +221,7 @@ iget-object v1, p0, Lcom/discord/views/ActiveSubscriptionView$a;->context:Landroid/content/Context; - const v2, 0x7f120ba8 + const v2, 0x7f120ba3 const/4 v3, 0x1 diff --git a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali index 3b12111c20..453999880b 100644 --- a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali +++ b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali @@ -182,9 +182,9 @@ if-eqz v1, :cond_0 - const v1, 0x7f120a83 + const v1, 0x7f120a7e - const v4, 0x7f120a83 + const v4, 0x7f120a7e goto :goto_0 @@ -196,9 +196,9 @@ if-eqz v1, :cond_1 - const v1, 0x7f120283 + const v1, 0x7f12027e - const v5, 0x7f120283 + const v5, 0x7f12027e goto :goto_1 @@ -210,9 +210,9 @@ if-eqz v1, :cond_2 - const v1, 0x7f1204e0 + const v1, 0x7f1204db - const v6, 0x7f1204e0 + const v6, 0x7f1204db goto :goto_2 diff --git a/com.discord/smali/com/discord/views/steps/StepsView$b$b.smali b/com.discord/smali/com/discord/views/steps/StepsView$b$b.smali index 463e87872c..e408610469 100644 --- a/com.discord/smali/com/discord/views/steps/StepsView$b$b.smali +++ b/com.discord/smali/com/discord/views/steps/StepsView$b$b.smali @@ -67,11 +67,11 @@ const v1, 0x7f0d0180 - const v2, 0x7f120a83 + const v2, 0x7f120a7e - const v3, 0x7f120283 + const v3, 0x7f12027e - const v4, 0x7f1204e0 + const v4, 0x7f1204db const/4 v5, 0x0 @@ -131,11 +131,11 @@ move-object v10, p0 - const v1, 0x7f120a83 + const v1, 0x7f120a7e - const v2, 0x7f120283 + const v2, 0x7f12027e - const v3, 0x7f1204e0 + const v3, 0x7f1204db const/4 v4, 0x0 @@ -157,15 +157,15 @@ iput v0, v10, Lcom/discord/views/steps/StepsView$b$b;->Bj:I - const v0, 0x7f120a83 + const v0, 0x7f120a7e iput v0, v10, Lcom/discord/views/steps/StepsView$b$b;->Bc:I - const v0, 0x7f120283 + const v0, 0x7f12027e iput v0, v10, Lcom/discord/views/steps/StepsView$b$b;->Bd:I - const v0, 0x7f1204e0 + const v0, 0x7f1204db iput v0, v10, Lcom/discord/views/steps/StepsView$b$b;->Be:I diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali index 553feab0b9..0894194281 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali @@ -501,7 +501,7 @@ move-result v5 - const v6, 0x7f120271 + const v6, 0x7f12026c if-eqz v5, :cond_6 @@ -581,7 +581,7 @@ :cond_5 :goto_3 - const p1, 0x7f1208f0 + const p1, 0x7f1208eb invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthInviteInfo;->getString(I)Ljava/lang/String; @@ -616,7 +616,7 @@ goto :goto_5 :cond_7 - const p1, 0x7f1208ee + const p1, 0x7f1208e9 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 be4db92380..5f6885680a 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 @@ -97,7 +97,7 @@ move-result-object p1 - const v0, 0x7f120b8d + const v0, 0x7f120b88 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 8c67c4e61e..b8657e3b49 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 @@ -51,13 +51,13 @@ invoke-direct {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v0, 0x7f120b8a + const v0, 0x7f120b85 invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object p1 - const v0, 0x7f120b8b + const v0, 0x7f120b86 invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -67,7 +67,7 @@ check-cast v0, Lkotlin/jvm/functions/Function1; - const v1, 0x7f120b8c + const v1, 0x7f120b87 invoke-virtual {p1, v1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -75,7 +75,7 @@ const/4 v0, 0x0 - const v1, 0x7f120343 + const v1, 0x7f12033e const/4 v2, 0x2 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali index fdb1c9588a..56851ac9bb 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali @@ -365,7 +365,7 @@ move-result-object v0 - const v1, 0x7f120509 + const v1, 0x7f120504 invoke-static {v0, v1}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -961,7 +961,7 @@ const/4 v3, 0x0 :goto_0 - const v6, 0x7f120b8f + const v6, 0x7f120b8a if-eqz v3, :cond_2 @@ -1101,7 +1101,7 @@ aput-object p1, v0, v1 - const p1, 0x7f12050a + const p1, 0x7f120505 invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/auth/WidgetAuthLogin;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali index ca49047aeb..86cf127aa2 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali @@ -185,7 +185,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const p2, 0x7f120f47 + const p2, 0x7f120f42 invoke-static {p1, p2}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V @@ -216,7 +216,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120f6e + const v0, 0x7f120f69 invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V @@ -458,7 +458,7 @@ move-result-object v1 - const v4, 0x7f120f51 + const v4, 0x7f120f4c 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 6478477921..247f00b9be 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 @@ -77,7 +77,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister; - const v1, 0x7f121063 + const v1, 0x7f12105e invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getString(I)Ljava/lang/String; @@ -110,7 +110,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister; - const v1, 0x7f120509 + const v1, 0x7f120504 invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getString(I)Ljava/lang/String; @@ -143,7 +143,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister; - const v1, 0x7f120508 + const v1, 0x7f120503 invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getString(I)Ljava/lang/String; @@ -176,7 +176,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister; - const v1, 0x7f120b8f + const v1, 0x7f120b8a invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getString(I)Ljava/lang/String; @@ -215,7 +215,7 @@ move-result-object p1 - const v0, 0x7f120eed + const v0, 0x7f120ee8 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 6dc919ddc7..8e7b0cb38d 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali @@ -840,7 +840,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120eea + const v1, 0x7f120ee5 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -850,7 +850,7 @@ aput-object v1, v0, v2 - const v1, 0x7f120ca8 + const v1, 0x7f120ca3 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1207,7 +1207,7 @@ move-result-object p1 - const v0, 0x7f121063 + const v0, 0x7f12105e invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1242,7 +1242,7 @@ move-result-object p1 - const v0, 0x7f120509 + const v0, 0x7f120504 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1273,7 +1273,7 @@ move-result-object p1 - const v0, 0x7f120508 + const v0, 0x7f120503 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1304,7 +1304,7 @@ move-result-object p1 - const v0, 0x7f120b8f + const v0, 0x7f120b8a invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1642,12 +1642,12 @@ if-eqz v3, :cond_1 - const v3, 0x7f120eec + const v3, 0x7f120ee7 goto :goto_1 :cond_1 - const v3, 0x7f120eeb + const v3, 0x7f120ee6 :goto_1 invoke-direct {p0, v5, v3}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali index 67a6bffa3a..1a33a72128 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 @@ -81,9 +81,9 @@ check-cast v9, Lkotlin/jvm/functions/Function1; - const v2, 0x7f1208d8 + const v2, 0x7f1208d3 - const v3, 0x7f1208d5 + const v3, 0x7f1208d0 const v4, 0x7f080326 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 1ba3080373..8897f7b7bd 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali @@ -65,7 +65,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegisterInvite; - const v1, 0x7f121063 + const v1, 0x7f12105e invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite;->getString(I)Ljava/lang/String; @@ -104,7 +104,7 @@ move-result-object p1 - const v0, 0x7f120eed + const v0, 0x7f120ee8 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$6.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$6.smali index 8a07a2d997..a2af05be79 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$6.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$6.smali @@ -135,7 +135,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f1208d8 + const v0, 0x7f1208d3 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 83310f26a0..4eafc6b7ed 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali @@ -718,7 +718,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120eea + const v1, 0x7f120ee5 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -728,7 +728,7 @@ aput-object v1, v0, v2 - const v1, 0x7f120ca8 + const v1, 0x7f120ca3 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -981,7 +981,7 @@ move-result-object p1 - const v0, 0x7f121063 + const v0, 0x7f12105e invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1269,12 +1269,12 @@ if-eqz v2, :cond_1 - const v2, 0x7f120eec + const v2, 0x7f120ee7 goto :goto_1 :cond_1 - const v2, 0x7f120eeb + const v2, 0x7f120ee6 :goto_1 invoke-direct {p0, v1, v2}, 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 92c68dadc5..a20ad7d442 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali @@ -238,7 +238,7 @@ move-result-object v1 - const v2, 0x7f120383 + const v2, 0x7f12037e invoke-virtual {p0, v2}, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->setActionBarTitle(I)Lkotlin/Unit; @@ -359,7 +359,7 @@ invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const p1, 0x7f1209ce + const p1, 0x7f1209c9 const/4 v2, 0x1 @@ -377,7 +377,7 @@ move-result-object p1 - const v1, 0x7f1209cb + const v1, 0x7f1209c6 new-array v2, v2, [Ljava/lang/Object; @@ -397,7 +397,7 @@ move-result-object p1 - const p3, 0x7f1209ca + const p3, 0x7f1209c5 new-instance v1, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$c8xwH3a5VMhyc7oYmYZ83i0PPRA; @@ -407,7 +407,7 @@ move-result-object p1 - const p2, 0x7f120343 + const p2, 0x7f12033e sget-object p3, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$6abWHBMCjAm9bi5nG5ikK9esJgU;->INSTANCE:Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$6abWHBMCjAm9bi5nG5ikK9esJgU; @@ -444,7 +444,7 @@ .method private handleUpdate()V .locals 2 - const v0, 0x7f120761 + const v0, 0x7f12075c invoke-static {p0, v0}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -684,9 +684,9 @@ .method public static synthetic lambda$null$7(Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;)V .locals 2 - const v0, 0x7f120398 + const v0, 0x7f120393 - const v1, 0x7f120f7c + const v1, 0x7f120f77 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 24fec46a7a..9ec06a0002 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali @@ -384,7 +384,7 @@ if-eqz v1, :cond_0 - const v1, 0x7f120a5b + const v1, 0x7f120a56 const/4 v2, 0x1 @@ -429,7 +429,7 @@ goto :goto_0 :cond_0 - const v1, 0x7f120a5a + const v1, 0x7f120a55 invoke-virtual {p0, v1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->getString(I)Ljava/lang/String; @@ -568,7 +568,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 v1, 0x7f120b01 + const v1, 0x7f120afc invoke-virtual {p0, v1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali index 5984d88508..f81ddd3509 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali @@ -801,7 +801,7 @@ const/4 v0, 0x0 :goto_0 - const v1, 0x7f120346 + const v1, 0x7f120341 if-eqz v0, :cond_4 @@ -829,7 +829,7 @@ return-void :cond_3 - const p2, 0x7f120344 + const p2, 0x7f12033f invoke-virtual {p1, p2}, Lcom/discord/views/TernaryCheckBox;->setOffDisabled(I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali index 95194b30d8..1d9066032a 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali @@ -373,7 +373,7 @@ move-result p2 - const v0, 0x7f120345 + const v0, 0x7f120340 if-eqz p2, :cond_0 @@ -400,7 +400,7 @@ return-void :cond_2 - const p2, 0x7f120344 + const p2, 0x7f12033f invoke-virtual {p1, p2}, Lcom/discord/views/TernaryCheckBox;->setDisabled(I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali index 2496d12024..6b5974a0ed 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali @@ -135,12 +135,12 @@ if-eqz v0, :cond_0 - const v0, 0x7f120356 + const v0, 0x7f120351 goto :goto_0 :cond_0 - const v0, 0x7f120383 + const v0, 0x7f12037e :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->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 e5c878f820..4c9b0fe267 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali @@ -155,12 +155,12 @@ if-eqz v0, :cond_0 - const v0, 0x7f120356 + const v0, 0x7f120351 goto :goto_0 :cond_0 - const v0, 0x7f120383 + const v0, 0x7f12037e :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->setActionBarTitle(I)Lkotlin/Unit; @@ -360,7 +360,7 @@ return-void :cond_0 - const p1, 0x7f120b7e + const p1, 0x7f120b79 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.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali index 45f711406b..8142286d90 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 @@ -159,7 +159,7 @@ :goto_1 new-instance p2, Lcom/discord/widgets/channels/WidgetChannelTopic$Model; - const p3, 0x7f120389 + const p3, 0x7f120384 invoke-virtual {p1, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali index e4088a0e4f..077f18f1ee 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali @@ -129,12 +129,12 @@ if-ne v0, v1, :cond_1 - const v0, 0x7f120431 + const v0, 0x7f12042c goto :goto_0 :cond_1 - const v0, 0x7f120432 + const v0, 0x7f12042d :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetCreateChannel;->setActionBarTitle(I)Lkotlin/Unit; @@ -877,12 +877,12 @@ if-ne v1, v2, :cond_4 - const v1, 0x7f120caa + const v1, 0x7f120ca5 goto :goto_1 :cond_4 - const v1, 0x7f120cac + const v1, 0x7f120ca7 :goto_1 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -893,12 +893,12 @@ if-ne v1, v2, :cond_5 - const v1, 0x7f120cab + const v1, 0x7f120ca6 goto :goto_2 :cond_5 - const v1, 0x7f120cad + const v1, 0x7f120ca8 :goto_2 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -909,12 +909,12 @@ if-ne v1, v2, :cond_6 - const v1, 0x7f120590 + const v1, 0x7f12058b goto :goto_3 :cond_6 - const v1, 0x7f120593 + const v1, 0x7f12058e :goto_3 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -925,12 +925,12 @@ if-ne v1, v2, :cond_7 - const v1, 0x7f120355 + const v1, 0x7f120350 goto :goto_4 :cond_7 - const v1, 0x7f120591 + const v1, 0x7f12058c :goto_4 invoke-virtual {p0, v1}, Lcom/discord/widgets/channels/WidgetCreateChannel;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali index e969f5d8f0..89e52ff92a 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali @@ -375,7 +375,7 @@ if-nez p1, :cond_0 - const p1, 0x7f12074b + const p1, 0x7f120746 invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String; @@ -420,7 +420,7 @@ if-lt p1, p3, :cond_0 - const p1, 0x7f120751 + const p1, 0x7f12074c invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -503,7 +503,7 @@ move-result-object p1 - const v0, 0x7f120751 + const v0, 0x7f12074c invoke-static {p1, v0}, Lcom/discord/app/f;->d(Landroid/content/Context;I)V @@ -753,7 +753,7 @@ aput-object v2, v1, v3 - const v2, 0x7f12075c + const v2, 0x7f120757 invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -785,7 +785,7 @@ if-lt v1, v2, :cond_0 - const p1, 0x7f120750 + const p1, 0x7f12074b invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String; @@ -831,7 +831,7 @@ :cond_1 if-nez v2, :cond_2 - const p1, 0x7f12075b + const p1, 0x7f120756 invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali index c10d64bbb4..ae2255d423 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 @@ -55,7 +55,7 @@ move-result-object p1 - const v0, 0x7f120bf5 + const v0, 0x7f120bf0 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali index 0d49232087..1e90eef0a3 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali @@ -77,12 +77,12 @@ if-eqz p1, :cond_0 - const p1, 0x7f120357 + const p1, 0x7f120352 goto :goto_0 :cond_0 - const p1, 0x7f120384 + const p1, 0x7f12037f :goto_0 invoke-static {v0, p1}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali index d3af16b1f0..3b584ac49f 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali @@ -833,12 +833,12 @@ if-eqz v0, :cond_2 - const v0, 0x7f120383 + const v0, 0x7f12037e goto :goto_0 :cond_2 - const v0, 0x7f120356 + const v0, 0x7f120351 :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->setActionBarTitle(I)Lkotlin/Unit; @@ -907,18 +907,18 @@ move-result v3 - const v4, 0x7f120591 + const v4, 0x7f12058c - const v5, 0x7f120355 + const v5, 0x7f120350 if-eqz v3, :cond_4 - const v3, 0x7f120591 + const v3, 0x7f12058c goto :goto_2 :cond_4 - const v3, 0x7f120355 + const v3, 0x7f120350 :goto_2 invoke-virtual {v0, v3}, Landroid/widget/TextView;->setText(I)V @@ -970,7 +970,7 @@ goto :goto_3 :cond_5 - const v4, 0x7f120355 + const v4, 0x7f120350 :goto_3 invoke-virtual {v0, v4}, Landroid/widget/EditText;->setHint(I)V @@ -1436,12 +1436,12 @@ if-eqz v5, :cond_0 - const v5, 0x7f12048e + const v5, 0x7f120489 goto :goto_0 :cond_0 - const v5, 0x7f12048d + const v5, 0x7f120488 :goto_0 invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V @@ -1466,7 +1466,7 @@ invoke-static {v3, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f12048f + const v0, 0x7f12048a const/4 v2, 0x1 @@ -1983,7 +1983,7 @@ move-result-object p1 - const v0, 0x7f1205f1 + const v0, 0x7f1205ec invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali index 391e72f9a7..30967e7ddc 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali @@ -288,7 +288,7 @@ const-wide/16 v7, 0x0 - const v9, 0x7f1204b2 + const v9, 0x7f1204ad const/4 v10, 0x0 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 76edca0bf5..fc7531e5e8 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali @@ -226,9 +226,9 @@ if-eqz p7, :cond_0 - const p3, 0x7f120a73 + const p3, 0x7f120a6e - const v3, 0x7f120a73 + const v3, 0x7f120a6e goto :goto_0 @@ -240,9 +240,9 @@ if-eqz p3, :cond_1 - const p4, 0x7f120a7f + const p4, 0x7f120a7a - const v4, 0x7f120a7f + const v4, 0x7f120a7a 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 826022a1ed..754c8db51a 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 @@ -95,7 +95,7 @@ check-cast p1, Ljava/lang/CharSequence; - const v1, 0x7f12093b + const v1, 0x7f120936 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 02ab0832bf..af4c3d4a5a 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 @@ -387,7 +387,7 @@ add-int/lit8 p1, p1, 0x1 - const v0, 0x7f120a14 + const v0, 0x7f120a0f 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 41300711c6..d6119600ff 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 @@ -184,17 +184,17 @@ if-eqz v0, :cond_3 - const v0, 0x7f120b4b + const v0, 0x7f120b46 if-eq p1, v0, :cond_2 - const p2, 0x7f120ef2 + const p2, 0x7f120eed const/4 v0, 0x0 if-eq p1, p2, :cond_1 - const p2, 0x7f1210ae + const p2, 0x7f1210a9 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 e4c6ce041c..3f958afe96 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali @@ -117,7 +117,7 @@ .method private final getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence; .locals 3 - const v0, 0x7f120f5e + const v0, 0x7f120f59 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 07bb2f596d..592aea0d7c 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali @@ -331,7 +331,7 @@ if-eqz v0, :cond_0 - const v0, 0x7f120f8e + const v0, 0x7f120f89 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -342,7 +342,7 @@ return-object p1 :cond_0 - const v0, 0x7f120a5b + const v0, 0x7f120a56 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 811a11d0c0..c6c6a578e1 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali @@ -928,7 +928,7 @@ if-eqz p2, :cond_0 - const p1, 0x7f1204fc + const p1, 0x7f1204f7 goto :goto_0 @@ -941,7 +941,7 @@ if-nez p2, :cond_1 - const p1, 0x7f120383 + const p1, 0x7f12037e goto :goto_0 @@ -952,12 +952,12 @@ if-eqz p1, :cond_2 - const p1, 0x7f1204fb + const p1, 0x7f1204f6 goto :goto_0 :cond_2 - const p1, 0x7f120d3d + const p1, 0x7f120d38 :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 69b76e2843..115b1db245 100644 --- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali +++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali @@ -421,7 +421,7 @@ invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const v1, 0x7f120a14 + const v1, 0x7f120a0f 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 9997ab8342..87f490311a 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali @@ -66,7 +66,7 @@ new-array v1, v1, [Ljava/lang/Object; - const v2, 0x7f120ee3 + const v2, 0x7f120ede 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 d7b0596e87..c36daad393 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali @@ -74,7 +74,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120ee4 + const v1, 0x7f120edf invoke-virtual {p2, v1, v0}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali index 86c6753be5..bef992c9ec 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali @@ -138,7 +138,7 @@ if-eqz v1, :cond_1 - const v2, 0x7f12025c + const v2, 0x7f120257 invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -239,7 +239,7 @@ const v6, 0x7f080274 - const v7, 0x7f12025f + const v7, 0x7f12025a invoke-direct {v5, v6, v7}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1;->(II)V @@ -253,7 +253,7 @@ const v7, 0x7f08023c - const v8, 0x7f12025d + const v8, 0x7f120258 invoke-direct {v6, v7, v8}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2;->(II)V @@ -267,7 +267,7 @@ const v7, 0x7f08019e - const v8, 0x7f12025b + const v8, 0x7f120256 invoke-direct {v6, v7, v8}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3;->(II)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 ffd4cd90db..d9a5d1c390 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali @@ -99,7 +99,7 @@ if-eqz p2, :cond_0 - const p1, 0x7f1204df + const p1, 0x7f1204da invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -110,7 +110,7 @@ :cond_0 if-nez p3, :cond_1 - const p1, 0x7f120ab2 + const p1, 0x7f120aad invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -123,7 +123,7 @@ move-result-object p1 - const p2, 0x7f120ef5 + const p2, 0x7f120ef0 invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -787,7 +787,7 @@ return-object p1 :cond_0 - const v0, 0x7f121092 + const v0, 0x7f12108d invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -796,7 +796,7 @@ return-object p1 :cond_1 - const v0, 0x7f121088 + const v0, 0x7f121083 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -821,7 +821,7 @@ return-object p1 :pswitch_0 - const v0, 0x7f120825 + const v0, 0x7f120820 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -830,7 +830,7 @@ return-object p1 :pswitch_1 - const v0, 0x7f120823 + const v0, 0x7f12081e new-array v2, v2, [Ljava/lang/Object; @@ -845,7 +845,7 @@ return-object p1 :pswitch_2 - const v0, 0x7f120822 + const v0, 0x7f12081d new-array v2, v2, [Ljava/lang/Object; @@ -860,7 +860,7 @@ return-object p1 :pswitch_3 - const v0, 0x7f120824 + const v0, 0x7f12081f invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$1$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$1$1.smali index d98ebc39e0..e54da41011 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$1$1.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$1$1.smali @@ -96,7 +96,7 @@ iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$1$1;->$appActivity:Lcom/discord/app/AppActivity; - const v3, 0x7f120c9a + const v3, 0x7f120c95 invoke-virtual {v0, v3}, Lcom/discord/app/AppActivity;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali index 2d1deb14aa..c2f4059b6d 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 @@ -71,7 +71,7 @@ iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2; - const p2, 0x7f120388 + const p2, 0x7f120383 invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z @@ -106,7 +106,7 @@ iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2; - const p2, 0x7f120505 + const p2, 0x7f120500 invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z @@ -136,7 +136,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, 0x7f120ab2 + const p2, 0x7f120aad 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 210efc34d3..f39e880839 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali @@ -95,57 +95,57 @@ packed-switch p1, :pswitch_data_0 - const p1, 0x7f120e84 + const p1, 0x7f120e7f return p1 :pswitch_0 - const p1, 0x7f120515 - - return p1 - - :pswitch_1 - const p1, 0x7f12050f - - return p1 - - :pswitch_2 const p1, 0x7f120510 return p1 + :pswitch_1 + const p1, 0x7f12050a + + return p1 + + :pswitch_2 + const p1, 0x7f12050b + + return p1 + :pswitch_3 - const p1, 0x7f120516 - - return p1 - - :pswitch_4 - const p1, 0x7f120513 - - return p1 - - :pswitch_5 - const p1, 0x7f120517 - - return p1 - - :pswitch_6 - const p1, 0x7f12050e - - return p1 - - :pswitch_7 const p1, 0x7f120511 return p1 - :pswitch_8 + :pswitch_4 + const p1, 0x7f12050e + + return p1 + + :pswitch_5 const p1, 0x7f120512 return p1 + :pswitch_6 + const p1, 0x7f120509 + + return p1 + + :pswitch_7 + const p1, 0x7f12050c + + return p1 + + :pswitch_8 + const p1, 0x7f12050d + + return p1 + :pswitch_9 - const p1, 0x7f120514 + const p1, 0x7f12050f return p1 diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali index e069561710..ed4d251fdf 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali @@ -89,7 +89,7 @@ iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions$configureUI$8;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListActions; - const v2, 0x7f120e3a + const v2, 0x7f120e35 invoke-virtual {v1, v2}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali index abdeb09aae..a203988f38 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali @@ -1038,12 +1038,12 @@ if-eqz v1, :cond_4 - const v1, 0x7f120f91 + const v1, 0x7f120f8c goto :goto_4 :cond_4 - const v1, 0x7f120be6 + const v1, 0x7f120be1 :goto_4 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1561,7 +1561,7 @@ move-result-object v2 - const v3, 0x7f120cf7 + const v3, 0x7f120cf2 invoke-virtual {v0, v3}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String; @@ -1571,7 +1571,7 @@ invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v4, 0x7f120cf6 + const v4, 0x7f120cf1 invoke-virtual {v0, v4}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String; @@ -1581,13 +1581,13 @@ invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f1210ee + const v5, 0x7f1210e9 invoke-virtual {v0, v5}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String; move-result-object v5 - const v6, 0x7f120ab4 + const v6, 0x7f120aaf invoke-virtual {v0, v6}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String; @@ -1717,12 +1717,12 @@ if-eqz p1, :cond_1 - const p1, 0x7f120a2e + const p1, 0x7f120a29 goto :goto_1 :cond_1 - const p1, 0x7f120a25 + const p1, 0x7f120a20 :goto_1 invoke-static {}, Lcom/discord/app/g;->du()Lrx/Observable$Transformer; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali index c6641eef79..7e4116a9c5 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali @@ -143,7 +143,7 @@ aput-object p2, v2, v4 - const p2, 0x7f12030b + const p2, 0x7f120306 invoke-virtual {p1, p2, v2}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String; 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 d6d76b99bf..08e78bfbb7 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali @@ -241,7 +241,7 @@ move-result-object v0 - const v3, 0x7f120eb0 + const v3, 0x7f120eab new-array v2, v2, [Ljava/lang/Object; @@ -262,7 +262,7 @@ move-result-object v0 - const v3, 0x7f120eaf + const v3, 0x7f120eaa 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 db77cd9f79..c8af270280 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali @@ -430,7 +430,7 @@ if-eqz v1, :cond_4 - const v6, 0x7f120916 + const v6, 0x7f120911 goto :goto_3 @@ -449,19 +449,19 @@ if-ne v9, v8, :cond_5 - const v6, 0x7f120927 + const v6, 0x7f120922 goto :goto_3 :cond_5 if-eqz v6, :cond_6 - const v6, 0x7f120914 + const v6, 0x7f12090f goto :goto_3 :cond_6 - const v6, 0x7f12091f + const v6, 0x7f12091a :goto_3 invoke-virtual {v7, v6}, Landroid/widget/TextView;->setText(I)V @@ -695,12 +695,12 @@ if-eq v0, v1, :cond_0 - const v0, 0x7f12091b + const v0, 0x7f120916 goto :goto_0 :cond_0 - const v0, 0x7f12091d + const v0, 0x7f120918 :goto_0 invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali index 9d352a7845..17f157b58a 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali @@ -610,7 +610,7 @@ if-eqz p1, :cond_2 - const p1, 0x7f120732 + const p1, 0x7f12072d invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -621,7 +621,7 @@ goto :goto_2 :cond_2 - const p1, 0x7f120731 + const p1, 0x7f12072c invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -636,7 +636,7 @@ move-result-object p1 - const v2, 0x7f12072e + const v2, 0x7f120729 invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(I)V @@ -734,7 +734,7 @@ move-result-object v1 - const v2, 0x7f120733 + const v2, 0x7f12072e invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V @@ -1137,7 +1137,7 @@ if-eqz v3, :cond_7 - const v3, 0x7f120736 + const v3, 0x7f120731 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1148,7 +1148,7 @@ goto :goto_6 :cond_7 - const v3, 0x7f120735 + const v3, 0x7f120730 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1279,7 +1279,7 @@ aput-object v10, v13, v5 - const v10, 0x7f120729 + const v10, 0x7f120724 invoke-virtual {v2, v10, v13}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -1398,7 +1398,7 @@ if-nez v3, :cond_c - const v3, 0x7f1206e1 + const v3, 0x7f1206dc invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1437,7 +1437,7 @@ :cond_c if-eqz v6, :cond_d - const v3, 0x7f120711 + const v3, 0x7f12070c invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1448,7 +1448,7 @@ :cond_d if-eqz v8, :cond_e - const v3, 0x7f1206ed + const v3, 0x7f1206e8 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1463,7 +1463,7 @@ if-eqz v3, :cond_f - const v3, 0x7f1206e0 + const v3, 0x7f1206db const/4 v7, 0x1 @@ -1510,7 +1510,7 @@ :cond_f if-eqz v7, :cond_10 - const v3, 0x7f1206df + const v3, 0x7f1206da invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1584,7 +1584,7 @@ if-eqz v8, :cond_13 - const v6, 0x7f120724 + const v6, 0x7f12071f goto :goto_b @@ -1595,7 +1595,7 @@ if-eqz v7, :cond_14 - const v6, 0x7f120726 + const v6, 0x7f120721 goto :goto_b @@ -1608,12 +1608,12 @@ if-eqz v6, :cond_15 - const v6, 0x7f120727 + const v6, 0x7f120722 goto :goto_b :cond_15 - const v6, 0x7f120725 + const v6, 0x7f120720 :goto_b invoke-virtual {v3, v6}, Landroid/widget/Button;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali index 76fff5df84..d1fe9cb120 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali @@ -312,7 +312,7 @@ check-cast v3, Landroid/view/View; - const v6, 0x7f1210da + const v6, 0x7f1210d5 new-array v7, v4, [Ljava/lang/Object; @@ -333,7 +333,7 @@ check-cast v3, Landroid/view/View; - const v6, 0x7f1210df + const v6, 0x7f1210da new-array v7, v4, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali index ce15366509..5a83c8f87d 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali @@ -617,7 +617,7 @@ if-eqz v2, :cond_2 - const v4, 0x7f120911 + const v4, 0x7f12090c invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -628,7 +628,7 @@ goto :goto_2 :cond_2 - const v4, 0x7f12090e + const v4, 0x7f120909 invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -643,7 +643,7 @@ move-result-object v3 - const v4, 0x7f120908 + const v4, 0x7f120903 invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(I)V @@ -699,7 +699,7 @@ :goto_3 if-eqz v3, :cond_4 - const v3, 0x7f1208d6 + const v3, 0x7f1208d1 const/4 v6, 0x1 @@ -738,7 +738,7 @@ :goto_4 if-nez v3, :cond_6 - const v3, 0x7f1208d5 + const v3, 0x7f1208d0 invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -749,7 +749,7 @@ :cond_6 if-eqz v2, :cond_7 - const v3, 0x7f120909 + const v3, 0x7f120904 invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -799,7 +799,7 @@ if-eqz v2, :cond_8 - const v3, 0x7f120434 + const v3, 0x7f12042f invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -810,7 +810,7 @@ goto :goto_6 :cond_8 - const v3, 0x7f120a18 + const v3, 0x7f120a13 invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -877,7 +877,7 @@ move-result-object v1 - const v2, 0x7f1208eb + const v2, 0x7f1208e6 invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V @@ -1085,7 +1085,7 @@ if-eqz v2, :cond_4 - const v2, 0x7f120910 + const v2, 0x7f12090b invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1096,7 +1096,7 @@ :cond_4 if-eqz v2, :cond_5 - const v2, 0x7f12090f + const v2, 0x7f12090a invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1109,7 +1109,7 @@ if-nez v2, :cond_6 - const v2, 0x7f12090d + const v2, 0x7f120908 invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1126,7 +1126,7 @@ if-eqz v2, :cond_8 - const v2, 0x7f1208ef + const v2, 0x7f1208ea new-array v3, v8, [Ljava/lang/Object; @@ -1155,7 +1155,7 @@ goto :goto_5 :cond_8 - const v2, 0x7f12090c + const v2, 0x7f120907 invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1412,7 +1412,7 @@ move-result-object v3 - const v11, 0x7f1208de + const v11, 0x7f1208d9 new-array v12, v8, [Ljava/lang/Object; 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 80073b8b07..48f4c4362f 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali @@ -418,7 +418,7 @@ aput-object v5, v4, v6 - const v5, 0x7f12091c + const v5, 0x7f120917 invoke-virtual {v2, v5, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -558,7 +558,7 @@ move-result-object v5 - const v7, 0x7f120fe8 + const v7, 0x7f120fe3 new-array v3, v3, [Ljava/lang/Object; @@ -724,7 +724,7 @@ return-object p1 :cond_0 - const p2, 0x7f12059c + const p2, 0x7f120597 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; 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 54928f54d2..524fbe00c2 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali @@ -193,7 +193,7 @@ move-result-object v0 - const v1, 0x7f120a75 + const v1, 0x7f120a70 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 44e628f42c..b697a18b7d 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali @@ -85,22 +85,22 @@ if-eqz p2, :cond_0 - const p1, 0x7f120297 + const p1, 0x7f120292 return p1 :cond_0 - const p1, 0x7f120298 + const p1, 0x7f120293 return p1 :cond_1 - const p1, 0x7f12029b + const p1, 0x7f120296 return p1 :cond_2 - const p1, 0x7f12029a + const p1, 0x7f120295 return p1 .end method @@ -193,7 +193,7 @@ move-result-object p1 - const v3, 0x7f120f90 + const v3, 0x7f120f8b 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 c2d585f9bc..9c3b44d444 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, 0x7f120edc + const v0, 0x7f120ed7 new-array v1, v2, [Ljava/lang/Object; @@ -141,7 +141,7 @@ return-object p1 :pswitch_3 - const v0, 0x7f120eb1 + const v0, 0x7f120eac new-array v1, v2, [Ljava/lang/Object; @@ -156,7 +156,7 @@ return-object p1 :pswitch_4 - const v0, 0x7f120eb2 + const v0, 0x7f120ead new-array v1, v1, [Ljava/lang/Object; @@ -208,7 +208,7 @@ if-nez v0, :cond_1 - const v0, 0x7f120ee1 + const v0, 0x7f120edc new-array v1, v2, [Ljava/lang/Object; @@ -224,7 +224,7 @@ :cond_1 :goto_0 - const v0, 0x7f120ee0 + const v0, 0x7f120edb new-array v1, v1, [Ljava/lang/Object; @@ -243,7 +243,7 @@ return-object p1 :pswitch_6 - const v0, 0x7f120edf + const v0, 0x7f120eda 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 fee411e329..2565637615 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali @@ -619,7 +619,7 @@ check-cast p2, Landroid/view/View; - const v0, 0x7f120fb8 + const v0, 0x7f120fb3 invoke-static {p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali index f93abe93ec..f6a010ef2c 100644 --- a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali +++ b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali @@ -284,7 +284,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, 0x7f120cdb + const p1, 0x7f120cd6 invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali index 845d7fef36..b0e9cd060e 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 @@ -171,12 +171,12 @@ if-eqz v1, :cond_2 - const v1, 0x7f120aae + const v1, 0x7f120aa9 goto :goto_0 :cond_2 - const v1, 0x7f120aad + const v1, 0x7f120aa8 :goto_0 invoke-virtual {p0, 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 52a178128c..bf26143a1b 100644 --- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali +++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali @@ -177,7 +177,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120bf0 + const p1, 0x7f120beb 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 dd482cc82e..a95e3afa2f 100644 --- a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali +++ b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali @@ -374,7 +374,7 @@ if-nez p3, :cond_1 - const p1, 0x7f120388 + const p1, 0x7f120383 invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/typing/WidgetChatTypingUsers;->getString(I)Ljava/lang/String; @@ -441,7 +441,7 @@ packed-switch v0, :pswitch_data_0 - const p2, 0x7f120e34 + const p2, 0x7f120e2f invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -452,7 +452,7 @@ :pswitch_0 sget-object v0, Lkotlin/jvm/internal/y;->beD:Lkotlin/jvm/internal/y; - const v0, 0x7f120f00 + const v0, 0x7f120efb invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -501,7 +501,7 @@ :pswitch_1 sget-object v0, Lkotlin/jvm/internal/y;->beD:Lkotlin/jvm/internal/y; - const v0, 0x7f120f73 + const v0, 0x7f120f6e invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -542,7 +542,7 @@ :pswitch_2 sget-object v0, Lkotlin/jvm/internal/y;->beD:Lkotlin/jvm/internal/y; - const v0, 0x7f120b40 + const v0, 0x7f120b3b invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali index f12bca5818..1d9e008ba0 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali @@ -250,7 +250,7 @@ invoke-static {p0, p1, v1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120480 + const p1, 0x7f12047b invoke-virtual {p0, p1}, Lcom/discord/widgets/debugging/WidgetDebugging;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 46f12b1685..12dc0ddc14 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -419,7 +419,7 @@ aput-object v2, v1, v3 - const v2, 0x7f12042c + const v2, 0x7f120427 invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -449,7 +449,7 @@ const-string v5, "INTENT_EXTRA_CRASH_SOURCE" - const v6, 0x7f120e84 + const v6, 0x7f120e7f invoke-virtual {p0, v6}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I)Ljava/lang/String; @@ -467,7 +467,7 @@ :goto_0 aput-object v5, v2, v3 - const v5, 0x7f12042b + const v5, 0x7f120426 invoke-virtual {p0, v5, v2}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -481,7 +481,7 @@ move-result-object v1 - const v2, 0x7f12042d + const v2, 0x7f120428 new-array v5, v0, [Ljava/lang/Object; @@ -508,11 +508,11 @@ move-result-object p1 - const v1, 0x7f120425 + const v1, 0x7f120420 new-array v2, v0, [Ljava/lang/Object; - const-string v4, "8.5.9" + const-string v4, "8.6.0" aput-object v4, v2, v3 @@ -528,7 +528,7 @@ move-result-object p1 - const v1, 0x7f120429 + const v1, 0x7f120424 new-array v2, v0, [Ljava/lang/Object; @@ -552,7 +552,7 @@ move-result-object p1 - const v1, 0x7f120428 + const v1, 0x7f120423 new-array v0, v0, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali index 1d097ea6c1..a261d12923 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali @@ -460,7 +460,7 @@ invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v1, 0x7f120630 + const v1, 0x7f12062b invoke-virtual {p0, v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd;->setActionBarTitle(I)Lkotlin/Unit; 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 40f77d3dec..a87de7cc24 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali @@ -462,7 +462,7 @@ move-result-object p1 - const p2, 0x7f120935 + const p2, 0x7f120930 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -481,7 +481,7 @@ move-result-object p1 - const p2, 0x7f120a0e + const p2, 0x7f120a09 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali index 9bcf507afc..f9d75110a7 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali @@ -96,11 +96,11 @@ invoke-direct {v1, p0, p1, v0, p2}, Lcom/discord/widgets/friends/WidgetFriendsList$addTab$1;->(Lcom/discord/widgets/friends/WidgetFriendsList;Lcom/google/android/material/tabs/TabLayout;Lcom/google/android/material/tabs/TabLayout$Tab;I)V - const v2, 0x7f120633 + const v2, 0x7f12062e if-eq p2, v2, :cond_1 - const v2, 0x7f120e93 + const v2, 0x7f120e8e if-eq p2, v2, :cond_0 @@ -164,23 +164,23 @@ invoke-static {v0, v1, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V - const v0, 0x7f120631 + const v0, 0x7f12062c invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V - const v0, 0x7f120632 + const v0, 0x7f12062d invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V - const v0, 0x7f120633 + const v0, 0x7f12062e invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V - const v0, 0x7f120634 + const v0, 0x7f12062f invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V - const v0, 0x7f12030a + const v0, 0x7f120305 invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali index 5f5a448fbb..776df7cb84 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali @@ -732,7 +732,7 @@ move-result-object v1 - const v4, 0x7f120b4f + const v4, 0x7f120b4a invoke-virtual {v1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -757,7 +757,7 @@ move-result-object v1 - const v4, 0x7f1208c4 + const v4, 0x7f1208bf invoke-virtual {v1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$2.smali index 5c07bbb539..7df9abd851 100644 --- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$2.smali +++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model$Companion$get$2.smali @@ -97,7 +97,7 @@ } .end annotation - move-object/from16 v0, p5 + move-object/from16 v7, p5 if-nez p1, :cond_0 @@ -106,105 +106,91 @@ return-object v0 :cond_0 - sget-object v1, Lcom/discord/utilities/permissions/ManageGuildContext;->Companion:Lcom/discord/utilities/permissions/ManageGuildContext$Companion; + sget-object v0, Lcom/discord/utilities/permissions/ManageGuildContext;->Companion:Lcom/discord/utilities/permissions/ManageGuildContext$Companion; - const-string v2, "categories" + const-string v1, "categories" - move-object/from16 v3, p4 + move-object/from16 v2, p4 - invoke-static {v3, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v2, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const-string v2, "me" + const-string v1, "me" move-object/from16 v8, p2 - invoke-static {v8, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v8, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelUser;->getId()J - move-result-wide v4 + move-result-wide v3 invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getOwnerId()J - move-result-wide v6 + move-result-wide v5 - cmp-long v2, v4, v6 + cmp-long v1, v3, v5 - if-nez v2, :cond_1 + if-nez v1, :cond_1 - const/4 v2, 0x1 + const/4 v1, 0x1 - const/4 v4, 0x1 + const/4 v3, 0x1 goto :goto_0 :cond_1 - const/4 v2, 0x0 + const/4 v1, 0x0 - const/4 v4, 0x0 + const/4 v3, 0x0 :goto_0 - const-string v2, "guildPermissions" + const-string v1, "channelPermissions" - invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + move-object/from16 v4, p6 - invoke-virtual/range {p5 .. p5}, Ljava/lang/Integer;->intValue()I - - move-result v5 - - const-string v2, "channelPermissions" - - move-object/from16 v6, p6 - - invoke-static {v6, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v4, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getMfaLevel()I - move-result v7 + move-result v5 invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z - move-result v9 + move-result v6 - move-object/from16 v2, p4 + move-object/from16 v1, p4 - move v3, v4 + move v2, v3 - move v4, v5 + move-object/from16 v3, p5 - move-object/from16 v5, p6 + invoke-virtual/range {v0 .. v6}, Lcom/discord/utilities/permissions/ManageGuildContext$Companion;->from(Ljava/util/List;ZLjava/lang/Integer;Ljava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext; - move v6, v7 - - move v7, v9 - - invoke-virtual/range {v1 .. v7}, Lcom/discord/utilities/permissions/ManageGuildContext$Companion;->from(Ljava/util/List;ZILjava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext; - - move-result-object v1 + move-result-object v0 new-instance v12, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Model; - const-string v2, "restrictedGuildIds" + const-string v1, "restrictedGuildIds" move-object/from16 v4, p7 - invoke-static {v4, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v4, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - sget-object v2, Lcom/discord/widgets/servers/WidgetServerSettings;->Companion:Lcom/discord/widgets/servers/WidgetServerSettings$Companion; + sget-object v1, Lcom/discord/widgets/servers/WidgetServerSettings;->Companion:Lcom/discord/widgets/servers/WidgetServerSettings$Companion; - invoke-virtual {v2, v1}, Lcom/discord/widgets/servers/WidgetServerSettings$Companion;->canManage(Lcom/discord/utilities/permissions/ManageGuildContext;)Z + invoke-virtual {v1, v0}, Lcom/discord/widgets/servers/WidgetServerSettings$Companion;->canManage(Lcom/discord/utilities/permissions/ManageGuildContext;)Z move-result v5 - const/16 v1, 0x10 + const/16 v0, 0x10 - invoke-static {v1, v0}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z + invoke-static {v0, v7}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z move-result v6 - const/high16 v1, 0x4000000 + const/high16 v0, 0x4000000 - invoke-static {v1, v0}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z + invoke-static {v0, v7}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z move-result v7 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 33301ed113..4ae1acafba 100644 --- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali +++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali @@ -930,7 +930,7 @@ invoke-virtual {p0, v1, v4}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->setOnClickAndDismissListener(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V - const v1, 0x7f120dfd + const v1, 0x7f120df8 new-array v2, v2, [Ljava/lang/Object; @@ -988,12 +988,12 @@ if-eqz p1, :cond_2 - const p1, 0x7f120e42 + const p1, 0x7f120e3d goto :goto_2 :cond_2 - const p1, 0x7f120835 + const p1, 0x7f120830 :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 bdec0b12de..db48041481 100644 --- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali +++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali @@ -305,7 +305,7 @@ .method private getCommunityGuidelines()Ljava/lang/CharSequence; .locals 4 - const v0, 0x7f12043e + const v0, 0x7f120439 invoke-virtual {p0, v0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->getString(I)Ljava/lang/String; @@ -419,7 +419,7 @@ if-eqz v1, :cond_0 - const p1, 0x7f120df6 + const p1, 0x7f120df1 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -432,7 +432,7 @@ if-eqz v1, :cond_1 - const p1, 0x7f120f8b + const p1, 0x7f120f86 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -537,9 +537,9 @@ .method public static synthetic lambda$null$3(Lcom/discord/widgets/guilds/create/WidgetGuildCreate;)V .locals 2 - const v0, 0x7f120398 + const v0, 0x7f120393 - const v1, 0x7f120f7c + const v1, 0x7f120f77 invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V @@ -669,7 +669,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120439 + const p1, 0x7f120434 invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali index 85f45e5ef6..65a892b438 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali @@ -977,7 +977,7 @@ return-object p1 :cond_5 - const p1, 0x7f120ab6 + const p1, 0x7f120ab1 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 76eb2d9304..438a23139a 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali @@ -387,7 +387,7 @@ aput-object p1, v0, v1 - const p1, 0x7f120946 + const p1, 0x7f120941 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 776b097bda..bfee45a162 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali @@ -1091,7 +1091,7 @@ check-cast p2, Ljava/lang/CharSequence; - const v0, 0x7f12093b + const v0, 0x7f120936 invoke-static {p1, p2, v0}, Lcom/discord/app/f;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V @@ -1579,7 +1579,7 @@ invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v1, 0x7f120f14 + const v1, 0x7f120f0f invoke-virtual {p0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getString(I)Ljava/lang/String; @@ -1716,7 +1716,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, 0x7f12094d + const v0, 0x7f120948 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 64c4378340..24859016ef 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali @@ -972,7 +972,7 @@ if-nez p1, :cond_0 - const p1, 0x7f1208ee + const p1, 0x7f1208e9 invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; @@ -989,7 +989,7 @@ return-object p1 :cond_0 - const v0, 0x7f120271 + const v0, 0x7f12026c const/4 v1, 0x1 @@ -1019,7 +1019,7 @@ if-eqz p2, :cond_0 - const p2, 0x7f120271 + const p2, 0x7f12026c const/4 v0, 0x1 @@ -1044,7 +1044,7 @@ return-object p1 :cond_0 - const p1, 0x7f1208f0 + const p1, 0x7f1208eb invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; @@ -1114,7 +1114,7 @@ aput-object p1, v1, v4 - const p1, 0x7f1208df + const p1, 0x7f1208da invoke-static {p0, p1, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; @@ -1146,7 +1146,7 @@ aput-object p1, v0, v1 - const p1, 0x7f1208de + const p1, 0x7f1208d9 invoke-static {p0, p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; @@ -1391,7 +1391,7 @@ move-result-object v0 - const v1, 0x7f1208d8 + const v1, 0x7f1208d3 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1399,7 +1399,7 @@ move-result-object v0 - const v1, 0x7f120906 + const v1, 0x7f120901 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 0b2c07dedf..045c18d472 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 @@ -40,7 +40,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, 0x7f12096b + const v0, 0x7f120966 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/WidgetGuildsListAdapter$Item.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali index 0e57a33079..a3ab6d50ec 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 @@ -236,7 +236,7 @@ if-eqz p3, :cond_6 - const p2, 0x7f120839 + const p2, 0x7f120834 invoke-virtual {p3, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -295,7 +295,7 @@ invoke-virtual {p1, v2}, Landroid/widget/TextView;->setBackgroundResource(I)V - const v2, 0x7f120a22 + const v2, 0x7f120a1d 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 9813c6f0ae..8b85b41ae3 100644 --- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali +++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali @@ -299,7 +299,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/guilds/management/WidgetGuildManagement;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120e04 + const p1, 0x7f120dff invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/management/WidgetGuildManagement;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali index 93a09ebf9e..ed2d284dc6 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali @@ -128,7 +128,7 @@ goto :goto_0 :pswitch_0 - const p1, 0x7f12038d + const p1, 0x7f120388 invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -137,7 +137,7 @@ goto :goto_0 :pswitch_1 - const p1, 0x7f120625 + const p1, 0x7f120620 invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali index d1efaf5229..756a230b13 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali @@ -108,7 +108,7 @@ move-result-object v0 - const v1, 0x7f12038d + const v1, 0x7f120388 invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -127,7 +127,7 @@ move-result-object v0 - const v1, 0x7f12038c + const v1, 0x7f120387 invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali index d030880c39..5d9a699c77 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali @@ -312,7 +312,7 @@ move-result-object p1 - const v0, 0x7f120ae8 + const v0, 0x7f120ae3 invoke-virtual {p0, v0}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String; @@ -326,7 +326,7 @@ move-result-object p1 - const v0, 0x7f120ae9 + const v0, 0x7f120ae4 invoke-virtual {p0, v0}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String; @@ -340,7 +340,7 @@ move-result-object p1 - const v0, 0x7f120ab5 + const v0, 0x7f120ab0 invoke-virtual {p0, v0}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String; @@ -366,7 +366,7 @@ move-result-object p1 - const v0, 0x7f120b3e + const v0, 0x7f120b39 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$onViewBoundOrOnResume$1$1$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali index b90fd73700..fd30aa1540 100644 --- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali +++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali @@ -91,7 +91,7 @@ iget-object v1, v1, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia; - const v2, 0x7f1204e9 + const v2, 0x7f1204e4 const/4 v3, 0x1 diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali index 59911533e3..6e67bf960e 100644 --- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali +++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali @@ -91,7 +91,7 @@ iget-object v0, v0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia; - const v1, 0x7f1204e8 + const v1, 0x7f1204e3 invoke-virtual {v0, v1}, Lcom/discord/widgets/media/WidgetMedia;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali index 2a450d153c..205af768b3 100644 --- a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali +++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali @@ -495,7 +495,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, 0x7f1210a3 + const v4, 0x7f12109e invoke-virtual {p0, v4}, Lcom/discord/widgets/media/WidgetMedia;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali index 393bae02fb..7bd6dac399 100644 --- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali +++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali @@ -472,7 +472,7 @@ move-result-object v14 - const v1, 0x7f1203dd + const v1, 0x7f1203d8 invoke-virtual {v0, v1}, Lcom/discord/app/AppActivity;->getString(I)Ljava/lang/String; 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 be90e1ca08..d9bb7313f0 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 @@ -81,12 +81,12 @@ if-eqz p1, :cond_0 - const p1, 0x7f120b34 + const p1, 0x7f120b2f goto :goto_0 :cond_0 - const p1, 0x7f120966 + const p1, 0x7f120961 :goto_0 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 5ea682e803..cbce8af637 100644 --- a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali +++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali @@ -242,7 +242,7 @@ aput-object p1, v0, v1 - const p1, 0x7f120dc2 + const p1, 0x7f120dbd invoke-virtual {p0, p1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -277,7 +277,7 @@ goto :goto_0 :cond_0 - const p1, 0x7f120dc2 + const p1, 0x7f120dbd new-array v2, v2, [Ljava/lang/Object; @@ -290,7 +290,7 @@ return-object p0 :cond_1 - const p1, 0x7f120da5 + const p1, 0x7f120da0 new-array v2, v2, [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 b442106e3a..8fb888b2cc 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 @@ -71,27 +71,27 @@ packed-switch p1, :pswitch_data_0 - const p1, 0x7f120d3d + const p1, 0x7f120d38 return p1 :pswitch_0 - const p1, 0x7f120d9c + const p1, 0x7f120d97 return p1 :pswitch_1 - const p1, 0x7f120d95 + const p1, 0x7f120d90 return p1 :pswitch_2 - const p1, 0x7f120d9e + const p1, 0x7f120d99 return p1 :pswitch_3 - const p1, 0x7f120d94 + const p1, 0x7f120d8f return p1 @@ -121,27 +121,27 @@ packed-switch p1, :pswitch_data_0 - const p1, 0x7f120d3d + const p1, 0x7f120d38 return p1 :pswitch_0 - const p1, 0x7f120dae + const p1, 0x7f120da9 return p1 :pswitch_1 - const p1, 0x7f120dad + const p1, 0x7f120da8 return p1 :pswitch_2 - const p1, 0x7f120db0 + const p1, 0x7f120dab return p1 :pswitch_3 - const p1, 0x7f120dac + const p1, 0x7f120da7 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 7c27e6d4cd..5b2eb0b0b6 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 @@ -71,32 +71,32 @@ throw v0 :pswitch_0 - const p1, 0x7f120db6 + const p1, 0x7f120db1 return p1 :pswitch_1 - const p1, 0x7f120db7 + const p1, 0x7f120db2 return p1 :pswitch_2 - const p1, 0x7f120dbb + const p1, 0x7f120db6 return p1 :pswitch_3 - const p1, 0x7f120dba + const p1, 0x7f120db5 return p1 :pswitch_4 - const p1, 0x7f120dbe + const p1, 0x7f120db9 return p1 :pswitch_5 - const p1, 0x7f120dbf + const p1, 0x7f120dba return p1 diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali index 7c8c42c668..0022d286dc 100644 --- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali @@ -115,7 +115,7 @@ if-eqz v0, :cond_0 - const p1, 0x7f1205c7 + const p1, 0x7f1205c2 goto :goto_0 diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali index 166d89319f..14e1a0883f 100644 --- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali @@ -153,7 +153,7 @@ if-eqz v0, :cond_1 - const p1, 0x7f1205c7 + const p1, 0x7f1205c2 goto :goto_1 diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali index c3d0713ef6..81f5a69df7 100644 --- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali @@ -96,7 +96,7 @@ if-ne p1, v0, :cond_0 - const p1, 0x7f12057f + const p1, 0x7f12057a return p1 @@ -105,7 +105,7 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f1205d1 + const p1, 0x7f1205cc return p1 @@ -114,7 +114,7 @@ if-ne p1, v0, :cond_2 - const p1, 0x7f1205cb + const p1, 0x7f1205c6 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 c3ecaa0d79..76a2afecd8 100644 --- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali @@ -175,7 +175,7 @@ move-result-object p1 - const v0, 0x7f120f83 + const v0, 0x7f120f7e 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 b2c25c4406..385fe20a7c 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali @@ -490,7 +490,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, 0x7f120b01 + const v0, 0x7f120afc invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->setActionBarTitle(I)Lkotlin/Unit; @@ -544,7 +544,7 @@ move-result-object v0 - const v3, 0x7f1205c5 + const v3, 0x7f1205c0 new-array v6, v4, [Ljava/lang/Object; @@ -618,7 +618,7 @@ move-result-object v0 - const v3, 0x7f1205f6 + const v3, 0x7f1205f1 invoke-virtual {p0, v3}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String; @@ -686,7 +686,7 @@ move-result-object v0 - const v1, 0x7f1205d1 + const v1, 0x7f1205cc invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali index 35f00dfcaa..8a55b9711c 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali @@ -234,11 +234,11 @@ invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120afc + const p1, 0x7f120af7 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarTitle(I)Lkotlin/Unit; - const p1, 0x7f120dd9 + const p1, 0x7f120dd4 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarSubtitle(I)Lkotlin/Unit; @@ -246,7 +246,7 @@ move-result-object p1 - const v1, 0x7f120d8f + const v1, 0x7f120d8a invoke-virtual {p1, v1}, Landroid/widget/EditText;->setHint(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali index 3949e7164e..d42b1cde33 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$Model$Companion$get$1.smali @@ -126,17 +126,9 @@ const/4 v2, 0x0 :goto_0 - const-string v1, "myPermissions" + const-string v1, "channelPermissions" - invoke-static {p3, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {p3}, Ljava/lang/Integer;->intValue()I - - move-result v3 - - const-string p3, "channelPermissions" - - invoke-static {p5, p3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {p5, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getMfaLevel()I @@ -148,9 +140,11 @@ move-object v1, p4 + move-object v3, p3 + move-object v4, p5 - invoke-virtual/range {v0 .. v6}, Lcom/discord/utilities/permissions/ManageGuildContext$Companion;->from(Ljava/util/List;ZILjava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext; + invoke-virtual/range {v0 .. v6}, Lcom/discord/utilities/permissions/ManageGuildContext$Companion;->from(Ljava/util/List;ZLjava/lang/Integer;Ljava/util/Map;IZ)Lcom/discord/utilities/permissions/ManageGuildContext; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali index f3389988e3..edae9f807f 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali @@ -1804,7 +1804,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, 0x7f120dfb + const p1, 0x7f120df6 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettings;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali index 218380c6c3..48c4cbb13e 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali @@ -213,7 +213,7 @@ .method private final configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120290 + const v0, 0x7f12028b invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->setActionBarTitle(I)Lkotlin/Unit; @@ -455,7 +455,7 @@ aput-object v4, v3, v5 - const v4, 0x7f120f7f + const v4, 0x7f120f7a invoke-virtual {v1, v4, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -481,7 +481,7 @@ aput-object v3, v2, v5 - const v3, 0x7f120f7e + const v3, 0x7f120f79 invoke-virtual {v1, v3, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -497,7 +497,7 @@ const/4 v1, 0x0 - const v2, 0x7f120343 + const v2, 0x7f12033e const/4 v3, 0x2 @@ -511,7 +511,7 @@ check-cast v1, Lkotlin/jvm/functions/Function1; - const p1, 0x7f120f7d + const p1, 0x7f120f78 invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali index 8c82d4ac54..75583f9ff2 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali @@ -74,12 +74,12 @@ if-nez p2, :cond_0 - const v0, 0x7f12038b + const v0, 0x7f120386 goto :goto_0 :cond_0 - const v0, 0x7f120e4b + const v0, 0x7f120e46 :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->setActionBarTitle(I)Lkotlin/Unit; @@ -397,7 +397,7 @@ .method public static synthetic lambda$reorderChannels$5(Lcom/discord/widgets/servers/WidgetServerSettingsChannels;Ljava/lang/Void;)V .locals 0 - const p1, 0x7f120380 + const p1, 0x7f12037b 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/WidgetServerSettingsEditIntegration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali index 82c5e6cadc..916d3b752d 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali @@ -186,7 +186,7 @@ goto/16 :goto_4 :cond_0 - const v0, 0x7f1208f2 + const v0, 0x7f1208ed invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali index 3228d35149..d215b3b2b9 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali @@ -275,7 +275,7 @@ iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->kickButton:Landroid/widget/TextView; - const v6, 0x7f1209be + const v6, 0x7f1209b9 new-array v7, v2, [Ljava/lang/Object; @@ -322,7 +322,7 @@ iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->banButton:Landroid/widget/TextView; - const v6, 0x7f12028f + const v6, 0x7f12028a new-array v2, v2, [Ljava/lang/Object; @@ -710,7 +710,7 @@ if-nez v0, :cond_0 - const v0, 0x7f120a85 + const v0, 0x7f120a80 const/4 v1, 0x1 @@ -727,7 +727,7 @@ goto :goto_0 :cond_0 - const p1, 0x7f120a86 + const p1, 0x7f120a81 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, 0x7f12076f + const p1, 0x7f12076a 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 28ac448283..ec89b36222 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali @@ -140,7 +140,7 @@ iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;->roleCheckedSetting:Lcom/discord/views/CheckedSetting; - const p2, 0x7f1209ff + const p2, 0x7f1209fa 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 5fb007706e..c2b13058eb 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali @@ -326,7 +326,7 @@ if-eqz p2, :cond_0 - const p1, 0x7f12059d + const p1, 0x7f120598 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; @@ -354,7 +354,7 @@ return-object p1 :pswitch_0 - const p1, 0x7f120f5f + const p1, 0x7f120f5a invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; @@ -363,7 +363,7 @@ return-object p1 :pswitch_1 - const p1, 0x7f12082f + const p1, 0x7f12082a invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; @@ -372,7 +372,7 @@ return-object p1 :pswitch_2 - const p1, 0x7f12082e + const p1, 0x7f120829 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; @@ -381,7 +381,7 @@ return-object p1 :pswitch_3 - const p1, 0x7f12082c + const p1, 0x7f120827 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; @@ -640,7 +640,7 @@ return-void :cond_0 - const p1, 0x7f1205e1 + const p1, 0x7f1205dc invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -1165,7 +1165,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const v2, 0x7f1205e3 + const v2, 0x7f1205de invoke-virtual {p0, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; @@ -1550,7 +1550,7 @@ aget v5, v5, v6 - const v6, 0x7f120830 + const v6, 0x7f12082b packed-switch v5, :pswitch_data_0 @@ -1609,7 +1609,7 @@ :cond_2 if-nez v4, :cond_3 - const v2, 0x7f12082d + const v2, 0x7f120828 invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->A(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali index 9eca05d699..2bf2b45644 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali @@ -221,7 +221,7 @@ aput-object p2, v1, v2 - const p2, 0x7f12080a + const p2, 0x7f120805 invoke-virtual {v0, p2, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali index 6a56b03e7a..94c63306ed 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali @@ -173,7 +173,7 @@ aput-object v0, v1, v5 - const v0, 0x7f12051c + const v0, 0x7f120517 invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -199,7 +199,7 @@ aput-object v0, v3, v2 - const p2, 0x7f12051b + const p2, 0x7f120516 invoke-virtual {p1, p2, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali index 1776b5a312..b22b5ba9c6 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali @@ -335,7 +335,7 @@ move-result v5 - const v6, 0x7f12050d + const v6, 0x7f120508 invoke-direct {v4, v0, v5, v6}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;->(III)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali index e8ea8afec8..366eaeee9a 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali @@ -41,9 +41,9 @@ check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider; - const v1, 0x7f120398 + const v1, 0x7f120393 - const v2, 0x7f120f7c + const v2, 0x7f120f77 invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali index 67e99b612a..31efc245aa 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali @@ -182,7 +182,7 @@ .method private final configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f12050d + const v0, 0x7f120508 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali index 70d35044d6..ec91b02c36 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali @@ -259,7 +259,7 @@ .method private final configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f12050d + const v0, 0x7f120508 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;->setActionBarTitle(I)Lkotlin/Unit; @@ -527,7 +527,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120d59 + const v0, 0x7f120d54 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali index 185e8d4c30..af295a8054 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali @@ -48,7 +48,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f1208f1 + const v0, 0x7f1208ec 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 77c6e35463..91e7d5d85b 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali @@ -65,7 +65,7 @@ aput-object v0, v2, v3 - const v3, 0x7f120e38 + const v3, 0x7f120e33 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 9b1f2b36c8..3cc63c50c3 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali @@ -260,7 +260,7 @@ iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView; - const v0, 0x7f120a09 + const v0, 0x7f120a04 invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V @@ -423,7 +423,7 @@ goto :goto_0 :cond_3 - const v1, 0x7f1208dc + const v1, 0x7f1208d7 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 8e664948e6..ffec4ef5ed 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali @@ -137,7 +137,7 @@ .method private final configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f1208f3 + const v0, 0x7f1208ee invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali index 25875bd031..c6fb190763 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali @@ -600,12 +600,12 @@ if-eqz p5, :cond_2 - const v0, 0x7f1204bb + const v0, 0x7f1204b6 goto :goto_0 :cond_2 - const v0, 0x7f1204bc + const v0, 0x7f1204b7 :goto_0 invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali index b9b435a40c..483d276c66 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali @@ -143,7 +143,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120a12 + const v0, 0x7f120a0d invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->setActionBarTitle(I)Lkotlin/Unit; @@ -362,7 +362,7 @@ if-nez v0, :cond_1 - const p1, 0x7f120348 + const p1, 0x7f120343 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -402,14 +402,14 @@ if-eqz p1, :cond_3 - const p1, 0x7f120349 + const p1, 0x7f120344 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V return-void :cond_3 - const p1, 0x7f120347 + const p1, 0x7f120342 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/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali index e6fcb84620..fb66948933 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali @@ -295,7 +295,7 @@ .method public static synthetic lambda$updateGuild$2(Lcom/discord/widgets/servers/WidgetServerSettingsModeration;Lcom/discord/models/domain/ModelGuild;)V .locals 0 - const p1, 0x7f120dfc + const p1, 0x7f120df7 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -391,7 +391,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120a51 + const p1, 0x7f120a4c invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->setActionBarTitle(I)Lkotlin/Unit; @@ -443,7 +443,7 @@ aput-object v2, v1, v3 - const v2, 0x7f12107d + const v2, 0x7f121078 invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -467,7 +467,7 @@ aput-object v1, v0, v3 - const v1, 0x7f121079 + const v1, 0x7f121074 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 5f456c8233..068f528a7d 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 @@ -43,9 +43,9 @@ check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider; - const v1, 0x7f120398 + const v1, 0x7f120393 - const v2, 0x7f120f7c + const v2, 0x7f120f77 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 65d20fe656..1207379bad 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali @@ -925,7 +925,7 @@ move-result-object v0 - const v1, 0x7f120a89 + const v1, 0x7f120a84 const v2, 0x7f0801ee @@ -1293,7 +1293,7 @@ move-result-object v0 - const v1, 0x7f120ab3 + const v1, 0x7f120aae const v2, 0x7f0801e6 @@ -1445,7 +1445,7 @@ goto :goto_0 :cond_1 - const v1, 0x7f120dfa + const v1, 0x7f120df5 invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getString(I)Ljava/lang/String; @@ -1775,7 +1775,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120dfc + const v0, 0x7f120df7 invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V @@ -2503,7 +2503,7 @@ invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->initChannelSelectedHandler()V - const v0, 0x7f120b7b + const v0, 0x7f120b76 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 b35d09d730..394b028d88 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali @@ -95,7 +95,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120d22 + const v0, 0x7f120d1d invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->setActionBarTitle(I)Lkotlin/Unit; @@ -425,7 +425,7 @@ .method public static synthetic lambda$processRoleDrop$3(Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;Ljava/lang/Void;)V .locals 0 - const p1, 0x7f120d21 + const p1, 0x7f120d1c 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 a8aadc2135..c56ddef613 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali @@ -89,7 +89,7 @@ move-result-object p0 - const v0, 0x7f12059d + const v0, 0x7f120598 invoke-static {p0, v0}, Lcom/discord/app/f;->d(Landroid/content/Context;I)V @@ -105,7 +105,7 @@ move-result-object p0 - const v0, 0x7f12082c + const v0, 0x7f120827 invoke-static {p0, v0}, Lcom/discord/app/f;->d(Landroid/content/Context;I)V @@ -121,7 +121,7 @@ move-result-object p0 - const v0, 0x7f120f5f + const v0, 0x7f120f5a 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$ToggleMfaDialog.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali index 9412316128..cd13e8ee1b 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali @@ -70,12 +70,12 @@ if-eqz p3, :cond_1 - const v1, 0x7f1204b3 + const v1, 0x7f1204ae goto :goto_0 :cond_1 - const v1, 0x7f120520 + const v1, 0x7f12051b :goto_0 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali index cbd89b29c5..2811978c2a 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali @@ -47,7 +47,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120dd7 + const v0, 0x7f120dd2 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->setActionBarTitle(I)Lkotlin/Unit; @@ -78,7 +78,7 @@ iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->toggleMfaButton:Landroid/widget/Button; - const v1, 0x7f120779 + const v1, 0x7f120774 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, 0x7f12077a + const v1, 0x7f120775 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 e609f59be5..d99f07d7d6 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali @@ -126,7 +126,7 @@ move-result-object v0 - const v2, 0x7f120f38 + const v2, 0x7f120f33 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 64d8b7fc8b..8818d0377b 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali @@ -98,7 +98,7 @@ iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView; - const v4, 0x7f12106b + const v4, 0x7f121066 const/4 v5, 0x1 @@ -146,7 +146,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120e33 + const v0, 0x7f120e2e 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 d1a85f6180..e4d95f5682 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 @@ -939,7 +939,7 @@ :cond_1c iget-object v1, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context; - const v2, 0x7f12080e + const v2, 0x7f120809 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 09f7c1cb2f..4caf4586b4 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali @@ -568,7 +568,7 @@ move-result-object v0 - const v1, 0x7f12042e + const v1, 0x7f120429 invoke-static {v0, v1}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -581,7 +581,7 @@ invoke-virtual {v0}, Lcom/discord/app/AppActivity;->finish()V :cond_0 - const v0, 0x7f120813 + const v0, 0x7f12080e 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 36f646f3e1..518e817895 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 @@ -102,7 +102,7 @@ iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;->$context:Landroid/content/Context; - const v4, 0x7f12080e + const v4, 0x7f120809 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 5d9e7e48b3..280b7693aa 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali @@ -475,7 +475,7 @@ iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->adapter:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter; - const p1, 0x7f120813 + const p1, 0x7f12080e invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->setActionBarTitle(I)Lkotlin/Unit; @@ -492,13 +492,13 @@ if-nez p1, :cond_1 - const p1, 0x7f12080f + const p1, 0x7f12080a goto :goto_1 :cond_1 :goto_0 - const p1, 0x7f12080b + const p1, 0x7f120806 :goto_1 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->setActionBarSubtitle(I)Lkotlin/Unit; @@ -520,13 +520,13 @@ if-nez p2, :cond_3 - const p2, 0x7f120dc3 + const p2, 0x7f120dbe goto :goto_3 :cond_3 :goto_2 - const p2, 0x7f120d90 + const p2, 0x7f120d8b :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 ede14157d8..9141c1dc4e 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali @@ -484,7 +484,7 @@ .method private final getDateString(Landroid/content/Context;)Ljava/lang/CharSequence; .locals 3 - const v0, 0x7f120369 + const v0, 0x7f120364 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetChangeLog;->getString(I)Ljava/lang/String; @@ -733,7 +733,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, 0x7f1210e1 + const p1, 0x7f1210dc invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog;->setActionBarTitle(I)Lkotlin/Unit; @@ -765,7 +765,7 @@ invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v2, 0x7f120368 + const v2, 0x7f120363 invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/WidgetChangeLog;->getString(I)Ljava/lang/String; @@ -793,7 +793,7 @@ invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V - const p1, 0x7f12036b + const p1, 0x7f120366 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali index 0d389e6afd..2510f746e7 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1341,13 +1341,13 @@ invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const p1, 0x7f1209e7 + const p1, 0x7f1209e2 invoke-virtual {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v1 - const v2, 0x7f121025 + const v2, 0x7f121020 invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -1367,7 +1367,7 @@ move-result-object p1 - const v1, 0x7f120343 + const v1, 0x7f12033e const/4 v2, 0x2 @@ -1401,7 +1401,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->setActionBarTitle(I)Lkotlin/Unit; @@ -1449,7 +1449,7 @@ invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v2, " - 8.5.9 (859)" + const-string v2, " - 8.6.0 (860)" invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali index 5095823c81..da509d21e4 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali @@ -357,7 +357,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f121009 + const p1, 0x7f121004 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 1abaf05aa2..2588a2f321 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali @@ -291,11 +291,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f1205b4 + const p1, 0x7f1205af invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarTitle(I)Lkotlin/Unit; @@ -391,7 +391,7 @@ aput-object v3, v2, v4 - const v3, 0x7f1204ad + const v3, 0x7f1204a8 invoke-virtual {p0, v3, v2}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali index 3344ff593b..84d9dc5d04 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali @@ -39,7 +39,7 @@ invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f1204ae + const p1, 0x7f1204a9 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali index a29677f8a6..d2b1968240 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali @@ -77,7 +77,7 @@ iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames; - const v5, 0x7f120fbb + const v5, 0x7f120fb6 invoke-virtual {v1, v5}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getString(I)Ljava/lang/String; @@ -89,7 +89,7 @@ iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames; - const v6, 0x7f12065b + const v6, 0x7f120656 invoke-virtual {v1, v6}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getString(I)Ljava/lang/String; @@ -101,7 +101,7 @@ iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames; - const v7, 0x7f12065c + const v7, 0x7f120657 invoke-virtual {v1, v7}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali index 522b8cdf27..65d0af064b 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali @@ -315,7 +315,7 @@ move-result-object v0 - const v1, 0x7f120e1c + const v1, 0x7f120e17 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -348,7 +348,7 @@ move-result-object v0 - const v1, 0x7f120e17 + const v1, 0x7f120e12 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -356,7 +356,7 @@ move-result-object v0 - const v1, 0x7f120e19 + const v1, 0x7f120e14 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -652,7 +652,7 @@ move-result-object v0 - const v1, 0x7f120bdf + const v1, 0x7f120bda const/4 v2, 0x1 @@ -677,11 +677,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsGames;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f1206c6 + const p1, 0x7f1206c1 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsGames;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali index c601148e14..6b8ff9ae7c 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali @@ -1685,139 +1685,139 @@ const/4 p0, -0x1 :goto_1 - const v0, 0x7f12051f + const v0, 0x7f12051a packed-switch p0, :pswitch_data_0 return v0 :pswitch_0 - const p0, 0x7f120ef6 + const p0, 0x7f120ef1 return p0 :pswitch_1 - const p0, 0x7f121095 + const p0, 0x7f121090 return p0 :pswitch_2 - const p0, 0x7f1210f3 + const p0, 0x7f1210ee return p0 :pswitch_3 - const p0, 0x7f120d20 + const p0, 0x7f120d1b return p0 :pswitch_4 - const p0, 0x7f12083c + const p0, 0x7f120837 return p0 :pswitch_5 - const p0, 0x7f1209e8 + const p0, 0x7f1209e3 return p0 :pswitch_6 - const p0, 0x7f120506 + const p0, 0x7f120501 return p0 :pswitch_7 - const p0, 0x7f120a88 + const p0, 0x7f120a83 return p0 :pswitch_8 - const p0, 0x7f120549 + const p0, 0x7f120544 return p0 :pswitch_9 - const p0, 0x7f12083b + const p0, 0x7f120836 return p0 :pswitch_a - const p0, 0x7f1209bf + const p0, 0x7f1209ba return p0 :pswitch_b - const p0, 0x7f1210f4 + const p0, 0x7f1210ef return p0 :pswitch_c - const p0, 0x7f120965 + const p0, 0x7f120960 return p0 :pswitch_d - const p0, 0x7f120f79 + const p0, 0x7f120f74 return p0 :pswitch_e - const p0, 0x7f120d34 + const p0, 0x7f120d2f return p0 :pswitch_f - const p0, 0x7f12029e + const p0, 0x7f120299 return p0 :pswitch_10 - const p0, 0x7f12045a + const p0, 0x7f120455 return p0 :pswitch_11 - const p0, 0x7f120f35 + const p0, 0x7f120f30 return p0 :pswitch_12 - const p0, 0x7f120e99 + const p0, 0x7f120e94 return p0 :pswitch_13 - const p0, 0x7f120cb2 + const p0, 0x7f120cad return p0 :pswitch_14 - const p0, 0x7f120bf6 + const p0, 0x7f120bf1 return p0 :pswitch_15 - const p0, 0x7f120a87 + const p0, 0x7f120a82 return p0 :pswitch_16 - const p0, 0x7f120964 + const p0, 0x7f12095f return p0 :pswitch_17 - const p0, 0x7f120610 + const p0, 0x7f12060b return p0 :pswitch_18 - const p0, 0x7f120530 + const p0, 0x7f12052b return p0 :pswitch_19 - const p0, 0x7f12051e + const p0, 0x7f120519 return p0 @@ -1825,12 +1825,12 @@ return v0 :pswitch_1b - const p0, 0x7f12047a + const p0, 0x7f120475 return p0 :pswitch_1c - const p0, 0x7f120460 + const p0, 0x7f12045b return p0 @@ -1950,11 +1950,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f1209c0 + const p1, 0x7f1209bb 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 dd448c310a..817da3fa0f 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali @@ -378,11 +378,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f120ef0 + const p1, 0x7f120eeb invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarTitle(I)Lkotlin/Unit; @@ -441,7 +441,7 @@ sget-object v0, Lkotlin/jvm/internal/y;->beD:Lkotlin/jvm/internal/y; - const v0, 0x7f1208c9 + const v0, 0x7f1208c4 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 2544d23f10..8ac61ca976 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali @@ -533,11 +533,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f120b04 + const p1, 0x7f120aff invoke-virtual {p0, p1}, 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 1f1e842df9..c0576faf3c 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali @@ -109,15 +109,15 @@ invoke-static {p5, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120fbf + const v0, 0x7f120fba invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120fbc + const p2, 0x7f120fb7 invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120fbd + const p2, 0x7f120fb8 invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V @@ -129,7 +129,7 @@ invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - const p2, 0x7f120fbe + const p2, 0x7f120fb9 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 3b3c43d28d..35c67d6cd9 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 @@ -109,15 +109,15 @@ invoke-static {p5, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120be3 + const v0, 0x7f120bde invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120be0 + const p2, 0x7f120bdb invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120be1 + const p2, 0x7f120bdc invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V @@ -129,7 +129,7 @@ invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - const p2, 0x7f120be2 + const p2, 0x7f120bdd invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali index fa6e08589e..2aa8ee6ba7 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali @@ -79,7 +79,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120474 + const v0, 0x7f12046f invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali index d8db1d0a2a..14d9f02de5 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali @@ -75,13 +75,13 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f120473 + const v1, 0x7f12046e invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v0 - const v1, 0x7f120472 + const v1, 0x7f12046d invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -89,7 +89,7 @@ const/4 v1, 0x0 - const v2, 0x7f120b3e + const v2, 0x7f120b39 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 694be45e5e..a47e283e7f 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali @@ -86,7 +86,7 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f12046a + const v1, 0x7f120465 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -96,7 +96,7 @@ iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;->$context:Landroid/content/Context; - const v1, 0x7f120469 + const v1, 0x7f120464 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -111,7 +111,7 @@ move-result-object p1 - const v0, 0x7f120b3e + const v0, 0x7f120b39 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 c77c3b06ba..62bc036995 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali @@ -72,13 +72,13 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f120468 + const v1, 0x7f120463 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v0 - const v1, 0x7f12046d + const v1, 0x7f120468 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -90,7 +90,7 @@ check-cast v1, Lkotlin/jvm/functions/Function1; - const v2, 0x7f120b3e + const v2, 0x7f120b39 invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -98,7 +98,7 @@ const/4 v1, 0x0 - const v2, 0x7f120343 + const v2, 0x7f12033e const/4 v3, 0x2 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali index f36a4aa67c..81c4d79df8 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali @@ -1796,7 +1796,7 @@ move-result-object p1 - const p2, 0x7f120461 + const p2, 0x7f12045c const/4 v1, 0x1 @@ -1814,7 +1814,7 @@ invoke-direct {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v0, 0x7f120477 + const v0, 0x7f120472 invoke-virtual {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -1828,7 +1828,7 @@ move-result-object p1 - const p2, 0x7f120b3e + const p2, 0x7f120b39 const/4 v0, 0x2 @@ -2153,11 +2153,11 @@ invoke-static {p0, v1, v0, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v0, 0x7f121009 + const v0, 0x7f121004 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarSubtitle(I)Lkotlin/Unit; - const v0, 0x7f120ca6 + const v0, 0x7f120ca1 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarTitle(I)Lkotlin/Unit; @@ -2185,7 +2185,7 @@ aput-object v0, v3, v1 - const v0, 0x7f120466 + const v0, 0x7f120461 invoke-virtual {p0, v0, v3}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -2223,7 +2223,7 @@ move-result-object v0 - const v3, 0x7f120463 + const v3, 0x7f12045e invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I)Ljava/lang/String; @@ -2328,7 +2328,7 @@ invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V - const v4, 0x7f120aef + const v4, 0x7f120aea 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 7b66029145..def3b96f8f 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 @@ -753,7 +753,7 @@ move-result-object v1 - const v2, 0x7f1204d6 + const v2, 0x7f1204d1 new-array v5, v3, [Ljava/lang/Object; @@ -940,7 +940,7 @@ move-result-object v0 - const v1, 0x7f120e64 + const v1, 0x7f120e5f 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 b1660c0b36..0a3ed65a77 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali @@ -376,11 +376,11 @@ invoke-static {p0, p1, v1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f120410 + const p1, 0x7f12040b invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali index 189fc18de1..b75d1569d3 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali @@ -253,7 +253,7 @@ move-result-object v0 - const v1, 0x7f120401 + const v1, 0x7f1203fc invoke-static {v0, v1}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -359,11 +359,11 @@ invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f120410 + const p1, 0x7f12040b invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali index ecd43657a5..77948b4af3 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali @@ -2091,7 +2091,7 @@ check-cast v0, Landroidx/fragment/app/Fragment; - const v1, 0x7f12104b + const v1, 0x7f121046 invoke-static {v0, v1}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V @@ -2113,11 +2113,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f1210a6 + const p1, 0x7f1210a1 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali index 1b549b7f49..2f2b68477c 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali @@ -101,7 +101,7 @@ iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount; - const v3, 0x7f120c8b + const v3, 0x7f120c86 invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali index 55f61bd199..3cd9dbe0a3 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali @@ -43,9 +43,9 @@ check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider; - const v1, 0x7f120398 + const v1, 0x7f120393 - const v2, 0x7f120f7c + const v2, 0x7f120f77 invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali index 914a62d4d1..0022584291 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali @@ -77,7 +77,7 @@ move-result-object v1 - const v2, 0x7f121040 + const v2, 0x7f12103b invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali index 74f62b27ba..926f09617a 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali @@ -2175,7 +2175,7 @@ move-result-object v2 - const v3, 0x7f120f69 + const v3, 0x7f120f64 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2189,7 +2189,7 @@ move-result-object v3 - const v4, 0x7f12103d + const v4, 0x7f121038 # 1.941515E38f invoke-virtual {v3, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2203,7 +2203,7 @@ move-result-object v4 - const v5, 0x7f120f45 + const v5, 0x7f120f40 invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2324,11 +2324,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f121043 + const p1, 0x7f12103e invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali index dbf9e84ffa..b3650afd3d 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali @@ -84,7 +84,7 @@ move-result-object p1 - const v0, 0x7f120417 + const v0, 0x7f120412 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali index 2feeb7158a..f52f516486 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali @@ -187,7 +187,7 @@ invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v4, 0x7f120286 + const v4, 0x7f120281 const/4 v6, 0x1 diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali index 0527afda36..7089d8a243 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali @@ -179,7 +179,7 @@ move-result-object v4 - const v5, 0x7f121023 + const v5, 0x7f12101e invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -258,7 +258,7 @@ move-result-object v2 - const v4, 0x7f121053 + const v4, 0x7f12104e invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali index f2d54a1a61..0f972eb0f3 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali @@ -450,7 +450,7 @@ move-result-object v2 - const v3, 0x7f121029 + const v3, 0x7f121024 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -464,7 +464,7 @@ move-result-object v2 - const v4, 0x7f120f4b + const v4, 0x7f120f46 invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -521,11 +521,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f120f4b + const p1, 0x7f120f46 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarTitle(I)Lkotlin/Unit; @@ -557,7 +557,7 @@ new-array p2, p2, [Ljava/lang/Object; - const v0, 0x7f120f4a + const v0, 0x7f120f45 invoke-virtual {p1, v0, p2}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali index 3e26bc083e..d3aa459409 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali @@ -515,7 +515,7 @@ move-result-object v2 - const v3, 0x7f120b8f + const v3, 0x7f120b8a invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -554,7 +554,7 @@ move-result-object v2 - const v3, 0x7f120b89 + const v3, 0x7f120b84 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -617,7 +617,7 @@ move-result-object v2 - const v3, 0x7f120f6e + const v3, 0x7f120f69 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -742,11 +742,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f12036f + const p1, 0x7f12036a invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali index 0dabb57aad..7c0c42df7c 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali @@ -63,7 +63,7 @@ iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit; - const p2, 0x7f120c97 + const p2, 0x7f120c92 invoke-virtual {p1, p2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali index 9e168afb6c..7921c00bad 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali @@ -1115,7 +1115,7 @@ move-result-object v1 - const v2, 0x7f121063 + const v2, 0x7f12105e invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1146,7 +1146,7 @@ move-result-object v0 - const v1, 0x7f120508 + const v1, 0x7f120503 invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getString(I)Ljava/lang/String; @@ -1177,7 +1177,7 @@ move-result-object v0 - const v1, 0x7f120c18 + const v1, 0x7f120c13 invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getString(I)Ljava/lang/String; @@ -1220,7 +1220,7 @@ move-result-object v0 - const v1, 0x7f120b8f + const v1, 0x7f120b8a invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getString(I)Ljava/lang/String; @@ -1351,11 +1351,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f121026 + const p1, 0x7f121021 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali index d92007bf2c..a0bcc6a10c 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali @@ -119,7 +119,7 @@ aput-object v1, v0, v2 - const v1, 0x7f120f51 + const v1, 0x7f120f4c invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFADownload;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali index 1422ef9035..150058c214 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali @@ -202,7 +202,7 @@ invoke-virtual {v1, v0}, Landroid/content/ClipboardManager;->setPrimaryClip(Landroid/content/ClipData;)V :cond_0 - const v0, 0x7f120417 + const v0, 0x7f120412 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -297,7 +297,7 @@ const/4 v2, 0x1 - const v3, 0x7f1209c7 + const v3, 0x7f1209c2 const/4 v4, 0x0 @@ -309,7 +309,7 @@ new-array v5, v2, [Ljava/lang/Object; - const v6, 0x7f120f43 + const v6, 0x7f120f3e invoke-virtual {p0, v6}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->getString(I)Ljava/lang/String; @@ -360,7 +360,7 @@ new-array v2, v2, [Ljava/lang/Object; - const v5, 0x7f120f44 + const v5, 0x7f120f3f invoke-virtual {p0, v5}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali index f644fcf43e..34790c254f 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali @@ -253,7 +253,7 @@ const/4 v3, 0x0 - const v4, 0x7f120343 + const v4, 0x7f12033e const/4 v5, 0x0 diff --git a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali index 02a0ca337f..28fd925982 100644 --- a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali @@ -78,7 +78,7 @@ throw p1 :pswitch_0 - const p2, 0x7f120b49 + const p2, 0x7f120b44 goto :goto_0 diff --git a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali index cd4fd8f7e0..fb6def13cf 100644 --- a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali +++ b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali @@ -191,7 +191,7 @@ aput-object v2, v1, v4 - const v2, 0x7f120ba7 + const v2, 0x7f120ba2 invoke-static {p0, v2, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; @@ -245,7 +245,7 @@ aput-object p1, v0, v4 - const p1, 0x7f120ba9 + const p1, 0x7f120ba4 invoke-static {p0, p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; @@ -263,7 +263,7 @@ iget-object v0, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->title:Landroid/widget/TextView; - const v1, 0x7f120bc5 + const v1, 0x7f120bc0 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali index 933cd1b2ee..1093fe0917 100644 --- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali @@ -65,7 +65,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120baf + const v0, 0x7f120baa invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali index 5c49069954..3117f2d456 100644 --- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali +++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali @@ -49,7 +49,7 @@ iget-object v3, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog; - const v4, 0x7f120bad + const v4, 0x7f120ba8 invoke-virtual {v3, v4}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; @@ -61,7 +61,7 @@ iget-object v4, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog; - const v5, 0x7f120bae + const v5, 0x7f120ba9 invoke-virtual {v4, v5}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; @@ -73,7 +73,7 @@ iget-object v5, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog; - const v6, 0x7f120b3e + const v6, 0x7f120b39 invoke-virtual {v5, v6}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali index 2c19462e7b..347ef8da7f 100644 --- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali @@ -65,7 +65,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120bb2 + const v0, 0x7f120bad invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali index 4578495032..5058e3597b 100644 --- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali +++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali @@ -1130,7 +1130,7 @@ .end method .method private final initPaymentSourceInfo(Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;)V - .locals 10 + .locals 11 invoke-virtual {p1}, Lcom/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceItem;->component1()Lcom/discord/models/domain/ModelPaymentSource; @@ -1150,19 +1150,55 @@ move-result-object v1 - instance-of v2, v0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal; + invoke-virtual {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->requireContext()Landroid/content/Context; - if-eqz v2, :cond_0 + move-result-object v2 - const v2, 0x7f120bb1 + const-string v3, "requireContext()" + + invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + instance-of v3, v0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal; + + const/4 v4, 0x0 + + const/4 v5, 0x1 + + if-eqz v3, :cond_0 + + const v3, 0x7f120bac + + new-array v6, v5, [Ljava/lang/Object; + + const-string v7, "https://www.paypal.com" + + aput-object v7, v6, v4 + + invoke-virtual {p0, v3, v6}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I[Ljava/lang/Object;)Ljava/lang/String; + + move-result-object v3 goto :goto_0 :cond_0 - const v2, 0x7f120bb0 + const v3, 0x7f120bab + + invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; + + move-result-object v3 :goto_0 - invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V + const-string v6, "when (paymentSource) {\n \u2026edit_help_card)\n }" + + invoke-static {v3, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + check-cast v3, Ljava/lang/CharSequence; + + invoke-static {v2, v3}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks(Landroid/content/Context;Ljava/lang/CharSequence;)Ljava/lang/CharSequence; + + move-result-object v2 + + invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(Ljava/lang/CharSequence;)V invoke-direct {p0, v0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getStatesFor(Lcom/discord/models/domain/ModelPaymentSource;)[Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry; @@ -1184,11 +1220,11 @@ invoke-virtual {v2}, Lcom/discord/models/domain/ModelBillingAddress;->getName()Ljava/lang/String; - move-result-object v4 + move-result-object v6 - check-cast v4, Ljava/lang/CharSequence; + check-cast v6, Ljava/lang/CharSequence; - invoke-virtual {v3, v4}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V + invoke-virtual {v3, v6}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V :cond_1 invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getAddressInput1()Lcom/google/android/material/textfield/TextInputLayout; @@ -1203,11 +1239,11 @@ invoke-virtual {v2}, Lcom/discord/models/domain/ModelBillingAddress;->getLine_1()Ljava/lang/String; - move-result-object v4 + move-result-object v6 - check-cast v4, Ljava/lang/CharSequence; + check-cast v6, Ljava/lang/CharSequence; - invoke-virtual {v3, v4}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V + invoke-virtual {v3, v6}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V :cond_2 invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getAddressInput2()Lcom/google/android/material/textfield/TextInputLayout; @@ -1222,11 +1258,11 @@ invoke-virtual {v2}, Lcom/discord/models/domain/ModelBillingAddress;->getLine_2()Ljava/lang/String; - move-result-object v4 + move-result-object v6 - check-cast v4, Ljava/lang/CharSequence; + check-cast v6, Ljava/lang/CharSequence; - invoke-virtual {v3, v4}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V + invoke-virtual {v3, v6}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V :cond_3 invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getCityInput()Lcom/google/android/material/textfield/TextInputLayout; @@ -1241,11 +1277,11 @@ invoke-virtual {v2}, Lcom/discord/models/domain/ModelBillingAddress;->getCity()Ljava/lang/String; - move-result-object v4 + move-result-object v6 - check-cast v4, Ljava/lang/CharSequence; + check-cast v6, Ljava/lang/CharSequence; - invoke-virtual {v3, v4}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V + invoke-virtual {v3, v6}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V :cond_4 invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getPostalCodeInput()Lcom/google/android/material/textfield/TextInputLayout; @@ -1260,11 +1296,11 @@ invoke-virtual {v2}, Lcom/discord/models/domain/ModelBillingAddress;->getPostalCode()Ljava/lang/String; - move-result-object v4 + move-result-object v6 - check-cast v4, Ljava/lang/CharSequence; + check-cast v6, Ljava/lang/CharSequence; - invoke-virtual {v3, v4}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V + invoke-virtual {v3, v6}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V :cond_5 invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getStateInput()Lcom/google/android/material/textfield/TextInputLayout; @@ -1275,67 +1311,65 @@ move-result-object v3 - const/4 v4, 0x0 - if-eqz v3, :cond_9 - const-string v5, "states" + const-string v6, "states" - invoke-static {v1, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v1, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - array-length v5, v1 + array-length v6, v1 - const/4 v6, 0x0 + const/4 v7, 0x0 :goto_1 - if-ge v6, v5, :cond_7 + if-ge v7, v6, :cond_7 - aget-object v7, v1, v6 + aget-object v8, v1, v7 - invoke-virtual {v7}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;->getValue()Ljava/lang/String; - - move-result-object v8 - - invoke-virtual {v2}, Lcom/discord/models/domain/ModelBillingAddress;->getState()Ljava/lang/String; + invoke-virtual {v8}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;->getValue()Ljava/lang/String; move-result-object v9 - invoke-static {v8, v9}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z + invoke-virtual {v2}, Lcom/discord/models/domain/ModelBillingAddress;->getState()Ljava/lang/String; - move-result v8 + move-result-object v10 - if-eqz v8, :cond_6 + invoke-static {v9, v10}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result v9 + + if-eqz v9, :cond_6 goto :goto_2 :cond_6 - add-int/lit8 v6, v6, 0x1 + add-int/lit8 v7, v7, 0x1 goto :goto_1 :cond_7 - const/4 v7, 0x0 + const/4 v8, 0x0 :goto_2 - if-eqz v7, :cond_8 + if-eqz v8, :cond_8 - invoke-virtual {v7}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;->getLabel()Ljava/lang/String; + invoke-virtual {v8}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$StateEntry;->getLabel()Ljava/lang/String; - move-result-object v5 + move-result-object v6 - if-eqz v5, :cond_8 + if-eqz v6, :cond_8 goto :goto_3 :cond_8 invoke-virtual {v2}, Lcom/discord/models/domain/ModelBillingAddress;->getState()Ljava/lang/String; - move-result-object v5 + move-result-object v6 :goto_3 - check-cast v5, Ljava/lang/CharSequence; + check-cast v6, Ljava/lang/CharSequence; - invoke-virtual {v3, v5}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V + invoke-virtual {v3, v6}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V :cond_9 invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getCountryInput()Lcom/google/android/material/textfield/TextInputLayout; @@ -1443,7 +1477,7 @@ move-result-object p1 - const v0, 0x7f1202b2 + const v0, 0x7f1202ad invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; @@ -1457,7 +1491,7 @@ move-result-object p1 - const v0, 0x7f1202af + const v0, 0x7f1202aa invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; @@ -1474,8 +1508,6 @@ array-length p1, v1 - const/4 v0, 0x1 - if-nez p1, :cond_d const/4 v4, 0x1 @@ -1493,7 +1525,7 @@ if-eqz p1, :cond_e - invoke-virtual {p1, v0}, Landroid/widget/EditText;->setInputType(I)V + invoke-virtual {p1, v5}, Landroid/widget/EditText;->setInputType(I)V :cond_e invoke-direct {p0}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getStateInput()Lcom/google/android/material/textfield/TextInputLayout; @@ -1506,7 +1538,7 @@ if-eqz p1, :cond_f - invoke-virtual {p1, v0}, Landroid/widget/EditText;->setFocusableInTouchMode(Z)V + invoke-virtual {p1, v5}, Landroid/widget/EditText;->setFocusableInTouchMode(Z)V :cond_f return-void @@ -1569,7 +1601,7 @@ return-void :cond_0 - const v1, 0x7f120bb3 + const v1, 0x7f120bae invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; @@ -2060,12 +2092,12 @@ if-eqz v4, :cond_3 - const v4, 0x7f1202b3 + const v4, 0x7f1202ae goto :goto_2 :cond_3 - const v4, 0x7f1202b6 + const v4, 0x7f1202b1 :goto_2 invoke-virtual {p0, v4}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; @@ -2091,7 +2123,7 @@ move-result-object v1 - const v4, 0x7f1202ae + const v4, 0x7f1202a9 invoke-virtual {p0, v4}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; @@ -2116,7 +2148,7 @@ move-result-object v1 - const v4, 0x7f1202a9 + const v4, 0x7f1202a4 invoke-virtual {p0, v4}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; @@ -2141,7 +2173,7 @@ move-result-object v1 - const v4, 0x7f1202a6 + const v4, 0x7f1202a1 invoke-virtual {p0, v4}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; @@ -2166,7 +2198,7 @@ move-result-object v1 - const v4, 0x7f1202b1 + const v4, 0x7f1202ac invoke-virtual {p0, v4}, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali index bbb7dba4c9..f431bd9ebe 100644 --- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali +++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali @@ -172,11 +172,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f121009 + const p1, 0x7f121004 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarTitle(I)Lkotlin/Unit; - const p1, 0x7f12029f + const p1, 0x7f12029a invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarSubtitle(I)Lkotlin/Unit; @@ -206,7 +206,7 @@ new-instance v1, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling$TabsPagerAdapter; - const v2, 0x7f1202df + const v2, 0x7f1202da invoke-static {p1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali index fff9b835ac..acb706b53d 100644 --- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali +++ b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali @@ -390,7 +390,7 @@ goto :goto_1 :pswitch_0 - const v2, 0x7f120c73 + const v2, 0x7f120c6e invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String; @@ -400,14 +400,14 @@ invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v3, 0x7f120c0d + const v3, 0x7f120c08 - const v5, 0x7f120c0e + const v5, 0x7f120c09 goto :goto_1 :pswitch_1 - const v2, 0x7f120c74 + const v2, 0x7f120c6f invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String; @@ -417,16 +417,16 @@ invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v3, 0x7f120c10 + const v3, 0x7f120c0b - const v5, 0x7f120c11 + const v5, 0x7f120c0c :goto_1 invoke-direct {p0}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getHeaderTv()Landroid/widget/TextView; move-result-object v6 - const v7, 0x7f120c14 + const v7, 0x7f120c0f const/4 v8, 0x1 diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali index c86d1bd56a..014bae1d17 100644 --- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali +++ b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali @@ -612,7 +612,7 @@ new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig; - const v3, 0x7f120343 + const v3, 0x7f12033e invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -641,7 +641,7 @@ new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig; - const v3, 0x7f120d19 + const v3, 0x7f120d14 invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -675,7 +675,7 @@ new-instance v3, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig; - const v4, 0x7f120c4a + const v4, 0x7f120c45 invoke-virtual {v0, v4}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -702,7 +702,7 @@ new-instance v3, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig; - const v4, 0x7f1202a1 + const v4, 0x7f12029c invoke-virtual {v0, v4}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -1082,7 +1082,7 @@ goto :goto_1 :pswitch_0 - const p1, 0x7f120c06 + const p1, 0x7f120c01 new-array v3, v1, [Ljava/lang/Object; @@ -1111,7 +1111,7 @@ goto :goto_2 :pswitch_1 - const p1, 0x7f120c05 + const p1, 0x7f120c00 new-array v3, v1, [Ljava/lang/Object; @@ -1230,12 +1230,12 @@ throw p1 :pswitch_0 - const v0, 0x7f1202dc + const v0, 0x7f1202d7 goto :goto_0 :pswitch_1 - const v0, 0x7f1202dd + const v0, 0x7f1202d8 :goto_0 invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType; @@ -1259,7 +1259,7 @@ throw p1 :pswitch_2 - const v1, 0x7f120c74 + const v1, 0x7f120c6f invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -1268,7 +1268,7 @@ goto :goto_1 :pswitch_3 - const v1, 0x7f120c73 + const v1, 0x7f120c6e invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -1327,7 +1327,7 @@ const/4 v1, 0x1 - const v3, 0x7f120eea + const v3, 0x7f120ee5 invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -2026,7 +2026,7 @@ move-result-object p1 - const v0, 0x7f120c50 + const v0, 0x7f120c4b new-array v1, v5, [Ljava/lang/Object; @@ -2115,12 +2115,12 @@ throw p1 :pswitch_0 - const p1, 0x7f120c48 + const p1, 0x7f120c43 goto :goto_0 :pswitch_1 - const p1, 0x7f120c47 + const p1, 0x7f120c42 :goto_0 invoke-virtual {v0}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPrice()I @@ -2161,7 +2161,7 @@ :cond_2 :goto_1 - const p1, 0x7f120c16 + const p1, 0x7f120c11 new-array v0, v5, [Ljava/lang/Object; @@ -2232,12 +2232,12 @@ throw p1 :pswitch_0 - const v0, 0x7f1202ee + const v0, 0x7f1202e9 goto :goto_0 :pswitch_1 - const v0, 0x7f1202e9 + const v0, 0x7f1202e4 :goto_0 const/4 v1, 0x1 @@ -2335,7 +2335,7 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f120562 + const p1, 0x7f12055d new-array v0, v0, [Ljava/lang/Object; @@ -2689,13 +2689,13 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f120c83 + const v1, 0x7f120c7e invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v0 - const v1, 0x7f120c82 + const v1, 0x7f120c7d invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -2703,7 +2703,7 @@ const/4 v1, 0x0 - const v2, 0x7f120b3e + const v2, 0x7f120b39 const/4 v3, 0x2 @@ -2935,11 +2935,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const v0, 0x7f121009 + const v0, 0x7f121004 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->setActionBarSubtitle(I)Lkotlin/Unit; - const v0, 0x7f120c75 + const v0, 0x7f120c70 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->setActionBarTitle(I)Lkotlin/Unit; @@ -2959,7 +2959,7 @@ new-array v2, v2, [Ljava/lang/Object; - const v3, 0x7f12054e + const v3, 0x7f120549 invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -2967,7 +2967,7 @@ aput-object v3, v2, v1 - const v1, 0x7f12054f + const v1, 0x7f12054a invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -2977,7 +2977,7 @@ aput-object v1, v2, v3 - const v1, 0x7f120c26 + const v1, 0x7f120c21 invoke-virtual {p0, v1, v2}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali index 30648601e5..27aca0204a 100644 --- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali +++ b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali @@ -349,7 +349,7 @@ move-result-object v4 - const v5, 0x7f120c7e + const v5, 0x7f120c79 const/4 v6, 0x1 @@ -385,7 +385,7 @@ if-ne v4, v7, :cond_6 - const v4, 0x7f120c7a + const v4, 0x7f120c75 new-array v7, v5, [Ljava/lang/Object; @@ -436,7 +436,7 @@ if-ne v4, v7, :cond_7 - const v4, 0x7f120c7b + const v4, 0x7f120c76 new-array v7, v5, [Ljava/lang/Object; @@ -487,7 +487,7 @@ if-ne v4, v7, :cond_8 - const v4, 0x7f120c79 + const v4, 0x7f120c74 new-array v7, v5, [Ljava/lang/Object; @@ -526,7 +526,7 @@ goto :goto_3 :cond_8 - const v2, 0x7f120c7c + const v2, 0x7f120c77 new-array v4, v6, [Ljava/lang/Object; @@ -810,7 +810,7 @@ throw p1 :pswitch_0 - const p1, 0x7f120c73 + const p1, 0x7f120c6e invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String; @@ -819,7 +819,7 @@ goto :goto_0 :pswitch_1 - const p1, 0x7f120c74 + const p1, 0x7f120c6f invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali index 4d885ec39c..609e1be734 100644 --- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali +++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali @@ -94,7 +94,7 @@ iget-object v0, v0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;->$context:Landroid/content/Context; - const v3, 0x7f120c9a + const v3, 0x7f120c95 invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali index c2139b0934..2316b8f00c 100644 --- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali +++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali @@ -689,7 +689,7 @@ goto :goto_1 :cond_3 - const p1, 0x7f120faa + const p1, 0x7f120fa5 :goto_1 invoke-virtual {v0, p1}, Landroid/widget/TextView;->setHint(I)V @@ -1321,7 +1321,7 @@ if-eqz p4, :cond_0 - const p2, 0x7f120388 + const p2, 0x7f120383 invoke-static {p1, p2}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1656,7 +1656,7 @@ return-void :cond_0 - const v0, 0x7f120e35 + const v0, 0x7f120e30 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 9650cb179a..e79c35255b 100644 --- a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali @@ -377,7 +377,7 @@ invoke-direct {p1}, Ljava/lang/StringBuilder;->()V - const v0, 0x7f1203fe + const v0, 0x7f1203f9 invoke-virtual {p0, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -400,7 +400,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f120a6e + const p1, 0x7f120a69 invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -453,7 +453,7 @@ move-result-object p1 - const v2, 0x7f120a76 + const v2, 0x7f120a71 new-array p4, p4, [Ljava/lang/Object; @@ -494,7 +494,7 @@ move-result-object p2 - const v2, 0x7f120a74 + const v2, 0x7f120a6f 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 2a824f31e5..0e35d8d570 100644 --- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali +++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali @@ -224,7 +224,7 @@ if-eqz v0, :cond_1 - const v2, 0x7f120eea + const v2, 0x7f120ee5 invoke-direct {p0, v0, v2}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence; @@ -248,7 +248,7 @@ if-eqz v0, :cond_2 - const v1, 0x7f120ca8 + const v1, 0x7f120ca3 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 c1ba76541d..7c0c645499 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali @@ -61,7 +61,7 @@ if-eqz v3, :cond_0 - const v4, 0x7f120fee + const v4, 0x7f120fe9 const/4 v5, 0x2 diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali index 7e0bb66f7c..25ab9bbf97 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali @@ -232,7 +232,7 @@ invoke-static {v5, v7}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v7, 0x7f120fe8 + const v7, 0x7f120fe3 const/4 v8, 0x1 @@ -256,7 +256,7 @@ invoke-static {v3, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f120fe7 + const v5, 0x7f120fe2 new-array v7, v8, [Ljava/lang/Object; @@ -344,7 +344,7 @@ invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v3, 0x7f120fd0 + const v3, 0x7f120fcb invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -371,7 +371,7 @@ invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v3, 0x7f120feb + const v3, 0x7f120fe6 new-array v4, v8, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali index e583a81b6b..305ec6b94e 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali @@ -100,7 +100,7 @@ move-result-object v2 - const v3, 0x7f120fde + const v3, 0x7f120fd9 const/4 v4, 0x1 @@ -186,7 +186,7 @@ move-result-object v1 - const v3, 0x7f120fd4 + const v3, 0x7f120fcf new-array v4, v4, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali index 0ab4518b16..751ffe3abe 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali @@ -450,7 +450,7 @@ if-eqz v3, :cond_0 - const v4, 0x7f120fee + const v4, 0x7f120fe9 const/4 v5, 0x2 @@ -857,7 +857,7 @@ move-result-wide v8 - const p1, 0x7f120ff0 + const p1, 0x7f120feb invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String; @@ -888,7 +888,7 @@ move-result-wide v8 - const p1, 0x7f120ff2 + const p1, 0x7f120fed invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali index 9837e97fd7..f6a6ef4c29 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali @@ -81,7 +81,7 @@ aput-object v2, v1, v3 - const v2, 0x7f12028d + const v2, 0x7f120288 invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/user/WidgetBanUser;->getString(I[Ljava/lang/Object;)Ljava/lang/String; 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 6f59e12cbe..bb9be06083 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 @@ -81,7 +81,7 @@ aput-object v2, v1, v3 - const v2, 0x7f1209bc + const v2, 0x7f1209b7 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 f69d2e8732..9f36371b58 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali @@ -145,7 +145,7 @@ invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const v1, 0x7f120cb1 + const v1, 0x7f120cac invoke-virtual {p0, v1}, Lcom/discord/widgets/user/WidgetPruneUsers;->getString(I)Ljava/lang/String; @@ -285,7 +285,7 @@ iget-object v3, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->estimateText:Lcom/discord/app/AppTextView; - const v5, 0x7f12056f + const v5, 0x7f12056a const/4 v6, 0x2 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 289b507708..5723a3ba84 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali @@ -478,7 +478,7 @@ move-result-object v0 - const v3, 0x7f120efe + const v3, 0x7f120ef9 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 c2a0c08bae..9acba716e3 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali @@ -336,7 +336,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, 0x7f120ce2 + const p1, 0x7f120cdd 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 e75c8556b5..2eec622ae1 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali @@ -87,7 +87,7 @@ const v0, 0x7f0401c8 - const v1, 0x7f120aa8 + const v1, 0x7f120aa3 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 a665ece55d..2c64d467fd 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali @@ -101,7 +101,7 @@ const v0, 0x7f0401c9 - const v1, 0x7f120aa9 + const v1, 0x7f120aa4 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 48400780a8..5806af0858 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali @@ -410,7 +410,7 @@ const/4 p1, 0x0 - const v0, 0x7f120621 + const v0, 0x7f12061c invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V @@ -444,7 +444,7 @@ .method public static synthetic lambda$configureActionButtons$9(Lcom/discord/widgets/user/WidgetUserProfile;Landroid/view/View;)V .locals 0 - const p1, 0x7f12061a + const p1, 0x7f120615 invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -467,14 +467,14 @@ goto :goto_0 :pswitch_0 - const p1, 0x7f121003 + const p1, 0x7f120ffe invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V return-void :pswitch_1 - const p1, 0x7f120611 + const p1, 0x7f12060c invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -486,14 +486,14 @@ return-void :pswitch_3 - const p1, 0x7f12061a + const p1, 0x7f120615 invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V return-void :pswitch_4 - const p1, 0x7f120618 + const p1, 0x7f120613 invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -506,7 +506,7 @@ move-result-object p1 - const p2, 0x7f121002 + const p2, 0x7f120ffd invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V @@ -565,7 +565,7 @@ const v2, 0xffff - const v3, 0x7f12041b + const v3, 0x7f120416 invoke-interface {p1, v0, v1, v2, v3}, Landroid/view/Menu;->add(IIII)Landroid/view/MenuItem; @@ -627,7 +627,7 @@ invoke-virtual {p1}, Landroidx/appcompat/app/AlertDialog;->dismiss()V - const p1, 0x7f120618 + const p1, 0x7f120613 invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -771,7 +771,7 @@ aput-object p1, v3, v4 - const p1, 0x7f120b50 + const p1, 0x7f120b4b invoke-virtual {v2, p1, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -886,7 +886,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120cae + const p1, 0x7f120ca9 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarTitle(I)Lkotlin/Unit; @@ -910,7 +910,7 @@ new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item; - const v4, 0x7f121004 + const v4, 0x7f120fff invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String; @@ -926,7 +926,7 @@ new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item; - const v4, 0x7f120a60 + const v4, 0x7f120a5b invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String; @@ -942,7 +942,7 @@ new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item; - const v4, 0x7f120a5f + const v4, 0x7f120a5a invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali index dc7996de25..03d60e8be2 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali @@ -65,7 +65,7 @@ iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;->$fragment:Lcom/discord/app/AppFragment; - const v3, 0x7f120c91 + const v3, 0x7f120c8c invoke-virtual {v0, v3}, Lcom/discord/app/AppFragment;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali index a896c30ea4..324a5f6d55 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali @@ -788,7 +788,7 @@ move-result v6 - const v4, 0x7f120e73 + const v4, 0x7f120e6e invoke-virtual {v0, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -839,7 +839,7 @@ move-result v6 - const v4, 0x7f120b84 + const v4, 0x7f120b7f invoke-virtual {v0, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -890,7 +890,7 @@ move-result v6 - const v4, 0x7f12083e + const v4, 0x7f120839 invoke-virtual {v0, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -925,7 +925,7 @@ move-result v3 - const v4, 0x7f12084f + const v4, 0x7f12084a const/4 v5, 0x0 @@ -969,7 +969,7 @@ move-result v9 - const v3, 0x7f120846 + const v3, 0x7f120841 invoke-virtual {v0, v3}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1058,7 +1058,7 @@ move-result v9 - const v3, 0x7f120847 + const v3, 0x7f120842 invoke-virtual {v0, v3}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1072,7 +1072,7 @@ aput-object v3, v7, v5 - const v3, 0x7f12084f + const v3, 0x7f12084a invoke-virtual {v0, v3, v7}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -1145,7 +1145,7 @@ move-result v9 - const v1, 0x7f120848 + const v1, 0x7f120843 invoke-virtual {v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1159,7 +1159,7 @@ aput-object v1, v4, v5 - const v1, 0x7f12084f + const v1, 0x7f12084a invoke-virtual {v0, v1, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -1208,7 +1208,7 @@ move-result v9 - const v3, 0x7f12032b + const v3, 0x7f120326 invoke-virtual {v0, v3}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1259,7 +1259,7 @@ move-result v9 - const v4, 0x7f1204f8 + const v4, 0x7f1204f3 invoke-virtual {v0, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1300,13 +1300,13 @@ move-result v9 - const v3, 0x7f120c75 + const v3, 0x7f120c70 invoke-virtual {v0, v3}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; move-result-object v10 - const v3, 0x7f120c09 + const v3, 0x7f120c04 new-array v4, v6, [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 8a3c5e83a3..e04e52ec2e 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali @@ -465,7 +465,7 @@ const v3, 0x7f060108 - const v4, 0x7f120e82 + const v4, 0x7f120e7d const/4 v5, 0x0 @@ -495,7 +495,7 @@ const v2, 0x7f06012a - const v3, 0x7f120e7e + const v3, 0x7f120e79 const/4 v4, 0x0 @@ -523,7 +523,7 @@ move-result-object p1 - const p2, 0x7f120e7d + const p2, 0x7f120e78 invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -531,7 +531,7 @@ const v0, 0x7f06011f - const v1, 0x7f120e7c + const v1, 0x7f120e77 invoke-direct {p0, p1, v0, v1, p2}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V @@ -551,7 +551,7 @@ move-result-object p1 - const p2, 0x7f120e80 + const p2, 0x7f120e7b invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -559,7 +559,7 @@ const v0, 0x7f060113 - const v1, 0x7f120e7f + const v1, 0x7f120e7a 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 9f8a710aa5..cf2a72f79a 100644 --- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali +++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali @@ -42,7 +42,7 @@ .method private getBodyText(Landroid/content/Context;)Ljava/lang/CharSequence; .locals 1 - const v0, 0x7f121070 + const v0, 0x7f12106b invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -74,7 +74,7 @@ aput-object v0, v1, v2 - const v0, 0x7f121078 + const v0, 0x7f121073 invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali index 6a0fa59bbd..50e49c4000 100644 --- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali +++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali @@ -448,7 +448,7 @@ if-eqz p1, :cond_0 - const p1, 0x7f120399 + const p1, 0x7f120394 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali index f22f37a903..c414531944 100644 --- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali +++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali @@ -68,7 +68,7 @@ move-result-object p1 - const v1, 0x7f120c4c + const v1, 0x7f120c47 invoke-static {p1, v1, v0}, Lcom/discord/app/f;->a(Landroid/content/Context;II)V @@ -243,7 +243,7 @@ aput-object p1, v0, v1 - const p1, 0x7f121072 + const p1, 0x7f12106d invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/user/email/WidgetUserEmailVerify;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali index ddd0cb2cc2..1a23cc5aac 100644 --- a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali +++ b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali @@ -1010,7 +1010,7 @@ move-result-object v0 - const v1, 0x7f120625 + const v1, 0x7f120620 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali index 8b5088c19e..3c64ebe359 100644 --- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali +++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali @@ -1164,7 +1164,7 @@ new-array v2, v1, [Lkotlin/Pair; - const v3, 0x7f121064 + const v3, 0x7f12105f invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1180,7 +1180,7 @@ aput-object v3, v2, v4 - const v3, 0x7f120ef2 + const v3, 0x7f120eed invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1198,7 +1198,7 @@ const/4 v3, 0x2 - const v5, 0x7f120e03 + const v5, 0x7f120dfe invoke-virtual {p0, v5}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1214,7 +1214,7 @@ sget-object v3, Lcom/discord/a/b;->vS:Lcom/discord/a/b$a; - const v3, 0x7f120553 + const v3, 0x7f12054e invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1424,7 +1424,7 @@ move-result-object p1 - const v0, 0x7f120cc3 + const v0, 0x7f120cbe 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 f161346e88..57a8e7bf02 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 @@ -1279,7 +1279,7 @@ new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v5, 0x7f120e93 + const v5, 0x7f120e8e const/4 v6, 0x0 @@ -1312,7 +1312,7 @@ new-instance v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v7, 0x7f120cc0 + const v7, 0x7f120cbb const/4 v8, 0x0 @@ -1340,7 +1340,7 @@ new-instance v11, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v6, 0x7f120e93 + const v6, 0x7f120e8e 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 e21b2b6fbb..eec8ff0460 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 @@ -67,7 +67,7 @@ move-result-object p1 - const v0, 0x7f120a57 + const v0, 0x7f120a52 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 e7476cc4fa..b973ff2f48 100644 --- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali +++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali @@ -1118,7 +1118,7 @@ move-result-object v0 - const v1, 0x7f120cfb + const v1, 0x7f120cf6 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1169,7 +1169,7 @@ move-result-object v0 - const v1, 0x7f1209b7 + const v1, 0x7f1209b2 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1316,12 +1316,12 @@ if-eqz v1, :cond_8 - const v1, 0x7f120e00 + const v1, 0x7f120dfb goto :goto_7 :cond_8 - const v1, 0x7f120df3 + const v1, 0x7f120dee :goto_7 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1416,12 +1416,12 @@ if-eqz v1, :cond_b - const v1, 0x7f120dff + const v1, 0x7f120dfa goto :goto_a :cond_b - const v1, 0x7f120def + const v1, 0x7f120dea :goto_a invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1985,7 +1985,7 @@ if-eqz v16, :cond_a - const v0, 0x7f120e0a + const v0, 0x7f120e05 invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V @@ -2044,7 +2044,7 @@ const/4 v12, 0x2 - const v0, 0x7f120cae + const v0, 0x7f120ca9 invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali index 4d8ced37f8..50837f25a1 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali @@ -65,7 +65,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120621 + const v0, 0x7f12061c invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali index 5ffebbff7a..db05dbbfd2 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali @@ -211,7 +211,7 @@ move-result-object v0 - const v1, 0x7f120332 + const v1, 0x7f12032d const/4 v2, 0x1 @@ -418,7 +418,7 @@ move-result-object p1 - const v0, 0x7f120e76 + const v0, 0x7f120e71 invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetCallFailed;->getString(I)Ljava/lang/String; @@ -446,7 +446,7 @@ move-result-object p1 - const v0, 0x7f120b3e + const v0, 0x7f120b39 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 bc1b4b56d4..b410b72de0 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali @@ -910,7 +910,7 @@ move-result-object p1 - const v0, 0x7f1210b5 + const v0, 0x7f1210b0 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 bfe883033e..0bb346fe52 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali @@ -440,12 +440,12 @@ if-eqz v8, :cond_5 - const v8, 0x7f1208c5 + const v8, 0x7f1208c0 goto :goto_2 :cond_5 - const v8, 0x7f1208c2 + const v8, 0x7f1208bd :goto_2 invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V @@ -460,12 +460,12 @@ if-eqz v8, :cond_6 - const v8, 0x7f121096 + const v8, 0x7f121091 goto :goto_3 :cond_6 - const v8, 0x7f1210a6 + const v8, 0x7f1210a1 :goto_3 invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V @@ -543,12 +543,12 @@ if-eqz v0, :cond_9 - const v0, 0x7f1203eb + const v0, 0x7f1203e6 goto :goto_5 :cond_9 - const v0, 0x7f1203ec + const v0, 0x7f1203e7 :goto_5 invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali index d64f7f4af2..9029f0eaaa 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali @@ -93,7 +93,7 @@ iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceOngoingUserCountLabel:Landroid/widget/TextView; - const v1, 0x7f120b42 + const v1, 0x7f120b3d const/4 v2, 0x1 @@ -530,37 +530,37 @@ packed-switch p0, :pswitch_data_0 - const p0, 0x7f120408 + const p0, 0x7f120403 return p0 :pswitch_0 - const p0, 0x7f12040e + const p0, 0x7f120409 return p0 :pswitch_1 - const p0, 0x7f12040b + const p0, 0x7f120406 return p0 :pswitch_2 - const p0, 0x7f120404 + const p0, 0x7f1203ff return p0 :pswitch_3 - const p0, 0x7f120405 + const p0, 0x7f120400 return p0 :pswitch_4 - const p0, 0x7f12040a + const p0, 0x7f120405 return p0 :pswitch_5 - const p0, 0x7f120407 + const p0, 0x7f120402 return p0 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 0c6eed8a82..3b68c6c350 100644 --- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali +++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali @@ -53,7 +53,7 @@ move-result-object p1 - const v0, 0x7f121066 + const v0, 0x7f121061 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 01e167d5d6..0944f30102 100644 --- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali +++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali @@ -834,12 +834,12 @@ if-eqz v3, :cond_1 - const v3, 0x7f120f8e + const v3, 0x7f120f89 goto :goto_1 :cond_1 - const v3, 0x7f120a59 + const v3, 0x7f120a54 :goto_1 invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -892,12 +892,12 @@ if-eqz p1, :cond_2 - const p1, 0x7f120f86 + const p1, 0x7f120f81 goto :goto_2 :cond_2 - const p1, 0x7f12047b + const p1, 0x7f120476 :goto_2 invoke-virtual {v1, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -961,7 +961,7 @@ move-result-object v0 - const v4, 0x7f1203ec + const v4, 0x7f1203e7 invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V @@ -984,7 +984,7 @@ move-result-object v0 - const v4, 0x7f120f7a + const v4, 0x7f120f75 invoke-direct {p0, v0, v4}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->disableWithToast(Landroid/widget/Button;I)V @@ -1019,7 +1019,7 @@ move-result-object v0 - const v4, 0x7f12037a + const v4, 0x7f120375 invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V @@ -1027,7 +1027,7 @@ move-result-object v0 - const v4, 0x7f120379 + const v4, 0x7f120374 invoke-direct {p0, v0, v4}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->disableWithToast(Landroid/widget/Button;I)V @@ -1058,7 +1058,7 @@ move-result-object v3 - const v4, 0x7f120b42 + const v4, 0x7f120b3d 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 a241286258..0f038598f4 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 @@ -192,7 +192,7 @@ new-instance v3, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader; - const v4, 0x7f1208c1 + const v4, 0x7f1208bc invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -271,7 +271,7 @@ new-instance v0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader; - const v3, 0x7f120abb + const v3, 0x7f120ab6 invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali index 86d7ceffeb..939180bb16 100644 --- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali +++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali @@ -67,7 +67,7 @@ move-result-object p1 - const v0, 0x7f120384 + const v0, 0x7f12037f invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali index 9b31eae7a2..9d0829f21c 100644 --- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali +++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali @@ -515,7 +515,7 @@ invoke-static {p0, v3, v2, v0, v2}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v0, 0x7f120383 + const v0, 0x7f12037e invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->setActionBarTitle(I)Lkotlin/Unit; @@ -597,7 +597,7 @@ move-result-object v0 - const v4, 0x7f12057a + const v4, 0x7f120575 invoke-virtual {p0, v4}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getString(I)Ljava/lang/String; @@ -681,7 +681,7 @@ move-result-object v4 - const v5, 0x7f120566 + const v5, 0x7f120561 new-array v1, v1, [Ljava/lang/Object; @@ -930,7 +930,7 @@ aput-object p1, v0, v3 - const p1, 0x7f12048f + const p1, 0x7f12048a invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -1124,7 +1124,7 @@ move-result-object p1 - const v0, 0x7f120ab6 + const v0, 0x7f120ab1 invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/google/android/gms/base/R$b.smali b/com.discord/smali/com/google/android/gms/base/R$b.smali index 1e41a895e5..21f407f278 100644 --- a/com.discord/smali/com/google/android/gms/base/R$b.smali +++ b/com.discord/smali/com/google/android/gms/base/R$b.smali @@ -15,39 +15,39 @@ # static fields -.field public static final common_google_play_services_enable_button:I = 0x7f1203c8 +.field public static final common_google_play_services_enable_button:I = 0x7f1203c3 -.field public static final common_google_play_services_enable_text:I = 0x7f1203c9 +.field public static final common_google_play_services_enable_text:I = 0x7f1203c4 -.field public static final common_google_play_services_enable_title:I = 0x7f1203ca +.field public static final common_google_play_services_enable_title:I = 0x7f1203c5 -.field public static final common_google_play_services_install_button:I = 0x7f1203cb +.field public static final common_google_play_services_install_button:I = 0x7f1203c6 -.field public static final common_google_play_services_install_text:I = 0x7f1203cc +.field public static final common_google_play_services_install_text:I = 0x7f1203c7 -.field public static final common_google_play_services_install_title:I = 0x7f1203cd +.field public static final common_google_play_services_install_title:I = 0x7f1203c8 -.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203ce +.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203c9 -.field public static final common_google_play_services_notification_ticker:I = 0x7f1203cf +.field public static final common_google_play_services_notification_ticker:I = 0x7f1203ca -.field public static final common_google_play_services_unsupported_text:I = 0x7f1203d1 +.field public static final common_google_play_services_unsupported_text:I = 0x7f1203cc -.field public static final common_google_play_services_update_button:I = 0x7f1203d2 +.field public static final common_google_play_services_update_button:I = 0x7f1203cd -.field public static final common_google_play_services_update_text:I = 0x7f1203d3 +.field public static final common_google_play_services_update_text:I = 0x7f1203ce -.field public static final common_google_play_services_update_title:I = 0x7f1203d4 +.field public static final common_google_play_services_update_title:I = 0x7f1203cf -.field public static final common_google_play_services_updating_text:I = 0x7f1203d5 +.field public static final common_google_play_services_updating_text:I = 0x7f1203d0 -.field public static final common_google_play_services_wear_update_text:I = 0x7f1203d6 +.field public static final common_google_play_services_wear_update_text:I = 0x7f1203d1 -.field public static final common_open_on_phone:I = 0x7f1203d7 +.field public static final common_open_on_phone:I = 0x7f1203d2 -.field public static final common_signin_button_text:I = 0x7f1203d8 +.field public static final common_signin_button_text:I = 0x7f1203d3 -.field public static final common_signin_button_text_long:I = 0x7f1203d9 +.field public static final common_signin_button_text_long:I = 0x7f1203d4 # direct methods diff --git a/com.discord/smali/com/google/android/gms/common/R$a.smali b/com.discord/smali/com/google/android/gms/common/R$a.smali index 3a1417775a..1284150df6 100644 --- a/com.discord/smali/com/google/android/gms/common/R$a.smali +++ b/com.discord/smali/com/google/android/gms/common/R$a.smali @@ -15,7 +15,7 @@ # static fields -.field public static final common_google_play_services_unknown_issue:I = 0x7f1203d0 +.field public static final common_google_play_services_unknown_issue:I = 0x7f1203cb # direct methods diff --git a/com.discord/smali_classes2/com/google/android/material/R$string.smali b/com.discord/smali_classes2/com/google/android/material/R$string.smali index 9bca5c9f99..6a05e49873 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 @@ -95,33 +95,33 @@ .field public static final appbar_scrolling_view_behavior:I = 0x7f1200c3 -.field public static final bottom_sheet_behavior:I = 0x7f120316 +.field public static final bottom_sheet_behavior:I = 0x7f120311 -.field public static final character_counter_content_description:I = 0x7f12038e +.field public static final character_counter_content_description:I = 0x7f120389 -.field public static final character_counter_pattern:I = 0x7f12038f +.field public static final character_counter_pattern:I = 0x7f12038a -.field public static final fab_transformation_scrim_behavior:I = 0x7f120545 +.field public static final fab_transformation_scrim_behavior:I = 0x7f120540 -.field public static final fab_transformation_sheet_behavior:I = 0x7f120546 +.field public static final fab_transformation_sheet_behavior:I = 0x7f120541 -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120831 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12082c -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120a58 +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120a53 -.field public static final password_toggle_content_description:I = 0x7f120b90 +.field public static final password_toggle_content_description:I = 0x7f120b8b -.field public static final path_password_eye:I = 0x7f120b93 +.field public static final path_password_eye:I = 0x7f120b8e -.field public static final path_password_eye_mask_strike_through:I = 0x7f120b94 +.field public static final path_password_eye_mask_strike_through:I = 0x7f120b8f -.field public static final path_password_eye_mask_visible:I = 0x7f120b95 +.field public static final path_password_eye_mask_visible:I = 0x7f120b90 -.field public static final path_password_strike_through:I = 0x7f120b96 +.field public static final path_password_strike_through:I = 0x7f120b91 -.field public static final search_menu_title:I = 0x7f120dc5 +.field public static final search_menu_title:I = 0x7f120dc0 -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 # direct methods diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali b/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali index 28e435f569..e66694821c 100644 --- a/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali +++ b/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali @@ -15,7 +15,7 @@ # static fields -.field public static final fcm_fallback_notification_channel_label:I = 0x7f120548 +.field public static final fcm_fallback_notification_channel_label:I = 0x7f120543 # 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 41cf75a273..52860f3921 100644 --- a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali +++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali @@ -99,71 +99,71 @@ .field public static final appbar_scrolling_view_behavior:I = 0x7f1200c3 -.field public static final attachment_camera:I = 0x7f12025b +.field public static final attachment_camera:I = 0x7f120256 -.field public static final attachment_files:I = 0x7f12025d +.field public static final attachment_files:I = 0x7f120258 -.field public static final attachment_photos:I = 0x7f12025f +.field public static final attachment_photos:I = 0x7f12025a -.field public static final attachments_keyboard:I = 0x7f120261 +.field public static final attachments_keyboard:I = 0x7f12025c -.field public static final bottom_sheet_behavior:I = 0x7f120316 +.field public static final bottom_sheet_behavior:I = 0x7f120311 -.field public static final camera_intent_result_error:I = 0x7f120337 +.field public static final camera_intent_result_error:I = 0x7f120332 -.field public static final camera_permission_denied_msg:I = 0x7f12033d +.field public static final camera_permission_denied_msg:I = 0x7f120338 -.field public static final camera_switched:I = 0x7f120340 +.field public static final camera_switched:I = 0x7f12033b -.field public static final camera_unknown_error:I = 0x7f120342 +.field public static final camera_unknown_error:I = 0x7f12033d -.field public static final character_counter_content_description:I = 0x7f12038e +.field public static final character_counter_content_description:I = 0x7f120389 -.field public static final character_counter_pattern:I = 0x7f12038f +.field public static final character_counter_pattern:I = 0x7f12038a -.field public static final choose_an_application:I = 0x7f120398 +.field public static final choose_an_application:I = 0x7f120393 -.field public static final clear_attachments:I = 0x7f1203a1 +.field public static final clear_attachments:I = 0x7f12039c -.field public static final emoji_keyboard_toggle:I = 0x7f120518 +.field public static final emoji_keyboard_toggle:I = 0x7f120513 -.field public static final fab_transformation_scrim_behavior:I = 0x7f120545 +.field public static final fab_transformation_scrim_behavior:I = 0x7f120540 -.field public static final fab_transformation_sheet_behavior:I = 0x7f120546 +.field public static final fab_transformation_sheet_behavior:I = 0x7f120541 -.field public static final files_permission_reason_msg:I = 0x7f120550 +.field public static final files_permission_reason_msg:I = 0x7f12054b -.field public static final flash_auto:I = 0x7f120555 +.field public static final flash_auto:I = 0x7f120550 -.field public static final flash_off:I = 0x7f120556 +.field public static final flash_off:I = 0x7f120551 -.field public static final flash_on:I = 0x7f120557 +.field public static final flash_on:I = 0x7f120552 -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120831 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12082c -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120a58 +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120a53 -.field public static final password_toggle_content_description:I = 0x7f120b90 +.field public static final password_toggle_content_description:I = 0x7f120b8b -.field public static final path_password_eye:I = 0x7f120b93 +.field public static final path_password_eye:I = 0x7f120b8e -.field public static final path_password_eye_mask_strike_through:I = 0x7f120b94 +.field public static final path_password_eye_mask_strike_through:I = 0x7f120b8f -.field public static final path_password_eye_mask_visible:I = 0x7f120b95 +.field public static final path_password_eye_mask_visible:I = 0x7f120b90 -.field public static final path_password_strike_through:I = 0x7f120b96 +.field public static final path_password_strike_through:I = 0x7f120b91 -.field public static final request_permission_msg:I = 0x7f120d0b +.field public static final request_permission_msg:I = 0x7f120d06 -.field public static final search_menu_title:I = 0x7f120dc5 +.field public static final search_menu_title:I = 0x7f120dc0 -.field public static final selection_shrink_scale:I = 0x7f120ddb +.field public static final selection_shrink_scale:I = 0x7f120dd6 -.field public static final send_contents:I = 0x7f120de6 +.field public static final send_contents:I = 0x7f120de1 -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 -.field public static final storage_permission_denied_msg:I = 0x7f120e88 +.field public static final storage_permission_denied_msg:I = 0x7f120e83 # 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 5772b89eda..a9569d791e 100644 --- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali +++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali @@ -93,19 +93,19 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120dc5 +.field public static final search_menu_title:I = 0x7f120dc0 -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 -.field public static final ucrop_error_input_data_is_absent:I = 0x7f120f74 +.field public static final ucrop_error_input_data_is_absent:I = 0x7f120f6f -.field public static final ucrop_label_edit_photo:I = 0x7f120f75 +.field public static final ucrop_label_edit_photo:I = 0x7f120f70 -.field public static final ucrop_label_original:I = 0x7f120f76 +.field public static final ucrop_label_original:I = 0x7f120f71 -.field public static final ucrop_menu_crop:I = 0x7f120f77 +.field public static final ucrop_menu_crop:I = 0x7f120f72 -.field public static final ucrop_mutate_exception_hint:I = 0x7f120f78 +.field public static final ucrop_mutate_exception_hint:I = 0x7f120f73 # 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 c401780a3a..5da26b5af8 100644 --- a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali +++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali @@ -73,19 +73,19 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120dc5 +.field public static final search_menu_title:I = 0x7f120dc0 -.field public static final status_bar_notification_info_overflow:I = 0x7f120e7b +.field public static final status_bar_notification_info_overflow:I = 0x7f120e76 -.field public static final ucrop_error_input_data_is_absent:I = 0x7f120f74 +.field public static final ucrop_error_input_data_is_absent:I = 0x7f120f6f -.field public static final ucrop_label_edit_photo:I = 0x7f120f75 +.field public static final ucrop_label_edit_photo:I = 0x7f120f70 -.field public static final ucrop_label_original:I = 0x7f120f76 +.field public static final ucrop_label_original:I = 0x7f120f71 -.field public static final ucrop_menu_crop:I = 0x7f120f77 +.field public static final ucrop_menu_crop:I = 0x7f120f72 -.field public static final ucrop_mutate_exception_hint:I = 0x7f120f78 +.field public static final ucrop_mutate_exception_hint:I = 0x7f120f73 # direct methods