From dc680a6b5103fdd7b09c1e384671b0e5ba58f433 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 21 Nov 2019 04:22:26 +0100 Subject: [PATCH] Changes of com.discord v989 --- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 29600 -> 29600 bytes com.discord/res/values/public.xml | 1290 +++++++++-------- com.discord/res/values/strings.xml | 4 +- .../smali/androidx/preference/R$string.smali | 4 +- .../androidx/preference/ktx/R$string.smali | 4 +- .../smali/com/discord/BuildConfig.smali | 6 +- .../smali/com/discord/app/AppFragment$c.smali | 2 +- com.discord/smali/com/discord/app/h.smali | 2 +- .../smali/com/discord/dialogs/a/a$c.smali | 2 +- .../smali/com/discord/dialogs/a/b$e.smali | 2 +- com.discord/smali/com/discord/dialogs/b.smali | 2 +- .../smali/com/discord/gateway/R$string.smali | 4 +- .../ModelMuteConfig$Parser$parse$1.smali | 109 ++ .../domain/ModelMuteConfig$Parser.smali | 90 ++ .../domain/ModelMuteConfig$endTimeMs$2.smali | 93 ++ .../models/domain/ModelMuteConfig.smali | 240 +++ ...delUserGuildSettings$ChannelOverride.smali | 257 +++- .../domain/ModelUserGuildSettings.smali | 454 +++++- .../NotificationSettingsModelUtils.smali | 78 + .../smali/com/discord/restapi/R$string.smali | 4 +- ...$$Lambda$0UyPDl1dK0kI7uSVBuqxhyISp_w.smali | 36 - ...Settings$3_wfNdqftcJSlhKnFVf-RHo4VZU.smali | 46 - ...Settings$CKg3Y3f26LcafhVO_loewL4XViw.smali | 38 - ...Settings$JIzKtlo9h0Kzlbukmhbp5tUJhMs.smali | 46 - ...Settings$U4SbAP8nl3XZYX4RapeY11Chko4.smali | 46 - ...Settings$_UmCUPV1EvBeHiZpKveX_lMTlLE.smali | 38 - ...Settings$mCtfaPvHPPMEZyCMQpNcbb2vtGg.smali | 46 - ...Settings$xAuTarfGExPiAI2-XFgTbp3HIP4.smali | 42 - .../smali/com/discord/stores/Dispatcher.smali | 8 + .../com/discord/stores/StoreAnalytics.smali | 24 +- .../discord/stores/StoreAuthentication.smali | 2 + .../com/discord/stores/StoreChannels.smali | 420 +++--- ...Selected$Selected$Companion$create$2.smali | 28 +- .../stores/StoreChannelsSelected.smali | 10 +- .../discord/stores/StoreClientVersion.smali | 2 +- .../stores/StoreGuildMemberRequester.smali | 12 +- .../discord/stores/StoreGuildsSorted.smali | 2 +- .../com/discord/stores/StoreLurking.smali | 42 +- .../StoreMediaNotification$init$3.smali | 2 +- .../discord/stores/StoreMentions$init$1.smali | 155 -- .../stores/StoreMentions$init$2$1.smali | 106 -- .../discord/stores/StoreMentions$init$2.smali | 91 -- .../stores/StoreMentions$init$Tuple.smali | 417 ------ ...oreMentions$sam$rx_functions_Func3$0.smali | 36 - .../com/discord/stores/StoreMentions.smali | 980 +++++-------- .../StoreMessageAck$markUnread$2$1.smali | 12 +- .../com/discord/stores/StoreMessageAck.smali | 25 +- ...ation$displayConnectionErrorNotice$2.smali | 2 +- .../discord/stores/StoreNotifications.smali | 6 +- .../com/discord/stores/StorePermissions.smali | 167 ++- .../discord/stores/StoreRtcConnection.smali | 12 +- .../stores/StoreStream$deferredInit$1.smali | 12 - .../com/discord/stores/StoreStream.smali | 52 +- .../stores/StoreUserGuildSettings$get$1.smali | 96 ++ ...GuildSettings$getHideMutedChannels$1.smali | 88 ++ ...rGuildSettings$handleGuildSettings$1.smali | 84 ++ ...uildSettings$handleGuildSettings$2$1.smali | 68 + ...rGuildSettings$handleGuildSettings$2.smali | 79 + ...eUserGuildSettings$mutedGuildIds$1$1.smali | 90 ++ ...eUserGuildSettings$mutedGuildIds$1$2.smali | 88 ++ ...oreUserGuildSettings$mutedGuildIds$1.smali | 124 ++ ...GuildSettings$setHideMutedChannels$1.smali | 128 ++ ...ldSettings$updateUserGuildSettings$1.smali | 83 ++ .../stores/StoreUserGuildSettings.smali | 923 +++++++----- .../discord/stores/StoreUserSettings.smali | 6 +- .../stores/StoreVoiceParticipants$get$1.smali | 122 +- .../analytics/AnalyticSuperProperties.smali | 6 +- .../auditlogs/AuditLogChangeUtils.smali | 6 +- .../discord/utilities/clocks/TestClock.smali | 50 + .../com/discord/utilities/error/Error.smali | 2 +- .../utilities/fcm/NotificationRenderer.smali | 2 +- .../images/MGImages$requestAvatarCrop$1.smali | 2 +- .../utilities/presence/PresenceUtils.smali | 12 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../textprocessing/MessageUtils.smali | 4 +- .../discord/utilities/uri/UriHandler.smali | 2 +- ...oregroundService$NotificationBuilder.smali | 4 +- .../discord/widgets/auth/WidgetAuthMfa.smali | 6 +- ...etAuthRegister$validationManager$2$1.smali | 2 +- ...dgetAuthRegister$validationManager$2.smali | 2 +- .../widgets/auth/WidgetAuthRegister.smali | 6 +- .../WidgetChannelGroupDMSettings.smali | 2 +- ...ings$configureNotificationRadios$1$1.smali | 4 + ...elNotificationSettings$configureUI$1.smali | 4 + ...getTextChannelSettings$configureUI$1.smali | 6 +- ...WidgetChannelsListAdapter$ItemHeader.smali | 4 +- .../WidgetChannelsListAdapter$ItemMFA.smali | 2 +- ...ChannelActions$Model$Companion$get$1.smali | 1 + ...ChannelsListItemChannelActions$Model.smali | 2 +- ...$configureUI$$inlined$apply$lambda$3.smali | 4 + ...putAttachments$DiscordCameraFragment.smali | 2 +- ...achments$PermissionsEmptyListAdapter.smali | 2 +- .../chat/input/WidgetChatInputModel.smali | 6 +- .../chat/list/ViewEmbedGameInvite.smali | 2 +- ...WidgetChatListAdapterItemCallMessage.smali | 4 +- ...idgetChatListAdapterItemGuildWelcome.smali | 4 +- ...getChatListAdapterItemListenTogether.smali | 2 +- .../list/WidgetChatListAdapterItemStart.smali | 2 +- ...ItemSystemMessage$getSystemMessage$1.smali | 18 +- ...getChatListAdapterItemUploadProgress.smali | 2 +- .../list/actions/MessageActionDialogs.smali | 6 +- ...idgetChatListActions$Model$Companion.smali | 22 +- .../WidgetChatListActions$editMessage$1.smali | 20 +- .../list/actions/WidgetChatListActions.smali | 4 +- ...hatTypingModel$Companion$getTarget$1.smali | 4 + ...hatOverlay$TypingIndicatorViewHolder.smali | 4 +- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- .../guilds/create/WidgetGuildCreate.smali | 4 +- .../guilds/invite/GuildInviteUiHelperKt.smali | 2 +- ...getGuildsListViewModel$Factory$Chunk.smali | 2 + ...tViewModel$Factory$observeStores$1$1.smali | 1 + ...WidgetGuildsListViewModel$StoreState.smali | 2 + ...nHeaderManager$getOnSelectedAction$1.smali | 22 +- .../WidgetMainPanelNsfw$configureUI$1.smali | 18 +- .../WidgetMainPanelNsfw$configureUI$2.smali | 18 +- .../discord/widgets/media/WidgetMedia.smali | 2 +- ...sChannelListAdapter$CategoryListItem.smali | 2 +- ...ServerNotifications$configureRadio$1.smali | 4 + ...getServerNotifications$configureUI$1.smali | 4 + ...getServerNotifications$configureUI$2.smali | 4 + ...getServerNotifications$configureUI$3.smali | 4 + ...ons$createSwipeableItemTouchHelper$1.smali | 28 +- .../servers/WidgetServerSettingsBans.smali | 6 +- .../WidgetServerSettingsEditRole.smali | 2 +- ...rverSettingsEmojis$showMediaPicker$1.smali | 2 +- .../WidgetServerSettingsModeration.smali | 4 +- ...ngsOverview$configureBannerImage$1$2.smali | 2 +- ...erSettingsOverview$configureIcon$1$2.smali | 2 +- ...ngsOverview$configureSplashImage$1$2.smali | 2 +- ...ettingsRolesListAdapter$RoleListItem.smali | 2 +- ...idgetServerSettingsTransferOwnership.smali | 2 +- .../WidgetServerSettingsVanityUrl.smali | 2 +- .../widgets/settings/WidgetChangeLog.smali | 2 +- .../widgets/settings/WidgetSettings.smali | 6 +- ...dgetSettingsAppearance$configureUI$1.smali | 4 +- .../settings/WidgetSettingsAppearance.smali | 4 +- .../settings/WidgetSettingsBehavior.smali | 2 +- ...$configureUI$$inlined$apply$lambda$2.smali | 2 +- .../settings/WidgetSettingsLanguage.smali | 14 +- .../settings/WidgetSettingsMedia.smali | 4 +- .../WidgetSettingsNotifications.smali | 2 +- ...Privacy$configurePrivacyControls$1$1.smali | 8 +- .../settings/WidgetSettingsPrivacy.smali | 2 +- .../WidgetSettingsUserConnections.smali | 2 +- ...WidgetSettingsUserConnectionsAddXbox.smali | 2 +- .../settings/WidgetSettingsVoice.smali | 2 +- ...idgetSettingsAccount$configureUI$5$1.smali | 2 +- ...ttingsAccount$showRemove2FAModal$1$1.smali | 2 +- .../account/WidgetSettingsAccount.smali | 10 +- ...sAccountBackupCodes$getBackupCodes$1.smali | 4 +- .../WidgetSettingsAccountBackupCodes.smali | 10 +- .../WidgetSettingsAccountChangePassword.smali | 4 +- ...tingsAccountEdit$validationManager$2.smali | 2 +- .../account/WidgetSettingsAccountEdit.smali | 4 +- .../account/mfa/WidgetEnableMFADownload.smali | 2 +- .../account/mfa/WidgetEnableMFAKey.smali | 4 +- .../billing/WidgetSettingsBilling.smali | 2 +- .../premium/WidgetSettingsPremium.smali | 4 +- ...dgetSettingsPremiumGuildSubscription.smali | 2 +- ...IncomingShare$onSendClicked$filter$3.smali | 34 +- .../widgets/share/WidgetIncomingShare.smali | 2 +- .../discord/widgets/tos/WidgetTosAccept.smali | 2 +- ...UserMentions$WidgetUserMentionFilter.smali | 2 +- .../account/WidgetUserAccountVerify.smali | 4 +- .../user/email/WidgetUserEmailVerify.smali | 2 +- .../presence/ViewHolderGameRichPresence.smali | 2 +- .../ViewHolderMusicRichPresence.smali | 8 +- .../ViewHolderPlatformRichPresence.smali | 2 +- .../ViewHolderStreamRichPresence.smali | 4 +- .../presence/ViewHolderUserRichPresence.smali | 6 +- .../search/WidgetGlobalSearch$Companion.smali | 6 +- ...Companion$create$$inlined$sortedBy$1.smali | 34 +- ...Companion$get$guildsListObservable$1.smali | 1 + .../voice/call/WidgetPrivateCall.smali | 2 +- .../voice/call/WidgetVoiceCallIncoming.smali | 4 +- .../VoiceControlsView$configureUI$2.smali | 2 +- .../voice/fullscreen/VoiceControlsView.smali | 6 +- .../miguelgaeta/media_picker/R$string.smali | 10 +- .../com/yalantis/ucrop/R$g.smali | 10 +- 181 files changed, 4661 insertions(+), 3579 deletions(-) create mode 100644 com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser$parse$1.smali create mode 100644 com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser.smali create mode 100644 com.discord/smali/com/discord/models/domain/ModelMuteConfig$endTimeMs$2.smali create mode 100644 com.discord/smali/com/discord/models/domain/ModelMuteConfig.smali create mode 100644 com.discord/smali/com/discord/models/domain/NotificationSettingsModelUtils.smali delete mode 100644 com.discord/smali/com/discord/stores/-$$Lambda$0UyPDl1dK0kI7uSVBuqxhyISp_w.smali delete mode 100644 com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU.smali delete mode 100644 com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$CKg3Y3f26LcafhVO_loewL4XViw.smali delete mode 100644 com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs.smali delete mode 100644 com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4.smali delete mode 100644 com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$_UmCUPV1EvBeHiZpKveX_lMTlLE.smali delete mode 100644 com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg.smali delete mode 100644 com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$xAuTarfGExPiAI2-XFgTbp3HIP4.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreMentions$init$1.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreMentions$init$2$1.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreMentions$init$2.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreMentions$init$Tuple.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreMentions$sam$rx_functions_Func3$0.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserGuildSettings$get$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1.smali create mode 100644 com.discord/smali/com/discord/utilities/clocks/TestClock.smali diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index d76488f573..f8aad40773 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-987.apk +apkFileName: com.discord-989.apk compressionType: false doNotCompress: - arsc @@ -179,5 +179,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '987' - versionName: 9.8.7 + versionCode: '989' + versionName: 9.8.9 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index cc6b3f6533..0989d2c9e3 100644 --- a/com.discord/assets/crashlytics-build.properties +++ b/com.discord/assets/crashlytics-build.properties @@ -3,9 +3,9 @@ # #Do NOT modify, delete, or commit to source control! # -#Wed Nov 20 20:11:42 UTC 2019 -version_name=9.8.7 +#Thu Nov 21 01:44:58 UTC 2019 +version_name=9.8.9 package_name=com.discord -build_id=8bf8fb9e-3e45-43e6-83ae-7195de27bcbb -version_code=987 +build_id=78f7fac2-1eb2-4b5a-871b-33aeeecdc2bd +version_code=989 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 1de69c722a7d3fedf1554fd76624ecff3adfd915..b44309749b6eb3032c2ee060fa1ac39b910cf600 100644 GIT binary patch delta 23 fcmZ4RoN>W(#tms4jFy|zIXZP2?{5BRy51H5cccmA delta 23 fcmZ4RoN>W(#tms4jOLruIXZP2Z*Tr+y51H5cYX=r diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 69ca1f7d89..692299b9f7 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -13391,650 +13391,652 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 2ac6240e34..dd66cb55cb 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1000,7 +1000,7 @@ ONE MORE THING {fixed} Unable to sync cloud saves OR Collapse Category - 8bf8fb9e-3e45-43e6-83ae-7195de27bcbb + 78f7fac2-1eb2-4b5a-871b-33aeeecdc2bd Coming Soon Search Animated GIFs on the Web Displays text with emphasis. @@ -4407,6 +4407,8 @@ Server Insights is an experimental feature and is subject to change or removal i This is an official message from Team Discord. Please be advised that Discord will never ask you for your password or account token. Help Center SYSTEM + "There's an official message from the Discord team that needs your attention." + Urgent Message System keyboard You missed a call from %1$s. You missed a call from %1$s that lasted %2$s. diff --git a/com.discord/smali/androidx/preference/R$string.smali b/com.discord/smali/androidx/preference/R$string.smali index 8f86b473c8..2e48a6121f 100644 --- a/com.discord/smali/androidx/preference/R$string.smali +++ b/com.discord/smali/androidx/preference/R$string.smali @@ -83,9 +83,9 @@ .field public static final summary_collapsed_preference_list:I = 0x7f1210e1 -.field public static final v7_preference_off:I = 0x7f1212d9 +.field public static final v7_preference_off:I = 0x7f1212db -.field public static final v7_preference_on:I = 0x7f1212da +.field public static final v7_preference_on:I = 0x7f1212dc # direct methods diff --git a/com.discord/smali/androidx/preference/ktx/R$string.smali b/com.discord/smali/androidx/preference/ktx/R$string.smali index c170f99ee9..aafaf5713d 100644 --- a/com.discord/smali/androidx/preference/ktx/R$string.smali +++ b/com.discord/smali/androidx/preference/ktx/R$string.smali @@ -83,9 +83,9 @@ .field public static final summary_collapsed_preference_list:I = 0x7f1210e1 -.field public static final v7_preference_off:I = 0x7f1212d9 +.field public static final v7_preference_off:I = 0x7f1212db -.field public static final v7_preference_on:I = 0x7f1212da +.field public static final v7_preference_on:I = 0x7f1212dc # direct methods diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 7099e7dbaf..848b49e79a 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -36,11 +36,11 @@ .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/987" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/989" -.field public static final VERSION_CODE:I = 0x3db +.field public static final VERSION_CODE:I = 0x3dd -.field public static final VERSION_NAME:Ljava/lang/String; = "9.8.7" +.field public static final VERSION_NAME:Ljava/lang/String; = "9.8.9" # direct methods diff --git a/com.discord/smali/com/discord/app/AppFragment$c.smali b/com.discord/smali/com/discord/app/AppFragment$c.smali index e3542e6576..49afa17db5 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, 0x7f121214 + const p1, 0x7f121216 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/h.smali b/com.discord/smali/com/discord/app/h.smali index d4d54acf40..f18b3d949d 100644 --- a/com.discord/smali/com/discord/app/h.smali +++ b/com.discord/smali/com/discord/app/h.smali @@ -302,7 +302,7 @@ .method public static final w(Landroid/content/Context;)V .locals 3 - const v0, 0x7f12126b + const v0, 0x7f12126d const/4 v1, 0x0 diff --git a/com.discord/smali/com/discord/dialogs/a/a$c.smali b/com.discord/smali/com/discord/dialogs/a/a$c.smali index a1c7968e5c..4f670495c4 100644 --- a/com.discord/smali/com/discord/dialogs/a/a$c.smali +++ b/com.discord/smali/com/discord/dialogs/a/a$c.smali @@ -43,7 +43,7 @@ move-result-object p1 - const v0, 0x7f121264 + const v0, 0x7f121266 invoke-virtual {p1, v0}, Lcom/discord/dialogs/a/b;->removeRelationship(I)V diff --git a/com.discord/smali/com/discord/dialogs/a/b$e.smali b/com.discord/smali/com/discord/dialogs/a/b$e.smali index 021ce7f8ba..0610ec7b27 100644 --- a/com.discord/smali/com/discord/dialogs/a/b$e.smali +++ b/com.discord/smali/com/discord/dialogs/a/b$e.smali @@ -51,7 +51,7 @@ iget-object p1, p0, Lcom/discord/dialogs/a/b$e;->this$0:Lcom/discord/dialogs/a/b; - const v0, 0x7f121263 + const v0, 0x7f121265 invoke-static {p1, v0}, Lcom/discord/dialogs/a/b;->a(Lcom/discord/dialogs/a/b;I)V diff --git a/com.discord/smali/com/discord/dialogs/b.smali b/com.discord/smali/com/discord/dialogs/b.smali index b80cea0222..3d0f3adf44 100644 --- a/com.discord/smali/com/discord/dialogs/b.smali +++ b/com.discord/smali/com/discord/dialogs/b.smali @@ -80,7 +80,7 @@ invoke-static {v6, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v3, 0x7f12126d + const v3, 0x7f12126f # 1.94163E38f invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/gateway/R$string.smali b/com.discord/smali/com/discord/gateway/R$string.smali index 76808ce648..f2c81a93e2 100644 --- a/com.discord/smali/com/discord/gateway/R$string.smali +++ b/com.discord/smali/com/discord/gateway/R$string.smali @@ -147,9 +147,9 @@ .field public static final summary_collapsed_preference_list:I = 0x7f1210e1 -.field public static final v7_preference_off:I = 0x7f1212d9 +.field public static final v7_preference_off:I = 0x7f1212db -.field public static final v7_preference_on:I = 0x7f1212da +.field public static final v7_preference_on:I = 0x7f1212dc # direct methods diff --git a/com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser$parse$1.smali new file mode 100644 index 0000000000..3fa0adc142 --- /dev/null +++ b/com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser$parse$1.smali @@ -0,0 +1,109 @@ +.class final Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1; +.super Ljava/lang/Object; +.source "ModelMuteConfig.kt" + +# interfaces +.implements Lrx/functions/Action1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/models/domain/ModelMuteConfig$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMuteConfig; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/Action1<", + "Ljava/lang/String;", + ">;" + } +.end annotation + + +# instance fields +.field final synthetic $endTime:Lkotlin/jvm/internal/Ref$ObjectRef; + +.field final synthetic $reader:Lcom/discord/models/domain/Model$JsonReader; + + +# direct methods +.method constructor (Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1;->$endTime:Lkotlin/jvm/internal/Ref$ObjectRef; + + iput-object p2, p0, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader; + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final bridge synthetic call(Ljava/lang/Object;)V + .locals 0 + + check-cast p1, Ljava/lang/String; + + invoke-virtual {p0, p1}, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1;->call(Ljava/lang/String;)V + + return-void +.end method + +.method public final call(Ljava/lang/String;)V + .locals 2 + + if-nez p1, :cond_0 + + goto :goto_0 + + :cond_0 + invoke-virtual {p1}, Ljava/lang/String;->hashCode()I + + move-result v0 + + const v1, 0x66d9d3b1 + + if-eq v0, v1, :cond_1 + + goto :goto_0 + + :cond_1 + const-string v0, "end_time" + + invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + + move-result p1 + + if-eqz p1, :cond_2 + + iget-object p1, p0, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1;->$endTime:Lkotlin/jvm/internal/Ref$ObjectRef; + + iget-object v0, p0, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader; + + invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String; + + move-result-object v0 + + iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object; + + return-void + + :cond_2 + :goto_0 + iget-object p1, p0, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader; + + invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V + + return-void +.end method diff --git a/com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser.smali new file mode 100644 index 0000000000..acdd6debd4 --- /dev/null +++ b/com.discord/smali/com/discord/models/domain/ModelMuteConfig$Parser.smali @@ -0,0 +1,90 @@ +.class public final Lcom/discord/models/domain/ModelMuteConfig$Parser; +.super Ljava/lang/Object; +.source "ModelMuteConfig.kt" + +# interfaces +.implements Lcom/discord/models/domain/Model$Parser; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lcom/discord/models/domain/ModelMuteConfig; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = "Parser" +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/lang/Object;", + "Lcom/discord/models/domain/Model$Parser<", + "Lcom/discord/models/domain/ModelMuteConfig;", + ">;" + } +.end annotation + + +# direct methods +.method private constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + +.method public synthetic constructor (Lkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 0 + + invoke-direct {p0}, Lcom/discord/models/domain/ModelMuteConfig$Parser;->()V + + return-void +.end method + + +# virtual methods +.method public final parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMuteConfig; + .locals 2 + + const-string v0, "reader" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + new-instance v0, Lkotlin/jvm/internal/Ref$ObjectRef; + + invoke-direct {v0}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V + + const/4 v1, 0x0 + + iput-object v1, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object; + + new-instance v1, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1; + + invoke-direct {v1, v0, p1}, Lcom/discord/models/domain/ModelMuteConfig$Parser$parse$1;->(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;)V + + check-cast v1, Lrx/functions/Action1; + + invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V + + new-instance p1, Lcom/discord/models/domain/ModelMuteConfig; + + iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object; + + check-cast v0, Ljava/lang/String; + + invoke-direct {p1, v0}, Lcom/discord/models/domain/ModelMuteConfig;->(Ljava/lang/String;)V + + return-object p1 +.end method + +.method public final bridge synthetic parse(Lcom/discord/models/domain/Model$JsonReader;)Ljava/lang/Object; + .locals 0 + + invoke-virtual {p0, p1}, Lcom/discord/models/domain/ModelMuteConfig$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMuteConfig; + + move-result-object p1 + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/models/domain/ModelMuteConfig$endTimeMs$2.smali b/com.discord/smali/com/discord/models/domain/ModelMuteConfig$endTimeMs$2.smali new file mode 100644 index 0000000000..4706bf81ba --- /dev/null +++ b/com.discord/smali/com/discord/models/domain/ModelMuteConfig$endTimeMs$2.smali @@ -0,0 +1,93 @@ +.class final Lcom/discord/models/domain/ModelMuteConfig$endTimeMs$2; +.super Lkotlin/jvm/internal/m; +.source "ModelMuteConfig.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function0; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/models/domain/ModelMuteConfig;->(Ljava/lang/String;)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lkotlin/jvm/internal/m;", + "Lkotlin/jvm/functions/Function0<", + "Ljava/lang/Long;", + ">;" + } +.end annotation + + +# instance fields +.field final synthetic this$0:Lcom/discord/models/domain/ModelMuteConfig; + + +# direct methods +.method constructor (Lcom/discord/models/domain/ModelMuteConfig;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/models/domain/ModelMuteConfig$endTimeMs$2;->this$0:Lcom/discord/models/domain/ModelMuteConfig; + + const/4 p1, 0x0 + + invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;->(I)V + + return-void +.end method + + +# virtual methods +.method public final invoke()Ljava/lang/Long; + .locals 2 + + iget-object v0, p0, Lcom/discord/models/domain/ModelMuteConfig$endTimeMs$2;->this$0:Lcom/discord/models/domain/ModelMuteConfig; + + invoke-virtual {v0}, Lcom/discord/models/domain/ModelMuteConfig;->getEndTime()Ljava/lang/String; + + move-result-object v0 + + if-eqz v0, :cond_0 + + invoke-static {}, Lcom/miguelgaeta/simple_time/SimpleTime;->getDefault()Lcom/miguelgaeta/simple_time/SimpleTime; + + move-result-object v0 + + iget-object v1, p0, Lcom/discord/models/domain/ModelMuteConfig$endTimeMs$2;->this$0:Lcom/discord/models/domain/ModelMuteConfig; + + invoke-virtual {v1}, Lcom/discord/models/domain/ModelMuteConfig;->getEndTime()Ljava/lang/String; + + move-result-object v1 + + invoke-virtual {v0, v1}, Lcom/miguelgaeta/simple_time/SimpleTime;->parseUTCDate(Ljava/lang/String;)J + + move-result-wide v0 + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + return-object v0 + + :cond_0 + const/4 v0, 0x0 + + return-object v0 +.end method + +.method public final bridge synthetic invoke()Ljava/lang/Object; + .locals 1 + + invoke-virtual {p0}, Lcom/discord/models/domain/ModelMuteConfig$endTimeMs$2;->invoke()Ljava/lang/Long; + + move-result-object v0 + + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/models/domain/ModelMuteConfig.smali b/com.discord/smali/com/discord/models/domain/ModelMuteConfig.smali new file mode 100644 index 0000000000..f8bccf47d0 --- /dev/null +++ b/com.discord/smali/com/discord/models/domain/ModelMuteConfig.smali @@ -0,0 +1,240 @@ +.class public final Lcom/discord/models/domain/ModelMuteConfig; +.super Ljava/lang/Object; +.source "ModelMuteConfig.kt" + + +# annotations +.annotation system Ldalvik/annotation/MemberClasses; + value = { + Lcom/discord/models/domain/ModelMuteConfig$Parser; + } +.end annotation + + +# static fields +.field static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty; + +.field public static final Parser:Lcom/discord/models/domain/ModelMuteConfig$Parser; + + +# instance fields +.field private final endTime:Ljava/lang/String; + +.field private final endTimeMs$delegate:Lkotlin/Lazy; + + +# direct methods +.method static constructor ()V + .locals 5 + + const/4 v0, 0x1 + + new-array v0, v0, [Lkotlin/reflect/KProperty; + + new-instance v1, Lkotlin/jvm/internal/x; + + const-class v2, Lcom/discord/models/domain/ModelMuteConfig; + + invoke-static {v2}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b; + + move-result-object v2 + + const-string v3, "endTimeMs" + + const-string v4, "getEndTimeMs()Ljava/lang/Long;" + + invoke-direct {v1, v2, v3, v4}, Lkotlin/jvm/internal/x;->(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V + + invoke-static {v1}, Lkotlin/jvm/internal/y;->property1(Lkotlin/jvm/internal/w;)Lkotlin/reflect/d; + + move-result-object v1 + + check-cast v1, Lkotlin/reflect/KProperty; + + const/4 v2, 0x0 + + aput-object v1, v0, v2 + + sput-object v0, Lcom/discord/models/domain/ModelMuteConfig;->$$delegatedProperties:[Lkotlin/reflect/KProperty; + + new-instance v0, Lcom/discord/models/domain/ModelMuteConfig$Parser; + + const/4 v1, 0x0 + + invoke-direct {v0, v1}, Lcom/discord/models/domain/ModelMuteConfig$Parser;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V + + sput-object v0, Lcom/discord/models/domain/ModelMuteConfig;->Parser:Lcom/discord/models/domain/ModelMuteConfig$Parser; + + return-void +.end method + +.method public constructor (Ljava/lang/String;)V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-object p1, p0, Lcom/discord/models/domain/ModelMuteConfig;->endTime:Ljava/lang/String; + + new-instance p1, Lcom/discord/models/domain/ModelMuteConfig$endTimeMs$2; + + invoke-direct {p1, p0}, Lcom/discord/models/domain/ModelMuteConfig$endTimeMs$2;->(Lcom/discord/models/domain/ModelMuteConfig;)V + + check-cast p1, Lkotlin/jvm/functions/Function0; + + invoke-static {p1}, Lkotlin/f;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy; + + move-result-object p1 + + iput-object p1, p0, Lcom/discord/models/domain/ModelMuteConfig;->endTimeMs$delegate:Lkotlin/Lazy; + + return-void +.end method + +.method public static synthetic copy$default(Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/domain/ModelMuteConfig; + .locals 0 + + and-int/lit8 p2, p2, 0x1 + + if-eqz p2, :cond_0 + + iget-object p1, p0, Lcom/discord/models/domain/ModelMuteConfig;->endTime:Ljava/lang/String; + + :cond_0 + invoke-virtual {p0, p1}, Lcom/discord/models/domain/ModelMuteConfig;->copy(Ljava/lang/String;)Lcom/discord/models/domain/ModelMuteConfig; + + move-result-object p0 + + return-object p0 +.end method + +.method public static parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMuteConfig; + .locals 1 + + sget-object v0, Lcom/discord/models/domain/ModelMuteConfig;->Parser:Lcom/discord/models/domain/ModelMuteConfig$Parser; + + invoke-virtual {v0, p0}, Lcom/discord/models/domain/ModelMuteConfig$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMuteConfig; + + move-result-object p0 + + return-object p0 +.end method + + +# virtual methods +.method public final component1()Ljava/lang/String; + .locals 1 + + iget-object v0, p0, Lcom/discord/models/domain/ModelMuteConfig;->endTime:Ljava/lang/String; + + return-object v0 +.end method + +.method public final copy(Ljava/lang/String;)Lcom/discord/models/domain/ModelMuteConfig; + .locals 1 + + new-instance v0, Lcom/discord/models/domain/ModelMuteConfig; + + invoke-direct {v0, p1}, Lcom/discord/models/domain/ModelMuteConfig;->(Ljava/lang/String;)V + + return-object v0 +.end method + +.method public final equals(Ljava/lang/Object;)Z + .locals 1 + + if-eq p0, p1, :cond_1 + + instance-of v0, p1, Lcom/discord/models/domain/ModelMuteConfig; + + if-eqz v0, :cond_0 + + check-cast p1, Lcom/discord/models/domain/ModelMuteConfig; + + iget-object v0, p0, Lcom/discord/models/domain/ModelMuteConfig;->endTime:Ljava/lang/String; + + iget-object p1, p1, Lcom/discord/models/domain/ModelMuteConfig;->endTime:Ljava/lang/String; + + invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result p1 + + if-eqz p1, :cond_0 + + goto :goto_0 + + :cond_0 + const/4 p1, 0x0 + + return p1 + + :cond_1 + :goto_0 + const/4 p1, 0x1 + + return p1 +.end method + +.method public final getEndTime()Ljava/lang/String; + .locals 1 + + iget-object v0, p0, Lcom/discord/models/domain/ModelMuteConfig;->endTime:Ljava/lang/String; + + return-object v0 +.end method + +.method public final getEndTimeMs()Ljava/lang/Long; + .locals 1 + + iget-object v0, p0, Lcom/discord/models/domain/ModelMuteConfig;->endTimeMs$delegate:Lkotlin/Lazy; + + invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object; + + move-result-object v0 + + check-cast v0, Ljava/lang/Long; + + return-object v0 +.end method + +.method public final hashCode()I + .locals 1 + + iget-object v0, p0, Lcom/discord/models/domain/ModelMuteConfig;->endTime:Ljava/lang/String; + + if-eqz v0, :cond_0 + + invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I + + move-result v0 + + return v0 + + :cond_0 + const/4 v0, 0x0 + + return v0 +.end method + +.method public final toString()Ljava/lang/String; + .locals 2 + + new-instance v0, Ljava/lang/StringBuilder; + + const-string v1, "ModelMuteConfig(endTime=" + + invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V + + iget-object v1, p0, Lcom/discord/models/domain/ModelMuteConfig;->endTime:Ljava/lang/String; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + const-string v1, ")" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v0 + + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings$ChannelOverride.smali b/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings$ChannelOverride.smali index e7c8f6dcea..f53561d6a1 100644 --- a/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings$ChannelOverride.smali +++ b/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings$ChannelOverride.smali @@ -20,8 +20,12 @@ # instance fields .field private channelId:J +.field private transient derivedMute:Z + .field private messageNotifications:I +.field private muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + .field private muted:Z @@ -46,6 +50,32 @@ return-void .end method +.method public constructor (ZLcom/discord/models/domain/ModelMuteConfig;ZIJ)V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-boolean p1, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muted:Z + + iput-object p2, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + iput-boolean p3, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->derivedMute:Z + + iput p4, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->messageNotifications:I + + iput-wide p5, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->channelId:J + + return-void +.end method + +.method static synthetic access$000(Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;)Lcom/discord/models/domain/ModelMuteConfig; + .locals 0 + + iget-object p0, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + return-object p0 +.end method + # virtual methods .method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V @@ -64,79 +94,86 @@ move-result v1 - const v2, -0x7315ce29 + const/4 v2, 0x3 const/4 v3, 0x2 const/4 v4, 0x1 - if-eq v1, v2, :cond_2 - - const v2, 0x636f16b - - if-eq v1, v2, :cond_1 - - const v2, 0x53cf4eb0 - - if-eq v1, v2, :cond_0 + sparse-switch v1, :sswitch_data_0 goto :goto_0 - :cond_0 + :sswitch_0 const-string v1, "message_notifications" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 - if-eqz v0, :cond_3 + if-eqz v0, :cond_0 - const/4 v0, 0x1 + const/4 v0, 0x2 goto :goto_1 - :cond_1 + :sswitch_1 const-string v1, "muted" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 - if-eqz v0, :cond_3 + if-eqz v0, :cond_0 const/4 v0, 0x0 goto :goto_1 - :cond_2 + :sswitch_2 const-string v1, "channel_id" invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 - if-eqz v0, :cond_3 + if-eqz v0, :cond_0 - const/4 v0, 0x2 + const/4 v0, 0x3 goto :goto_1 - :cond_3 + :sswitch_3 + const-string v1, "mute_config" + + invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :cond_0 + + const/4 v0, 0x1 + + goto :goto_1 + + :cond_0 :goto_0 const/4 v0, -0x1 :goto_1 - if-eqz v0, :cond_6 + if-eqz v0, :cond_5 - if-eq v0, v4, :cond_5 + if-eq v0, v4, :cond_3 - if-eq v0, v3, :cond_4 + if-eq v0, v3, :cond_2 + + if-eq v0, v2, :cond_1 invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V return-void - :cond_4 + :cond_1 iget-wide v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->channelId:J invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J @@ -147,7 +184,7 @@ return-void - :cond_5 + :cond_2 iget v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->messageNotifications:I invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I @@ -158,7 +195,31 @@ return-void - :cond_6 + :cond_3 + invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->peek()Lcom/google/gson/stream/JsonToken; + + move-result-object v0 + + sget-object v1, Lcom/google/gson/stream/JsonToken;->NULL:Lcom/google/gson/stream/JsonToken; + + if-ne v0, v1, :cond_4 + + invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextNull()V + + return-void + + :cond_4 + sget-object v0, Lcom/discord/models/domain/ModelMuteConfig;->Parser:Lcom/discord/models/domain/ModelMuteConfig$Parser; + + invoke-virtual {v0, p1}, Lcom/discord/models/domain/ModelMuteConfig$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMuteConfig; + + move-result-object p1 + + iput-object p1, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + return-void + + :cond_5 iget-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muted:Z invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextBoolean(Z)Z @@ -168,6 +229,14 @@ iput-boolean p1, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muted:Z return-void + + :sswitch_data_0 + .sparse-switch + -0x7986afd8 -> :sswitch_3 + -0x7315ce29 -> :sswitch_2 + 0x636f16b -> :sswitch_1 + 0x53cf4eb0 -> :sswitch_0 + .end sparse-switch .end method .method protected canEqual(Ljava/lang/Object;)Z @@ -178,6 +247,52 @@ return p1 .end method +.method public copyAndRecomputeTransientFields(Lcom/discord/utilities/clocks/Clock;)Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride; + .locals 8 + + iget-object v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + if-nez v0, :cond_0 + + const/4 v0, 0x0 + + goto :goto_0 + + :cond_0 + invoke-virtual {v0}, Lcom/discord/models/domain/ModelMuteConfig;->getEndTime()Ljava/lang/String; + + move-result-object v1 + + invoke-virtual {v0, v1}, Lcom/discord/models/domain/ModelMuteConfig;->copy(Ljava/lang/String;)Lcom/discord/models/domain/ModelMuteConfig; + + move-result-object v0 + + :goto_0 + move-object v3, v0 + + iget-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muted:Z + + iget-object v1, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + invoke-static {v0, v1, p1}, Lcom/discord/models/domain/NotificationSettingsModelUtils;->isMuted(ZLcom/discord/models/domain/ModelMuteConfig;Lcom/discord/utilities/clocks/Clock;)Z + + move-result v4 + + new-instance p1, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride; + + iget-boolean v2, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muted:Z + + iget v5, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->messageNotifications:I + + iget-wide v6, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->channelId:J + + move-object v1, p1 + + invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->(ZLcom/discord/models/domain/ModelMuteConfig;ZIJ)V + + return-object p1 +.end method + .method public equals(Ljava/lang/Object;)Z .locals 7 @@ -221,6 +336,36 @@ return v2 :cond_3 + iget-object v1, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + iget-object v3, p1, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + if-nez v1, :cond_4 + + if-eqz v3, :cond_5 + + goto :goto_0 + + :cond_4 + invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z + + move-result v1 + + if-nez v1, :cond_5 + + :goto_0 + return v2 + + :cond_5 + iget-boolean v1, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->derivedMute:Z + + iget-boolean v3, p1, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->derivedMute:Z + + if-eq v1, v3, :cond_6 + + return v2 + + :cond_6 invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->getMessageNotifications()I move-result v1 @@ -229,11 +374,11 @@ move-result v3 - if-eq v1, v3, :cond_4 + if-eq v1, v3, :cond_7 return v2 - :cond_4 + :cond_7 invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->getChannelId()J move-result-wide v3 @@ -244,11 +389,11 @@ cmp-long p1, v3, v5 - if-eqz p1, :cond_5 + if-eqz p1, :cond_8 return v2 - :cond_5 + :cond_8 return v0 .end method @@ -275,6 +420,10 @@ move-result v0 + const/16 v1, 0x4f + + const/16 v2, 0x61 + if-eqz v0, :cond_0 const/16 v0, 0x4f @@ -287,6 +436,38 @@ :goto_0 add-int/lit8 v0, v0, 0x3b + iget-object v3, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + mul-int/lit8 v0, v0, 0x3b + + if-nez v3, :cond_1 + + const/16 v3, 0x2b + + goto :goto_1 + + :cond_1 + invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I + + move-result v3 + + :goto_1 + add-int/2addr v0, v3 + + mul-int/lit8 v0, v0, 0x3b + + iget-boolean v3, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->derivedMute:Z + + if-eqz v3, :cond_2 + + goto :goto_2 + + :cond_2 + const/16 v1, 0x61 + + :goto_2 + add-int/2addr v0, v1 + mul-int/lit8 v0, v0, 0x3b invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->getMessageNotifications()I @@ -317,7 +498,7 @@ .method public isMuted()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muted:Z + iget-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->derivedMute:Z return v0 .end method @@ -337,6 +518,22 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; + const-string v1, ", muteConfig=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-object v1, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v1, ", derivedMute=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-boolean v1, p0, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->derivedMute:Z + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; + const-string v1, ", messageNotifications=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings.smali b/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings.smali index b23b8dc9a9..7649f8e55a 100644 --- a/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings.smali +++ b/com.discord/smali/com/discord/models/domain/ModelUserGuildSettings.smali @@ -35,12 +35,16 @@ .end annotation .end field +.field private transient derivedMute:Z + .field private guildId:J .field private messageNotifications:I .field private mobilePush:Z +.field private muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + .field private muted:Z .field private suppressEveryone:Z @@ -64,6 +68,10 @@ iput-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muted:Z + const/4 v0, 0x0 + + iput-object v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + const/4 v0, 0x1 iput-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->mobilePush:Z @@ -85,6 +93,40 @@ return-void .end method +.method public constructor (ZZLcom/discord/models/domain/ModelMuteConfig;ZZIJLjava/util/List;)V + .locals 0 + .annotation system Ldalvik/annotation/Signature; + value = { + "(ZZ", + "Lcom/discord/models/domain/ModelMuteConfig;", + "ZZIJ", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;", + ">;)V" + } + .end annotation + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-boolean p1, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->suppressEveryone:Z + + iput-boolean p2, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muted:Z + + iput-object p3, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + iput-boolean p4, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->derivedMute:Z + + iput-boolean p5, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->mobilePush:Z + + iput p6, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->messageNotifications:I + + iput-wide p7, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->guildId:J + + iput-object p9, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->channelOverrides:Ljava/util/List; + + return-void +.end method + .method static synthetic lambda$assignField$0(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride; .locals 1 .annotation system Ldalvik/annotation/Throws; @@ -109,7 +151,7 @@ # virtual methods .method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V - .locals 7 + .locals 2 .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/IOException; @@ -124,16 +166,6 @@ move-result v1 - const/4 v2, 0x5 - - const/4 v3, 0x4 - - const/4 v4, 0x3 - - const/4 v5, 0x2 - - const/4 v6, 0x1 - sparse-switch v1, :sswitch_data_0 goto :goto_0 @@ -160,7 +192,7 @@ if-eqz v0, :cond_0 - const/4 v0, 0x3 + const/4 v0, 0x4 goto :goto_1 @@ -186,7 +218,7 @@ if-eqz v0, :cond_0 - const/4 v0, 0x5 + const/4 v0, 0x6 goto :goto_1 @@ -199,7 +231,7 @@ if-eqz v0, :cond_0 - const/4 v0, 0x4 + const/4 v0, 0x5 goto :goto_1 @@ -212,6 +244,19 @@ if-eqz v0, :cond_0 + const/4 v0, 0x3 + + goto :goto_1 + + :sswitch_6 + const-string v1, "mute_config" + + invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :cond_0 + const/4 v0, 0x2 goto :goto_1 @@ -221,23 +266,13 @@ const/4 v0, -0x1 :goto_1 - if-eqz v0, :cond_6 - - if-eq v0, v6, :cond_5 - - if-eq v0, v5, :cond_4 - - if-eq v0, v4, :cond_3 - - if-eq v0, v3, :cond_2 - - if-eq v0, v2, :cond_1 + packed-switch v0, :pswitch_data_0 invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V return-void - :cond_1 + :pswitch_0 new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelUserGuildSettings$IvOTQQITKYcQVvFUeVXDgMhlxYM; invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelUserGuildSettings$IvOTQQITKYcQVvFUeVXDgMhlxYM;->(Lcom/discord/models/domain/Model$JsonReader;)V @@ -250,7 +285,7 @@ return-void - :cond_2 + :pswitch_1 iget-wide v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->guildId:J invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J @@ -261,7 +296,7 @@ return-void - :cond_3 + :pswitch_2 iget v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->messageNotifications:I invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I @@ -272,7 +307,7 @@ return-void - :cond_4 + :pswitch_3 iget-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->mobilePush:Z invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextBoolean(Z)Z @@ -283,7 +318,31 @@ return-void - :cond_5 + :pswitch_4 + invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->peek()Lcom/google/gson/stream/JsonToken; + + move-result-object v0 + + sget-object v1, Lcom/google/gson/stream/JsonToken;->NULL:Lcom/google/gson/stream/JsonToken; + + if-ne v0, v1, :cond_1 + + invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextNull()V + + return-void + + :cond_1 + sget-object v0, Lcom/discord/models/domain/ModelMuteConfig;->Parser:Lcom/discord/models/domain/ModelMuteConfig$Parser; + + invoke-virtual {v0, p1}, Lcom/discord/models/domain/ModelMuteConfig$Parser;->parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelMuteConfig; + + move-result-object p1 + + iput-object p1, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + return-void + + :pswitch_5 iget-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muted:Z invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextBoolean(Z)Z @@ -294,7 +353,7 @@ return-void - :cond_6 + :pswitch_6 iget-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->suppressEveryone:Z invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextBoolean(Z)Z @@ -305,10 +364,9 @@ return-void - nop - :sswitch_data_0 .sparse-switch + -0x7986afd8 -> :sswitch_6 -0x4e501369 -> :sswitch_5 -0x4de03319 -> :sswitch_4 -0x41315215 -> :sswitch_3 @@ -316,6 +374,17 @@ 0x53cf4eb0 -> :sswitch_1 0x6a5ce7b5 -> :sswitch_0 .end sparse-switch + + :pswitch_data_0 + .packed-switch 0x0 + :pswitch_6 + :pswitch_5 + :pswitch_4 + :pswitch_3 + :pswitch_2 + :pswitch_1 + :pswitch_0 + .end packed-switch .end method .method protected canEqual(Ljava/lang/Object;)Z @@ -326,6 +395,88 @@ return p1 .end method +.method public copyAndRecomputeTransientFields(Lcom/discord/utilities/clocks/Clock;)Lcom/discord/models/domain/ModelUserGuildSettings; + .locals 11 + + iget-object v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + if-nez v0, :cond_0 + + const/4 v0, 0x0 + + goto :goto_0 + + :cond_0 + invoke-virtual {v0}, Lcom/discord/models/domain/ModelMuteConfig;->getEndTime()Ljava/lang/String; + + move-result-object v1 + + invoke-virtual {v0, v1}, Lcom/discord/models/domain/ModelMuteConfig;->copy(Ljava/lang/String;)Lcom/discord/models/domain/ModelMuteConfig; + + move-result-object v0 + + :goto_0 + move-object v4, v0 + + iget-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muted:Z + + iget-object v1, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + invoke-static {v0, v1, p1}, Lcom/discord/models/domain/NotificationSettingsModelUtils;->isMuted(ZLcom/discord/models/domain/ModelMuteConfig;Lcom/discord/utilities/clocks/Clock;)Z + + move-result v5 + + new-instance v10, Ljava/util/ArrayList; + + invoke-direct {v10}, Ljava/util/ArrayList;->()V + + iget-object v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->channelOverrides:Ljava/util/List; + + invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator; + + move-result-object v0 + + :goto_1 + invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z + + move-result v1 + + if-eqz v1, :cond_1 + + invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v1 + + check-cast v1, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride; + + invoke-virtual {v1, p1}, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->copyAndRecomputeTransientFields(Lcom/discord/utilities/clocks/Clock;)Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride; + + move-result-object v1 + + invoke-interface {v10, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z + + goto :goto_1 + + :cond_1 + new-instance p1, Lcom/discord/models/domain/ModelUserGuildSettings; + + iget-boolean v2, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->suppressEveryone:Z + + iget-boolean v3, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muted:Z + + iget-boolean v6, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->mobilePush:Z + + iget v7, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->messageNotifications:I + + iget-wide v8, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->guildId:J + + move-object v1, p1 + + invoke-direct/range {v1 .. v10}, Lcom/discord/models/domain/ModelUserGuildSettings;->(ZZLcom/discord/models/domain/ModelMuteConfig;ZZIJLjava/util/List;)V + + return-object p1 +.end method + .method public equals(Ljava/lang/Object;)Z .locals 7 @@ -382,6 +533,36 @@ return v2 :cond_4 + iget-object v1, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + iget-object v3, p1, Lcom/discord/models/domain/ModelUserGuildSettings;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + if-nez v1, :cond_5 + + if-eqz v3, :cond_6 + + goto :goto_0 + + :cond_5 + invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z + + move-result v1 + + if-nez v1, :cond_6 + + :goto_0 + return v2 + + :cond_6 + iget-boolean v1, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->derivedMute:Z + + iget-boolean v3, p1, Lcom/discord/models/domain/ModelUserGuildSettings;->derivedMute:Z + + if-eq v1, v3, :cond_7 + + return v2 + + :cond_7 invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserGuildSettings;->isMobilePush()Z move-result v1 @@ -390,11 +571,11 @@ move-result v3 - if-eq v1, v3, :cond_5 + if-eq v1, v3, :cond_8 return v2 - :cond_5 + :cond_8 invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserGuildSettings;->getMessageNotifications()I move-result v1 @@ -403,11 +584,11 @@ move-result v3 - if-eq v1, v3, :cond_6 + if-eq v1, v3, :cond_9 return v2 - :cond_6 + :cond_9 invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserGuildSettings;->getGuildId()J move-result-wide v3 @@ -418,11 +599,11 @@ cmp-long v1, v3, v5 - if-eqz v1, :cond_7 + if-eqz v1, :cond_a return v2 - :cond_7 + :cond_a invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserGuildSettings;->getChannelOverrides()Ljava/util/List; move-result-object v1 @@ -431,23 +612,23 @@ move-result-object p1 - if-nez v1, :cond_8 + if-nez v1, :cond_b - if-eqz p1, :cond_9 + if-eqz p1, :cond_c - goto :goto_0 + goto :goto_1 - :cond_8 + :cond_b invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z move-result p1 - if-nez p1, :cond_9 + if-nez p1, :cond_c - :goto_0 + :goto_1 return v2 - :cond_9 + :cond_c return v0 .end method @@ -526,8 +707,107 @@ return v0 .end method +.method public getNextMuteEndTimeMs(Lcom/discord/utilities/clocks/Clock;)J + .locals 8 + + invoke-interface {p1}, Lcom/discord/utilities/clocks/Clock;->currentTimeMillis()J + + move-result-wide v0 + + iget-object p1, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + if-eqz p1, :cond_0 + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelMuteConfig;->getEndTimeMs()Ljava/lang/Long; + + move-result-object p1 + + if-eqz p1, :cond_0 + + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J + + move-result-wide v2 + + cmp-long v4, v2, v0 + + if-lez v4, :cond_0 + + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J + + move-result-wide v2 + + goto :goto_0 + + :cond_0 + const-wide v2, 0x7fffffffffffffffL + + :goto_0 + iget-object p1, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->channelOverrides:Ljava/util/List; + + invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator; + + move-result-object p1 + + :cond_1 + :goto_1 + invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z + + move-result v4 + + if-eqz v4, :cond_3 + + invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v4 + + check-cast v4, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride; + + invoke-static {v4}, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->access$000(Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;)Lcom/discord/models/domain/ModelMuteConfig; + + move-result-object v4 + + if-eqz v4, :cond_2 + + invoke-virtual {v4}, Lcom/discord/models/domain/ModelMuteConfig;->getEndTimeMs()Ljava/lang/Long; + + move-result-object v4 + + goto :goto_2 + + :cond_2 + const-wide/high16 v4, -0x8000000000000000L + + invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v4 + + :goto_2 + if-eqz v4, :cond_1 + + invoke-virtual {v4}, Ljava/lang/Long;->longValue()J + + move-result-wide v5 + + cmp-long v7, v5, v0 + + if-lez v7, :cond_1 + + invoke-virtual {v4}, Ljava/lang/Long;->longValue()J + + move-result-wide v4 + + invoke-static {v2, v3, v4, v5}, Ljava/lang/Math;->min(JJ)J + + move-result-wide v2 + + goto :goto_1 + + :cond_3 + return-wide v2 +.end method + .method public hashCode()I - .locals 5 + .locals 7 invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserGuildSettings;->isSuppressEveryone()Z @@ -567,20 +847,56 @@ :goto_1 add-int/2addr v0, v3 + iget-object v3, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + mul-int/lit8 v0, v0, 0x3b + + const/16 v4, 0x2b + + if-nez v3, :cond_2 + + const/16 v3, 0x2b + + goto :goto_2 + + :cond_2 + invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I + + move-result v3 + + :goto_2 + add-int/2addr v0, v3 + + mul-int/lit8 v0, v0, 0x3b + + iget-boolean v3, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->derivedMute:Z + + if-eqz v3, :cond_3 + + const/16 v3, 0x4f + + goto :goto_3 + + :cond_3 + const/16 v3, 0x61 + + :goto_3 + add-int/2addr v0, v3 + mul-int/lit8 v0, v0, 0x3b invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserGuildSettings;->isMobilePush()Z move-result v3 - if-eqz v3, :cond_2 + if-eqz v3, :cond_4 - goto :goto_2 + goto :goto_4 - :cond_2 + :cond_4 const/16 v1, 0x61 - :goto_2 + :goto_4 add-int/2addr v0, v1 mul-int/lit8 v0, v0, 0x3b @@ -599,9 +915,9 @@ const/16 v3, 0x20 - ushr-long v3, v1, v3 + ushr-long v5, v1, v3 - xor-long/2addr v1, v3 + xor-long/2addr v1, v5 long-to-int v2, v1 @@ -613,19 +929,17 @@ mul-int/lit8 v0, v0, 0x3b - if-nez v1, :cond_3 + if-nez v1, :cond_5 - const/16 v1, 0x2b + goto :goto_5 - goto :goto_3 - - :cond_3 + :cond_5 invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I - move-result v1 + move-result v4 - :goto_3 - add-int/2addr v0, v1 + :goto_5 + add-int/2addr v0, v4 return v0 .end method @@ -641,7 +955,7 @@ .method public isMuted()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muted:Z + iget-boolean v0, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->derivedMute:Z return v0 .end method @@ -679,6 +993,22 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; + const-string v1, ", muteConfig=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-object v1, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->muteConfig:Lcom/discord/models/domain/ModelMuteConfig; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v1, ", derivedMute=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-boolean v1, p0, Lcom/discord/models/domain/ModelUserGuildSettings;->derivedMute:Z + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; + const-string v1, ", mobilePush=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/models/domain/NotificationSettingsModelUtils.smali b/com.discord/smali/com/discord/models/domain/NotificationSettingsModelUtils.smali new file mode 100644 index 0000000000..c21eacf5e5 --- /dev/null +++ b/com.discord/smali/com/discord/models/domain/NotificationSettingsModelUtils.smali @@ -0,0 +1,78 @@ +.class public final Lcom/discord/models/domain/NotificationSettingsModelUtils; +.super Ljava/lang/Object; +.source "NotificationSettingsModelUtils.kt" + + +# static fields +.field public static final INSTANCE:Lcom/discord/models/domain/NotificationSettingsModelUtils; + + +# direct methods +.method static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/models/domain/NotificationSettingsModelUtils; + + invoke-direct {v0}, Lcom/discord/models/domain/NotificationSettingsModelUtils;->()V + + sput-object v0, Lcom/discord/models/domain/NotificationSettingsModelUtils;->INSTANCE:Lcom/discord/models/domain/NotificationSettingsModelUtils; + + return-void +.end method + +.method private constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + +.method public static final isMuted(ZLcom/discord/models/domain/ModelMuteConfig;Lcom/discord/utilities/clocks/Clock;)Z + .locals 5 + + const-string v0, "clock" + + invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const/4 v0, 0x1 + + const/4 v1, 0x0 + + if-eqz p1, :cond_0 + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelMuteConfig;->getEndTimeMs()Ljava/lang/Long; + + move-result-object p1 + + if-eqz p1, :cond_0 + + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J + + move-result-wide v2 + + invoke-interface {p2}, Lcom/discord/utilities/clocks/Clock;->currentTimeMillis()J + + move-result-wide p1 + + cmp-long v4, v2, p1 + + if-gtz v4, :cond_0 + + const/4 p1, 0x1 + + goto :goto_0 + + :cond_0 + const/4 p1, 0x0 + + :goto_0 + if-eqz p0, :cond_1 + + if-nez p1, :cond_1 + + return v0 + + :cond_1 + return v1 +.end method diff --git a/com.discord/smali/com/discord/restapi/R$string.smali b/com.discord/smali/com/discord/restapi/R$string.smali index a51891186e..2bf629a6e1 100644 --- a/com.discord/smali/com/discord/restapi/R$string.smali +++ b/com.discord/smali/com/discord/restapi/R$string.smali @@ -145,9 +145,9 @@ .field public static final summary_collapsed_preference_list:I = 0x7f1210e1 -.field public static final v7_preference_off:I = 0x7f1212d9 +.field public static final v7_preference_off:I = 0x7f1212db -.field public static final v7_preference_on:I = 0x7f1212da +.field public static final v7_preference_on:I = 0x7f1212dc # direct methods diff --git a/com.discord/smali/com/discord/stores/-$$Lambda$0UyPDl1dK0kI7uSVBuqxhyISp_w.smali b/com.discord/smali/com/discord/stores/-$$Lambda$0UyPDl1dK0kI7uSVBuqxhyISp_w.smali deleted file mode 100644 index f8741faf08..0000000000 --- a/com.discord/smali/com/discord/stores/-$$Lambda$0UyPDl1dK0kI7uSVBuqxhyISp_w.smali +++ /dev/null @@ -1,36 +0,0 @@ -.class public final synthetic Lcom/discord/stores/-$$Lambda$0UyPDl1dK0kI7uSVBuqxhyISp_w; -.super Ljava/lang/Object; -.source "lambda" - -# interfaces -.implements Lrx/functions/Action1; - - -# instance fields -.field private final synthetic f$0:Ljava/util/Set; - - -# direct methods -.method public synthetic constructor (Ljava/util/Set;)V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - iput-object p1, p0, Lcom/discord/stores/-$$Lambda$0UyPDl1dK0kI7uSVBuqxhyISp_w;->f$0:Ljava/util/Set; - - return-void -.end method - - -# virtual methods -.method public final call(Ljava/lang/Object;)V - .locals 1 - - iget-object v0, p0, Lcom/discord/stores/-$$Lambda$0UyPDl1dK0kI7uSVBuqxhyISp_w;->f$0:Ljava/util/Set; - - check-cast p1, Ljava/util/Set; - - invoke-interface {v0, p1}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z - - return-void -.end method diff --git a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU.smali b/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU.smali deleted file mode 100644 index e5f63bb321..0000000000 --- a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU.smali +++ /dev/null @@ -1,46 +0,0 @@ -.class public final synthetic Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU; -.super Ljava/lang/Object; -.source "lambda" - -# interfaces -.implements Lrx/functions/b; - - -# static fields -.field public static final synthetic INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU; - - -# direct methods -.method static synthetic constructor ()V - .locals 1 - - new-instance v0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU; - - invoke-direct {v0}, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU;->()V - - sput-object v0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU;->INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU; - - return-void -.end method - -.method private synthetic constructor ()V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - - -# virtual methods -.method public final call(Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Ljava/util/Map; - - invoke-static {p1}, Lcom/discord/stores/StoreUserGuildSettings;->lambda$getMuted$5(Ljava/util/Map;)Lrx/Observable; - - move-result-object p1 - - return-object p1 -.end method diff --git a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$CKg3Y3f26LcafhVO_loewL4XViw.smali b/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$CKg3Y3f26LcafhVO_loewL4XViw.smali deleted file mode 100644 index 9aa282dac5..0000000000 --- a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$CKg3Y3f26LcafhVO_loewL4XViw.smali +++ /dev/null @@ -1,38 +0,0 @@ -.class public final synthetic Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$CKg3Y3f26LcafhVO_loewL4XViw; -.super Ljava/lang/Object; -.source "lambda" - -# interfaces -.implements Lrx/functions/b; - - -# instance fields -.field private final synthetic f$0:J - - -# direct methods -.method public synthetic constructor (J)V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - iput-wide p1, p0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$CKg3Y3f26LcafhVO_loewL4XViw;->f$0:J - - return-void -.end method - - -# virtual methods -.method public final call(Ljava/lang/Object;)Ljava/lang/Object; - .locals 2 - - iget-wide v0, p0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$CKg3Y3f26LcafhVO_loewL4XViw;->f$0:J - - check-cast p1, Ljava/util/Map; - - invoke-static {v0, v1, p1}, Lcom/discord/stores/StoreUserGuildSettings;->lambda$get$1(JLjava/util/Map;)Lcom/discord/models/domain/ModelUserGuildSettings; - - move-result-object p1 - - return-object p1 -.end method diff --git a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs.smali b/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs.smali deleted file mode 100644 index c683248b52..0000000000 --- a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs.smali +++ /dev/null @@ -1,46 +0,0 @@ -.class public final synthetic Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs; -.super Ljava/lang/Object; -.source "lambda" - -# interfaces -.implements Lrx/functions/b; - - -# static fields -.field public static final synthetic INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs; - - -# direct methods -.method static synthetic constructor ()V - .locals 1 - - new-instance v0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs; - - invoke-direct {v0}, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs;->()V - - sput-object v0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs;->INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs; - - return-void -.end method - -.method private synthetic constructor ()V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - - -# virtual methods -.method public final call(Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Lcom/discord/models/domain/ModelUserGuildSettings; - - invoke-static {p1}, Lcom/discord/stores/StoreUserGuildSettings;->lambda$get$2(Lcom/discord/models/domain/ModelUserGuildSettings;)Lcom/discord/models/domain/ModelUserGuildSettings; - - move-result-object p1 - - return-object p1 -.end method diff --git a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4.smali b/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4.smali deleted file mode 100644 index 1b9e823529..0000000000 --- a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4.smali +++ /dev/null @@ -1,46 +0,0 @@ -.class public final synthetic Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4; -.super Ljava/lang/Object; -.source "lambda" - -# interfaces -.implements Lrx/functions/b; - - -# static fields -.field public static final synthetic INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4; - - -# direct methods -.method static synthetic constructor ()V - .locals 1 - - new-instance v0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4; - - invoke-direct {v0}, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4;->()V - - sput-object v0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4;->INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4; - - return-void -.end method - -.method private synthetic constructor ()V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - - -# virtual methods -.method public final call(Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Lcom/discord/models/domain/ModelUserGuildSettings; - - invoke-static {p1}, Lcom/discord/stores/StoreUserGuildSettings;->lambda$null$3(Lcom/discord/models/domain/ModelUserGuildSettings;)Ljava/lang/Boolean; - - move-result-object p1 - - return-object p1 -.end method diff --git a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$_UmCUPV1EvBeHiZpKveX_lMTlLE.smali b/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$_UmCUPV1EvBeHiZpKveX_lMTlLE.smali deleted file mode 100644 index 8bb87ee747..0000000000 --- a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$_UmCUPV1EvBeHiZpKveX_lMTlLE.smali +++ /dev/null @@ -1,38 +0,0 @@ -.class public final synthetic Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$_UmCUPV1EvBeHiZpKveX_lMTlLE; -.super Ljava/lang/Object; -.source "lambda" - -# interfaces -.implements Lrx/functions/b; - - -# instance fields -.field private final synthetic f$0:J - - -# direct methods -.method public synthetic constructor (J)V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - iput-wide p1, p0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$_UmCUPV1EvBeHiZpKveX_lMTlLE;->f$0:J - - return-void -.end method - - -# virtual methods -.method public final call(Ljava/lang/Object;)Ljava/lang/Object; - .locals 2 - - iget-wide v0, p0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$_UmCUPV1EvBeHiZpKveX_lMTlLE;->f$0:J - - check-cast p1, Ljava/util/Set; - - invoke-static {v0, v1, p1}, Lcom/discord/stores/StoreUserGuildSettings;->lambda$getHideMutedChannels$0(JLjava/util/Set;)Ljava/lang/Boolean; - - move-result-object p1 - - return-object p1 -.end method diff --git a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg.smali b/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg.smali deleted file mode 100644 index b30582f69a..0000000000 --- a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg.smali +++ /dev/null @@ -1,46 +0,0 @@ -.class public final synthetic Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg; -.super Ljava/lang/Object; -.source "lambda" - -# interfaces -.implements Lrx/functions/b; - - -# static fields -.field public static final synthetic INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg; - - -# direct methods -.method static synthetic constructor ()V - .locals 1 - - new-instance v0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg; - - invoke-direct {v0}, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg;->()V - - sput-object v0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg;->INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg; - - return-void -.end method - -.method private synthetic constructor ()V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - - -# virtual methods -.method public final call(Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Lcom/discord/models/domain/ModelUserGuildSettings; - - invoke-static {p1}, Lcom/discord/stores/StoreUserGuildSettings;->lambda$null$4(Lcom/discord/models/domain/ModelUserGuildSettings;)Ljava/lang/Long; - - move-result-object p1 - - return-object p1 -.end method diff --git a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$xAuTarfGExPiAI2-XFgTbp3HIP4.smali b/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$xAuTarfGExPiAI2-XFgTbp3HIP4.smali deleted file mode 100644 index 1230c43a2e..0000000000 --- a/com.discord/smali/com/discord/stores/-$$Lambda$StoreUserGuildSettings$xAuTarfGExPiAI2-XFgTbp3HIP4.smali +++ /dev/null @@ -1,42 +0,0 @@ -.class public final synthetic Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$xAuTarfGExPiAI2-XFgTbp3HIP4; -.super Ljava/lang/Object; -.source "lambda" - -# interfaces -.implements Lrx/functions/Action1; - - -# instance fields -.field private final synthetic f$0:Landroid/content/Context; - -.field private final synthetic f$1:I - - -# direct methods -.method public synthetic constructor (Landroid/content/Context;I)V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - iput-object p1, p0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$xAuTarfGExPiAI2-XFgTbp3HIP4;->f$0:Landroid/content/Context; - - iput p2, p0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$xAuTarfGExPiAI2-XFgTbp3HIP4;->f$1:I - - return-void -.end method - - -# virtual methods -.method public final call(Ljava/lang/Object;)V - .locals 2 - - iget-object v0, p0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$xAuTarfGExPiAI2-XFgTbp3HIP4;->f$0:Landroid/content/Context; - - iget v1, p0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$xAuTarfGExPiAI2-XFgTbp3HIP4;->f$1:I - - check-cast p1, Lcom/discord/models/domain/ModelUserGuildSettings; - - invoke-static {v0, v1, p1}, Lcom/discord/stores/StoreUserGuildSettings;->lambda$updateUserGuildSettings$6(Landroid/content/Context;ILcom/discord/models/domain/ModelUserGuildSettings;)V - - return-void -.end method diff --git a/com.discord/smali/com/discord/stores/Dispatcher.smali b/com.discord/smali/com/discord/stores/Dispatcher.smali index c4f7827149..6a4b1ffced 100644 --- a/com.discord/smali/com/discord/stores/Dispatcher.smali +++ b/com.discord/smali/com/discord/stores/Dispatcher.smali @@ -40,6 +40,14 @@ # virtual methods +.method public final getScheduler()Lrx/Scheduler; + .locals 1 + + iget-object v0, p0, Lcom/discord/stores/Dispatcher;->scheduler:Lrx/Scheduler; + + return-object v0 +.end method + .method public final onDispatchEnded()V .locals 2 .annotation runtime Lcom/discord/stores/StoreThread; diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics.smali b/com.discord/smali/com/discord/stores/StoreAnalytics.smali index c0e8575391..eead042242 100644 --- a/com.discord/smali/com/discord/stores/StoreAnalytics.smali +++ b/com.discord/smali/com/discord/stores/StoreAnalytics.smali @@ -1221,17 +1221,29 @@ move-result-object v0 - iget-object v1, p0, Lcom/discord/stores/StoreAnalytics;->stores:Lcom/discord/stores/StoreStream; + const-string v1, "selectedVoiceChannel.guildId" - invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getVoiceStates$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceStates; + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - move-result-object v1 + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - invoke-virtual {v1}, Lcom/discord/stores/StoreVoiceStates;->getMediaStatesBlocking()Ljava/util/Map; + move-result-wide v0 - move-result-object v1 + iget-object v2, p0, Lcom/discord/stores/StoreAnalytics;->stores:Lcom/discord/stores/StoreStream; - invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v2}, Lcom/discord/stores/StoreStream;->getVoiceStates$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceStates; + + move-result-object v2 + + invoke-virtual {v2}, Lcom/discord/stores/StoreVoiceStates;->getMediaStatesBlocking()Ljava/util/Map; + + move-result-object v2 + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + invoke-interface {v2, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object v0 diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication.smali b/com.discord/smali/com/discord/stores/StoreAuthentication.smali index c58f899aa5..bae25b81cc 100644 --- a/com.discord/smali/com/discord/stores/StoreAuthentication.smali +++ b/com.discord/smali/com/discord/stores/StoreAuthentication.smali @@ -654,6 +654,8 @@ move-result-object v0 + iput-object v0, p0, Lcom/discord/stores/StoreAuthentication;->authToken:Ljava/lang/String; + invoke-virtual {p0, v0}, Lcom/discord/stores/StoreAuthentication;->setAuthed(Ljava/lang/String;)V invoke-virtual {p0}, Lcom/discord/stores/StoreAuthentication;->getPrefsSessionDurable()Landroid/content/SharedPreferences; diff --git a/com.discord/smali/com/discord/stores/StoreChannels.smali b/com.discord/smali/com/discord/stores/StoreChannels.smali index 1026a41305..ebadd1040f 100644 --- a/com.discord/smali/com/discord/stores/StoreChannels.smali +++ b/com.discord/smali/com/discord/stores/StoreChannels.smali @@ -1168,7 +1168,7 @@ .end method .method public final handleChannelCreated(Lcom/discord/models/domain/ModelChannel;)V - .locals 11 + .locals 9 .annotation runtime Lcom/discord/stores/StoreThread; .end annotation @@ -1205,72 +1205,94 @@ move-result-object v0 :goto_0 + const-string v1, "if (!channel.isPrivate) \u2026 else PRIVATE_CHANNELS_ID" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J + + move-result-wide v0 + invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J - move-result-wide v1 + move-result-wide v2 - iget-object v3, p0, Lcom/discord/stores/StoreChannels;->channels:Ljava/util/Map; + iget-object v4, p0, Lcom/discord/stores/StoreChannels;->channels:Ljava/util/Map; - invoke-interface {v3, v0}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z - - move-result v3 - - const-string v4, "guildId" - - if-nez v3, :cond_2 - - iget-object v3, p0, Lcom/discord/stores/StoreChannels;->channels:Ljava/util/Map; - - invoke-static {v0, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - new-instance v5, Ljava/util/HashMap; - - invoke-direct {v5}, Ljava/util/HashMap;->()V - - invoke-interface {v3, v0, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - - :cond_2 - iget-object v3, p0, Lcom/discord/stores/StoreChannels;->channelIds:Ljava/util/Map; - - invoke-interface {v3, v0}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z - - move-result v3 - - if-nez v3, :cond_3 - - iget-object v3, p0, Lcom/discord/stores/StoreChannels;->channelIds:Ljava/util/Map; - - invoke-static {v0, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - new-instance v5, Ljava/util/ArrayList; - - invoke-direct {v5}, Ljava/util/ArrayList;->()V - - invoke-interface {v3, v0, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - - :cond_3 - iget-object v3, p0, Lcom/discord/stores/StoreChannels;->channels:Ljava/util/Map; - - invoke-interface {v3, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object v3 - - check-cast v3, Ljava/util/Map; - - if-nez v3, :cond_4 - - new-instance v3, Ljava/util/HashMap; - - invoke-direct {v3}, Ljava/util/HashMap;->()V - - check-cast v3, Ljava/util/Map; - - :cond_4 - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v5 - invoke-interface {v3, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v4, v5}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z + + move-result v4 + + if-nez v4, :cond_2 + + iget-object v4, p0, Lcom/discord/stores/StoreChannels;->channels:Ljava/util/Map; + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v5 + + new-instance v6, Ljava/util/HashMap; + + invoke-direct {v6}, Ljava/util/HashMap;->()V + + invoke-interface {v4, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + + :cond_2 + iget-object v4, p0, Lcom/discord/stores/StoreChannels;->channelIds:Ljava/util/Map; + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v5 + + invoke-interface {v4, v5}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z + + move-result v4 + + if-nez v4, :cond_3 + + iget-object v4, p0, Lcom/discord/stores/StoreChannels;->channelIds:Ljava/util/Map; + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v5 + + new-instance v6, Ljava/util/ArrayList; + + invoke-direct {v6}, Ljava/util/ArrayList;->()V + + invoke-interface {v4, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + + :cond_3 + iget-object v4, p0, Lcom/discord/stores/StoreChannels;->channels:Ljava/util/Map; + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v5 + + invoke-interface {v4, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v4 + + check-cast v4, Ljava/util/Map; + + if-nez v4, :cond_4 + + new-instance v4, Ljava/util/HashMap; + + invoke-direct {v4}, Ljava/util/HashMap;->()V + + check-cast v4, Ljava/util/Map; + + :cond_4 + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v5 + + invoke-interface {v4, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object v5 @@ -1288,67 +1310,59 @@ if-eqz v5, :cond_5 - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v6 new-instance v8, Lcom/discord/models/domain/ModelChannel; - invoke-static {v0, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - - move-result-wide v9 - invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List; move-result-object v5 - invoke-direct {v8, p1, v9, v10, v5}, Lcom/discord/models/domain/ModelChannel;->(Lcom/discord/models/domain/ModelChannel;JLjava/util/List;)V + invoke-direct {v8, p1, v0, v1, v5}, Lcom/discord/models/domain/ModelChannel;->(Lcom/discord/models/domain/ModelChannel;JLjava/util/List;)V - invoke-interface {v3, v6, v8}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v4, v6, v8}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; goto :goto_1 :cond_5 - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v5 new-instance v6, Lcom/discord/models/domain/ModelChannel; - invoke-static {v0, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-direct {v6, p1, v0, v1}, Lcom/discord/models/domain/ModelChannel;->(Lcom/discord/models/domain/ModelChannel;J)V - invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - - move-result-wide v8 - - invoke-direct {v6, p1, v8, v9}, Lcom/discord/models/domain/ModelChannel;->(Lcom/discord/models/domain/ModelChannel;J)V - - invoke-interface {v3, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v4, v5, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; :cond_6 :goto_1 - iget-object v3, p0, Lcom/discord/stores/StoreChannels;->channelIds:Ljava/util/Map; + iget-object v4, p0, Lcom/discord/stores/StoreChannels;->channelIds:Ljava/util/Map; - invoke-interface {v3, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object v3 - - check-cast v3, Ljava/util/List; - - if-nez v3, :cond_7 - - invoke-static {}, Lkotlin/a/m;->emptyList()Ljava/util/List; - - move-result-object v3 - - :cond_7 - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v5 - invoke-interface {v3, v5}, Ljava/util/List;->contains(Ljava/lang/Object;)Z + invoke-interface {v4, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v4 + + check-cast v4, Ljava/util/List; + + if-nez v4, :cond_7 + + invoke-static {}, Lkotlin/a/m;->emptyList()Ljava/util/List; + + move-result-object v4 + + :cond_7 + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v5 + + invoke-interface {v4, v5}, Ljava/util/List;->contains(Ljava/lang/Object;)Z move-result v5 @@ -1356,28 +1370,30 @@ iget-object v5, p0, Lcom/discord/stores/StoreChannels;->channelIds:Ljava/util/Map; - invoke-static {v0, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - check-cast v3, Ljava/util/Collection; + move-result-object v0 - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + check-cast v4, Ljava/util/Collection; - move-result-object v4 + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - invoke-static {v3, v4}, Lkotlin/a/m;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List; + move-result-object v1 - move-result-object v3 + invoke-static {v4, v1}, Lkotlin/a/m;->plus(Ljava/util/Collection;Ljava/lang/Object;)Ljava/util/List; - invoke-interface {v5, v0, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + move-result-object v1 + + invoke-interface {v5, v0, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; :cond_8 iget-object v0, p0, Lcom/discord/stores/StoreChannels;->channelNames:Ljava/util/Map; - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v3 + move-result-object v1 - invoke-interface {v0, v3}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z + invoke-interface {v0, v1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z move-result v0 @@ -1385,11 +1401,11 @@ iget-object v0, p0, Lcom/discord/stores/StoreChannels;->channelNames:Ljava/util/Map; - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v3 + move-result-object v1 - invoke-interface {v0, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object v0 @@ -1397,11 +1413,11 @@ iget-object v0, p0, Lcom/discord/stores/StoreChannels;->channelNames:Ljava/util/Map; - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v3 + move-result-object v1 - invoke-interface {v0, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object v0 @@ -1409,9 +1425,9 @@ invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String; - move-result-object v3 + move-result-object v1 - invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z move-result v0 @@ -1422,7 +1438,7 @@ :cond_9 iget-object v0, p0, Lcom/discord/stores/StoreChannels;->channelNames:Ljava/util/Map; - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v1 @@ -1471,23 +1487,39 @@ move-result-object v0 :goto_0 + const-string v1, "if (!channel.isPrivate) \u2026 else PRIVATE_CHANNELS_ID" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J + + move-result-wide v0 + invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J - move-result-wide v1 + move-result-wide v2 iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channels:Ljava/util/Map; - invoke-interface {p1, v0}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v4 + + invoke-interface {p1, v4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z move-result p1 - const/4 v3, 0x1 + const/4 v4, 0x1 if-eqz p1, :cond_3 iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channels:Ljava/util/Map; - invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v5 + + invoke-interface {p1, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object p1 @@ -1498,11 +1530,11 @@ :cond_1 check-cast p1, Ljava/util/Map; - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v4 + move-result-object v5 - invoke-interface {p1, v4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z + invoke-interface {p1, v5}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z move-result p1 @@ -1510,7 +1542,11 @@ iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channels:Ljava/util/Map; - invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v5 + + invoke-interface {p1, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object p1 @@ -1521,18 +1557,22 @@ :cond_2 check-cast p1, Ljava/util/Map; - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v4 + move-result-object v5 - invoke-interface {p1, v4}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {p1, v5}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object; - iput-boolean v3, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z + iput-boolean v4, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z :cond_3 iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channelIds:Ljava/util/Map; - invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v5 + + invoke-interface {p1, v5}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object p1 @@ -1545,40 +1585,40 @@ move-result-object p1 :cond_4 - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - - move-result-object v4 - - invoke-interface {p1, v4}, Ljava/util/List;->contains(Ljava/lang/Object;)Z - - move-result v4 - - if-eqz v4, :cond_5 - - iget-object v4, p0, Lcom/discord/stores/StoreChannels;->channelIds:Ljava/util/Map; - - const-string v5, "guildId" - - invoke-static {v0, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - check-cast p1, Ljava/lang/Iterable; - - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v5 - invoke-static {p1, v5}, Lkotlin/a/m;->minus(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/util/List; + invoke-interface {p1, v5}, Ljava/util/List;->contains(Ljava/lang/Object;)Z + + move-result v5 + + if-eqz v5, :cond_5 + + iget-object v5, p0, Lcom/discord/stores/StoreChannels;->channelIds:Ljava/util/Map; + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + check-cast p1, Ljava/lang/Iterable; + + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v1 + + invoke-static {p1, v1}, Lkotlin/a/m;->minus(Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/util/List; move-result-object p1 - invoke-interface {v4, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v5, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - iput-boolean v3, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z + iput-boolean v4, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z :cond_5 iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channelNames:Ljava/util/Map; - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v0 @@ -1590,13 +1630,13 @@ iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channelNames:Ljava/util/Map; - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v0 invoke-interface {p1, v0}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object; - iput-boolean v3, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z + iput-boolean v4, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z :cond_6 return-void @@ -1958,7 +1998,7 @@ .end method .method public final handleGroupDMRecipient(Lcom/discord/models/domain/ModelChannel$Recipient;Z)V - .locals 12 + .locals 13 .annotation runtime Lcom/discord/stores/StoreThread; .end annotation @@ -2010,7 +2050,15 @@ move-result-object v0 - const-string v3, "recipient.user" + const-string v3, "existing.guildId" + + invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J + + move-result-wide v9 + + const-string v0, "recipient.user" if-eqz p2, :cond_3 @@ -2018,21 +2066,21 @@ invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List; - move-result-object v5 + move-result-object v3 - check-cast v5, Ljava/util/Collection; + check-cast v3, Ljava/util/Collection; - invoke-direct {p2, v5}, Ljava/util/ArrayList;->(Ljava/util/Collection;)V + invoke-direct {p2, v3}, Ljava/util/ArrayList;->(Ljava/util/Collection;)V check-cast p2, Ljava/util/List; invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel$Recipient;->getUser()Lcom/discord/models/domain/ModelUser; - move-result-object v5 + move-result-object v3 - invoke-static {v5, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v3, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-interface {p2, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z + invoke-interface {p2, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z :cond_2 move-object v7, p2 @@ -2048,71 +2096,69 @@ invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List; - move-result-object v5 + move-result-object v3 - invoke-interface {v5}, Ljava/util/List;->iterator()Ljava/util/Iterator; + invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator; - move-result-object v5 + move-result-object v3 :cond_4 :goto_0 - invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z - move-result v6 + move-result v5 - if-eqz v6, :cond_2 + if-eqz v5, :cond_2 - invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v6 + move-result-object v5 - check-cast v6, Lcom/discord/models/domain/ModelUser; + check-cast v5, Lcom/discord/models/domain/ModelUser; - const-string v7, "existingRecipient" + const-string v6, "existingRecipient" - invoke-static {v6, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getId()J + invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getId()J - move-result-wide v7 + move-result-wide v6 invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel$Recipient;->getUser()Lcom/discord/models/domain/ModelUser; - move-result-object v9 + move-result-object v8 - invoke-static {v9, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v8, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v9}, Lcom/discord/models/domain/ModelUser;->getId()J + invoke-virtual {v8}, Lcom/discord/models/domain/ModelUser;->getId()J - move-result-wide v9 + move-result-wide v11 - cmp-long v11, v7, v9 + cmp-long v8, v6, v11 - if-eqz v11, :cond_4 + if-eqz v8, :cond_4 - invoke-interface {p2, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z + invoke-interface {p2, v5}, Ljava/util/List;->add(Ljava/lang/Object;)Z goto :goto_0 :goto_1 new-instance p2, Lcom/discord/models/domain/ModelChannel; - const-string v3, "guildId" - - invoke-static {v0, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - - move-result-wide v5 - move-object v3, p2 + move-wide v5, v9 + move-object v8, p1 invoke-direct/range {v3 .. v8}, Lcom/discord/models/domain/ModelChannel;->(Lcom/discord/models/domain/ModelChannel;JLjava/util/List;Lcom/discord/models/domain/ModelChannel$Recipient;)V iget-object p1, p0, Lcom/discord/stores/StoreChannels;->channels:Ljava/util/Map; + invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object p1 diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali index 5a8e43185c..3e8c233c77 100644 --- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali +++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$Selected$Companion$create$2.smali @@ -80,7 +80,7 @@ move-result v2 - if-eqz v2, :cond_4 + if-eqz v2, :cond_2 invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -96,17 +96,6 @@ move-result-object v4 - goto :goto_1 - - :cond_1 - const/4 v4, 0x0 - - :goto_1 - if-nez v4, :cond_2 - - goto :goto_2 - - :cond_2 invoke-virtual {v4}, Ljava/lang/Long;->longValue()J move-result-wide v4 @@ -115,13 +104,13 @@ cmp-long v8, v4, v6 - if-nez v8, :cond_3 + if-nez v8, :cond_1 invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->isGuildTextChannel()Z move-result v4 - if-eqz v4, :cond_3 + if-eqz v4, :cond_1 iget-object v4, p0, Lcom/discord/stores/StoreChannelsSelected$Selected$Companion$create$2;->$permissions:Ljava/util/Map; @@ -129,24 +118,23 @@ move-result v3 - if-eqz v3, :cond_3 + if-eqz v3, :cond_1 const/4 v3, 0x1 - goto :goto_3 + goto :goto_1 - :cond_3 - :goto_2 + :cond_1 const/4 v3, 0x0 - :goto_3 + :goto_1 if-eqz v3, :cond_0 invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z goto :goto_0 - :cond_4 + :cond_2 check-cast v1, Ljava/util/List; check-cast v1, Ljava/lang/Iterable; diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali index 3c9bc25509..62c1314278 100644 --- a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali +++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali @@ -1161,14 +1161,17 @@ .method public final set(Lcom/discord/models/domain/ModelChannel;)V .locals 7 - if-eqz p1, :cond_0 + if-eqz p1, :cond_1 invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long; move-result-object v0 - if-eqz v0, :cond_0 + if-nez v0, :cond_0 + goto :goto_0 + + :cond_0 invoke-virtual {v0}, Ljava/lang/Long;->longValue()J move-result-wide v2 @@ -1185,6 +1188,7 @@ invoke-virtual/range {v1 .. v6}, Lcom/discord/stores/StoreChannelsSelected;->set(JJI)V - :cond_0 + :cond_1 + :goto_0 return-void .end method diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 192fb4878b..607b1fbb2d 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, 0x3db + const/16 v0, 0x3dd iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali index 20b91e1eb8..5a1c481b3e 100644 --- a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali +++ b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali @@ -532,11 +532,7 @@ if-eqz p1, :cond_2 - move-object p2, p1 - - check-cast p2, Ljava/lang/Number; - - invoke-virtual {p2}, Ljava/lang/Number;->longValue()J + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J move-result-wide v0 @@ -564,9 +560,11 @@ :goto_1 if-eqz p1, :cond_2 - check-cast p1, Ljava/lang/Number; + const-string p2, "guildId" - invoke-virtual {p1}, Ljava/lang/Number;->longValue()J + invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J move-result-wide p1 diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali index b90cb50eb1..1cebc6d4aa 100644 --- a/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali +++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali @@ -678,7 +678,7 @@ move-result-object v1 - invoke-virtual {v1}, Lcom/discord/stores/StoreUserGuildSettings;->getMuted()Lrx/Observable; + invoke-virtual {v1}, Lcom/discord/stores/StoreUserGuildSettings;->getMutedGuildIds()Lrx/Observable; move-result-object v1 diff --git a/com.discord/smali/com/discord/stores/StoreLurking.smali b/com.discord/smali/com/discord/stores/StoreLurking.smali index 73e432f8f5..5935ca53ba 100644 --- a/com.discord/smali/com/discord/stores/StoreLurking.smali +++ b/com.discord/smali/com/discord/stores/StoreLurking.smali @@ -588,10 +588,28 @@ .annotation runtime Lcom/discord/stores/StoreThread; .end annotation + iget-object v0, p0, Lcom/discord/stores/StoreLurking;->lurkRequest:Lcom/discord/stores/StoreLurking$LurkRequest; + + if-eqz v0, :cond_0 + + invoke-virtual {v0}, Lcom/discord/stores/StoreLurking$LurkRequest;->getGuildId()J + + move-result-wide v0 + + cmp-long v2, p1, v0 + + if-eqz v2, :cond_1 + + :cond_0 + iget-object v0, p0, Lcom/discord/stores/StoreLurking;->sessionId:Ljava/lang/String; + + if-eqz v0, :cond_1 + const/4 v0, 0x0 iput-object v0, p0, Lcom/discord/stores/StoreLurking;->lurkRequest:Lcom/discord/stores/StoreLurking$LurkRequest; + :cond_1 iget-object v0, p0, Lcom/discord/stores/StoreLurking;->lurkingGuildIds:Ljava/util/ArrayList; check-cast v0, Ljava/lang/Iterable; @@ -606,13 +624,13 @@ move-result-object v0 - :cond_0 + :cond_2 :goto_0 invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z move-result v2 - if-eqz v2, :cond_2 + if-eqz v2, :cond_4 invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -628,23 +646,23 @@ cmp-long v5, v3, p1 - if-eqz v5, :cond_1 + if-eqz v5, :cond_3 const/4 v3, 0x1 goto :goto_1 - :cond_1 + :cond_3 const/4 v3, 0x0 :goto_1 - if-eqz v3, :cond_0 + if-eqz v3, :cond_2 invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z goto :goto_0 - :cond_2 + :cond_4 check-cast v1, Ljava/util/List; check-cast v1, Ljava/lang/Iterable; @@ -659,13 +677,13 @@ move-result-object p2 - :cond_3 + :cond_5 :goto_2 invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z move-result v0 - if-eqz v0, :cond_4 + if-eqz v0, :cond_6 invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -691,13 +709,13 @@ check-cast v0, Lcom/discord/models/domain/ModelGuild; - if-eqz v0, :cond_3 + if-eqz v0, :cond_5 invoke-interface {p1, v0}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z goto :goto_2 - :cond_4 + :cond_6 check-cast p1, Ljava/util/List; check-cast p1, Ljava/lang/Iterable; @@ -711,7 +729,7 @@ move-result p2 - if-eqz p2, :cond_5 + if-eqz p2, :cond_7 invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -727,7 +745,7 @@ goto :goto_3 - :cond_5 + :cond_7 return-void .end method 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 d1af9b725d..9ee9e71453 100644 --- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali +++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali @@ -73,7 +73,7 @@ iget-object p1, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context; - const v0, 0x7f1212dc + const v0, 0x7f1212de const/4 v1, 0x0 diff --git a/com.discord/smali/com/discord/stores/StoreMentions$init$1.smali b/com.discord/smali/com/discord/stores/StoreMentions$init$1.smali deleted file mode 100644 index a035369467..0000000000 --- a/com.discord/smali/com/discord/stores/StoreMentions$init$1.smali +++ /dev/null @@ -1,155 +0,0 @@ -.class final synthetic Lcom/discord/stores/StoreMentions$init$1; -.super Lkotlin/jvm/internal/j; -.source "StoreMentions.kt" - -# interfaces -.implements Lkotlin/jvm/functions/Function3; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/stores/StoreMentions;->init(Landroid/content/Context;)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x1018 - name = null -.end annotation - -.annotation system Ldalvik/annotation/Signature; - value = { - "Lkotlin/jvm/internal/j;", - "Lkotlin/jvm/functions/Function3<", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "+", - "Ljava/lang/Integer;", - ">;", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "+", - "Ljava/lang/Integer;", - ">;", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "+", - "Lcom/discord/stores/StoreMessageAck$Ack;", - ">;", - "Lcom/discord/stores/StoreMentions$init$Tuple;", - ">;" - } -.end annotation - - -# static fields -.field public static final INSTANCE:Lcom/discord/stores/StoreMentions$init$1; - - -# direct methods -.method static constructor ()V - .locals 1 - - new-instance v0, Lcom/discord/stores/StoreMentions$init$1; - - invoke-direct {v0}, Lcom/discord/stores/StoreMentions$init$1;->()V - - sput-object v0, Lcom/discord/stores/StoreMentions$init$1;->INSTANCE:Lcom/discord/stores/StoreMentions$init$1; - - return-void -.end method - -.method constructor ()V - .locals 1 - - const/4 v0, 0x3 - - invoke-direct {p0, v0}, Lkotlin/jvm/internal/j;->(I)V - - return-void -.end method - - -# virtual methods -.method public final getName()Ljava/lang/String; - .locals 1 - - const-string v0, "" - - return-object v0 -.end method - -.method public final getOwner()Lkotlin/reflect/KDeclarationContainer; - .locals 1 - - const-class v0, Lcom/discord/stores/StoreMentions$init$Tuple; - - invoke-static {v0}, Lkotlin/jvm/internal/y;->getOrCreateKotlinClass(Ljava/lang/Class;)Lkotlin/reflect/b; - - move-result-object v0 - - return-object v0 -.end method - -.method public final getSignature()Ljava/lang/String; - .locals 1 - - const-string v0, "(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V" - - return-object v0 -.end method - -.method public final invoke(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/stores/StoreMentions$init$Tuple; - .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "(", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Lcom/discord/stores/StoreMessageAck$Ack;", - ">;)", - "Lcom/discord/stores/StoreMentions$init$Tuple;" - } - .end annotation - - const-string v0, "p1" - - invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - const-string v0, "p2" - - invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - const-string v0, "p3" - - invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - new-instance v0, Lcom/discord/stores/StoreMentions$init$Tuple; - - invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreMentions$init$Tuple;->(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V - - return-object v0 -.end method - -.method public final bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Ljava/util/Map; - - check-cast p2, Ljava/util/Map; - - check-cast p3, Ljava/util/Map; - - invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/StoreMentions$init$1;->invoke(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/stores/StoreMentions$init$Tuple; - - move-result-object p1 - - return-object p1 -.end method diff --git a/com.discord/smali/com/discord/stores/StoreMentions$init$2$1.smali b/com.discord/smali/com/discord/stores/StoreMentions$init$2$1.smali deleted file mode 100644 index 9546fe1d24..0000000000 --- a/com.discord/smali/com/discord/stores/StoreMentions$init$2$1.smali +++ /dev/null @@ -1,106 +0,0 @@ -.class final Lcom/discord/stores/StoreMentions$init$2$1; -.super Lkotlin/jvm/internal/m; -.source "StoreMentions.kt" - -# interfaces -.implements Lkotlin/jvm/functions/Function0; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/stores/StoreMentions$init$2;->invoke(Lcom/discord/stores/StoreMentions$init$Tuple;)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x18 - name = null -.end annotation - -.annotation system Ldalvik/annotation/Signature; - value = { - "Lkotlin/jvm/internal/m;", - "Lkotlin/jvm/functions/Function0<", - "Lkotlin/Unit;", - ">;" - } -.end annotation - - -# instance fields -.field final synthetic $channelPermissions:Ljava/util/Map; - -.field final synthetic $messageAcks:Ljava/util/Map; - -.field final synthetic $userRelationships:Ljava/util/Map; - -.field final synthetic this$0:Lcom/discord/stores/StoreMentions$init$2; - - -# direct methods -.method constructor (Lcom/discord/stores/StoreMentions$init$2;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V - .locals 0 - - iput-object p1, p0, Lcom/discord/stores/StoreMentions$init$2$1;->this$0:Lcom/discord/stores/StoreMentions$init$2; - - iput-object p2, p0, Lcom/discord/stores/StoreMentions$init$2$1;->$userRelationships:Ljava/util/Map; - - iput-object p3, p0, Lcom/discord/stores/StoreMentions$init$2$1;->$channelPermissions:Ljava/util/Map; - - iput-object p4, p0, Lcom/discord/stores/StoreMentions$init$2$1;->$messageAcks:Ljava/util/Map; - - const/4 p1, 0x0 - - invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;->(I)V - - return-void -.end method - - -# virtual methods -.method public final bridge synthetic invoke()Ljava/lang/Object; - .locals 1 - - invoke-virtual {p0}, Lcom/discord/stores/StoreMentions$init$2$1;->invoke()V - - sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit; - - return-object v0 -.end method - -.method public final invoke()V - .locals 2 - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$2$1;->this$0:Lcom/discord/stores/StoreMentions$init$2; - - iget-object v0, v0, Lcom/discord/stores/StoreMentions$init$2;->this$0:Lcom/discord/stores/StoreMentions; - - iget-object v1, p0, Lcom/discord/stores/StoreMentions$init$2$1;->$userRelationships:Ljava/util/Map; - - invoke-static {v0, v1}, Lcom/discord/stores/StoreMentions;->access$setUserRelationships$p(Lcom/discord/stores/StoreMentions;Ljava/util/Map;)V - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$2$1;->this$0:Lcom/discord/stores/StoreMentions$init$2; - - iget-object v0, v0, Lcom/discord/stores/StoreMentions$init$2;->this$0:Lcom/discord/stores/StoreMentions; - - iget-object v1, p0, Lcom/discord/stores/StoreMentions$init$2$1;->$channelPermissions:Ljava/util/Map; - - invoke-static {v0, v1}, Lcom/discord/stores/StoreMentions;->access$setPermissions$p(Lcom/discord/stores/StoreMentions;Ljava/util/Map;)V - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$2$1;->this$0:Lcom/discord/stores/StoreMentions$init$2; - - iget-object v0, v0, Lcom/discord/stores/StoreMentions$init$2;->this$0:Lcom/discord/stores/StoreMentions; - - iget-object v1, p0, Lcom/discord/stores/StoreMentions$init$2$1;->$messageAcks:Ljava/util/Map; - - invoke-static {v0, v1}, Lcom/discord/stores/StoreMentions;->access$setAcks$p(Lcom/discord/stores/StoreMentions;Ljava/util/Map;)V - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$2$1;->this$0:Lcom/discord/stores/StoreMentions$init$2; - - iget-object v0, v0, Lcom/discord/stores/StoreMentions$init$2;->this$0:Lcom/discord/stores/StoreMentions; - - const/4 v1, 0x0 - - invoke-static {v0, v1}, Lcom/discord/stores/StoreMentions;->access$tryPublishMentionCounts(Lcom/discord/stores/StoreMentions;Z)V - - return-void -.end method diff --git a/com.discord/smali/com/discord/stores/StoreMentions$init$2.smali b/com.discord/smali/com/discord/stores/StoreMentions$init$2.smali deleted file mode 100644 index 5d2e82b6c7..0000000000 --- a/com.discord/smali/com/discord/stores/StoreMentions$init$2.smali +++ /dev/null @@ -1,91 +0,0 @@ -.class final Lcom/discord/stores/StoreMentions$init$2; -.super Lkotlin/jvm/internal/m; -.source "StoreMentions.kt" - -# interfaces -.implements Lkotlin/jvm/functions/Function1; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/stores/StoreMentions;->init(Landroid/content/Context;)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x18 - name = null -.end annotation - -.annotation system Ldalvik/annotation/Signature; - value = { - "Lkotlin/jvm/internal/m;", - "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/stores/StoreMentions$init$Tuple;", - "Lkotlin/Unit;", - ">;" - } -.end annotation - - -# instance fields -.field final synthetic this$0:Lcom/discord/stores/StoreMentions; - - -# direct methods -.method constructor (Lcom/discord/stores/StoreMentions;)V - .locals 0 - - iput-object p1, p0, Lcom/discord/stores/StoreMentions$init$2;->this$0:Lcom/discord/stores/StoreMentions; - - const/4 p1, 0x1 - - invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;->(I)V - - return-void -.end method - - -# virtual methods -.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Lcom/discord/stores/StoreMentions$init$Tuple; - - invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMentions$init$2;->invoke(Lcom/discord/stores/StoreMentions$init$Tuple;)V - - sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit; - - return-object p1 -.end method - -.method public final invoke(Lcom/discord/stores/StoreMentions$init$Tuple;)V - .locals 4 - - invoke-virtual {p1}, Lcom/discord/stores/StoreMentions$init$Tuple;->component1()Ljava/util/Map; - - move-result-object v0 - - invoke-virtual {p1}, Lcom/discord/stores/StoreMentions$init$Tuple;->component2()Ljava/util/Map; - - move-result-object v1 - - invoke-virtual {p1}, Lcom/discord/stores/StoreMentions$init$Tuple;->component3()Ljava/util/Map; - - move-result-object p1 - - iget-object v2, p0, Lcom/discord/stores/StoreMentions$init$2;->this$0:Lcom/discord/stores/StoreMentions; - - invoke-static {v2}, Lcom/discord/stores/StoreMentions;->access$getDispatcher$p(Lcom/discord/stores/StoreMentions;)Lcom/discord/stores/Dispatcher; - - move-result-object v2 - - new-instance v3, Lcom/discord/stores/StoreMentions$init$2$1; - - invoke-direct {v3, p0, v0, v1, p1}, Lcom/discord/stores/StoreMentions$init$2$1;->(Lcom/discord/stores/StoreMentions$init$2;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V - - check-cast v3, Lkotlin/jvm/functions/Function0; - - invoke-virtual {v2, v3}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V - - return-void -.end method diff --git a/com.discord/smali/com/discord/stores/StoreMentions$init$Tuple.smali b/com.discord/smali/com/discord/stores/StoreMentions$init$Tuple.smali deleted file mode 100644 index fcd9825611..0000000000 --- a/com.discord/smali/com/discord/stores/StoreMentions$init$Tuple.smali +++ /dev/null @@ -1,417 +0,0 @@ -.class public final Lcom/discord/stores/StoreMentions$init$Tuple; -.super Ljava/lang/Object; -.source "StoreMentions.kt" - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/stores/StoreMentions;->init(Landroid/content/Context;)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x19 - name = "Tuple" -.end annotation - - -# instance fields -.field private final channelPermissions:Ljava/util/Map; - .annotation system Ldalvik/annotation/Signature; - value = { - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;" - } - .end annotation -.end field - -.field private final messageAcks:Ljava/util/Map; - .annotation system Ldalvik/annotation/Signature; - value = { - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Lcom/discord/stores/StoreMessageAck$Ack;", - ">;" - } - .end annotation -.end field - -.field private final userRelationships:Ljava/util/Map; - .annotation system Ldalvik/annotation/Signature; - value = { - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;" - } - .end annotation -.end field - - -# direct methods -.method public constructor (Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V - .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "(", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Lcom/discord/stores/StoreMessageAck$Ack;", - ">;)V" - } - .end annotation - - const-string v0, "userRelationships" - - invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - const-string v0, "channelPermissions" - - invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - const-string v0, "messageAcks" - - invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-direct {p0}, Ljava/lang/Object;->()V - - iput-object p1, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->userRelationships:Ljava/util/Map; - - iput-object p2, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->channelPermissions:Ljava/util/Map; - - iput-object p3, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->messageAcks:Ljava/util/Map; - - return-void -.end method - -.method public static synthetic copy$default(Lcom/discord/stores/StoreMentions$init$Tuple;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/stores/StoreMentions$init$Tuple; - .locals 0 - - and-int/lit8 p5, p4, 0x1 - - if-eqz p5, :cond_0 - - iget-object p1, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->userRelationships:Ljava/util/Map; - - :cond_0 - and-int/lit8 p5, p4, 0x2 - - if-eqz p5, :cond_1 - - iget-object p2, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->channelPermissions:Ljava/util/Map; - - :cond_1 - and-int/lit8 p4, p4, 0x4 - - if-eqz p4, :cond_2 - - iget-object p3, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->messageAcks:Ljava/util/Map; - - :cond_2 - invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/StoreMentions$init$Tuple;->copy(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/stores/StoreMentions$init$Tuple; - - move-result-object p0 - - return-object p0 -.end method - - -# virtual methods -.method public final component1()Ljava/util/Map; - .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "()", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;" - } - .end annotation - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->userRelationships:Ljava/util/Map; - - return-object v0 -.end method - -.method public final component2()Ljava/util/Map; - .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "()", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;" - } - .end annotation - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->channelPermissions:Ljava/util/Map; - - return-object v0 -.end method - -.method public final component3()Ljava/util/Map; - .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "()", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Lcom/discord/stores/StoreMessageAck$Ack;", - ">;" - } - .end annotation - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->messageAcks:Ljava/util/Map; - - return-object v0 -.end method - -.method public final copy(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/stores/StoreMentions$init$Tuple; - .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "(", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Lcom/discord/stores/StoreMessageAck$Ack;", - ">;)", - "Lcom/discord/stores/StoreMentions$init$Tuple;" - } - .end annotation - - const-string v0, "userRelationships" - - invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - const-string v0, "channelPermissions" - - invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - const-string v0, "messageAcks" - - invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - new-instance v0, Lcom/discord/stores/StoreMentions$init$Tuple; - - invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreMentions$init$Tuple;->(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V - - return-object v0 -.end method - -.method public final equals(Ljava/lang/Object;)Z - .locals 2 - - if-eq p0, p1, :cond_1 - - instance-of v0, p1, Lcom/discord/stores/StoreMentions$init$Tuple; - - if-eqz v0, :cond_0 - - check-cast p1, Lcom/discord/stores/StoreMentions$init$Tuple; - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->userRelationships:Ljava/util/Map; - - iget-object v1, p1, Lcom/discord/stores/StoreMentions$init$Tuple;->userRelationships:Ljava/util/Map; - - invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z - - move-result v0 - - if-eqz v0, :cond_0 - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->channelPermissions:Ljava/util/Map; - - iget-object v1, p1, Lcom/discord/stores/StoreMentions$init$Tuple;->channelPermissions:Ljava/util/Map; - - invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z - - move-result v0 - - if-eqz v0, :cond_0 - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->messageAcks:Ljava/util/Map; - - iget-object p1, p1, Lcom/discord/stores/StoreMentions$init$Tuple;->messageAcks:Ljava/util/Map; - - invoke-static {v0, p1}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z - - move-result p1 - - if-eqz p1, :cond_0 - - goto :goto_0 - - :cond_0 - const/4 p1, 0x0 - - return p1 - - :cond_1 - :goto_0 - const/4 p1, 0x1 - - return p1 -.end method - -.method public final getChannelPermissions()Ljava/util/Map; - .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "()", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;" - } - .end annotation - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->channelPermissions:Ljava/util/Map; - - return-object v0 -.end method - -.method public final getMessageAcks()Ljava/util/Map; - .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "()", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Lcom/discord/stores/StoreMessageAck$Ack;", - ">;" - } - .end annotation - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->messageAcks:Ljava/util/Map; - - return-object v0 -.end method - -.method public final getUserRelationships()Ljava/util/Map; - .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "()", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;" - } - .end annotation - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->userRelationships:Ljava/util/Map; - - return-object v0 -.end method - -.method public final hashCode()I - .locals 3 - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->userRelationships:Ljava/util/Map; - - const/4 v1, 0x0 - - if-eqz v0, :cond_0 - - invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I - - move-result v0 - - goto :goto_0 - - :cond_0 - const/4 v0, 0x0 - - :goto_0 - mul-int/lit8 v0, v0, 0x1f - - iget-object v2, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->channelPermissions:Ljava/util/Map; - - if-eqz v2, :cond_1 - - invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I - - move-result v2 - - goto :goto_1 - - :cond_1 - const/4 v2, 0x0 - - :goto_1 - add-int/2addr v0, v2 - - mul-int/lit8 v0, v0, 0x1f - - iget-object v2, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->messageAcks:Ljava/util/Map; - - if-eqz v2, :cond_2 - - invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I - - move-result v1 - - :cond_2 - add-int/2addr v0, v1 - - return v0 -.end method - -.method public final toString()Ljava/lang/String; - .locals 2 - - new-instance v0, Ljava/lang/StringBuilder; - - const-string v1, "Tuple(userRelationships=" - - invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V - - iget-object v1, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->userRelationships:Ljava/util/Map; - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - - const-string v1, ", channelPermissions=" - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - iget-object v1, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->channelPermissions:Ljava/util/Map; - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - - const-string v1, ", messageAcks=" - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - iget-object v1, p0, Lcom/discord/stores/StoreMentions$init$Tuple;->messageAcks:Ljava/util/Map; - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - - const-string v1, ")" - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - - move-result-object v0 - - return-object v0 -.end method diff --git a/com.discord/smali/com/discord/stores/StoreMentions$sam$rx_functions_Func3$0.smali b/com.discord/smali/com/discord/stores/StoreMentions$sam$rx_functions_Func3$0.smali deleted file mode 100644 index dc9beb4384..0000000000 --- a/com.discord/smali/com/discord/stores/StoreMentions$sam$rx_functions_Func3$0.smali +++ /dev/null @@ -1,36 +0,0 @@ -.class final Lcom/discord/stores/StoreMentions$sam$rx_functions_Func3$0; -.super Ljava/lang/Object; -.source "StoreMentions.kt" - -# interfaces -.implements Lrx/functions/Func3; - - -# instance fields -.field private final synthetic function:Lkotlin/jvm/functions/Function3; - - -# direct methods -.method constructor (Lkotlin/jvm/functions/Function3;)V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - iput-object p1, p0, Lcom/discord/stores/StoreMentions$sam$rx_functions_Func3$0;->function:Lkotlin/jvm/functions/Function3; - - return-void -.end method - - -# virtual methods -.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - .locals 1 - - iget-object v0, p0, Lcom/discord/stores/StoreMentions$sam$rx_functions_Func3$0;->function:Lkotlin/jvm/functions/Function3; - - invoke-interface {v0, p1, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object p1 - - return-object p1 -.end method diff --git a/com.discord/smali/com/discord/stores/StoreMentions.smali b/com.discord/smali/com/discord/stores/StoreMentions.smali index fb0e82bbc7..d3906e1bba 100644 --- a/com.discord/smali/com/discord/stores/StoreMentions.smali +++ b/com.discord/smali/com/discord/stores/StoreMentions.smali @@ -2,19 +2,11 @@ .super Lcom/discord/stores/Store; .source "StoreMentions.kt" +# interfaces +.implements Lcom/discord/stores/DispatchHandler; + # instance fields -.field private acks:Ljava/util/Map; - .annotation system Ldalvik/annotation/Signature; - value = { - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Lcom/discord/stores/StoreMessageAck$Ack;", - ">;" - } - .end annotation -.end field - .field private final channelGuildIds:Ljava/util/HashMap; .annotation system Ldalvik/annotation/Signature; value = { @@ -62,6 +54,8 @@ .field private final dispatcher:Lcom/discord/stores/Dispatcher; +.field private isDirty:Z + .field private final mentionedMessages:Ljava/util/HashMap; .annotation system Ldalvik/annotation/Signature; value = { @@ -87,17 +81,6 @@ .end annotation .end field -.field private permissions:Ljava/util/Map; - .annotation system Ldalvik/annotation/Signature; - value = { - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;" - } - .end annotation -.end field - .field private final privateChannels:Ljava/util/HashSet; .annotation system Ldalvik/annotation/Signature; value = { @@ -120,48 +103,50 @@ .end annotation .end field -.field private final stream:Lcom/discord/stores/StoreStream; +.field private final storeMessageAck:Lcom/discord/stores/StoreMessageAck; -.field private final userGuildSettings:Ljava/util/HashMap; - .annotation system Ldalvik/annotation/Signature; - value = { - "Ljava/util/HashMap<", - "Ljava/lang/Long;", - "Lcom/discord/models/domain/ModelUserGuildSettings;", - ">;" - } - .end annotation -.end field +.field private final storePermissions:Lcom/discord/stores/StorePermissions; -.field private userRelationships:Ljava/util/Map; - .annotation system Ldalvik/annotation/Signature; - value = { - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;" - } - .end annotation -.end field +.field private final storeUserGuildSettings:Lcom/discord/stores/StoreUserGuildSettings; + +.field private final storeUserRelationships:Lcom/discord/stores/StoreUserRelationships; # direct methods -.method public constructor (Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V +.method public constructor (Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreMessageAck;Lcom/discord/stores/StoreUserGuildSettings;)V .locals 1 - const-string v0, "stream" - - invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "dispatcher" + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "storeUserRelationships" + invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + const-string v0, "storePermissions" + + invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "storeMessageAck" + + invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "storeUserGuildSettings" + + invoke-static {p5, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-direct {p0}, Lcom/discord/stores/Store;->()V - iput-object p1, p0, Lcom/discord/stores/StoreMentions;->stream:Lcom/discord/stores/StoreStream; + iput-object p1, p0, Lcom/discord/stores/StoreMentions;->dispatcher:Lcom/discord/stores/Dispatcher; - iput-object p2, p0, Lcom/discord/stores/StoreMentions;->dispatcher:Lcom/discord/stores/Dispatcher; + iput-object p2, p0, Lcom/discord/stores/StoreMentions;->storeUserRelationships:Lcom/discord/stores/StoreUserRelationships; + + iput-object p3, p0, Lcom/discord/stores/StoreMentions;->storePermissions:Lcom/discord/stores/StorePermissions; + + iput-object p4, p0, Lcom/discord/stores/StoreMentions;->storeMessageAck:Lcom/discord/stores/StoreMessageAck; + + iput-object p5, p0, Lcom/discord/stores/StoreMentions;->storeUserGuildSettings:Lcom/discord/stores/StoreUserGuildSettings; new-instance p1, Ljava/util/HashMap; @@ -177,9 +162,9 @@ new-instance p2, Lcom/discord/utilities/persister/Persister; - const-string v0, "CHANNEL_MENTION_COUNTS_V6" + const-string p3, "CHANNEL_MENTION_COUNTS_V6" - invoke-direct {p2, v0, p1}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V + invoke-direct {p2, p3, p1}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V iput-object p2, p0, Lcom/discord/stores/StoreMentions;->countsSubject:Lcom/discord/utilities/persister/Persister; @@ -205,30 +190,6 @@ invoke-direct {p1}, Ljava/util/HashMap;->()V - check-cast p1, Ljava/util/Map; - - iput-object p1, p0, Lcom/discord/stores/StoreMentions;->userRelationships:Ljava/util/Map; - - new-instance p1, Ljava/util/HashMap; - - invoke-direct {p1}, Ljava/util/HashMap;->()V - - check-cast p1, Ljava/util/Map; - - iput-object p1, p0, Lcom/discord/stores/StoreMentions;->acks:Ljava/util/Map; - - new-instance p1, Ljava/util/HashMap; - - invoke-direct {p1}, Ljava/util/HashMap;->()V - - check-cast p1, Ljava/util/Map; - - iput-object p1, p0, Lcom/discord/stores/StoreMentions;->permissions:Ljava/util/Map; - - new-instance p1, Ljava/util/HashMap; - - invoke-direct {p1}, Ljava/util/HashMap;->()V - iput-object p1, p0, Lcom/discord/stores/StoreMentions;->myRoleIds:Ljava/util/HashMap; new-instance p1, Ljava/util/HashMap; @@ -237,81 +198,14 @@ iput-object p1, p0, Lcom/discord/stores/StoreMentions;->channelGuildIds:Ljava/util/HashMap; - new-instance p1, Ljava/util/HashMap; - - invoke-direct {p1}, Ljava/util/HashMap;->()V - - iput-object p1, p0, Lcom/discord/stores/StoreMentions;->userGuildSettings:Ljava/util/HashMap; - - return-void -.end method - -.method public static final synthetic access$getAcks$p(Lcom/discord/stores/StoreMentions;)Ljava/util/Map; - .locals 0 - - iget-object p0, p0, Lcom/discord/stores/StoreMentions;->acks:Ljava/util/Map; - - return-object p0 -.end method - -.method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreMentions;)Lcom/discord/stores/Dispatcher; - .locals 0 - - iget-object p0, p0, Lcom/discord/stores/StoreMentions;->dispatcher:Lcom/discord/stores/Dispatcher; - - return-object p0 -.end method - -.method public static final synthetic access$getPermissions$p(Lcom/discord/stores/StoreMentions;)Ljava/util/Map; - .locals 0 - - iget-object p0, p0, Lcom/discord/stores/StoreMentions;->permissions:Ljava/util/Map; - - return-object p0 -.end method - -.method public static final synthetic access$getUserRelationships$p(Lcom/discord/stores/StoreMentions;)Ljava/util/Map; - .locals 0 - - iget-object p0, p0, Lcom/discord/stores/StoreMentions;->userRelationships:Ljava/util/Map; - - return-object p0 -.end method - -.method public static final synthetic access$setAcks$p(Lcom/discord/stores/StoreMentions;Ljava/util/Map;)V - .locals 0 - - iput-object p1, p0, Lcom/discord/stores/StoreMentions;->acks:Ljava/util/Map; - - return-void -.end method - -.method public static final synthetic access$setPermissions$p(Lcom/discord/stores/StoreMentions;Ljava/util/Map;)V - .locals 0 - - iput-object p1, p0, Lcom/discord/stores/StoreMentions;->permissions:Ljava/util/Map; - - return-void -.end method - -.method public static final synthetic access$setUserRelationships$p(Lcom/discord/stores/StoreMentions;Ljava/util/Map;)V - .locals 0 - - iput-object p1, p0, Lcom/discord/stores/StoreMentions;->userRelationships:Ljava/util/Map; - - return-void -.end method - -.method public static final synthetic access$tryPublishMentionCounts(Lcom/discord/stores/StoreMentions;Z)V - .locals 0 - - invoke-direct {p0, p1}, Lcom/discord/stores/StoreMentions;->tryPublishMentionCounts(Z)V - return-void .end method .method private final computeMentionCounts()Ljava/util/Map; - .locals 12 + .locals 13 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -347,265 +241,271 @@ invoke-direct {v0}, Ljava/util/HashMap;->()V - iget-object v1, p0, Lcom/discord/stores/StoreMentions;->serverInitReadStates:Ljava/util/ArrayList; + iget-object v1, p0, Lcom/discord/stores/StoreMentions;->storeMessageAck:Lcom/discord/stores/StoreMessageAck; - invoke-virtual {v1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator; + invoke-virtual {v1}, Lcom/discord/stores/StoreMessageAck;->getAcks$app_productionDiscordExternalRelease()Ljava/util/HashMap; move-result-object v1 - :cond_1 - :goto_0 - invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z + iget-object v2, p0, Lcom/discord/stores/StoreMentions;->serverInitReadStates:Ljava/util/ArrayList; - move-result v2 - - const/4 v3, 0x0 - - if-eqz v2, :cond_4 - - invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-virtual {v2}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator; move-result-object v2 - check-cast v2, Lcom/discord/models/domain/ModelReadState; + :cond_1 + :goto_0 + invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z - const-string v4, "readState" + move-result v3 - invoke-static {v2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + const/4 v4, 0x0 - invoke-virtual {v2}, Lcom/discord/models/domain/ModelReadState;->getChannelId()J + if-eqz v3, :cond_4 - move-result-wide v4 + invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; - invoke-direct {p0, v4, v5}, Lcom/discord/stores/StoreMentions;->isMentionableChannel(J)Z + move-result-object v3 - move-result v6 + check-cast v3, Lcom/discord/models/domain/ModelReadState; - if-eqz v6, :cond_1 + const-string v5, "readState" - iget-object v6, p0, Lcom/discord/stores/StoreMentions;->acks:Ljava/util/Map; + invoke-static {v3, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-virtual {v3}, Lcom/discord/models/domain/ModelReadState;->getChannelId()J + + move-result-wide v5 + + invoke-direct {p0, v5, v6}, Lcom/discord/stores/StoreMentions;->isMentionableChannel(J)Z + + move-result v7 + + if-eqz v7, :cond_1 + + invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v7 - invoke-interface {v6, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v1, v7}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v6 + move-result-object v7 - check-cast v6, Lcom/discord/stores/StoreMessageAck$Ack; + check-cast v7, Lcom/discord/stores/StoreMessageAck$Ack; - if-nez v6, :cond_2 + if-nez v7, :cond_2 goto :goto_0 :cond_2 - invoke-virtual {v6}, Lcom/discord/stores/StoreMessageAck$Ack;->component1()J + invoke-virtual {v7}, Lcom/discord/stores/StoreMessageAck$Ack;->component1()J - move-result-wide v6 + move-result-wide v7 - invoke-virtual {v2}, Lcom/discord/models/domain/ModelReadState;->getLastMessageId()J + invoke-virtual {v3}, Lcom/discord/models/domain/ModelReadState;->getLastMessageId()J - move-result-wide v8 + move-result-wide v9 - cmp-long v10, v6, v8 + cmp-long v11, v7, v9 - if-gtz v10, :cond_1 + if-gtz v11, :cond_1 - move-object v6, v0 + move-object v7, v0 - check-cast v6, Ljava/util/Map; + check-cast v7, Ljava/util/Map; - invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v7 + move-result-object v8 - invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v4 + move-result-object v5 - invoke-virtual {v0, v4}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v0, v5}, Ljava/util/HashMap;->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; - if-nez v4, :cond_3 + if-nez v5, :cond_3 - invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v4 + move-result-object v5 :cond_3 - invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I + invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I + + move-result v4 + + invoke-virtual {v3}, Lcom/discord/models/domain/ModelReadState;->getMentionCount()I move-result v3 - invoke-virtual {v2}, Lcom/discord/models/domain/ModelReadState;->getMentionCount()I + add-int/2addr v4, v3 - move-result v2 + invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - add-int/2addr v3, v2 + move-result-object v3 - invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v2 - - invoke-interface {v6, v7, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v7, v8, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; goto :goto_0 :cond_4 - iget-object v1, p0, Lcom/discord/stores/StoreMentions;->mentionedMessages:Ljava/util/HashMap; + iget-object v2, p0, Lcom/discord/stores/StoreMentions;->mentionedMessages:Ljava/util/HashMap; - invoke-virtual {v1}, Ljava/util/HashMap;->values()Ljava/util/Collection; - - move-result-object v1 - - invoke-interface {v1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator; - - move-result-object v1 - - :cond_5 - :goto_1 - invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z - - move-result v2 - - if-eqz v2, :cond_9 - - invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-virtual {v2}, Ljava/util/HashMap;->values()Ljava/util/Collection; move-result-object v2 - check-cast v2, Lcom/discord/models/domain/ModelMessage; + invoke-interface {v2}, Ljava/util/Collection;->iterator()Ljava/util/Iterator; - const-string v4, "message" + move-result-object v2 - invoke-static {v2, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + :cond_5 + :goto_1 + invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z - invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J + move-result v3 - move-result-wide v4 + if-eqz v3, :cond_9 - invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; + invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v6 + move-result-object v3 - const-string v7, "message.author" + check-cast v3, Lcom/discord/models/domain/ModelMessage; - invoke-static {v6, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + const-string v5, "message" - invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getId()J + invoke-static {v3, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - move-result-wide v6 + invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J - iget-object v8, p0, Lcom/discord/stores/StoreMentions;->userRelationships:Ljava/util/Map; + move-result-wide v5 - invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - - move-result-object v6 - - invoke-interface {v8, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object v6 - - check-cast v6, Ljava/lang/Integer; - - const/4 v7, 0x2 - - invoke-static {v6, v7}, Lcom/discord/models/domain/ModelUserRelationship;->isType(Ljava/lang/Integer;I)Z - - move-result v6 - - if-nez v6, :cond_5 - - invoke-direct {p0, v4, v5}, Lcom/discord/stores/StoreMentions;->isMentionableChannel(J)Z - - move-result v6 - - if-eqz v6, :cond_5 - - iget-object v6, p0, Lcom/discord/stores/StoreMentions;->acks:Ljava/util/Map; - - invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; move-result-object v7 - invoke-interface {v6, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + const-string v8, "message.author" - move-result-object v6 + invoke-static {v7, v8}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - check-cast v6, Lcom/discord/stores/StoreMessageAck$Ack; + invoke-virtual {v7}, Lcom/discord/models/domain/ModelUser;->getId()J - const/4 v7, 0x1 + move-result-wide v7 - if-eqz v6, :cond_7 + iget-object v9, p0, Lcom/discord/stores/StoreMentions;->storeUserRelationships:Lcom/discord/stores/StoreUserRelationships; - invoke-virtual {v6}, Lcom/discord/stores/StoreMessageAck$Ack;->component1()J + invoke-virtual {v9}, Lcom/discord/stores/StoreUserRelationships;->getRelationships$app_productionDiscordExternalRelease()Ljava/util/HashMap; - move-result-wide v8 + move-result-object v9 - invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage;->getId()J + invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-wide v10 + move-result-object v7 - cmp-long v2, v8, v10 + invoke-virtual {v9, v7}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - if-gez v2, :cond_6 + move-result-object v7 + + check-cast v7, Ljava/lang/Integer; + + const/4 v8, 0x2 + + invoke-static {v7, v8}, Lcom/discord/models/domain/ModelUserRelationship;->isType(Ljava/lang/Integer;I)Z + + move-result v7 + + if-nez v7, :cond_5 + + invoke-direct {p0, v5, v6}, Lcom/discord/stores/StoreMentions;->isMentionableChannel(J)Z + + move-result v7 + + if-eqz v7, :cond_5 + + invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v7 + + invoke-virtual {v1, v7}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v7 + + check-cast v7, Lcom/discord/stores/StoreMessageAck$Ack; + + const/4 v8, 0x1 + + if-eqz v7, :cond_7 + + invoke-virtual {v7}, Lcom/discord/stores/StoreMessageAck$Ack;->component1()J + + move-result-wide v9 + + invoke-virtual {v3}, Lcom/discord/models/domain/ModelMessage;->getId()J + + move-result-wide v11 + + cmp-long v3, v9, v11 + + if-gez v3, :cond_6 goto :goto_2 :cond_6 - const/4 v2, 0x0 + const/4 v3, 0x0 goto :goto_3 :cond_7 :goto_2 - const/4 v2, 0x1 + const/4 v3, 0x1 :goto_3 - if-eqz v2, :cond_5 + if-eqz v3, :cond_5 - move-object v2, v0 + move-object v3, v0 - check-cast v2, Ljava/util/Map; + check-cast v3, Ljava/util/Map; - invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v6 + move-result-object v7 - invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v4 + move-result-object v5 - invoke-virtual {v0, v4}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v0, v5}, Ljava/util/HashMap;->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; - if-nez v4, :cond_8 - - invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v4 - - :cond_8 - invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I - - move-result v4 - - add-int/2addr v4, v7 + if-nez v5, :cond_8 invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v4 + move-result-object v5 - invoke-interface {v2, v6, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + :cond_8 + invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I - goto :goto_1 + move-result v5 + + add-int/2addr v5, v8 + + invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v5 + + invoke-interface {v3, v7, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + + goto/16 :goto_1 :cond_9 check-cast v0, Ljava/util/Map; @@ -682,7 +582,13 @@ goto/16 :goto_5 :cond_1 - iget-object v1, p0, Lcom/discord/stores/StoreMentions;->privateChannels:Ljava/util/HashSet; + iget-object v1, p0, Lcom/discord/stores/StoreMentions;->storeUserGuildSettings:Lcom/discord/stores/StoreUserGuildSettings; + + invoke-virtual {v1}, Lcom/discord/stores/StoreUserGuildSettings;->getGuildSettings$app_productionDiscordExternalRelease()Ljava/util/Map; + + move-result-object v1 + + iget-object v2, p0, Lcom/discord/stores/StoreMentions;->privateChannels:Ljava/util/HashSet; invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J @@ -690,61 +596,59 @@ invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + move-result-object v6 + + invoke-virtual {v2, v6}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z + + move-result v2 + + const/4 v6, 0x1 + + if-eqz v2, :cond_3 + + invoke-interface {v1, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + move-result-object v2 - invoke-virtual {v1, v2}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z + check-cast v2, Lcom/discord/models/domain/ModelUserGuildSettings; - move-result v1 - - const/4 v2, 0x1 - - if-eqz v1, :cond_3 - - iget-object v1, p0, Lcom/discord/stores/StoreMentions;->userGuildSettings:Ljava/util/HashMap; - - invoke-virtual {v1, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object v1 - - check-cast v1, Lcom/discord/models/domain/ModelUserGuildSettings; - - if-eqz v1, :cond_2 + if-eqz v2, :cond_2 invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J - move-result-wide v6 + move-result-wide v7 - invoke-virtual {v1, v6, v7}, Lcom/discord/models/domain/ModelUserGuildSettings;->getChannelOverride(J)Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride; + invoke-virtual {v2, v7, v8}, Lcom/discord/models/domain/ModelUserGuildSettings;->getChannelOverride(J)Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride; - move-result-object v1 + move-result-object v2 - if-eqz v1, :cond_2 + if-eqz v2, :cond_2 - invoke-virtual {v1}, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->isMuted()Z + invoke-virtual {v2}, Lcom/discord/models/domain/ModelUserGuildSettings$ChannelOverride;->isMuted()Z - move-result v1 + move-result v2 - if-eq v1, v2, :cond_3 + if-eq v2, v6, :cond_3 :cond_2 - return v2 + return v6 :cond_3 invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getMentions()Ljava/util/List; - move-result-object v1 + move-result-object v2 const-string v3, "mentions" - invoke-static {v1, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - check-cast v1, Ljava/lang/Iterable; + check-cast v2, Ljava/lang/Iterable; - instance-of v3, v1, Ljava/util/Collection; + instance-of v3, v2, Ljava/util/Collection; if-eqz v3, :cond_4 - move-object v3, v1 + move-object v3, v2 check-cast v3, Ljava/util/Collection; @@ -755,34 +659,34 @@ if-nez v3, :cond_7 :cond_4 - invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - move-result-object v1 + move-result-object v2 :cond_5 - invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z move-result v3 if-eqz v3, :cond_7 - invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; move-result-object v3 check-cast v3, Lcom/discord/models/domain/ModelUser; - const-string v6, "it" + const-string v7, "it" - invoke-static {v3, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v3, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getId()J - move-result-wide v6 + move-result-wide v7 - iget-wide v8, p0, Lcom/discord/stores/StoreMentions;->myId:J + iget-wide v9, p0, Lcom/discord/stores/StoreMentions;->myId:J - cmp-long v3, v6, v8 + cmp-long v3, v7, v9 if-nez v3, :cond_6 @@ -796,32 +700,32 @@ :goto_0 if-eqz v3, :cond_5 - const/4 v1, 0x1 + const/4 v2, 0x1 goto :goto_1 :cond_7 - const/4 v1, 0x0 + const/4 v2, 0x0 :goto_1 - if-eqz v1, :cond_8 + if-eqz v2, :cond_8 - return v2 + return v6 :cond_8 invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getMentionRoles()Ljava/util/List; - move-result-object v1 + move-result-object v2 - if-eqz v1, :cond_d + if-eqz v2, :cond_d - check-cast v1, Ljava/lang/Iterable; + check-cast v2, Ljava/lang/Iterable; - instance-of v3, v1, Ljava/util/Collection; + instance-of v3, v2, Ljava/util/Collection; if-eqz v3, :cond_9 - move-object v3, v1 + move-object v3, v2 check-cast v3, Ljava/util/Collection; @@ -832,42 +736,42 @@ if-nez v3, :cond_c :cond_9 - invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - move-result-object v1 + move-result-object v2 :cond_a - invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z move-result v3 if-eqz v3, :cond_c - invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; move-result-object v3 check-cast v3, Ljava/lang/Long; - iget-object v6, p0, Lcom/discord/stores/StoreMentions;->myRoleIds:Ljava/util/HashMap; + iget-object v7, p0, Lcom/discord/stores/StoreMentions;->myRoleIds:Ljava/util/HashMap; invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + move-result-object v8 + + invoke-virtual {v7, v8}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; + move-result-object v7 - invoke-virtual {v6, v7}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; + check-cast v7, Ljava/util/List; - move-result-object v6 + if-eqz v7, :cond_b - check-cast v6, Ljava/util/List; - - if-eqz v6, :cond_b - - invoke-interface {v6, v3}, Ljava/util/List;->contains(Ljava/lang/Object;)Z + invoke-interface {v7, v3}, Ljava/util/List;->contains(Ljava/lang/Object;)Z move-result v3 - if-ne v3, v2, :cond_b + if-ne v3, v6, :cond_b const/4 v3, 0x1 @@ -879,17 +783,17 @@ :goto_2 if-eqz v3, :cond_a - const/4 v1, 0x1 + const/4 v2, 0x1 goto :goto_3 :cond_c - const/4 v1, 0x0 + const/4 v2, 0x0 :goto_3 - if-ne v1, v2, :cond_d + if-ne v2, v6, :cond_d - return v2 + return v6 :cond_d invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->isMentionEveryone()Z @@ -898,13 +802,11 @@ if-eqz p1, :cond_10 - iget-object p1, p0, Lcom/discord/stores/StoreMentions;->userGuildSettings:Ljava/util/HashMap; - invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v1 + move-result-object p1 - invoke-virtual {p1, v1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object p1 @@ -916,7 +818,7 @@ move-result p1 - if-eq p1, v2, :cond_e + if-eq p1, v6, :cond_e goto :goto_4 @@ -925,7 +827,7 @@ :cond_f :goto_4 - return v2 + return v6 :cond_10 :goto_5 @@ -934,14 +836,20 @@ .method private final isMentionableChannel(J)Z .locals 5 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation - iget-object v0, p0, Lcom/discord/stores/StoreMentions;->acks:Ljava/util/Map; + iget-object v0, p0, Lcom/discord/stores/StoreMentions;->storeMessageAck:Lcom/discord/stores/StoreMessageAck; + + invoke-virtual {v0}, Lcom/discord/stores/StoreMessageAck;->getAcks$app_productionDiscordExternalRelease()Ljava/util/HashMap; + + move-result-object v0 invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v1 - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v0, v1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object v0 @@ -972,7 +880,11 @@ return v1 :cond_1 - iget-object v0, p0, Lcom/discord/stores/StoreMentions;->permissions:Ljava/util/Map; + iget-object v0, p0, Lcom/discord/stores/StoreMentions;->storePermissions:Lcom/discord/stores/StorePermissions; + + invoke-virtual {v0}, Lcom/discord/stores/StorePermissions;->getPermissionsForChannels$app_productionDiscordExternalRelease()Ljava/util/Map; + + move-result-object v0 invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; @@ -1012,42 +924,6 @@ return p1 .end method -.method private final tryPublishMentionCounts(Z)V - .locals 4 - - invoke-direct {p0}, Lcom/discord/stores/StoreMentions;->computeMentionCounts()Ljava/util/Map; - - move-result-object v0 - - iget-object v1, p0, Lcom/discord/stores/StoreMentions;->counts:Ljava/util/Map; - - invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z - - move-result v1 - - xor-int/lit8 v1, v1, 0x1 - - if-nez v1, :cond_0 - - if-eqz p1, :cond_1 - - :cond_0 - iput-object v0, p0, Lcom/discord/stores/StoreMentions;->counts:Ljava/util/Map; - - iget-object p1, p0, Lcom/discord/stores/StoreMentions;->countsSubject:Lcom/discord/utilities/persister/Persister; - - const/4 v1, 0x0 - - const/4 v2, 0x2 - - const/4 v3, 0x0 - - invoke-static {p1, v0, v1, v2, v3}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object; - - :cond_1 - return-void -.end method - # virtual methods .method public final getCounts()Lrx/Observable; @@ -1172,9 +1048,9 @@ iput-wide p1, p0, Lcom/discord/stores/StoreMentions;->selectedChannelId:J - const/4 p1, 0x0 + const/4 p1, 0x1 - invoke-direct {p0, p1}, Lcom/discord/stores/StoreMentions;->tryPublishMentionCounts(Z)V + iput-boolean p1, p0, Lcom/discord/stores/StoreMentions;->isDirty:Z return-void .end method @@ -1200,10 +1076,6 @@ invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V - iget-object v0, p0, Lcom/discord/stores/StoreMentions;->userGuildSettings:Ljava/util/HashMap; - - invoke-virtual {v0}, Ljava/util/HashMap;->clear()V - iget-object v0, p0, Lcom/discord/stores/StoreMentions;->channelGuildIds:Ljava/util/HashMap; invoke-virtual {v0}, Ljava/util/HashMap;->clear()V @@ -1226,16 +1098,6 @@ iput-wide v0, p0, Lcom/discord/stores/StoreMentions;->myId:J - invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getUserGuildSettings()Ljava/util/List; - - move-result-object v0 - - const-string v1, "payload.userGuildSettings" - - invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {p0, v0}, Lcom/discord/stores/StoreMentions;->handleGuildSettingUpdated(Ljava/util/List;)V - invoke-virtual {p1}, Lcom/discord/models/domain/ModelPayload;->getGuilds()Ljava/util/List; move-result-object v0 @@ -1434,7 +1296,7 @@ invoke-virtual {v0, v1}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z - invoke-direct {p0, v4}, Lcom/discord/stores/StoreMentions;->tryPublishMentionCounts(Z)V + iput-boolean v4, p0, Lcom/discord/stores/StoreMentions;->isDirty:Z return-void .end method @@ -1589,62 +1451,6 @@ return-void .end method -.method public final handleGuildSettingUpdated(Ljava/util/List;)V - .locals 4 - .annotation runtime Lcom/discord/stores/StoreThread; - .end annotation - - .annotation system Ldalvik/annotation/Signature; - value = { - "(", - "Ljava/util/List<", - "+", - "Lcom/discord/models/domain/ModelUserGuildSettings;", - ">;)V" - } - .end annotation - - const-string v0, "guildSettingsList" - - invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator; - - move-result-object p1 - - :goto_0 - invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z - - move-result v0 - - if-eqz v0, :cond_0 - - invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; - - move-result-object v0 - - check-cast v0, Lcom/discord/models/domain/ModelUserGuildSettings; - - iget-object v1, p0, Lcom/discord/stores/StoreMentions;->userGuildSettings:Ljava/util/HashMap; - - check-cast v1, Ljava/util/Map; - - invoke-virtual {v0}, Lcom/discord/models/domain/ModelUserGuildSettings;->getGuildId()J - - move-result-wide v2 - - invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - - move-result-object v2 - - invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - - goto :goto_0 - - :cond_0 - return-void -.end method - .method public final handleMessageCreateOrUpdate(Lcom/discord/models/domain/ModelMessage;)V .locals 3 .annotation runtime Lcom/discord/stores/StoreThread; @@ -1674,9 +1480,9 @@ invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - const/4 p1, 0x0 + const/4 p1, 0x1 - invoke-direct {p0, p1}, Lcom/discord/stores/StoreMentions;->tryPublishMentionCounts(Z)V + iput-boolean p1, p0, Lcom/discord/stores/StoreMentions;->isDirty:Z :cond_0 return-void @@ -1747,144 +1553,77 @@ goto :goto_0 :cond_0 - const/4 p1, 0x0 + const/4 p1, 0x1 - invoke-direct {p0, p1}, Lcom/discord/stores/StoreMentions;->tryPublishMentionCounts(Z)V + iput-boolean p1, p0, Lcom/discord/stores/StoreMentions;->isDirty:Z :cond_1 return-void .end method -.method public final init(Landroid/content/Context;)V - .locals 18 +.method public final onDispatchEnded()V + .locals 5 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation - move-object/from16 v0, p0 + iget-boolean v0, p0, Lcom/discord/stores/StoreMentions;->isDirty:Z - const-string v1, "context" + if-nez v0, :cond_0 - move-object/from16 v2, p1 - - invoke-static {v2, v1}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-super/range {p0 .. p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V - - iget-object v1, v0, Lcom/discord/stores/StoreMentions;->stream:Lcom/discord/stores/StoreStream; - - invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getUserRelationships$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUserRelationships; - - move-result-object v1 - - invoke-virtual {v1}, Lcom/discord/stores/StoreUserRelationships;->get()Lrx/Observable; - - move-result-object v2 - - iget-object v1, v0, Lcom/discord/stores/StoreMentions;->stream:Lcom/discord/stores/StoreStream; - - invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getPermissions$app_productionDiscordExternalRelease()Lcom/discord/stores/StorePermissions; - - move-result-object v1 - - invoke-virtual {v1}, Lcom/discord/stores/StorePermissions;->getForChannels()Lrx/Observable; - - move-result-object v3 - - iget-object v1, v0, Lcom/discord/stores/StoreMentions;->stream:Lcom/discord/stores/StoreStream; - - invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getMessageAck$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMessageAck; - - move-result-object v1 - - invoke-virtual {v1}, Lcom/discord/stores/StoreMessageAck;->get()Lrx/Observable; - - move-result-object v4 - - sget-object v1, Lcom/discord/stores/StoreMentions$init$1;->INSTANCE:Lcom/discord/stores/StoreMentions$init$1; - - check-cast v1, Lkotlin/jvm/functions/Function3; - - if-eqz v1, :cond_0 - - new-instance v5, Lcom/discord/stores/StoreMentions$sam$rx_functions_Func3$0; - - invoke-direct {v5, v1}, Lcom/discord/stores/StoreMentions$sam$rx_functions_Func3$0;->(Lkotlin/jvm/functions/Function3;)V - - move-object v1, v5 + return-void :cond_0 - move-object v5, v1 + invoke-direct {p0}, Lcom/discord/stores/StoreMentions;->computeMentionCounts()Ljava/util/Map; - check-cast v5, Lrx/functions/Func3; + move-result-object v0 - const-wide/16 v6, 0x1 + iget-object v1, p0, Lcom/discord/stores/StoreMentions;->counts:Ljava/util/Map; - sget-object v8, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit; + invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z - invoke-static/range {v2 .. v8}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;JLjava/util/concurrent/TimeUnit;)Lrx/Observable; + move-result v1 - move-result-object v9 + xor-int/lit8 v1, v1, 0x1 - const-string v1, "ObservableWithLeadingEdg\u2026imeUnit.SECONDS\n )" + const/4 v2, 0x0 - invoke-static {v9, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + if-eqz v1, :cond_1 - invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; + iput-object v0, p0, Lcom/discord/stores/StoreMentions;->counts:Ljava/util/Map; - move-result-object v10 + iget-object v1, p0, Lcom/discord/stores/StoreMentions;->countsSubject:Lcom/discord/utilities/persister/Persister; - const/4 v11, 0x0 + const/4 v3, 0x2 - const/4 v12, 0x0 + const/4 v4, 0x0 - const/4 v13, 0x0 + invoke-static {v1, v0, v2, v3, v4}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object; - const/4 v14, 0x0 - - new-instance v1, Lcom/discord/stores/StoreMentions$init$2; - - invoke-direct {v1, v0}, Lcom/discord/stores/StoreMentions$init$2;->(Lcom/discord/stores/StoreMentions;)V - - move-object v15, v1 - - check-cast v15, Lkotlin/jvm/functions/Function1; - - const/16 v16, 0x1e - - const/16 v17, 0x0 - - invoke-static/range {v9 .. v17}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + :cond_1 + iput-boolean v2, p0, Lcom/discord/stores/StoreMentions;->isDirty:Z return-void .end method -.method public final declared-synchronized processMarkUnread(JLjava/util/List;Ljava/util/Map;)I - .locals 3 +.method public final processMarkUnread$app_productionDiscordExternalRelease(JLjava/util/List;)I + .locals 4 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(J", "Ljava/util/List<", "+", "Lcom/discord/models/domain/ModelMessage;", - ">;", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Lcom/discord/stores/StoreMessageAck$Ack;", ">;)I" } .end annotation - monitor-enter p0 - - :try_start_0 const-string v0, "messagesAfter" invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "updatedAcks" - - invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - iput-object p4, p0, Lcom/discord/stores/StoreMentions;->acks:Ljava/util/Map; - invoke-interface {p3}, Ljava/util/List;->iterator()Ljava/util/Iterator; move-result-object p3 @@ -1893,51 +1632,51 @@ :goto_0 invoke-interface {p3}, Ljava/util/Iterator;->hasNext()Z - move-result p4 + move-result v0 - if-eqz p4, :cond_1 + if-eqz v0, :cond_1 invoke-interface {p3}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object p4 + move-result-object v0 - check-cast p4, Lcom/discord/models/domain/ModelMessage; + check-cast v0, Lcom/discord/models/domain/ModelMessage; - iget-object v0, p0, Lcom/discord/stores/StoreMentions;->mentionedMessages:Ljava/util/HashMap; + iget-object v1, p0, Lcom/discord/stores/StoreMentions;->mentionedMessages:Ljava/util/HashMap; - invoke-virtual {p4}, Lcom/discord/models/domain/ModelMessage;->getId()J + invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->getId()J - move-result-wide v1 + move-result-wide v2 - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v1 + move-result-object v2 - invoke-virtual {v0, v1}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z + invoke-virtual {v1, v2}, Ljava/util/HashMap;->containsKey(Ljava/lang/Object;)Z - move-result v0 + move-result v1 - if-nez v0, :cond_0 + if-nez v1, :cond_0 - invoke-direct {p0, p4}, Lcom/discord/stores/StoreMentions;->hasMention(Lcom/discord/models/domain/ModelMessage;)Z + invoke-direct {p0, v0}, Lcom/discord/stores/StoreMentions;->hasMention(Lcom/discord/models/domain/ModelMessage;)Z - move-result v0 + move-result v1 - if-eqz v0, :cond_0 + if-eqz v1, :cond_0 - iget-object v0, p0, Lcom/discord/stores/StoreMentions;->mentionedMessages:Ljava/util/HashMap; + iget-object v1, p0, Lcom/discord/stores/StoreMentions;->mentionedMessages:Ljava/util/HashMap; - check-cast v0, Ljava/util/Map; + check-cast v1, Ljava/util/Map; - invoke-virtual {p4}, Lcom/discord/models/domain/ModelMessage;->getId()J + invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->getId()J - move-result-wide v1 + move-result-wide v2 - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v1 + move-result-object v2 - invoke-interface {v0, v1, p4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; goto :goto_0 @@ -1948,52 +1687,52 @@ move-result-object p3 - const-string p4, "serverInitReadStates.listIterator()" + const-string v0, "serverInitReadStates.listIterator()" - invoke-static {p3, p4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {p3, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V :cond_2 :goto_1 invoke-interface {p3}, Ljava/util/ListIterator;->hasNext()Z - move-result p4 + move-result v0 - if-eqz p4, :cond_3 + if-eqz v0, :cond_3 invoke-interface {p3}, Ljava/util/ListIterator;->next()Ljava/lang/Object; - move-result-object p4 + move-result-object v0 - const-string v0, "iterator.next()" + const-string v1, "iterator.next()" - invoke-static {p4, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - check-cast p4, Lcom/discord/models/domain/ModelReadState; + check-cast v0, Lcom/discord/models/domain/ModelReadState; - invoke-virtual {p4}, Lcom/discord/models/domain/ModelReadState;->getChannelId()J + invoke-virtual {v0}, Lcom/discord/models/domain/ModelReadState;->getChannelId()J move-result-wide v0 - cmp-long p4, v0, p1 + cmp-long v2, v0, p1 - if-nez p4, :cond_2 + if-nez v2, :cond_2 invoke-interface {p3}, Ljava/util/ListIterator;->remove()V goto :goto_1 :cond_3 - const/4 p3, 0x0 + const/4 p3, 0x1 - invoke-direct {p0, p3}, Lcom/discord/stores/StoreMentions;->tryPublishMentionCounts(Z)V + iput-boolean p3, p0, Lcom/discord/stores/StoreMentions;->isDirty:Z - iget-object p4, p0, Lcom/discord/stores/StoreMentions;->counts:Ljava/util/Map; + iget-object p3, p0, Lcom/discord/stores/StoreMentions;->counts:Ljava/util/Map; invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object p1 - invoke-interface {p4, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {p3, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object p1 @@ -2004,22 +1743,11 @@ invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I move-result p1 - :try_end_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 - - monitor-exit p0 return p1 :cond_4 - monitor-exit p0 + const/4 p1, 0x0 - return p3 - - :catchall_0 - move-exception p1 - - monitor-exit p0 - - throw p1 + return p1 .end method diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali index 4a4d8e6ddf..d99efcdd81 100644 --- a/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali +++ b/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali @@ -307,17 +307,7 @@ iget-wide v3, v3, Lcom/discord/stores/StoreMessageAck$markUnread$2;->$channelId:J - iget-object v5, p0, Lcom/discord/stores/StoreMessageAck$markUnread$2$1;->this$0:Lcom/discord/stores/StoreMessageAck$markUnread$2; - - iget-object v5, v5, Lcom/discord/stores/StoreMessageAck$markUnread$2;->this$0:Lcom/discord/stores/StoreMessageAck; - - invoke-static {v5}, Lcom/discord/stores/StoreMessageAck;->access$getAcks$p(Lcom/discord/stores/StoreMessageAck;)Ljava/util/HashMap; - - move-result-object v5 - - check-cast v5, Ljava/util/Map; - - invoke-virtual {v2, v3, v4, v1, v5}, Lcom/discord/stores/StoreMentions;->processMarkUnread(JLjava/util/List;Ljava/util/Map;)I + invoke-virtual {v2, v3, v4, v1}, Lcom/discord/stores/StoreMentions;->processMarkUnread$app_productionDiscordExternalRelease(JLjava/util/List;)I move-result v1 diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck.smali b/com.discord/smali/com/discord/stores/StoreMessageAck.smali index a9c6d03ed0..1b2a69f514 100644 --- a/com.discord/smali/com/discord/stores/StoreMessageAck.smali +++ b/com.discord/smali/com/discord/stores/StoreMessageAck.smali @@ -89,14 +89,6 @@ return-void .end method -.method public static final synthetic access$getAcks$p(Lcom/discord/stores/StoreMessageAck;)Ljava/util/HashMap; - .locals 0 - - iget-object p0, p0, Lcom/discord/stores/StoreMessageAck;->acks:Ljava/util/HashMap; - - return-object p0 -.end method - .method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreMessageAck;)Lcom/discord/stores/Dispatcher; .locals 0 @@ -493,6 +485,23 @@ return-object p1 .end method +.method public final getAcks$app_productionDiscordExternalRelease()Ljava/util/HashMap; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/HashMap<", + "Ljava/lang/Long;", + "Lcom/discord/stores/StoreMessageAck$Ack;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/stores/StoreMessageAck;->acks:Ljava/util/HashMap; + + return-object v0 +.end method + .method public final handleChannelSelected()V .locals 8 .annotation runtime Lcom/discord/stores/StoreThread; diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali index ac3afc1419..ab95f25b01 100644 --- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali +++ b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali @@ -81,7 +81,7 @@ aput-object v2, v0, v3 - const v2, 0x7f12119c + const v2, 0x7f12119e invoke-virtual {p1, v2}, Landroid/app/Activity;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/stores/StoreNotifications.smali b/com.discord/smali/com/discord/stores/StoreNotifications.smali index 51058925c2..dae45accce 100644 --- a/com.discord/smali/com/discord/stores/StoreNotifications.smali +++ b/com.discord/smali/com/discord/stores/StoreNotifications.smali @@ -820,11 +820,9 @@ move-result-object v1 - iget-object v12, v1, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; + invoke-virtual {v1}, Lcom/discord/stores/StoreUserGuildSettings;->getGuildSettings$app_productionDiscordExternalRelease()Ljava/util/Map; - const-string v1, "stream.guildSettings.guildSettings" - - invoke-static {v12, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + move-result-object v12 move-object v7, p1 diff --git a/com.discord/smali/com/discord/stores/StorePermissions.smali b/com.discord/smali/com/discord/stores/StorePermissions.smali index f5ad16a632..9e0cdc87eb 100644 --- a/com.discord/smali/com/discord/stores/StorePermissions.smali +++ b/com.discord/smali/com/discord/stores/StorePermissions.smali @@ -48,6 +48,17 @@ .end annotation .end field +.field private permissionsForChannels:Ljava/util/Map; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/Integer;", + ">;" + } + .end annotation +.end field + .field private final permissionsForGuild:Ljava/util/Map; .annotation system Ldalvik/annotation/Signature; value = { @@ -118,6 +129,14 @@ iput-object p1, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannel:Ljava/util/Map; + new-instance p1, Ljava/util/HashMap; + + invoke-direct {p1}, Ljava/util/HashMap;->()V + + check-cast p1, Ljava/util/Map; + + iput-object p1, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannels:Ljava/util/Map; + new-instance p1, Lcom/discord/utilities/persister/Persister; new-instance p2, Ljava/util/HashMap; @@ -795,6 +814,23 @@ return-object v0 .end method +.method public final getPermissionsForChannels$app_productionDiscordExternalRelease()Ljava/util/Map; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/Integer;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannels:Ljava/util/Map; + + return-object v0 +.end method + .method public final getPermissionsForGuild$app_productionDiscordExternalRelease()Ljava/util/Map; .locals 1 .annotation system Ldalvik/annotation/Signature; @@ -838,28 +874,32 @@ move-result-object v0 - iget-object v1, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannel:Ljava/util/Map; + const-string v1, "channel.guildId" - const-string v2, "guildId" - - invoke-static {v0, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object v1 - - if-nez v1, :cond_1 - - invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map; - - move-result-object v1 - - :cond_1 - check-cast v1, Ljava/util/Map; + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - move-result-wide v2 + move-result-wide v0 + + iget-object v2, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannel:Ljava/util/Map; + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v3 + + invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v2 + + if-nez v2, :cond_1 + + invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map; + + move-result-object v2 + + :cond_1 + check-cast v2, Ljava/util/Map; invoke-static {p1}, Lkotlin/a/m;->listOf(Ljava/lang/Object;)Ljava/util/List; @@ -867,17 +907,21 @@ check-cast p1, Ljava/lang/Iterable; - invoke-direct {p0, v2, v3, p1}, Lcom/discord/stores/StorePermissions;->computeChannelPermissions(JLjava/lang/Iterable;)Ljava/util/Map; + invoke-direct {p0, v0, v1, p1}, Lcom/discord/stores/StorePermissions;->computeChannelPermissions(JLjava/lang/Iterable;)Ljava/util/Map; move-result-object p1 - iget-object v2, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannel:Ljava/util/Map; + iget-object v3, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannel:Ljava/util/Map; - invoke-static {v1, p1}, Lkotlin/a/ad;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map; + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + invoke-static {v2, p1}, Lkotlin/a/ad;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map; move-result-object p1 - invoke-interface {v2, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v3, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; const/4 p1, 0x1 @@ -887,7 +931,7 @@ .end method .method public final handleChannelDeleted(Lcom/discord/models/domain/ModelChannel;)V - .locals 5 + .locals 6 .annotation runtime Lcom/discord/stores/StoreThread; .end annotation @@ -899,40 +943,52 @@ move-result-object v0 - iget-object v1, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannel:Ljava/util/Map; + const-string v1, "channel.guildId" - const-string v2, "guildId" + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v0, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - invoke-interface {v1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object v1 - - if-nez v1, :cond_0 - - invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map; - - move-result-object v1 - - :cond_0 - check-cast v1, Ljava/util/Map; + move-result-wide v0 iget-object v2, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannel:Ljava/util/Map; + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v3 + + invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v2 + + if-nez v2, :cond_0 + + invoke-static {}, Lkotlin/a/ad;->emptyMap()Ljava/util/Map; + + move-result-object v2 + + :cond_0 + check-cast v2, Ljava/util/Map; + + iget-object v3, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannel:Ljava/util/Map; + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J - move-result-wide v3 + move-result-wide v4 - invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object p1 - invoke-static {v1, p1}, Lkotlin/a/ad;->minus(Ljava/util/Map;Ljava/lang/Object;)Ljava/util/Map; + invoke-static {v2, p1}, Lkotlin/a/ad;->minus(Ljava/util/Map;Ljava/lang/Object;)Ljava/util/Map; move-result-object p1 - invoke-interface {v2, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v3, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; const/4 p1, 0x1 @@ -1297,6 +1353,12 @@ goto :goto_0 :cond_1 + move-object v2, v0 + + check-cast v2, Ljava/util/Map; + + iput-object v2, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannels:Ljava/util/Map; + iget-object v2, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannelPublisher:Lcom/discord/utilities/persister/Persister; const/4 v3, 0x1 @@ -1311,3 +1373,24 @@ return-void .end method + +.method public final setPermissionsForChannels$app_productionDiscordExternalRelease(Ljava/util/Map;)V + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/Integer;", + ">;)V" + } + .end annotation + + const-string v0, "" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + iput-object p1, p0, Lcom/discord/stores/StorePermissions;->permissionsForChannels:Ljava/util/Map; + + return-void +.end method diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection.smali index d28d7bdbce..7ece64fff9 100644 --- a/com.discord/smali/com/discord/stores/StoreRtcConnection.smali +++ b/com.discord/smali/com/discord/stores/StoreRtcConnection.smali @@ -439,11 +439,7 @@ if-eqz v2, :cond_2 - move-object v3, v2 - - check-cast v3, Ljava/lang/Number; - - invoke-virtual {v3}, Ljava/lang/Number;->longValue()J + invoke-virtual {v2}, Ljava/lang/Long;->longValue()J move-result-wide v3 @@ -1241,11 +1237,7 @@ if-eqz v0, :cond_6 - move-object v4, v0 - - check-cast v4, Ljava/lang/Number; - - invoke-virtual {v4}, Ljava/lang/Number;->longValue()J + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J move-result-wide v4 diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali index 1d9696f0ab..76313fc8e5 100644 --- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali +++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali @@ -250,18 +250,6 @@ iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream; - invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getMentions$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMentions; - - move-result-object v1 - - iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application; - - check-cast v2, Landroid/content/Context; - - invoke-virtual {v1, v2}, Lcom/discord/stores/StoreMentions;->init(Landroid/content/Context;)V - - iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream; - invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getNotifications$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreNotifications; move-result-object v1 diff --git a/com.discord/smali/com/discord/stores/StoreStream.smali b/com.discord/smali/com/discord/stores/StoreStream.smali index 6155264834..3fb59750e2 100644 --- a/com.discord/smali/com/discord/stores/StoreStream.smali +++ b/com.discord/smali/com/discord/stores/StoreStream.smali @@ -56,6 +56,8 @@ .field private final clientVersion:Lcom/discord/stores/StoreClientVersion; +.field private final clock:Lcom/discord/utilities/clocks/Clock; + .field private final connectivity:Lcom/discord/stores/StoreConnectivity; .field private final customEmojis:Lcom/discord/stores/StoreEmojiCustom; @@ -233,7 +235,7 @@ .end method .method public constructor ()V - .locals 5 + .locals 7 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -273,6 +275,14 @@ iput-object v0, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher; + new-instance v0, Lcom/discord/utilities/clocks/SystemClock; + + invoke-direct {v0}, Lcom/discord/utilities/clocks/SystemClock;->()V + + check-cast v0, Lcom/discord/utilities/clocks/Clock; + + iput-object v0, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/clocks/Clock; + new-instance v0, Lcom/discord/stores/StoreAuthentication; invoke-direct {v0}, Lcom/discord/stores/StoreAuthentication;->()V @@ -413,7 +423,11 @@ new-instance v0, Lcom/discord/stores/StoreUserGuildSettings; - invoke-direct {v0}, Lcom/discord/stores/StoreUserGuildSettings;->()V + iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher; + + iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/clocks/Clock; + + invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreUserGuildSettings;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/clocks/Clock;)V iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings; @@ -591,9 +605,19 @@ new-instance v0, Lcom/discord/stores/StoreMentions; - iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher; + iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher; - invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreMentions;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V + iget-object v3, p0, Lcom/discord/stores/StoreStream;->userRelationships:Lcom/discord/stores/StoreUserRelationships; + + iget-object v4, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions; + + iget-object v5, p0, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck; + + iget-object v6, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings; + + move-object v1, v0 + + invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreMentions;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreMessageAck;Lcom/discord/stores/StoreUserGuildSettings;)V iput-object v0, p0, Lcom/discord/stores/StoreStream;->mentions:Lcom/discord/stores/StoreMentions; @@ -2765,7 +2789,7 @@ iget-object v1, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings; - invoke-virtual {v1, p1}, Lcom/discord/stores/StoreUserGuildSettings;->handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V + invoke-virtual {v1, p1}, Lcom/discord/stores/StoreUserGuildSettings;->handleConnectionOpen$app_productionDiscordExternalRelease(Lcom/discord/models/domain/ModelPayload;)V iget-object v1, p0, Lcom/discord/stores/StoreStream;->lurking:Lcom/discord/stores/StoreLurking; @@ -3458,11 +3482,7 @@ iget-object v0, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings; - invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUserGuildSettings;->handleGuildSettingUpdated(Ljava/util/List;)V - - iget-object v0, p0, Lcom/discord/stores/StoreStream;->mentions:Lcom/discord/stores/StoreMentions; - - invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMentions;->handleGuildSettingUpdated(Ljava/util/List;)V + invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUserGuildSettings;->handleGuildSettingUpdated$app_productionDiscordExternalRelease(Ljava/util/List;)V return-void .end method @@ -5033,7 +5053,7 @@ iget-object v0, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher; - const/16 v1, 0x23 + const/16 v1, 0x24 new-array v1, v1, [Lcom/discord/stores/DispatchHandler; @@ -5309,7 +5329,7 @@ aput-object v2, v1, v3 - iget-object v2, p0, Lcom/discord/stores/StoreStream;->entitlements:Lcom/discord/stores/StoreEntitlements; + iget-object v2, p0, Lcom/discord/stores/StoreStream;->mentions:Lcom/discord/stores/StoreMentions; check-cast v2, Lcom/discord/stores/DispatchHandler; @@ -5317,6 +5337,14 @@ aput-object v2, v1, v3 + iget-object v2, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings; + + check-cast v2, Lcom/discord/stores/DispatchHandler; + + const/16 v3, 0x23 + + aput-object v2, v1, v3 + invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->registerDispatchHandlers([Lcom/discord/stores/DispatchHandler;)V return-void diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$get$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$get$1.smali new file mode 100644 index 0000000000..40723542d7 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$get$1.smali @@ -0,0 +1,96 @@ +.class final Lcom/discord/stores/StoreUserGuildSettings$get$1; +.super Ljava/lang/Object; +.source "StoreUserGuildSettings.kt" + +# interfaces +.implements Lrx/functions/b; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserGuildSettings;->get(J)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/b<", + "TT;TR;>;" + } +.end annotation + + +# instance fields +.field final synthetic $guildId:J + + +# direct methods +.method constructor (J)V + .locals 0 + + iput-wide p1, p0, Lcom/discord/stores/StoreUserGuildSettings$get$1;->$guildId:J + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final call(Ljava/util/Map;)Lcom/discord/models/domain/ModelUserGuildSettings; + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "+", + "Lcom/discord/models/domain/ModelUserGuildSettings;", + ">;)", + "Lcom/discord/models/domain/ModelUserGuildSettings;" + } + .end annotation + + iget-wide v0, p0, Lcom/discord/stores/StoreUserGuildSettings$get$1;->$guildId:J + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object p1 + + check-cast p1, Lcom/discord/models/domain/ModelUserGuildSettings; + + if-nez p1, :cond_0 + + new-instance p1, Lcom/discord/models/domain/ModelUserGuildSettings; + + invoke-direct {p1}, Lcom/discord/models/domain/ModelUserGuildSettings;->()V + + :cond_0 + return-object p1 +.end method + +.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/util/Map; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$get$1;->call(Ljava/util/Map;)Lcom/discord/models/domain/ModelUserGuildSettings; + + move-result-object p1 + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1.smali new file mode 100644 index 0000000000..18c727af70 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1.smali @@ -0,0 +1,88 @@ +.class final Lcom/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1; +.super Ljava/lang/Object; +.source "StoreUserGuildSettings.kt" + +# interfaces +.implements Lrx/functions/b; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserGuildSettings;->getHideMutedChannels(J)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/b<", + "TT;TR;>;" + } +.end annotation + + +# instance fields +.field final synthetic $guildId:J + + +# direct methods +.method constructor (J)V + .locals 0 + + iput-wide p1, p0, Lcom/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1;->$guildId:J + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/util/Set; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1;->call(Ljava/util/Set;)Z + + move-result p1 + + invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Ljava/util/Set;)Z + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Set<", + "Ljava/lang/Long;", + ">;)Z" + } + .end annotation + + iget-wide v0, p0, Lcom/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1;->$guildId:J + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + invoke-interface {p1, v0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z + + move-result p1 + + return p1 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.smali new file mode 100644 index 0000000000..262dfbe053 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$1.smali @@ -0,0 +1,84 @@ +.class final Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$1; +.super Lkotlin/jvm/internal/m; +.source "StoreUserGuildSettings.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserGuildSettings;->handleGuildSettings(Ljava/util/List;)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lkotlin/jvm/internal/m;", + "Lkotlin/jvm/functions/Function1<", + "Lrx/Subscription;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field final synthetic this$0:Lcom/discord/stores/StoreUserGuildSettings; + + +# direct methods +.method constructor (Lcom/discord/stores/StoreUserGuildSettings;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings; + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;->(I)V + + return-void +.end method + + +# virtual methods +.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lrx/Subscription; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$1;->invoke(Lrx/Subscription;)V + + sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit; + + return-object p1 +.end method + +.method public final invoke(Lrx/Subscription;)V + .locals 1 + + const-string v0, "subscription" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings; + + invoke-static {v0}, Lcom/discord/stores/StoreUserGuildSettings;->access$getRecomputeSettingsSubscription$p(Lcom/discord/stores/StoreUserGuildSettings;)Lrx/Subscription; + + move-result-object v0 + + if-eqz v0, :cond_0 + + invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V + + :cond_0 + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings; + + invoke-static {v0, p1}, Lcom/discord/stores/StoreUserGuildSettings;->access$setRecomputeSettingsSubscription$p(Lcom/discord/stores/StoreUserGuildSettings;Lrx/Subscription;)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1.smali new file mode 100644 index 0000000000..38097b0396 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1.smali @@ -0,0 +1,68 @@ +.class final Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1; +.super Lkotlin/jvm/internal/m; +.source "StoreUserGuildSettings.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function0; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2;->invoke(Ljava/lang/Long;)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lkotlin/jvm/internal/m;", + "Lkotlin/jvm/functions/Function0<", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field final synthetic this$0:Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2; + + +# direct methods +.method constructor (Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2; + + const/4 p1, 0x0 + + invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;->(I)V + + return-void +.end method + + +# virtual methods +.method public final bridge synthetic invoke()Ljava/lang/Object; + .locals 1 + + invoke-virtual {p0}, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1;->invoke()V + + sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit; + + return-object v0 +.end method + +.method public final invoke()V + .locals 1 + + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2; + + iget-object v0, v0, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2;->this$0:Lcom/discord/stores/StoreUserGuildSettings; + + invoke-static {v0}, Lcom/discord/stores/StoreUserGuildSettings;->access$recomputeMuteConfigs(Lcom/discord/stores/StoreUserGuildSettings;)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2.smali new file mode 100644 index 0000000000..95312942e1 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$handleGuildSettings$2.smali @@ -0,0 +1,79 @@ +.class final Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2; +.super Lkotlin/jvm/internal/m; +.source "StoreUserGuildSettings.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserGuildSettings;->handleGuildSettings(Ljava/util/List;)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lkotlin/jvm/internal/m;", + "Lkotlin/jvm/functions/Function1<", + "Ljava/lang/Long;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field final synthetic this$0:Lcom/discord/stores/StoreUserGuildSettings; + + +# direct methods +.method constructor (Lcom/discord/stores/StoreUserGuildSettings;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2;->this$0:Lcom/discord/stores/StoreUserGuildSettings; + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;->(I)V + + return-void +.end method + + +# virtual methods +.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/lang/Long; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2;->invoke(Ljava/lang/Long;)V + + sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit; + + return-object p1 +.end method + +.method public final invoke(Ljava/lang/Long;)V + .locals 1 + + iget-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2;->this$0:Lcom/discord/stores/StoreUserGuildSettings; + + invoke-static {p1}, Lcom/discord/stores/StoreUserGuildSettings;->access$getDispatcher$p(Lcom/discord/stores/StoreUserGuildSettings;)Lcom/discord/stores/Dispatcher; + + move-result-object p1 + + new-instance v0, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1; + + invoke-direct {v0, p0}, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2$1;->(Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2;)V + + check-cast v0, Lkotlin/jvm/functions/Function0; + + invoke-virtual {p1, v0}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1.smali new file mode 100644 index 0000000000..a13154d295 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1.smali @@ -0,0 +1,90 @@ +.class final Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1; +.super Ljava/lang/Object; +.source "StoreUserGuildSettings.kt" + +# interfaces +.implements Lrx/functions/b; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1;->call(Ljava/util/Map;)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/b<", + "Lcom/discord/models/domain/ModelUserGuildSettings;", + "Ljava/lang/Boolean;", + ">;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1; + + +# direct methods +.method static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1; + + invoke-direct {v0}, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1;->()V + + sput-object v0, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1;->INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1; + + return-void +.end method + +.method constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lcom/discord/models/domain/ModelUserGuildSettings; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1;->call(Lcom/discord/models/domain/ModelUserGuildSettings;)Z + + move-result p1 + + invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Lcom/discord/models/domain/ModelUserGuildSettings;)Z + .locals 1 + + const-string v0, "setting" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserGuildSettings;->isMuted()Z + + move-result p1 + + return p1 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2.smali new file mode 100644 index 0000000000..d225464870 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2.smali @@ -0,0 +1,88 @@ +.class final Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2; +.super Ljava/lang/Object; +.source "StoreUserGuildSettings.kt" + +# interfaces +.implements Lrx/functions/b; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1;->call(Ljava/util/Map;)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/b<", + "TT;TR;>;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2; + + +# direct methods +.method static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2; + + invoke-direct {v0}, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2;->()V + + sput-object v0, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2;->INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2; + + return-void +.end method + +.method constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final call(Lcom/discord/models/domain/ModelUserGuildSettings;)J + .locals 2 + + const-string v0, "setting" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserGuildSettings;->getGuildId()J + + move-result-wide v0 + + return-wide v0 +.end method + +.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 2 + + check-cast p1, Lcom/discord/models/domain/ModelUserGuildSettings; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2;->call(Lcom/discord/models/domain/ModelUserGuildSettings;)J + + move-result-wide v0 + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object p1 + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1.smali new file mode 100644 index 0000000000..f896621672 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$mutedGuildIds$1.smali @@ -0,0 +1,124 @@ +.class final Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1; +.super Ljava/lang/Object; +.source "StoreUserGuildSettings.kt" + +# interfaces +.implements Lrx/functions/b; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserGuildSettings;->getMutedGuildIds()Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/b<", + "TT;", + "Lrx/Observable<", + "+TR;>;>;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1; + + +# direct methods +.method static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1; + + invoke-direct {v0}, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1;->()V + + sput-object v0, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1;->INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1; + + return-void +.end method + +.method constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/util/Map; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1;->call(Ljava/util/Map;)Lrx/Observable; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Ljava/util/Map;)Lrx/Observable; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "+", + "Lcom/discord/models/domain/ModelUserGuildSettings;", + ">;)", + "Lrx/Observable<", + "Ljava/util/List<", + "Ljava/lang/Long;", + ">;>;" + } + .end annotation + + invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection; + + move-result-object p1 + + check-cast p1, Ljava/lang/Iterable; + + invoke-static {p1}, Lrx/Observable;->m(Ljava/lang/Iterable;)Lrx/Observable; + + move-result-object p1 + + sget-object v0, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1;->INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$1; + + check-cast v0, Lrx/functions/b; + + invoke-virtual {p1, v0}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable; + + move-result-object p1 + + sget-object v0, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2;->INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1$2; + + check-cast v0, Lrx/functions/b; + + invoke-virtual {p1, v0}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable; + + move-result-object p1 + + sget-object v0, Lrx/internal/a/ba$a;->bKX:Lrx/internal/a/ba; + + invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable; + + move-result-object p1 + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1.smali new file mode 100644 index 0000000000..55cf5fa558 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1.smali @@ -0,0 +1,128 @@ +.class final Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1; +.super Lkotlin/jvm/internal/m; +.source "StoreUserGuildSettings.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function0; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserGuildSettings;->setHideMutedChannels(JZ)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lkotlin/jvm/internal/m;", + "Lkotlin/jvm/functions/Function0<", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field final synthetic $guildId:J + +.field final synthetic $hideChannels:Z + +.field final synthetic this$0:Lcom/discord/stores/StoreUserGuildSettings; + + +# direct methods +.method constructor (Lcom/discord/stores/StoreUserGuildSettings;ZJ)V + .locals 0 + + iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings; + + iput-boolean p2, p0, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->$hideChannels:Z + + iput-wide p3, p0, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->$guildId:J + + const/4 p1, 0x0 + + invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;->(I)V + + return-void +.end method + + +# virtual methods +.method public final bridge synthetic invoke()Ljava/lang/Object; + .locals 1 + + invoke-virtual {p0}, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->invoke()V + + sget-object v0, Lkotlin/Unit;->bgy:Lkotlin/Unit; + + return-object v0 +.end method + +.method public final invoke()V + .locals 3 + + iget-boolean v0, p0, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->$hideChannels:Z + + if-eqz v0, :cond_0 + + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings; + + invoke-static {v0}, Lcom/discord/stores/StoreUserGuildSettings;->access$getShowHideMutedChannels$p(Lcom/discord/stores/StoreUserGuildSettings;)Ljava/util/HashSet; + + move-result-object v0 + + iget-wide v1, p0, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->$guildId:J + + invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v1 + + invoke-virtual {v0, v1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z + + goto :goto_0 + + :cond_0 + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings; + + invoke-static {v0}, Lcom/discord/stores/StoreUserGuildSettings;->access$getShowHideMutedChannels$p(Lcom/discord/stores/StoreUserGuildSettings;)Ljava/util/HashSet; + + move-result-object v0 + + iget-wide v1, p0, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->$guildId:J + + invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v1 + + invoke-virtual {v0, v1}, Ljava/util/HashSet;->remove(Ljava/lang/Object;)Z + + :goto_0 + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings; + + invoke-static {v0}, Lcom/discord/stores/StoreUserGuildSettings;->access$getHideMutedChannelsPublisher$p(Lcom/discord/stores/StoreUserGuildSettings;)Lcom/discord/utilities/persister/Persister; + + move-result-object v0 + + new-instance v1, Ljava/util/HashSet; + + iget-object v2, p0, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings; + + invoke-static {v2}, Lcom/discord/stores/StoreUserGuildSettings;->access$getShowHideMutedChannels$p(Lcom/discord/stores/StoreUserGuildSettings;)Ljava/util/HashSet; + + move-result-object v2 + + check-cast v2, Ljava/util/Collection; + + invoke-direct {v1, v2}, Ljava/util/HashSet;->(Ljava/util/Collection;)V + + const/4 v2, 0x1 + + invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object; + + return-void +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1.smali new file mode 100644 index 0000000000..ba97fde1bb --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1.smali @@ -0,0 +1,83 @@ +.class final Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1; +.super Lkotlin/jvm/internal/m; +.source "StoreUserGuildSettings.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lkotlin/jvm/internal/m;", + "Lkotlin/jvm/functions/Function1<", + "Lcom/discord/models/domain/ModelUserGuildSettings;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field final synthetic $context:Landroid/content/Context; + +.field final synthetic $successString:I + + +# direct methods +.method constructor (Landroid/content/Context;I)V + .locals 0 + + iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->$context:Landroid/content/Context; + + iput p2, p0, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->$successString:I + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lkotlin/jvm/internal/m;->(I)V + + return-void +.end method + + +# virtual methods +.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lcom/discord/models/domain/ModelUserGuildSettings; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->invoke(Lcom/discord/models/domain/ModelUserGuildSettings;)V + + sget-object p1, Lkotlin/Unit;->bgy:Lkotlin/Unit; + + return-object p1 +.end method + +.method public final invoke(Lcom/discord/models/domain/ModelUserGuildSettings;)V + .locals 3 + + const-string v0, "it" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + iget-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->$context:Landroid/content/Context; + + iget v0, p0, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->$successString:I + + const/4 v1, 0x0 + + const/16 v2, 0xc + + invoke-static {p1, v0, v1, v2}, Lcom/discord/app/h;->a(Landroid/content/Context;III)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali index e824571559..a751041bf9 100644 --- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali @@ -1,12 +1,17 @@ -.class public Lcom/discord/stores/StoreUserGuildSettings; +.class public final Lcom/discord/stores/StoreUserGuildSettings; .super Lcom/discord/stores/Store; -.source "StoreUserGuildSettings.java" +.source "StoreUserGuildSettings.kt" + +# interfaces +.implements Lcom/discord/stores/DispatchHandler; # instance fields -.field private final $lock:Ljava/lang/Object; +.field private final clock:Lcom/discord/utilities/clocks/Clock; -.field final guildSettings:Ljava/util/Map; +.field private final dispatcher:Lcom/discord/stores/Dispatcher; + +.field private final guildSettings:Ljava/util/Map; .annotation system Ldalvik/annotation/Signature; value = { "Ljava/util/Map<", @@ -40,10 +45,14 @@ .end annotation .end field -.field private final showHideMutedChannels:Ljava/util/Set; +.field private isDirty:Z + +.field private recomputeSettingsSubscription:Lrx/Subscription; + +.field private final showHideMutedChannels:Ljava/util/HashSet; .annotation system Ldalvik/annotation/Signature; value = { - "Ljava/util/Set<", + "Ljava/util/HashSet<", "Ljava/lang/Long;", ">;" } @@ -52,58 +61,114 @@ # direct methods -.method public constructor ()V - .locals 3 +.method public constructor (Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/clocks/Clock;)V + .locals 1 + + const-string v0, "dispatcher" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "clock" + + invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-direct {p0}, Lcom/discord/stores/Store;->()V - const/4 v0, 0x0 + iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->dispatcher:Lcom/discord/stores/Dispatcher; - new-array v0, v0, [Ljava/lang/Object; + iput-object p2, p0, Lcom/discord/stores/StoreUserGuildSettings;->clock:Lcom/discord/utilities/clocks/Clock; - iput-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->$lock:Ljava/lang/Object; + new-instance p1, Ljava/util/HashMap; - new-instance v0, Ljava/util/HashMap; + invoke-direct {p1}, Ljava/util/HashMap;->()V - invoke-direct {v0}, Ljava/util/HashMap;->()V + check-cast p1, Ljava/util/Map; - iput-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; + iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; - new-instance v0, Ljava/util/HashSet; + new-instance p1, Ljava/util/HashSet; - invoke-direct {v0}, Ljava/util/HashSet;->()V + invoke-direct {p1}, Ljava/util/HashSet;->()V - iput-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->showHideMutedChannels:Ljava/util/Set; + iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->showHideMutedChannels:Ljava/util/HashSet; - new-instance v0, Lcom/discord/utilities/persister/Persister; + new-instance p1, Lcom/discord/utilities/persister/Persister; - new-instance v1, Ljava/util/HashMap; + new-instance p2, Ljava/util/HashMap; - invoke-direct {v1}, Ljava/util/HashMap;->()V + invoke-direct {p2}, Ljava/util/HashMap;->()V - const-string v2, "STORE_SETTINGS_USER_GUILD_V4" + const-string v0, "STORE_SETTINGS_USER_GUILD_V4" - invoke-direct {v0, v2, v1}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V + invoke-direct {p1, v0, p2}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V - iput-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettingsPublisher:Lcom/discord/utilities/persister/Persister; + iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettingsPublisher:Lcom/discord/utilities/persister/Persister; - new-instance v0, Lcom/discord/utilities/persister/Persister; + new-instance p1, Lcom/discord/utilities/persister/Persister; - new-instance v1, Ljava/util/HashSet; + new-instance p2, Ljava/util/HashSet; - invoke-direct {v1}, Ljava/util/HashSet;->()V + invoke-direct {p2}, Ljava/util/HashSet;->()V - const-string v2, "STORE_SHOW_HIDE_MUTED_CHANNELS_V2" + const-string v0, "STORE_SHOW_HIDE_MUTED_CHANNELS_V2" - invoke-direct {v0, v2, v1}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V + invoke-direct {p1, v0, p2}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V - iput-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->hideMutedChannelsPublisher:Lcom/discord/utilities/persister/Persister; + iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->hideMutedChannelsPublisher:Lcom/discord/utilities/persister/Persister; return-void .end method -.method private handleGuildSettings(Ljava/util/List;)V - .locals 5 +.method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreUserGuildSettings;)Lcom/discord/stores/Dispatcher; + .locals 0 + + iget-object p0, p0, Lcom/discord/stores/StoreUserGuildSettings;->dispatcher:Lcom/discord/stores/Dispatcher; + + return-object p0 +.end method + +.method public static final synthetic access$getHideMutedChannelsPublisher$p(Lcom/discord/stores/StoreUserGuildSettings;)Lcom/discord/utilities/persister/Persister; + .locals 0 + + iget-object p0, p0, Lcom/discord/stores/StoreUserGuildSettings;->hideMutedChannelsPublisher:Lcom/discord/utilities/persister/Persister; + + return-object p0 +.end method + +.method public static final synthetic access$getRecomputeSettingsSubscription$p(Lcom/discord/stores/StoreUserGuildSettings;)Lrx/Subscription; + .locals 0 + + iget-object p0, p0, Lcom/discord/stores/StoreUserGuildSettings;->recomputeSettingsSubscription:Lrx/Subscription; + + return-object p0 +.end method + +.method public static final synthetic access$getShowHideMutedChannels$p(Lcom/discord/stores/StoreUserGuildSettings;)Ljava/util/HashSet; + .locals 0 + + iget-object p0, p0, Lcom/discord/stores/StoreUserGuildSettings;->showHideMutedChannels:Ljava/util/HashSet; + + return-object p0 +.end method + +.method public static final synthetic access$recomputeMuteConfigs(Lcom/discord/stores/StoreUserGuildSettings;)V + .locals 0 + + invoke-direct {p0}, Lcom/discord/stores/StoreUserGuildSettings;->recomputeMuteConfigs()V + + return-void +.end method + +.method public static final synthetic access$setRecomputeSettingsSubscription$p(Lcom/discord/stores/StoreUserGuildSettings;Lrx/Subscription;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->recomputeSettingsSubscription:Lrx/Subscription; + + return-void +.end method + +.method private final handleGuildSettings(Ljava/util/List;)V + .locals 13 .annotation runtime Lcom/discord/stores/StoreThread; .end annotation @@ -111,209 +176,248 @@ value = { "(", "Ljava/util/List<", + "+", "Lcom/discord/models/domain/ModelUserGuildSettings;", ">;)V" } .end annotation + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->recomputeSettingsSubscription:Lrx/Subscription; + + if-eqz v0, :cond_0 + + invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V + + :cond_0 invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator; move-result-object p1 - const/4 v0, 0x0 + const-wide v0, 0x7fffffffffffffffL - :cond_0 + move-wide v2, v0 + + :cond_1 :goto_0 invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z - move-result v1 + move-result v4 - if-eqz v1, :cond_1 + if-eqz v4, :cond_2 invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - check-cast v1, Lcom/discord/models/domain/ModelUserGuildSettings; + check-cast v4, Lcom/discord/models/domain/ModelUserGuildSettings; - if-eqz v1, :cond_0 + iget-object v5, p0, Lcom/discord/stores/StoreUserGuildSettings;->clock:Lcom/discord/utilities/clocks/Clock; - iget-object v2, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; + invoke-virtual {v4, v5}, Lcom/discord/models/domain/ModelUserGuildSettings;->copyAndRecomputeTransientFields(Lcom/discord/utilities/clocks/Clock;)Lcom/discord/models/domain/ModelUserGuildSettings; - invoke-virtual {v1}, Lcom/discord/models/domain/ModelUserGuildSettings;->getGuildId()J + move-result-object v4 - move-result-wide v3 + iget-object v5, p0, Lcom/discord/stores/StoreUserGuildSettings;->clock:Lcom/discord/utilities/clocks/Clock; - invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-virtual {v4, v5}, Lcom/discord/models/domain/ModelUserGuildSettings;->getNextMuteEndTimeMs(Lcom/discord/utilities/clocks/Clock;)J - move-result-object v3 + move-result-wide v5 - invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object v2 - - invoke-virtual {v1, v2}, Lcom/discord/models/domain/ModelUserGuildSettings;->equals(Ljava/lang/Object;)Z - - move-result v2 - - if-nez v2, :cond_0 - - iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; - - invoke-virtual {v1}, Lcom/discord/models/domain/ModelUserGuildSettings;->getGuildId()J + invoke-static {v2, v3, v5, v6}, Ljava/lang/Math;->min(JJ)J move-result-wide v2 - invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + iget-object v5, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; - move-result-object v2 + const-string v6, "computedSettings" - invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-static {v4, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const/4 v0, 0x1 + invoke-virtual {v4}, Lcom/discord/models/domain/ModelUserGuildSettings;->getGuildId()J + + move-result-wide v6 + + invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v6 + + invoke-interface {v5, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v5 + + check-cast v5, Lcom/discord/models/domain/ModelUserGuildSettings; + + invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result v5 + + const/4 v6, 0x1 + + xor-int/2addr v5, v6 + + if-eqz v5, :cond_1 + + iget-object v5, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; + + invoke-virtual {v4}, Lcom/discord/models/domain/ModelUserGuildSettings;->getGuildId()J + + move-result-wide v7 + + invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v7 + + invoke-interface {v5, v7, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + + iput-boolean v6, p0, Lcom/discord/stores/StoreUserGuildSettings;->isDirty:Z goto :goto_0 - :cond_1 - if-eqz v0, :cond_2 - - iget-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettingsPublisher:Lcom/discord/utilities/persister/Persister; - - new-instance v0, Ljava/util/HashMap; - - iget-object v1, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; - - invoke-direct {v0, v1}, Ljava/util/HashMap;->(Ljava/util/Map;)V - - invoke-virtual {p1, v0}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;)Ljava/lang/Object; - :cond_2 - return-void -.end method + cmp-long p1, v2, v0 -.method static synthetic lambda$get$1(JLjava/util/Map;)Lcom/discord/models/domain/ModelUserGuildSettings; - .locals 0 + if-gez p1, :cond_3 - invoke-static {p0, p1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + iget-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->clock:Lcom/discord/utilities/clocks/Clock; - move-result-object p0 - - invoke-interface {p2, p0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object p0 - - check-cast p0, Lcom/discord/models/domain/ModelUserGuildSettings; - - return-object p0 -.end method - -.method static synthetic lambda$get$2(Lcom/discord/models/domain/ModelUserGuildSettings;)Lcom/discord/models/domain/ModelUserGuildSettings; - .locals 0 - - if-eqz p0, :cond_0 - - return-object p0 - - :cond_0 - new-instance p0, Lcom/discord/models/domain/ModelUserGuildSettings; - - invoke-direct {p0}, Lcom/discord/models/domain/ModelUserGuildSettings;->()V - - return-object p0 -.end method - -.method static synthetic lambda$getHideMutedChannels$0(JLjava/util/Set;)Ljava/lang/Boolean; - .locals 0 - - invoke-static {p0, p1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - - move-result-object p0 - - invoke-interface {p2, p0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z - - move-result p0 - - invoke-static {p0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; - - move-result-object p0 - - return-object p0 -.end method - -.method static synthetic lambda$getMuted$5(Ljava/util/Map;)Lrx/Observable; - .locals 1 - - invoke-interface {p0}, Ljava/util/Map;->values()Ljava/util/Collection; - - move-result-object p0 - - invoke-static {p0}, Lrx/Observable;->m(Ljava/lang/Iterable;)Lrx/Observable; - - move-result-object p0 - - sget-object v0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4;->INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$U4SbAP8nl3XZYX4RapeY11Chko4; - - invoke-virtual {p0, v0}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable; - - move-result-object p0 - - sget-object v0, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg;->INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$mCtfaPvHPPMEZyCMQpNcbb2vtGg; - - invoke-virtual {p0, v0}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable; - - move-result-object p0 - - invoke-static {}, Lrx/internal/a/ba;->JL()Lrx/internal/a/ba; - - move-result-object v0 - - invoke-virtual {p0, v0}, Lrx/Observable;->a(Lrx/Observable$b;)Lrx/Observable; - - move-result-object p0 - - return-object p0 -.end method - -.method static synthetic lambda$null$3(Lcom/discord/models/domain/ModelUserGuildSettings;)Ljava/lang/Boolean; - .locals 0 - - invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserGuildSettings;->isMuted()Z - - move-result p0 - - invoke-static {p0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; - - move-result-object p0 - - return-object p0 -.end method - -.method static synthetic lambda$null$4(Lcom/discord/models/domain/ModelUserGuildSettings;)Ljava/lang/Long; - .locals 2 - - invoke-virtual {p0}, Lcom/discord/models/domain/ModelUserGuildSettings;->getGuildId()J + invoke-interface {p1}, Lcom/discord/utilities/clocks/Clock;->currentTimeMillis()J move-result-wide v0 - invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + sub-long/2addr v2, v0 - move-result-object p0 + sget-object p1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; - return-object p0 + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->dispatcher:Lcom/discord/stores/Dispatcher; + + invoke-virtual {v0}, Lcom/discord/stores/Dispatcher;->getScheduler()Lrx/Scheduler; + + move-result-object v0 + + invoke-static {v2, v3, p1, v0}, Lrx/Observable;->a(JLjava/util/concurrent/TimeUnit;Lrx/Scheduler;)Lrx/Observable; + + move-result-object v4 + + const-string p1, "Observable.timer(\n \u2026patcher.scheduler\n )" + + invoke-static {v4, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; + + move-result-object v5 + + const/4 v6, 0x0 + + new-instance p1, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$1; + + invoke-direct {p1, p0}, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$1;->(Lcom/discord/stores/StoreUserGuildSettings;)V + + move-object v7, p1 + + check-cast v7, Lkotlin/jvm/functions/Function1; + + const/4 v8, 0x0 + + const/4 v9, 0x0 + + new-instance p1, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2; + + invoke-direct {p1, p0}, Lcom/discord/stores/StoreUserGuildSettings$handleGuildSettings$2;->(Lcom/discord/stores/StoreUserGuildSettings;)V + + move-object v10, p1 + + check-cast v10, Lkotlin/jvm/functions/Function1; + + const/16 v11, 0x1a + + const/4 v12, 0x0 + + invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + + :cond_3 + return-void .end method -.method static synthetic lambda$updateUserGuildSettings$6(Landroid/content/Context;ILcom/discord/models/domain/ModelUserGuildSettings;)V - .locals 0 +.method private final recomputeMuteConfigs()V + .locals 2 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation - invoke-static {p0, p1}, Lcom/discord/app/h;->show(Landroid/content/Context;I)V + new-instance v0, Ljava/util/ArrayList; + + iget-object v1, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; + + invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection; + + move-result-object v1 + + invoke-direct {v0, v1}, Ljava/util/ArrayList;->(Ljava/util/Collection;)V + + check-cast v0, Ljava/util/List; + + invoke-virtual {p0, v0}, Lcom/discord/stores/StoreUserGuildSettings;->handleGuildSettingUpdated$app_productionDiscordExternalRelease(Ljava/util/List;)V return-void .end method -.method private updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V - .locals 1 +.method public static synthetic setGuildToggles$default(Lcom/discord/stores/StoreUserGuildSettings;Landroid/content/Context;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;ILjava/lang/Object;)V + .locals 7 - invoke-static {}, Lcom/discord/utilities/rest/RestAPI;->getApi()Lcom/discord/utilities/rest/RestAPI; + and-int/lit8 p7, p6, 0x4 + + const/4 v0, 0x0 + + if-eqz p7, :cond_0 + + move-object v4, v0 + + goto :goto_0 + + :cond_0 + move-object v4, p3 + + :goto_0 + and-int/lit8 p3, p6, 0x8 + + if-eqz p3, :cond_1 + + move-object v5, v0 + + goto :goto_1 + + :cond_1 + move-object v5, p4 + + :goto_1 + and-int/lit8 p3, p6, 0x10 + + if-eqz p3, :cond_2 + + move-object v6, v0 + + goto :goto_2 + + :cond_2 + move-object v6, p5 + + :goto_2 + move-object v1, p0 + + move-object v2, p1 + + move-object v3, p2 + + invoke-virtual/range {v1 .. v6}, Lcom/discord/stores/StoreUserGuildSettings;->setGuildToggles(Landroid/content/Context;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V + + return-void +.end method + +.method private final updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V + .locals 9 + + sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion; + + invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI; move-result-object v0 @@ -321,39 +425,53 @@ move-result-object p2 - invoke-static {}, Lcom/discord/app/i;->dN()Lrx/Observable$c; + const/4 p3, 0x0 - move-result-object p3 + const/4 p4, 0x1 - invoke-virtual {p2, p3}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable; + const/4 v0, 0x0 + + invoke-static {p2, p3, p4, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable; move-result-object p2 - invoke-static {}, Lcom/discord/app/i;->dL()Lrx/Observable$c; + invoke-static {p2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui(Lrx/Observable;)Lrx/Observable; - move-result-object p3 + move-result-object v0 - invoke-virtual {p2, p3}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable; + invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - move-result-object p2 + move-result-object v1 - new-instance p3, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$xAuTarfGExPiAI2-XFgTbp3HIP4; + new-instance p2, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1; - invoke-direct {p3, p1, p5}, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$xAuTarfGExPiAI2-XFgTbp3HIP4;->(Landroid/content/Context;I)V + invoke-direct {p2, p1, p5}, Lcom/discord/stores/StoreUserGuildSettings$updateUserGuildSettings$1;->(Landroid/content/Context;I)V - invoke-static {p3, p1}, Lcom/discord/app/i;->b(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c; + move-object v6, p2 - move-result-object p1 + check-cast v6, Lkotlin/jvm/functions/Function1; - invoke-virtual {p2, p1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable; + const/4 v3, 0x0 + + const/4 v4, 0x0 + + const/4 v5, 0x0 + + const/16 v7, 0x1c + + const/4 v8, 0x0 + + move-object v2, p1 + + invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V return-void .end method # virtual methods -.method public get()Lrx/Observable; - .locals 2 +.method public final get()Lrx/Observable; + .locals 1 .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -371,18 +489,14 @@ move-result-object v0 - invoke-static {}, Lcom/discord/app/i;->dO()Lrx/Observable$c; - - move-result-object v1 - - invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable; + invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable; move-result-object v0 return-object v0 .end method -.method public get(J)Lrx/Observable; +.method public final get(J)Lrx/Observable; .locals 2 .annotation system Ldalvik/annotation/Signature; value = { @@ -399,20 +513,16 @@ move-result-object v0 - new-instance v1, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$CKg3Y3f26LcafhVO_loewL4XViw; + new-instance v1, Lcom/discord/stores/StoreUserGuildSettings$get$1; - invoke-direct {v1, p1, p2}, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$CKg3Y3f26LcafhVO_loewL4XViw;->(J)V + invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreUserGuildSettings$get$1;->(J)V + + check-cast v1, Lrx/functions/b; invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable; move-result-object p1 - sget-object p2, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs;->INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$JIzKtlo9h0Kzlbukmhbp5tUJhMs; - - invoke-virtual {p1, p2}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable; - - move-result-object p1 - invoke-static {}, Lrx/internal/a/ae;->Jr()Lrx/internal/a/ae; move-result-object p2 @@ -421,10 +531,31 @@ move-result-object p1 + const-string p2, "guildSettingsPublisher\n \u2026 .distinctUntilChanged()" + + invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + return-object p1 .end method -.method public getHideMutedChannels(J)Lrx/Observable; +.method public final getGuildSettings$app_productionDiscordExternalRelease()Ljava/util/Map; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/models/domain/ModelUserGuildSettings;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; + + return-object v0 +.end method + +.method public final getHideMutedChannels(J)Lrx/Observable; .locals 2 .annotation system Ldalvik/annotation/Signature; value = { @@ -441,9 +572,11 @@ move-result-object v0 - new-instance v1, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$_UmCUPV1EvBeHiZpKveX_lMTlLE; + new-instance v1, Lcom/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1; - invoke-direct {v1, p1, p2}, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$_UmCUPV1EvBeHiZpKveX_lMTlLE;->(J)V + invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreUserGuildSettings$getHideMutedChannels$1;->(J)V + + check-cast v1, Lrx/functions/b; invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable; @@ -457,10 +590,14 @@ move-result-object p1 + const-string p2, "hideMutedChannelsPublish\u2026 .distinctUntilChanged()" + + invoke-static {p1, p2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + return-object p1 .end method -.method public getMuted()Lrx/Observable; +.method public final getMutedGuildIds()Lrx/Observable; .locals 2 .annotation system Ldalvik/annotation/Signature; value = { @@ -476,7 +613,9 @@ move-result-object v0 - sget-object v1, Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU;->INSTANCE:Lcom/discord/stores/-$$Lambda$StoreUserGuildSettings$3_wfNdqftcJSlhKnFVf-RHo4VZU; + sget-object v1, Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1;->INSTANCE:Lcom/discord/stores/StoreUserGuildSettings$mutedGuildIds$1; + + check-cast v1, Lrx/functions/b; invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable; @@ -490,14 +629,22 @@ move-result-object v0 + const-string v1, "get()\n .switchMap\u2026 .distinctUntilChanged()" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + return-object v0 .end method -.method handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V +.method public final handleConnectionOpen$app_productionDiscordExternalRelease(Lcom/discord/models/domain/ModelPayload;)V .locals 1 .annotation runtime Lcom/discord/stores/StoreThread; .end annotation + const-string v0, "payload" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; invoke-interface {v0}, Ljava/util/Map;->clear()V @@ -506,13 +653,21 @@ move-result-object p1 + const-string v0, "payload.userGuildSettings" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-direct {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings;->handleGuildSettings(Ljava/util/List;)V + const/4 p1, 0x1 + + iput-boolean p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->isDirty:Z + return-void .end method -.method handleGuildSettingUpdated(Ljava/util/List;)V - .locals 0 +.method public final handleGuildSettingUpdated$app_productionDiscordExternalRelease(Ljava/util/List;)V + .locals 1 .annotation runtime Lcom/discord/stores/StoreThread; .end annotation @@ -520,68 +675,104 @@ value = { "(", "Ljava/util/List<", + "+", "Lcom/discord/models/domain/ModelUserGuildSettings;", ">;)V" } .end annotation + const-string v0, "guildSettingsList" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-direct {p0, p1}, Lcom/discord/stores/StoreUserGuildSettings;->handleGuildSettings(Ljava/util/List;)V + const/4 p1, 0x1 + + iput-boolean p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->isDirty:Z + return-void .end method -.method public init(Landroid/content/Context;)V - .locals 2 +.method public final init(Landroid/content/Context;)V + .locals 1 + + const-string v0, "context" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V - iget-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->hideMutedChannelsPublisher:Lcom/discord/utilities/persister/Persister; + iget-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->showHideMutedChannels:Ljava/util/HashSet; - invoke-virtual {p1}, Lcom/discord/utilities/persister/Persister;->getObservable()Lrx/Observable; + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->hideMutedChannelsPublisher:Lcom/discord/utilities/persister/Persister; - move-result-object p1 - - invoke-static {}, Lcom/discord/app/i;->dQ()Lrx/Observable$c; + invoke-virtual {v0}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object; move-result-object v0 - invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable; + check-cast v0, Ljava/util/Collection; - move-result-object p1 - - iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->showHideMutedChannels:Ljava/util/Set; - - invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - - new-instance v1, Lcom/discord/stores/-$$Lambda$0UyPDl1dK0kI7uSVBuqxhyISp_w; - - invoke-direct {v1, v0}, Lcom/discord/stores/-$$Lambda$0UyPDl1dK0kI7uSVBuqxhyISp_w;->(Ljava/util/Set;)V - - invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - - move-result-object v0 - - invoke-static {v1, v0}, Lcom/discord/app/i;->a(Lrx/functions/Action1;Ljava/lang/Class;)Lrx/Observable$c; - - move-result-object v0 - - invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable; + invoke-virtual {p1, v0}, Ljava/util/HashSet;->addAll(Ljava/util/Collection;)Z return-void .end method -.method public setChannelFrequency(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;I)V - .locals 7 +.method public final onDispatchEnded()V + .locals 5 + + iget-boolean v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->isDirty:Z + + if-nez v0, :cond_0 + + return-void + + :cond_0 + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettingsPublisher:Lcom/discord/utilities/persister/Persister; + + new-instance v1, Ljava/util/HashMap; + + iget-object v2, p0, Lcom/discord/stores/StoreUserGuildSettings;->guildSettings:Ljava/util/Map; + + invoke-direct {v1, v2}, Ljava/util/HashMap;->(Ljava/util/Map;)V + + const/4 v2, 0x2 + + const/4 v3, 0x0 + + const/4 v4, 0x0 + + invoke-static {v0, v1, v4, v2, v3}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object; + + iput-boolean v4, p0, Lcom/discord/stores/StoreUserGuildSettings;->isDirty:Z + + return-void +.end method + +.method public final setChannelFrequency(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;I)V + .locals 8 + + const-string v0, "context" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "channel" + + invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long; move-result-object v0 + const-string v1, "channel.guildId" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - move-result-wide v3 + move-result-wide v4 - new-instance v5, Lcom/discord/restapi/RestAPIParams$UserGuildSettings; + new-instance v6, Lcom/discord/restapi/RestAPIParams$UserGuildSettings; invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getId()J @@ -595,80 +786,56 @@ invoke-direct {p2, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;->(Ljava/lang/Integer;)V - invoke-direct {v5, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V + invoke-direct {v6, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V - const v6, 0x7f120392 + const v7, 0x7f120392 - move-object v1, p0 + move-object v2, p0 - move-object v2, p1 + move-object v3, p1 - invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V + invoke-direct/range {v2 .. v7}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V return-void .end method -.method public setChannelMuted(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Z)V +.method public final setChannelMuted(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Z)V .locals 7 - invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long; + const-string v0, "context" - move-result-object v0 + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v0}, Ljava/lang/Long;->longValue()J + const-string v0, "channel" - move-result-wide v3 - - new-instance v5, Lcom/discord/restapi/RestAPIParams$UserGuildSettings; - - invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getId()J - - move-result-wide v0 - - new-instance v2, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride; - - invoke-static {p3}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; - - move-result-object p3 - - invoke-direct {v2, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;->(Ljava/lang/Boolean;)V - - invoke-direct {v5, v0, v1, v2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V + invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->isTextChannel()Z - move-result p2 + move-result v0 - if-eqz p2, :cond_0 + if-eqz v0, :cond_0 - const p2, 0x7f120392 + const v0, 0x7f120392 const v6, 0x7f120392 goto :goto_0 :cond_0 - const p2, 0x7f12036c + const v0, 0x7f12036c const v6, 0x7f12036c :goto_0 - move-object v1, p0 - - move-object v2, p1 - - invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V - - return-void -.end method - -.method public setChannelNotificationsDefault(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;)V - .locals 7 - invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long; move-result-object v0 + const-string v1, "channel.guildId" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J move-result-wide v3 @@ -681,20 +848,14 @@ new-instance p2, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride; - sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean; + invoke-static {p3}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; - sget v6, Lcom/discord/models/domain/ModelUserGuildSettings;->FREQUENCY_UNSET:I + move-result-object p3 - invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v6 - - invoke-direct {p2, v2, v6}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;->(Ljava/lang/Boolean;Ljava/lang/Integer;)V + invoke-direct {p2, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;->(Ljava/lang/Boolean;)V invoke-direct {v5, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V - const v6, 0x7f120392 - move-object v1, p0 move-object v2, p1 @@ -704,102 +865,132 @@ return-void .end method -.method public setGuildFrequency(Landroid/content/Context;Lcom/discord/models/domain/ModelGuild;I)V - .locals 6 +.method public final setChannelNotificationsDefault(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;)V + .locals 8 + + const-string v0, "context" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "channel" + + invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long; + + move-result-object v0 + + const-string v1, "channel.guildId" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J + + move-result-wide v4 + + new-instance v6, Lcom/discord/restapi/RestAPIParams$UserGuildSettings; + + invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getId()J + + move-result-wide v0 + + new-instance p2, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride; + + sget-object v2, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean; + + sget v3, Lcom/discord/models/domain/ModelUserGuildSettings;->FREQUENCY_UNSET:I + + invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v3 + + invoke-direct {p2, v2, v3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;->(Ljava/lang/Boolean;Ljava/lang/Integer;)V + + invoke-direct {v6, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V + + const v7, 0x7f120392 + + move-object v2, p0 + + move-object v3, p1 + + invoke-direct/range {v2 .. v7}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V + + return-void +.end method + +.method public final setGuildFrequency(Landroid/content/Context;Lcom/discord/models/domain/ModelGuild;I)V + .locals 7 + + const-string v0, "context" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "guild" + + invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getId()J - move-result-wide v2 + move-result-wide v3 - new-instance v4, Lcom/discord/restapi/RestAPIParams$UserGuildSettings; + new-instance v5, Lcom/discord/restapi/RestAPIParams$UserGuildSettings; - invoke-direct {v4, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(I)V + invoke-direct {v5, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(I)V - const v5, 0x7f12101c + const v6, 0x7f12101c - move-object v0, p0 + move-object v1, p0 - move-object v1, p1 + move-object v2, p1 - invoke-direct/range {v0 .. v5}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V + invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V return-void .end method -.method public setGuildToggles(Landroid/content/Context;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V - .locals 6 +.method public final setGuildToggles(Landroid/content/Context;Lcom/discord/models/domain/ModelGuild;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V + .locals 7 + + const-string v0, "context" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "guild" + + invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {p2}, Lcom/discord/models/domain/ModelGuild;->getId()J - move-result-wide v2 + move-result-wide v3 - new-instance v4, Lcom/discord/restapi/RestAPIParams$UserGuildSettings; + new-instance v5, Lcom/discord/restapi/RestAPIParams$UserGuildSettings; - invoke-direct {v4, p3, p4, p5}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V + invoke-direct {v5, p3, p4, p5}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V - const v5, 0x7f12101c + const v6, 0x7f12101c - move-object v0, p0 + move-object v1, p0 - move-object v1, p1 + move-object v2, p1 - invoke-direct/range {v0 .. v5}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V + invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreUserGuildSettings;->updateUserGuildSettings(Landroid/content/Context;JLcom/discord/restapi/RestAPIParams$UserGuildSettings;I)V return-void .end method -.method public setHideMutedChannels(JZ)V - .locals 1 +.method public final setHideMutedChannels(JZ)V + .locals 2 - iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->$lock:Ljava/lang/Object; + iget-object v0, p0, Lcom/discord/stores/StoreUserGuildSettings;->dispatcher:Lcom/discord/stores/Dispatcher; - monitor-enter v0 + new-instance v1, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1; - if-eqz p3, :cond_0 + invoke-direct {v1, p0, p3, p1, p2}, Lcom/discord/stores/StoreUserGuildSettings$setHideMutedChannels$1;->(Lcom/discord/stores/StoreUserGuildSettings;ZJ)V - :try_start_0 - iget-object p3, p0, Lcom/discord/stores/StoreUserGuildSettings;->showHideMutedChannels:Ljava/util/Set; + check-cast v1, Lkotlin/jvm/functions/Function0; - invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - - move-result-object p1 - - invoke-interface {p3, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z - - goto :goto_0 - - :cond_0 - iget-object p3, p0, Lcom/discord/stores/StoreUserGuildSettings;->showHideMutedChannels:Ljava/util/Set; - - invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - - move-result-object p1 - - invoke-interface {p3, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z - - :goto_0 - iget-object p1, p0, Lcom/discord/stores/StoreUserGuildSettings;->hideMutedChannelsPublisher:Lcom/discord/utilities/persister/Persister; - - new-instance p2, Ljava/util/HashSet; - - iget-object p3, p0, Lcom/discord/stores/StoreUserGuildSettings;->showHideMutedChannels:Ljava/util/Set; - - invoke-direct {p2, p3}, Ljava/util/HashSet;->(Ljava/util/Collection;)V - - const/4 p3, 0x1 - - invoke-virtual {p1, p2, p3}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object; - - monitor-exit v0 + invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V return-void - - :catchall_0 - move-exception p1 - - monitor-exit v0 - :try_end_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 - - throw p1 .end method diff --git a/com.discord/smali/com/discord/stores/StoreUserSettings.smali b/com.discord/smali/com/discord/stores/StoreUserSettings.smali index 6f2c6a4ee9..2aa34bf491 100644 --- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali +++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali @@ -1579,7 +1579,7 @@ move-result-object v0 - const v1, 0x7f121160 + const v1, 0x7f121162 invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -2062,7 +2062,7 @@ move-result-object v0 - const v1, 0x7f121160 + const v1, 0x7f121162 invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -2093,7 +2093,7 @@ move-result-object v0 - const v1, 0x7f12115f + const v1, 0x7f121161 invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; diff --git a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali index 7186bc40f5..89166d4356 100644 --- a/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali +++ b/com.discord/smali/com/discord/stores/StoreVoiceParticipants$get$1.smali @@ -66,7 +66,7 @@ .end method .method public final call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable; - .locals 10 + .locals 11 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -101,10 +101,6 @@ const-wide/16 v0, 0x0 - invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - - move-result-object v0 - goto :goto_0 :cond_1 @@ -112,52 +108,52 @@ move-result-object v0 - :goto_0 - iget-object v1, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants; + const-string v1, "channel.guildId" - invoke-virtual {v1}, Lcom/discord/stores/StoreVoiceParticipants;->getStream()Lcom/discord/stores/StoreStream; - - move-result-object v1 - - invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser; - - move-result-object v1 - - invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable; - - move-result-object v2 - - iget-object v1, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants; - - invoke-static {v1, p1}, Lcom/discord/stores/StoreVoiceParticipants;->access$getOtherUsers(Lcom/discord/stores/StoreVoiceParticipants;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable; - - move-result-object v3 - - iget-object v1, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants; - - invoke-virtual {v1}, Lcom/discord/stores/StoreVoiceParticipants;->getStream()Lcom/discord/stores/StoreStream; - - move-result-object v1 - - invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getVoiceStates$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceStates; - - move-result-object v1 - - const-string v4, "guildId" - - invoke-static {v0, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - move-result-wide v4 + move-result-wide v0 + + :goto_0 + iget-object v2, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants; + + invoke-virtual {v2}, Lcom/discord/stores/StoreVoiceParticipants;->getStream()Lcom/discord/stores/StoreStream; + + move-result-object v2 + + invoke-virtual {v2}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser; + + move-result-object v2 + + invoke-virtual {v2}, Lcom/discord/stores/StoreUser;->getMe()Lrx/Observable; + + move-result-object v3 + + iget-object v2, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants; + + invoke-static {v2, p1}, Lcom/discord/stores/StoreVoiceParticipants;->access$getOtherUsers(Lcom/discord/stores/StoreVoiceParticipants;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable; + + move-result-object v4 + + iget-object v2, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants; + + invoke-virtual {v2}, Lcom/discord/stores/StoreVoiceParticipants;->getStream()Lcom/discord/stores/StoreStream; + + move-result-object v2 + + invoke-virtual {v2}, Lcom/discord/stores/StoreStream;->getVoiceStates$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceStates; + + move-result-object v2 invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J - move-result-wide v6 + move-result-wide v5 - invoke-virtual {v1, v4, v5, v6, v7}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable; + invoke-virtual {v2, v0, v1, v5, v6}, Lcom/discord/stores/StoreVoiceStates;->get(JJ)Lrx/Observable; - move-result-object v4 + move-result-object v5 iget-object p1, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants; @@ -173,17 +169,17 @@ move-result-object p1 - const-string v1, "stream\n \u2026 .get()" + const-string v2, "stream\n \u2026 .get()" - invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {p1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const-wide/16 v5, 0xfa + const-wide/16 v6, 0xfa - sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; + sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; - invoke-static {p1, v5, v6, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable; + invoke-static {p1, v6, v7, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable; - move-result-object v5 + move-result-object v6 iget-object p1, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants; @@ -195,19 +191,19 @@ move-result-object p1 - iget-wide v6, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->$channelId:J + iget-wide v7, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->$channelId:J - invoke-virtual {p1, v6, v7}, Lcom/discord/stores/StoreCalls;->get(J)Lrx/Observable; + invoke-virtual {p1, v7, v8}, Lcom/discord/stores/StoreCalls;->get(J)Lrx/Observable; move-result-object p1 - sget-object v1, Lcom/discord/stores/StoreVoiceParticipants$get$1$1;->INSTANCE:Lcom/discord/stores/StoreVoiceParticipants$get$1$1; + sget-object v2, Lcom/discord/stores/StoreVoiceParticipants$get$1$1;->INSTANCE:Lcom/discord/stores/StoreVoiceParticipants$get$1$1; - check-cast v1, Lrx/functions/b; + check-cast v2, Lrx/functions/b; - invoke-virtual {p1, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable; + invoke-virtual {p1, v2}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable; - move-result-object v6 + move-result-object v7 iget-object p1, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants; @@ -221,7 +217,7 @@ invoke-virtual {p1}, Lcom/discord/stores/StoreVideoStreams;->getVideoStreams()Lrx/Observable; - move-result-object v7 + move-result-object v8 iget-object p1, p0, Lcom/discord/stores/StoreVoiceParticipants$get$1;->this$0:Lcom/discord/stores/StoreVoiceParticipants; @@ -233,10 +229,6 @@ move-result-object p1 - invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - - move-result-wide v0 - invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreGuilds;->getComputed(J)Lrx/Observable; move-result-object p1 @@ -247,11 +239,11 @@ const-wide/16 v0, 0x1 - sget-object v8, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit; + sget-object v2, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit; - invoke-static {p1, v0, v1, v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable; + invoke-static {p1, v0, v1, v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable; - move-result-object v8 + move-result-object v9 new-instance p1, Lcom/discord/stores/StoreVoiceParticipants$get$1$2; @@ -265,11 +257,11 @@ invoke-direct {v0, p1}, Lcom/discord/stores/StoreVoiceParticipants$sam$rx_functions_Func7$0;->(Lkotlin/jvm/functions/Function7;)V - move-object v9, v0 + move-object v10, v0 - check-cast v9, Lrx/functions/Func7; + check-cast v10, Lrx/functions/Func7; - invoke-static/range {v2 .. v9}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func7;)Lrx/Observable; + invoke-static/range {v3 .. v10}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func7;)Lrx/Observable; move-result-object p1 diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index ba1d3a66a0..b5256ec4eb 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali @@ -179,7 +179,7 @@ const-string v1, "browser_user_agent" - const-string v2, "Discord-Android/987" + const-string v2, "Discord-Android/989" invoke-static {v1, v2}, Lkotlin/q;->to(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; @@ -189,7 +189,7 @@ aput-object v1, v0, v2 - const/16 v1, 0x3db + const/16 v1, 0x3dd invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -207,7 +207,7 @@ const-string v1, "client_version" - const-string v2, "9.8.7" + const-string v2, "9.8.9" invoke-static {v1, v2}, Lkotlin/q;->to(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 af3d59ebb8..46118e6867 100644 --- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali +++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali @@ -3608,7 +3608,7 @@ return p1 :sswitch_5 - const p1, 0x7f121222 + const p1, 0x7f121224 return p1 @@ -3638,7 +3638,7 @@ return p1 :sswitch_b - const p1, 0x7f12121f + const p1, 0x7f121221 return p1 @@ -3693,7 +3693,7 @@ return p1 :sswitch_16 - const p1, 0x7f121312 + const p1, 0x7f121314 return p1 diff --git a/com.discord/smali/com/discord/utilities/clocks/TestClock.smali b/com.discord/smali/com/discord/utilities/clocks/TestClock.smali new file mode 100644 index 0000000000..6c1c912a43 --- /dev/null +++ b/com.discord/smali/com/discord/utilities/clocks/TestClock.smali @@ -0,0 +1,50 @@ +.class public final Lcom/discord/utilities/clocks/TestClock; +.super Ljava/lang/Object; +.source "TestClock.kt" + +# interfaces +.implements Lcom/discord/utilities/clocks/Clock; + + +# instance fields +.field private currentTimeMs:J + + +# direct methods +.method public constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final currentTimeMillis()J + .locals 2 + + iget-wide v0, p0, Lcom/discord/utilities/clocks/TestClock;->currentTimeMs:J + + return-wide v0 +.end method + +.method public final progressTimeByMs(J)V + .locals 2 + + iget-wide v0, p0, Lcom/discord/utilities/clocks/TestClock;->currentTimeMs:J + + add-long/2addr v0, p1 + + iput-wide v0, p0, Lcom/discord/utilities/clocks/TestClock;->currentTimeMs:J + + return-void +.end method + +.method public final setTimeMs(J)V + .locals 0 + + iput-wide p1, p0, Lcom/discord/utilities/clocks/TestClock;->currentTimeMs:J + + return-void +.end method diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali index c4163f1296..f712647106 100644 --- a/com.discord/smali/com/discord/utilities/error/Error.smali +++ b/com.discord/smali/com/discord/utilities/error/Error.smali @@ -693,7 +693,7 @@ return-object p1 :pswitch_4 - const v0, 0x7f121164 + const v0, 0x7f121166 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 d6b54417aa..b70751769e 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali @@ -1176,7 +1176,7 @@ new-instance v2, Landroid/app/NotificationChannel; - const v4, 0x7f12131b + const v4, 0x7f12131d invoke-virtual {p1, v4}, Landroid/app/Application;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali index b470e6cf82..a2b613e3c0 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 @@ -45,7 +45,7 @@ if-eqz v0, :cond_0 - const v3, 0x7f1211d4 + const v3, 0x7f1211d6 const/4 v4, 0x1 diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali index 4634674ec9..04addce48f 100644 --- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali +++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali @@ -62,7 +62,7 @@ goto :goto_1 :cond_0 - const v0, 0x7f12123f + const v0, 0x7f121241 new-array v2, v2, [Ljava/lang/Object; @@ -79,7 +79,7 @@ goto :goto_2 :cond_1 - const v0, 0x7f12123a + const v0, 0x7f12123c new-array v2, v2, [Ljava/lang/Object; @@ -96,7 +96,7 @@ goto :goto_2 :cond_2 - const v0, 0x7f12123b + const v0, 0x7f12123d new-array v2, v2, [Ljava/lang/Object; @@ -143,7 +143,7 @@ :goto_0 if-eqz p1, :cond_6 - const v0, 0x7f12123d + const v0, 0x7f12123f new-array v2, v2, [Ljava/lang/Object; @@ -164,7 +164,7 @@ :cond_6 :goto_1 - const p1, 0x7f12123c + const p1, 0x7f12123e invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -219,7 +219,7 @@ goto :goto_0 :cond_1 - const v1, 0x7f121333 + const v1, 0x7f121335 new-array v3, v3, [Ljava/lang/Object; 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 6f5aa8065e..9d7e9bd84c 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/987" + const-string v0, "Discord-Android/989" return-object v0 .end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali index aff542ee24..2dd3107fb0 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali @@ -33,8 +33,6 @@ :array_0 .array-data 4 - 0x7f12110e - 0x7f12110f 0x7f121110 0x7f121111 0x7f121112 @@ -72,6 +70,8 @@ 0x7f121132 0x7f121133 0x7f121134 + 0x7f121135 + 0x7f121136 .end array-data .end method diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali index 1a0f202b93..5ed60dbd14 100644 --- a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali +++ b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali @@ -1103,7 +1103,7 @@ :cond_7 :goto_2 - const p2, 0x7f1211e0 + const p2, 0x7f1211e2 const/16 v0, 0xc 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 861306b28c..bdb9f73053 100644 --- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali +++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali @@ -332,7 +332,7 @@ move-result-object v3 - const v9, 0x7f1211e5 + const v9, 0x7f1211e7 invoke-virtual {v3, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -376,7 +376,7 @@ move-result-object p0 - const v6, 0x7f1211de + const v6, 0x7f1211e0 invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)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 a03c6ec320..d4acbf2dcb 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali @@ -191,7 +191,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const p2, 0x7f1211a3 + const p2, 0x7f1211a5 invoke-static {p1, p2}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V @@ -222,7 +222,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f1211c8 + const v0, 0x7f1211ca invoke-static {p1, v0}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V @@ -464,7 +464,7 @@ move-result-object v8 - const v1, 0x7f1211ac + const v1, 0x7f1211ae const/4 v2, 0x2 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali index fd13918f8f..9dc301a79c 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali @@ -102,7 +102,7 @@ move-result-object p1 - const v0, 0x7f12114e + const v0, 0x7f121150 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali index 60d74a5dae..e86c15c02f 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali @@ -68,7 +68,7 @@ sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; - const v7, 0x7f1212d7 + const v7, 0x7f1212d9 invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali index 91464736fc..d4b0a99542 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali @@ -700,7 +700,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f12114b + const v1, 0x7f12114d invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1312,12 +1312,12 @@ if-eqz v3, :cond_1 - const v3, 0x7f12114d + const v3, 0x7f12114f goto :goto_1 :cond_1 - const v3, 0x7f12114c + const v3, 0x7f12114e :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/channels/WidgetChannelGroupDMSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali index 0232102010..812b4f463e 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali @@ -711,7 +711,7 @@ const v0, 0x7f1203ab - const v1, 0x7f1211d4 + const v1, 0x7f1211d6 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$configureNotificationRadios$1$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1.smali index 0d8d4f607b..d2f27f7696 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1.smali @@ -55,6 +55,10 @@ move-result-object p1 + const-string v1, "it.context" + + invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1$1;->$this_configureNotificationRadio:Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model; invoke-virtual {v1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$1.smali index 3e02816d05..774cc08f55 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$1.smali @@ -69,6 +69,10 @@ move-result-object v0 + const-string v1, "channelSettingsNotificationsMuteToggle.context" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureUI$1;->$this_configureUI:Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model; invoke-virtual {v1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali index 082a5105bb..ff9e666876 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali @@ -75,6 +75,10 @@ move-result-object p1 + const-string v0, "context" + + invoke-static {p2, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + iget-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1;->$this_configureUI:Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model; invoke-virtual {v0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; @@ -99,8 +103,6 @@ :goto_0 return-void - nop - :pswitch_data_0 .packed-switch 0x7f0a044f :pswitch_1 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 09f9851e32..9e56f49abd 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 @@ -186,13 +186,13 @@ if-eq p1, v0, :cond_2 - const p2, 0x7f121154 + const p2, 0x7f121156 const/4 v0, 0x0 if-eq p1, p2, :cond_1 - const p2, 0x7f121324 + const p2, 0x7f121326 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 7047a1e8a3..9303b8af30 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 @@ -113,7 +113,7 @@ .method private final getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence; .locals 7 - const v0, 0x7f1211b9 + const v0, 0x7f1211bb 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$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.smali index ba753ddd64..a269605e3f 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model$Companion$get$1.smali @@ -73,6 +73,7 @@ "Ljava/lang/Integer;", "Ljava/util/Map<", "Ljava/lang/Long;", + "+", "Lcom/discord/models/domain/ModelUserGuildSettings;", ">;)", "Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;" 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 e03add3b86..d7bf9b9846 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 @@ -329,7 +329,7 @@ if-eqz v0, :cond_0 - const v0, 0x7f1211e5 + const v0, 0x7f1211e7 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.smali index b2d6d2fb5d..263aee4cb6 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3.smali @@ -85,6 +85,10 @@ move-result-object v0 + const-string v1, "context" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3;->$this_configureUI$inlined:Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model; invoke-virtual {v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; 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 af5299f6de..d58ff2835e 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, 0x7f121142 + const v2, 0x7f121144 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 fa069a4dac..ec4cfbb65e 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 @@ -66,7 +66,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f121143 + const v1, 0x7f121145 invoke-virtual {p2, v1, v0}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali index 30517cdb7a..5b851118f8 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali @@ -135,7 +135,7 @@ move-result-object p1 - const p2, 0x7f121157 + const p2, 0x7f121159 invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -837,7 +837,7 @@ return-object p1 :cond_0 - const v0, 0x7f121307 + const v0, 0x7f121309 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -846,7 +846,7 @@ return-object p1 :cond_1 - const v0, 0x7f1212fe + const v0, 0x7f121300 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali index 0bc117380b..99c9e84f97 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali @@ -941,7 +941,7 @@ iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton; - const v0, 0x7f121227 + const v0, 0x7f121229 invoke-virtual {p2, v0}, Lcom/google/android/material/button/MaterialButton;->setText(I)V 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 1b025faa72..ef2d2cb03f 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali @@ -256,7 +256,7 @@ move-result-object v0 - const v3, 0x7f121107 + const v3, 0x7f121109 new-array v2, v2, [Ljava/lang/Object; @@ -277,7 +277,7 @@ move-result-object v0 - const v3, 0x7f121105 + const v3, 0x7f121107 new-array v2, v2, [Ljava/lang/Object; 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 8f7282168c..f285180386 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali @@ -306,7 +306,7 @@ check-cast v3, Landroid/view/View; - const v6, 0x7f12134f + const v6, 0x7f121351 new-array v7, v4, [Ljava/lang/Object; @@ -327,7 +327,7 @@ check-cast v3, Landroid/view/View; - const v6, 0x7f121354 + const v6, 0x7f121356 new-array v7, v4, [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 99f3e02390..915f0207e6 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali @@ -544,7 +544,7 @@ move-result-object v5 - const v7, 0x7f121249 + const v7, 0x7f12124b new-array v3, v3, [Ljava/lang/Object; 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 52cfd543a3..ce9b93c317 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali @@ -191,7 +191,7 @@ move-result-object p1 - const v3, 0x7f1211e9 + const v3, 0x7f1211eb 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 98cbbce19a..e7aa51cb1c 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 @@ -93,7 +93,7 @@ const/4 v1, 0x3 - const v2, 0x7f121136 + const v2, 0x7f121138 const/4 v3, 0x2 @@ -109,7 +109,7 @@ goto/16 :goto_1 :pswitch_1 - const v0, 0x7f121109 + const v0, 0x7f12110b new-array v1, v3, [Ljava/lang/Object; @@ -207,7 +207,7 @@ goto/16 :goto_1 :pswitch_5 - const v0, 0x7f121135 + const v0, 0x7f121137 new-array v1, v4, [Ljava/lang/Object; @@ -247,7 +247,7 @@ goto/16 :goto_1 :pswitch_7 - const v0, 0x7f12113b + const v0, 0x7f12113d new-array v1, v4, [Ljava/lang/Object; @@ -262,7 +262,7 @@ goto/16 :goto_1 :pswitch_8 - const v0, 0x7f12110b + const v0, 0x7f12110d new-array v1, v4, [Ljava/lang/Object; @@ -277,7 +277,7 @@ goto :goto_1 :pswitch_9 - const v0, 0x7f12110c + const v0, 0x7f12110e new-array v1, v3, [Ljava/lang/Object; @@ -329,7 +329,7 @@ if-nez v0, :cond_1 - const v0, 0x7f121140 + const v0, 0x7f121142 new-array v1, v4, [Ljava/lang/Object; @@ -345,7 +345,7 @@ :cond_1 :goto_0 - const v0, 0x7f12113f + const v0, 0x7f121141 new-array v1, v3, [Ljava/lang/Object; @@ -364,7 +364,7 @@ goto :goto_1 :pswitch_b - const v0, 0x7f12113e + const v0, 0x7f121140 new-array v1, v3, [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 2b6d17315d..5c5cc1736a 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali @@ -611,7 +611,7 @@ check-cast p2, Landroid/view/View; - const v0, 0x7f121215 + const v0, 0x7f121217 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/list/actions/MessageActionDialogs.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali index a443a3646a..99341aa600 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali @@ -198,7 +198,7 @@ if-eqz v2, :cond_0 - const v0, 0x7f1211f1 + const v0, 0x7f1211f3 goto :goto_0 @@ -216,7 +216,7 @@ if-eqz v2, :cond_1 - const v0, 0x7f1211ed + const v0, 0x7f1211ef goto :goto_1 @@ -234,7 +234,7 @@ if-eqz v2, :cond_2 - const v0, 0x7f1211ea + const v0, 0x7f1211ec goto :goto_2 diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion.smali index e1f2e5f59e..89e10e0adf 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion.smali @@ -147,19 +147,23 @@ move-result-object v1 - if-eqz v1, :cond_6 - - invoke-virtual {v1}, Ljava/lang/Long;->longValue()J - - move-result-wide v1 - - goto :goto_1 + if-nez v1, :cond_7 :cond_6 const-wide/16 v1, 0x0 - :goto_1 - move-wide v3, v1 + invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v1 + + :cond_7 + const-string v2, "channel?.guildId ?: 0L" + + invoke-static {v1, v2}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v1}, Ljava/lang/Long;->longValue()J + + move-result-wide v3 sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.smali index dc140ececa..c56fc8159c 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.smali @@ -99,18 +99,24 @@ move-result-object v0 - if-eqz v0, :cond_0 + if-nez v0, :cond_1 + + :cond_0 + const-wide/16 v0, 0x0 + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + :cond_1 + const-string v1, "channel?.guildId ?: 0" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {v0}, Ljava/lang/Long;->longValue()J move-result-wide v0 - goto :goto_0 - - :cond_0 - const-wide/16 v0, 0x0 - - :goto_0 sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser; diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali index bb7886a904..e1708634e2 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali @@ -1156,7 +1156,7 @@ if-eqz v1, :cond_6 - const v1, 0x7f1211ea + const v1, 0x7f1211ec goto :goto_4 @@ -1775,7 +1775,7 @@ invoke-static {v4, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f121382 + const v5, 0x7f121384 invoke-virtual {v0, v5}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.smali b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.smali index 7588659e13..ba0bfdab73 100644 --- a/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.smali +++ b/com.discord/smali/com/discord/widgets/chat/overlay/ChatTypingModel$Companion$getTarget$1.smali @@ -96,6 +96,10 @@ move-result-object v2 + const-string v3, "guildId" + + invoke-static {v2, v3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + aput-object v2, v1, v0 const/4 v0, 0x2 diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali index ea54cb8648..14cabd9523 100644 --- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali @@ -310,7 +310,7 @@ :cond_0 sget-object v0, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab; - const v0, 0x7f121163 + const v0, 0x7f121165 invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -355,7 +355,7 @@ :cond_1 sget-object v0, Lkotlin/jvm/internal/ab;->bhO:Lkotlin/jvm/internal/ab; - const v0, 0x7f1211cc + const v0, 0x7f1211ce invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 6b10452ed4..4d714044ec 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -502,7 +502,7 @@ new-array v3, v0, [Ljava/lang/Object; - const-string v4, "9.8.7" + const-string v4, "9.8.9" aput-object v4, v3, v2 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 466d2f0c25..f6aa330f47 100644 --- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali +++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali @@ -474,7 +474,7 @@ if-eqz v1, :cond_1 - const p1, 0x7f1211e3 + const p1, 0x7f1211e5 invoke-static {p0, p1}, Lcom/discord/app/h;->b(Landroidx/fragment/app/Fragment;I)V @@ -541,7 +541,7 @@ const v0, 0x7f1203ab - const v1, 0x7f1211d4 + const v1, 0x7f1211d6 invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali b/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali index 3eb95b764b..07fba9654c 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali @@ -97,7 +97,7 @@ move-result-object v0 - const v1, 0x7f12116e + const v1, 0x7f121170 invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk.smali index bbe71e1e30..a54c3252d4 100644 --- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk.smali +++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$Chunk.smali @@ -103,6 +103,7 @@ "(JJ", "Ljava/util/Map<", "Ljava/lang/Long;", + "+", "Lcom/discord/models/domain/ModelUserGuildSettings;", ">;", "Ljava/util/Set<", @@ -466,6 +467,7 @@ "(JJ", "Ljava/util/Map<", "Ljava/lang/Long;", + "+", "Lcom/discord/models/domain/ModelUserGuildSettings;", ">;", "Ljava/util/Set<", diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1$1.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1$1.smali index fcf2e98156..9411ea6f8c 100644 --- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1$1.smali +++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$Factory$observeStores$1$1.smali @@ -82,6 +82,7 @@ "Ljava/lang/Long;", "Ljava/util/Map<", "Ljava/lang/Long;", + "+", "Lcom/discord/models/domain/ModelUserGuildSettings;", ">;", "Ljava/util/Set<", diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali index 65dc39c429..de153cf568 100644 --- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali +++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListViewModel$StoreState.smali @@ -125,6 +125,7 @@ "(JJ", "Ljava/util/Map<", "Ljava/lang/Long;", + "+", "Lcom/discord/models/domain/ModelUserGuildSettings;", ">;", "Ljava/util/Set<", @@ -590,6 +591,7 @@ "(JJ", "Ljava/util/Map<", "Ljava/lang/Long;", + "+", "Lcom/discord/models/domain/ModelUserGuildSettings;", ">;", "Ljava/util/Set<", diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1.smali index 335b6cbd9f..6f7268de55 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1.smali @@ -82,7 +82,7 @@ move-result v0 - if-nez v0, :cond_2 + if-nez v0, :cond_3 iget-object v0, p0, Lcom/discord/widgets/main/WidgetMainHeaderManager$getOnSelectedAction$1;->$this_getOnSelectedAction:Lcom/discord/widgets/main/WidgetMainModel; @@ -96,21 +96,23 @@ move-result-object v0 - if-eqz v0, :cond_1 - - invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - - move-result-wide v0 - - goto :goto_0 + if-nez v0, :cond_2 :cond_1 const-wide/16 v0, 0x0 - :goto_0 - invoke-static {v0, v1, p1}, Lcom/discord/widgets/search/WidgetSearch;->launchForGuild(JLandroid/content/Context;)V + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 :cond_2 + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J + + move-result-wide v0 + + invoke-static {v0, v1, p1}, Lcom/discord/widgets/search/WidgetSearch;->launchForGuild(JLandroid/content/Context;)V + + :cond_3 return-void .end method diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$1.smali index 24a1f906d4..3407c8973d 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$1.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$1.smali @@ -59,18 +59,20 @@ move-result-object v0 - if-eqz v0, :cond_0 - - invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - - move-result-wide v0 - - goto :goto_0 + if-nez v0, :cond_1 :cond_0 const-wide/16 v0, 0x0 - :goto_0 + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + :cond_1 + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J + + move-result-wide v0 + invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreGuildsNsfw;->deny(J)V return-void diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$2.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$2.smali index 8a0359e22c..b92f3c52ea 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$2.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNsfw$configureUI$2.smali @@ -59,18 +59,20 @@ move-result-object v0 - if-eqz v0, :cond_0 - - invoke-virtual {v0}, Ljava/lang/Long;->longValue()J - - move-result-wide v0 - - goto :goto_0 + if-nez v0, :cond_1 :cond_0 const-wide/16 v0, 0x0 - :goto_0 + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + :cond_1 + invoke-virtual {v0}, Ljava/lang/Long;->longValue()J + + move-result-wide v0 + invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreGuildsNsfw;->allow(J)V iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainPanelNsfw$configureUI$2;->this$0:Lcom/discord/widgets/main/WidgetMainPanelNsfw; diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali index 1b222c66eb..35f67bfa15 100644 --- a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali +++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali @@ -474,7 +474,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, 0x7f121315 + const v4, 0x7f121317 invoke-virtual {p0, v4}, Lcom/discord/widgets/media/WidgetMedia;->setActionBarTitle(I)Lkotlin/Unit; 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 7b55dd9007..148fbc36dd 100644 --- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali @@ -172,7 +172,7 @@ move-result-object p1 - const v0, 0x7f1211db # 1.9416E38f + const v0, 0x7f1211dd invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali index 9ca0aeeb2e..90d6425600 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureRadio$1.smali @@ -55,6 +55,10 @@ move-result-object p1 + const-string v1, "view.context" + + invoke-static {p1, v1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$configureRadio$1;->$model:Lcom/discord/widgets/servers/WidgetServerNotifications$Model; invoke-virtual {v1}, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali index 6c016d23b4..141b1f9e83 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$1.smali @@ -69,6 +69,10 @@ move-result-object v1 + const-string p1, "muteServerCheck.context" + + invoke-static {v1, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$1;->$model:Lcom/discord/widgets/servers/WidgetServerNotifications$Model; invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali index 0401212631..ea5010ab2f 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$2.smali @@ -69,6 +69,10 @@ move-result-object v1 + const-string p1, "notificationsSwitchEveryone.context" + + invoke-static {v1, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$2;->$model:Lcom/discord/widgets/servers/WidgetServerNotifications$Model; invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali index 498da9a46c..648c7270f8 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$configureUI$3.smali @@ -69,6 +69,10 @@ move-result-object v1 + const-string p1, "notificationsSwitchPush.context" + + invoke-static {v1, p1}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$configureUI$3;->$model:Lcom/discord/widgets/servers/WidgetServerNotifications$Model; invoke-virtual {p1}, Lcom/discord/widgets/servers/WidgetServerNotifications$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali index 057398f648..1f4ed61989 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1.smali @@ -59,7 +59,7 @@ # virtual methods .method public final onSwiped(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V - .locals 2 + .locals 3 const-string p2, "viewHolder" @@ -102,6 +102,8 @@ move-result p1 + const-string v0, "requireContext()" + if-eqz p1, :cond_1 sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; @@ -110,15 +112,17 @@ move-result-object p1 - iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1;->this$0:Lcom/discord/widgets/servers/WidgetServerNotifications; + iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1;->this$0:Lcom/discord/widgets/servers/WidgetServerNotifications; - invoke-virtual {v0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->requireContext()Landroid/content/Context; + invoke-virtual {v1}, Lcom/discord/widgets/servers/WidgetServerNotifications;->requireContext()Landroid/content/Context; - move-result-object v0 + move-result-object v1 - const/4 v1, 0x0 + invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {p1, v0, p2, v1}, Lcom/discord/stores/StoreUserGuildSettings;->setChannelMuted(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Z)V + const/4 v2, 0x0 + + invoke-virtual {p1, v1, p2, v2}, Lcom/discord/stores/StoreUserGuildSettings;->setChannelMuted(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Z)V :cond_1 sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; @@ -127,15 +131,17 @@ move-result-object p1 - iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1;->this$0:Lcom/discord/widgets/servers/WidgetServerNotifications; + iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerNotifications$createSwipeableItemTouchHelper$1;->this$0:Lcom/discord/widgets/servers/WidgetServerNotifications; - invoke-virtual {v0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->requireContext()Landroid/content/Context; + invoke-virtual {v1}, Lcom/discord/widgets/servers/WidgetServerNotifications;->requireContext()Landroid/content/Context; - move-result-object v0 + move-result-object v1 - sget v1, Lcom/discord/models/domain/ModelUserGuildSettings;->FREQUENCY_UNSET:I + invoke-static {v1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {p1, v0, p2, v1}, Lcom/discord/stores/StoreUserGuildSettings;->setChannelFrequency(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;I)V + sget v0, Lcom/discord/models/domain/ModelUserGuildSettings;->FREQUENCY_UNSET:I + + invoke-virtual {p1, v1, p2, v0}, Lcom/discord/stores/StoreUserGuildSettings;->setChannelFrequency(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;I)V return-void .end method diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali index f359515d0f..105208e79b 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali @@ -447,7 +447,7 @@ aput-object v4, v3, v5 - const v4, 0x7f1211d7 + const v4, 0x7f1211d9 invoke-virtual {v1, v4, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -473,7 +473,7 @@ aput-object v3, v2, v5 - const v3, 0x7f1211d6 + const v3, 0x7f1211d8 invoke-virtual {v1, v3, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -503,7 +503,7 @@ check-cast v1, Lkotlin/jvm/functions/Function1; - const p1, 0x7f1211d5 + const p1, 0x7f1211d7 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/WidgetServerSettingsEditRole.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali index e8970b8408..fb0ddbaa16 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali @@ -333,7 +333,7 @@ return-object p1 :cond_1 - const p1, 0x7f1211ba + const p1, 0x7f1211bc invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; 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 4cb2183deb..a6722c64b3 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 @@ -43,7 +43,7 @@ const v1, 0x7f1203ab - const v2, 0x7f1211d4 + const v2, 0x7f1211d6 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/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali index 5240a2ffc6..7a31114667 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali @@ -523,7 +523,7 @@ aput-object v1, v0, v2 - const v1, 0x7f1212f3 + const v1, 0x7f1212f5 invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -545,7 +545,7 @@ aput-object v1, v0, v2 - const v1, 0x7f1212ef + const v1, 0x7f1212f1 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$configureBannerImage$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1$2.smali index d95491b8c8..9ef1daa49b 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1$2.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1$2.smali @@ -45,7 +45,7 @@ const v1, 0x7f1203ab - const v2, 0x7f1211d4 + const v2, 0x7f1211d6 invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali index 210fb1c99d..bbcb066550 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali @@ -45,7 +45,7 @@ const v1, 0x7f1203ab - const v2, 0x7f1211d4 + const v2, 0x7f1211d6 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$configureSplashImage$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali index 2ca5d3f068..04278cff42 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali @@ -45,7 +45,7 @@ const v1, 0x7f1203ab - const v2, 0x7f1211d4 + const v2, 0x7f1211d6 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/WidgetServerSettingsRolesListAdapter$RoleListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali index cc72618bd1..4a36a3c632 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali @@ -119,7 +119,7 @@ move-result-object p0 - const v0, 0x7f1211ba + const v0, 0x7f1211bc invoke-static {p0, v0}, Lcom/discord/app/h;->show(Landroid/content/Context;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 2537dd81a3..47986527ea 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali @@ -114,7 +114,7 @@ move-result-object v0 - const v2, 0x7f121191 + const v2, 0x7f121193 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 2c3cb83126..503975266f 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali @@ -114,7 +114,7 @@ iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView; - const v4, 0x7f1212e1 + const v4, 0x7f1212e3 const/4 v5, 0x1 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali index 6c01e13a9e..d8a8bc59a1 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali @@ -728,7 +728,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, 0x7f121356 + const p1, 0x7f121358 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali index a45add6fdf..cf1ce09598 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1473,7 +1473,7 @@ move-result-object v1 - const v2, 0x7f121296 + const v2, 0x7f121298 invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -1527,7 +1527,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->setActionBarTitle(I)Lkotlin/Unit; @@ -1595,7 +1595,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 9.8.7 (987)" + const-string v0, " - 9.8.9 (989)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.smali index cef0d1c6ec..822618ec98 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.smali @@ -112,7 +112,7 @@ iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsAppearance; - const v2, 0x7f12115c + const v2, 0x7f12115e new-array v1, v1, [Ljava/lang/Object; @@ -150,7 +150,7 @@ move-result-object p1 - const v0, 0x7f12115d + const v0, 0x7f12115f iget-object v1, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsAppearance; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali index 4373b06be5..0ff0833a0c 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali @@ -1202,7 +1202,7 @@ move-result-object p1 - const v0, 0x7f121287 + const v0, 0x7f121289 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->getString(I)Ljava/lang/String; @@ -1234,7 +1234,7 @@ invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->setActionBarTitle(I)Lkotlin/Unit; - const p1, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->setActionBarSubtitle(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 9748606895..245e7896aa 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali @@ -285,7 +285,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali index 1c8b8fe804..a67419c98d 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali @@ -81,7 +81,7 @@ iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity; - const v5, 0x7f12121a + const v5, 0x7f12121c invoke-virtual {v1, v5}, Lcom/discord/widgets/settings/WidgetSettingsGameActivity;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali index b51526701d..35716cb04d 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali @@ -1674,17 +1674,17 @@ return v0 :pswitch_0 - const p0, 0x7f121158 + const p0, 0x7f12115a return p0 :pswitch_1 - const p0, 0x7f12130a + const p0, 0x7f12130c return p0 :pswitch_2 - const p0, 0x7f121386 + const p0, 0x7f121388 return p0 @@ -1729,7 +1729,7 @@ return p0 :pswitch_b - const p0, 0x7f121387 + const p0, 0x7f121389 return p0 @@ -1739,7 +1739,7 @@ return p0 :pswitch_d - const p0, 0x7f1211d2 + const p0, 0x7f1211d4 return p0 @@ -1759,7 +1759,7 @@ return p0 :pswitch_11 - const p0, 0x7f12118e + const p0, 0x7f121190 return p0 @@ -1928,7 +1928,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const v0, 0x7f121277 + const v0, 0x7f121279 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali index 025452cd4f..f8ddf350f9 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali @@ -370,11 +370,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f121152 + const p1, 0x7f121154 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali index b9ecf4b1af..ec8ba7b132 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali @@ -523,7 +523,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali index fcfd262c2c..b579877bdc 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/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f12121e + const v0, 0x7f121220 invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f12121b + const p2, 0x7f12121d invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f12121c + const p2, 0x7f12121e 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, 0x7f12121d + const p2, 0x7f12121f invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali index 4a082100a9..9cae638964 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali @@ -2125,7 +2125,7 @@ invoke-static {v0, v3, v1, v4, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v1, 0x7f121277 + const v1, 0x7f121279 invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali index 438a2894de..8e30c0a7b6 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali @@ -378,7 +378,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, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->setActionBarSubtitle(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 6b84ab5adf..f52a97826f 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali @@ -359,7 +359,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, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->setActionBarSubtitle(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 666c8c9afa..ac5f7bd166 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali @@ -2182,7 +2182,7 @@ check-cast v0, Landroidx/fragment/app/Fragment; - const v1, 0x7f1212bb + const v1, 0x7f1212bd invoke-static {v0, v1}, Lcom/discord/app/h;->a(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali index a9599b73d2..049e8eaa9d 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali @@ -45,7 +45,7 @@ const v1, 0x7f1203ab - const v2, 0x7f1211d4 + const v2, 0x7f1211d6 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 be15de78e1..706d8e6ea0 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, 0x7f1212b0 + const v2, 0x7f1212b2 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 2c54e5582f..49c0cc8af7 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali @@ -2470,7 +2470,7 @@ move-result-object v2 - const v3, 0x7f1211c4 + const v3, 0x7f1211c6 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2484,7 +2484,7 @@ move-result-object v3 - const v4, 0x7f1212ad + const v4, 0x7f1212af invoke-virtual {v3, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2498,7 +2498,7 @@ move-result-object v4 - const v5, 0x7f1211a1 + const v5, 0x7f1211a3 invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2604,11 +2604,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f1212b3 + const p1, 0x7f1212b5 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$getBackupCodes$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali index 1e87a5888d..2c53d0bd8c 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, 0x7f121290 + const v5, 0x7f121292 invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -258,7 +258,7 @@ move-result-object v2 - const v4, 0x7f1212c3 + const v4, 0x7f1212c5 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 21537bde41..7476c1dd84 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali @@ -442,7 +442,7 @@ move-result-object v2 - const v3, 0x7f12129a + const v3, 0x7f12129c invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -456,7 +456,7 @@ move-result-object v2 - const v4, 0x7f1211a7 + const v4, 0x7f1211a9 invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -511,11 +511,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f1211a7 + const p1, 0x7f1211a9 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarTitle(I)Lkotlin/Unit; @@ -547,7 +547,7 @@ new-array p2, p2, [Ljava/lang/Object; - const v0, 0x7f1211a6 + const v0, 0x7f1211a8 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 7589a80783..1ae4fc6945 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali @@ -609,7 +609,7 @@ move-result-object v2 - const v3, 0x7f1211c8 + const v3, 0x7f1211ca invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -734,7 +734,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali index f01ca626ce..baed82a756 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali @@ -68,7 +68,7 @@ sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion; - const v7, 0x7f1212d7 + const v7, 0x7f1212d9 invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator; diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali index 4f8d9f6304..4a4bf7f6e0 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali @@ -1072,11 +1072,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f121297 + const p1, 0x7f121299 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 b36ce4010c..cd472cdd1a 100644 --- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali +++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali @@ -119,7 +119,7 @@ aput-object v2, v0, v1 - const v1, 0x7f1211ac + const v1, 0x7f1211ae 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 7b98106841..c9675b6d7d 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 @@ -309,7 +309,7 @@ new-array v5, v2, [Ljava/lang/Object; - const v6, 0x7f12119f + const v6, 0x7f1211a1 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, 0x7f1211a0 + const v5, 0x7f1211a2 invoke-virtual {p0, v5}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali index 75ab962d05..859099f555 100644 --- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali +++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali @@ -121,7 +121,7 @@ invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarTitle(I)Lkotlin/Unit; - const p1, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali index ce69f28236..8847fc4f5e 100644 --- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali +++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali @@ -2107,7 +2107,7 @@ aput-object v3, v5, v6 - const v3, 0x7f12114b + const v3, 0x7f12114d invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->getString(I)Ljava/lang/String; @@ -4444,7 +4444,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f121277 + const p1, 0x7f121279 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription.smali index e844493f7e..73d982983e 100644 --- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription.smali +++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription.smali @@ -565,7 +565,7 @@ 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, 0x7f121277 + const v0, 0x7f121279 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremiumGuildSubscription;->setActionBarSubtitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali index d14b1c5282..c1ffeff542 100644 --- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali +++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3.smali @@ -71,43 +71,31 @@ move-result-object p1 - goto :goto_0 - - :cond_0 - const/4 p1, 0x0 - - :goto_0 - iget-object v0, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload; - - check-cast v0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild; - - invoke-virtual {v0}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;->getGuild()Lcom/discord/models/domain/ModelGuild; - - move-result-object v0 - - invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J + invoke-virtual {p1}, Ljava/lang/Long;->longValue()J move-result-wide v0 - if-nez p1, :cond_1 + iget-object p1, p0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$filter$3;->$receiver:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemDataPayload; - goto :goto_1 + check-cast p1, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild; - :cond_1 - invoke-virtual {p1}, Ljava/lang/Long;->longValue()J + invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemGuild;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object p1 + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J move-result-wide v2 - cmp-long p1, v2, v0 + cmp-long p1, v0, v2 - if-nez p1, :cond_2 + if-nez p1, :cond_0 const/4 p1, 0x1 return p1 - :cond_2 - :goto_1 + :cond_0 const/4 p1, 0x0 return p1 diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali index 659318894f..f513914c3e 100644 --- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali +++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali @@ -701,7 +701,7 @@ goto :goto_1 :cond_3 - const p1, 0x7f121200 + const p1, 0x7f121202 :goto_1 invoke-virtual {v0, p1}, Landroid/widget/TextView;->setHint(I)V diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali index acd97e2532..dd133f0d49 100644 --- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali +++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali @@ -218,7 +218,7 @@ if-eqz v0, :cond_1 - const v2, 0x7f12114b + const v2, 0x7f12114d invoke-direct {p0, v0, v2}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence; 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 1967713a99..43e931acab 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali @@ -474,7 +474,7 @@ move-result-object v0 - const v4, 0x7f121162 + const v4, 0x7f121164 new-array v3, v3, [Ljava/lang/Object; 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 04f3774b2f..5100920e19 100644 --- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali +++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali @@ -27,7 +27,7 @@ .method private getBodyText(Landroid/content/Context;)Ljava/lang/CharSequence; .locals 1 - const v0, 0x7f1212e6 + const v0, 0x7f1212e8 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -55,7 +55,7 @@ aput-object v0, v1, v2 - const v0, 0x7f1212ee + const v0, 0x7f1212f0 invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali index 7d224ad7db..6153037a37 100644 --- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali +++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali @@ -138,7 +138,7 @@ aput-object p1, v0, v1 - const p1, 0x7f1212e8 + const p1, 0x7f1212ea 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/presence/ViewHolderGameRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali index 959606e0f5..d33a47037e 100644 --- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali @@ -59,7 +59,7 @@ if-eqz v2, :cond_0 - const v3, 0x7f12124f + const v3, 0x7f121251 const/4 v4, 0x2 diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali index a0576b64cf..0a6bee1b59 100644 --- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali @@ -252,7 +252,7 @@ invoke-static {v6, v7}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v7, 0x7f121249 + const v7, 0x7f12124b new-array v8, v4, [Ljava/lang/Object; @@ -274,7 +274,7 @@ invoke-static {v5, v6}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v6, 0x7f121248 + const v6, 0x7f12124a new-array v7, v4, [Ljava/lang/Object; @@ -364,7 +364,7 @@ invoke-static {p2, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v1, 0x7f12122f + const v1, 0x7f121231 invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -387,7 +387,7 @@ invoke-static {p2, v5}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v1, 0x7f12124c + const v1, 0x7f12124e new-array v2, v4, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali index 178e2d8e47..d1928e6ee7 100644 --- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali @@ -502,7 +502,7 @@ move-result-object p4 - const v3, 0x7f121233 + const v3, 0x7f121235 new-array v2, v2, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali index c2102fcc38..bdc9c7b8e4 100644 --- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali @@ -125,7 +125,7 @@ if-eqz v1, :cond_1 - const v0, 0x7f12124f + const v0, 0x7f121251 const/4 v2, 0x2 @@ -395,7 +395,7 @@ if-eqz v1, :cond_0 - const v5, 0x7f12123e + const v5, 0x7f121240 new-array v6, v3, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali index a82edda160..8588007c49 100644 --- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali @@ -486,7 +486,7 @@ if-eqz v2, :cond_1 - const v3, 0x7f12124f + const v3, 0x7f121251 const/4 v4, 0x2 @@ -884,7 +884,7 @@ move-result-wide v8 - const p1, 0x7f121251 + const p1, 0x7f121253 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String; @@ -915,7 +915,7 @@ move-result-wide v8 - const p1, 0x7f121253 + const p1, 0x7f121255 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali index a367dbed07..e9f7b9cb7d 100644 --- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali +++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali @@ -67,7 +67,7 @@ new-array v0, v0, [Lkotlin/Pair; - const v1, 0x7f1212d8 + const v1, 0x7f1212da invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -87,7 +87,7 @@ aput-object v1, v0, v2 - const v1, 0x7f121154 + const v1, 0x7f121156 invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -107,7 +107,7 @@ aput-object v1, v0, v2 - const v1, 0x7f121324 + const v1, 0x7f121326 invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1.smali index 9b54267c61..d23adf10f3 100644 --- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1.smali +++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1.smali @@ -46,7 +46,7 @@ # virtual methods .method public final compare(Ljava/lang/Object;Ljava/lang/Object;)I - .locals 7 + .locals 6 .annotation system Ldalvik/annotation/Signature; value = { "(TT;TT;)I" @@ -77,23 +77,13 @@ if-eqz p1, :cond_2 - check-cast p1, Ljava/lang/Number; + iget-object v5, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1;->$searchContext$inlined:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext; - invoke-virtual {p1}, Ljava/lang/Number;->longValue()J - - move-result-wide v5 - - iget-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1;->$searchContext$inlined:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext; - - invoke-virtual {p1}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getRecentGuildIds()Ljava/util/List; - - move-result-object p1 - - invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-virtual {v5}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getRecentGuildIds()Ljava/util/List; move-result-object v5 - invoke-interface {p1, v5}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I + invoke-interface {v5, p1}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I move-result p1 @@ -159,23 +149,13 @@ if-eqz p2, :cond_5 - check-cast p2, Ljava/lang/Number; + iget-object v5, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1;->$searchContext$inlined:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext; - invoke-virtual {p2}, Ljava/lang/Number;->longValue()J - - move-result-wide v5 - - iget-object p2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$create$$inlined$sortedBy$1;->$searchContext$inlined:Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext; - - invoke-virtual {p2}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getRecentGuildIds()Ljava/util/List; - - move-result-object p2 - - invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-virtual {v5}, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$SearchContext;->getRecentGuildIds()Ljava/util/List; move-result-object v5 - invoke-interface {p2, v5}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I + invoke-interface {v5, p2}, Ljava/util/List;->indexOf(Ljava/lang/Object;)I move-result p2 diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali index 27278fe08b..10f6aab9dc 100644 --- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali +++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion$get$guildsListObservable$1.smali @@ -72,6 +72,7 @@ "Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ChannelContext;", "Ljava/util/Map<", "Ljava/lang/Long;", + "+", "Lcom/discord/models/domain/ModelUserGuildSettings;", ">;", "Ljava/util/LinkedHashMap<", 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 e264770728..f493e4ef9f 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali @@ -899,7 +899,7 @@ move-result-object p1 - const v0, 0x7f121328 + const v0, 0x7f12132a 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 17c22fc5c5..c31ff5cc14 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali @@ -446,12 +446,12 @@ if-eqz v8, :cond_6 - const v8, 0x7f12130b + const v8, 0x7f12130d goto :goto_3 :cond_6 - const v8, 0x7f12131b + const v8, 0x7f12131d :goto_3 invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali index 4966a0e6ac..6570c478df 100644 --- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali +++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali @@ -55,7 +55,7 @@ move-result-object p1 - const v0, 0x7f1212dc + const v0, 0x7f1212de const/4 v1, 0x0 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 a9f9a7bfd6..c50159d461 100644 --- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali +++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali @@ -840,7 +840,7 @@ if-eqz v3, :cond_2 - const v3, 0x7f1211e5 + const v3, 0x7f1211e7 goto :goto_2 @@ -894,7 +894,7 @@ if-eqz p1, :cond_3 - const p1, 0x7f1211de + const p1, 0x7f1211e0 goto :goto_3 @@ -986,7 +986,7 @@ move-result-object v0 - const v4, 0x7f1211d3 + const v4, 0x7f1211d5 invoke-direct {p0, v0, v4}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->disableWithToast(Landroid/widget/Button;I)V 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 e104fb529f..e9dc73b055 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 @@ -73,15 +73,15 @@ .field public static final status_bar_notification_info_overflow:I = 0x7f12108e -.field public static final ucrop_error_input_data_is_absent:I = 0x7f1211cd +.field public static final ucrop_error_input_data_is_absent:I = 0x7f1211cf -.field public static final ucrop_label_edit_photo:I = 0x7f1211ce +.field public static final ucrop_label_edit_photo:I = 0x7f1211d0 -.field public static final ucrop_label_original:I = 0x7f1211cf +.field public static final ucrop_label_original:I = 0x7f1211d1 -.field public static final ucrop_menu_crop:I = 0x7f1211d0 +.field public static final ucrop_menu_crop:I = 0x7f1211d2 -.field public static final ucrop_mutate_exception_hint:I = 0x7f1211d1 +.field public static final ucrop_mutate_exception_hint:I = 0x7f1211d3 # 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 ef0d51b354..c6ec0dce03 100644 --- a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali +++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali @@ -53,15 +53,15 @@ .field public static final status_bar_notification_info_overflow:I = 0x7f12108e -.field public static final ucrop_error_input_data_is_absent:I = 0x7f1211cd +.field public static final ucrop_error_input_data_is_absent:I = 0x7f1211cf -.field public static final ucrop_label_edit_photo:I = 0x7f1211ce +.field public static final ucrop_label_edit_photo:I = 0x7f1211d0 -.field public static final ucrop_label_original:I = 0x7f1211cf +.field public static final ucrop_label_original:I = 0x7f1211d1 -.field public static final ucrop_menu_crop:I = 0x7f1211d0 +.field public static final ucrop_menu_crop:I = 0x7f1211d2 -.field public static final ucrop_mutate_exception_hint:I = 0x7f1211d1 +.field public static final ucrop_mutate_exception_hint:I = 0x7f1211d3 # direct methods