From eb196dcc90c2fec92a2fcb0e780374b5f2dee045 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 20 Mar 2019 01:09:22 +0100 Subject: [PATCH] Changes of com.discord v861 --- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 27548 -> 27548 bytes .../layout-v17/view_active_subscription.xml | 2 +- .../widget_payment_source_edit_dialog.xml | 6 +- .../widget_payment_source_edit_dialog.xml | 6 +- .../res/layout/view_active_subscription.xml | 2 +- .../widget_payment_source_edit_dialog.xml | 6 +- .../res/layout/widget_premium_upsell.xml | 4 +- .../widget_settings_payment_methods.xml | 14 +- com.discord/res/values/ids.xml | 3 + com.discord/res/values/public.xml | 1553 +++++++++-------- com.discord/res/values/strings.xml | 2 +- .../smali/androidx/appcompat/R$id.smali | 94 +- .../androidx/asynclayoutinflater/R$id.smali | 18 +- com.discord/smali/androidx/browser/R$id.smali | 24 +- .../constraintlayout/widget/R$id.smali | 14 +- .../androidx/coordinatorlayout/R$id.smali | 24 +- com.discord/smali/androidx/core/R$id.smali | 18 +- .../smali/androidx/customview/R$id.smali | 18 +- .../smali/androidx/drawerlayout/R$id.smali | 18 +- .../smali/androidx/fragment/R$id.smali | 24 +- .../smali/androidx/legacy/coreui/R$id.smali | 24 +- .../androidx/legacy/coreutils/R$id.smali | 18 +- .../smali/androidx/legacy/v13/R$id.smali | 26 +- .../smali/androidx/legacy/v4/R$id.smali | 26 +- .../androidx/lifecycle/extensions/R$id.smali | 24 +- com.discord/smali/androidx/loader/R$id.smali | 18 +- com.discord/smali/androidx/media/R$id.smali | 20 +- .../smali/androidx/recyclerview/R$id.smali | 24 +- com.discord/smali/androidx/room/R$id.smali | 18 +- .../androidx/slidingpanelayout/R$id.smali | 18 +- .../androidx/swiperefreshlayout/R$id.smali | 18 +- .../smali/androidx/transition/R$id.smali | 34 +- .../smali/androidx/vectordrawable/R$id.smali | 24 +- .../smali/androidx/viewpager/R$id.smali | 18 +- com.discord/smali/androidx/work/R$id.smali | 12 +- .../smali/androidx/work/ktx/R$id.smali | 12 +- com.discord/smali/butterknife/R$id.smali | 18 +- .../smali/com/angarron/colorpicker/R$a.smali | 88 +- .../smali/com/discord/BuildConfig.smali | 6 +- com.discord/smali/com/discord/a/a$c.smali | 6 +- com.discord/smali/com/discord/a/a.smali | 8 +- com.discord/smali/com/discord/app/a/a.smali | 6 +- .../smali/com/discord/chipsview/R$c.smali | 86 +- .../smali/com/discord/gateway/R$id.smali | 158 +- .../smali/com/discord/restapi/R$id.smali | 158 +- .../discord/stores/StoreClientVersion.smali | 2 +- .../discord/stores/StoreInviteSettings.smali | 2 - .../analytics/AnalyticSuperProperties.smali | 6 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- ...ulViews$FragmentOnBackPressedHandler.smali | 8 +- .../utilities/textprocessing/Parsers.smali | 8 - .../Rules$createInviteRule$1.smali | 96 - .../utilities/textprocessing/Rules.smali | 63 - .../InviteNode$render$clickableSpan$1.smali | 97 - .../textprocessing/node/InviteNode.smali | 120 -- .../discord/utilities/time/TimeUtils.smali | 68 +- .../discord/utilities/uri/UriHandler.smali | 4 +- .../com/discord/views/CheckedSetting.smali | 8 +- .../discord/views/DigitVerificationView.smali | 12 +- .../com/discord/views/TernaryCheckBox.smali | 12 +- .../discord/views/ToolbarTitleLayout.smali | 6 +- .../discord/views/UploadProgressView.smali | 8 +- .../com/discord/views/UserListItemView.smali | 10 +- .../com/discord/views/VoiceUserView.smali | 4 +- com.discord/smali/com/discord/views/d.smali | 8 +- .../com/discord/views/steps/StepsView.smali | 10 +- .../discord/widgets/auth/WidgetAuthMfa.smali | 10 +- ...sAdapter$RoleAdapterItem_ViewBinding.smali | 2 +- .../WidgetChannelGroupDMSettings.smali | 2 +- ...etChannelGroupDMSettings_ViewBinding.smali | 6 +- ...tingsPermissionsOverview_ViewBinding.smali | 4 +- ...olesAdapter$RoleListItem_ViewBinding.smali | 2 +- ...oupInviteFriendsListItem_ViewBinding.smali | 2 +- .../WidgetChannelsListItemVoiceActions.smali | 18 +- ...tAdapter$WidgetCollapsedUserListItem.smali | 4 +- .../ChannelMembersListViewHolderLoading.smali | 2 +- ...putAttachments$DiscordCameraFragment.smali | 2 +- ...achments$PermissionsEmptyListAdapter.smali | 2 +- ...dgetChatInputEmojiPicker_ViewBinding.smali | 6 +- ...idgetChatListAdapterItemGuildWelcome.smali | 4 +- ...AdapterItemMentionFooter_ViewBinding.smali | 2 +- ...terItemSearchResultCount_ViewBinding.smali | 2 +- ...getChatListAdapterItemUploadProgress.smali | 10 +- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- .../invite/WidgetGuildInviteShare.smali | 6 +- .../widgets/main/WidgetMainPanelNsfw.smali | 2 +- .../widgets/main/WidgetMainSurveyDialog.smali | 8 +- .../notice/WidgetNoticeDialog$Builder.smali | 8 + ...iceDialog$Companion$showInputModal$1.smali | 2 +- ...iceDialog$Companion$showInputModal$3.smali | 2 +- .../widgets/notice/WidgetNoticePopup.smali | 10 +- .../notice/WidgetNoticePopupChannel.smali | 4 +- .../search/WidgetSearch_ViewBinding.smali | 12 +- .../WidgetSearchResults_ViewBinding.smali | 2 +- ...Adapter$FilterViewHolder_ViewBinding.smali | 8 +- ...onsAdapter$HasViewHolder_ViewBinding.smali | 6 +- ...Adapter$HeaderViewHolder_ViewBinding.smali | 2 +- ...$HistoryHeaderViewHolder_ViewBinding.smali | 2 +- ...pter$InChannelViewHolder_ViewBinding.smali | 6 +- ...er$RecentQueryViewHolder_ViewBinding.smali | 4 +- ...nsAdapter$UserViewHolder_ViewBinding.smali | 2 +- .../WidgetSearchSuggestions_ViewBinding.smali | 2 +- ...sChannelListAdapter$CategoryListItem.smali | 4 +- ...gsChannelListAdapter$ChannelListItem.smali | 8 +- .../servers/WidgetServerDeleteDialog.smali | 12 +- .../servers/WidgetServerNotifications.smali | 14 +- ...tServerNotificationsOverrideSelector.smali | 2 +- ...electDialog$RegionAdapter$ItemRegion.smali | 2 +- .../WidgetServerRegionSelectDialog.smali | 2 +- .../servers/WidgetServerSettings.smali | 36 +- .../servers/WidgetServerSettingsBans.smali | 6 +- ...erverSettingsChannelsFabMenuFragment.smali | 2 +- ...getServerSettingsChannelsSortActions.smali | 6 +- ...etServerSettingsChannels_ViewBinding.smali | 4 +- ...olesAdapter$RoleListItem_ViewBinding.smali | 2 +- .../WidgetServerSettingsEditRole.smali | 2 +- ...etServerSettingsEditRole_ViewBinding.smali | 68 +- ...Emojis$Adapter$EmojiHeaderViewHolder.smali | 4 +- ...gsEmojis$Adapter$EmojiItemViewHolder.smali | 10 +- ...mojis$Adapter$EmojiSectionViewHolder.smali | 2 +- .../servers/WidgetServerSettingsEmojis.smali | 4 +- .../WidgetServerSettingsEmojisEdit.smali | 4 +- ...erSettingsInstantInvites_ViewBinding.smali | 4 +- ...etServerSettingsIntegrationsListItem.smali | 6 +- ...rSettingsMembers$RolesSpinnerAdapter.smali | 2 +- ...getServerSettingsMembers_ViewBinding.smali | 8 +- ...ServerSettingsModeration_ViewBinding.smali | 16 +- ...erverSettingsOverview$AfkBottomSheet.smali | 6 +- ...rview$initChannelSelectedHandler$1$1.smali | 4 +- ...RegionDialog$$inlined$apply$lambda$1.smali | 6 +- .../WidgetServerSettingsOverview.smali | 50 +- ...ListAdapter$RoleListItem_ViewBinding.smali | 8 +- ...tServerSettingsRolesList_ViewBinding.smali | 4 +- ...Security$ToggleMfaDialog_ViewBinding.smali | 6 +- ...etServerSettingsSecurity_ViewBinding.smali | 2 +- ...tServerSettingsVanityUrl_ViewBinding.smali | 22 +- .../WidgetServerSettingsAuditLog.smali | 10 +- .../widgets/settings/WidgetSettings.smali | 42 +- .../settings/WidgetSettingsAppearance.smali | 8 +- .../settings/WidgetSettingsBehavior.smali | 8 +- .../settings/WidgetSettingsGames.smali | 12 +- ...uageSelect$Adapter$AdapterItemLocale.smali | 4 +- .../WidgetSettingsLanguageSelect.smali | 2 +- .../WidgetSettingsLanguage_ViewBinding.smali | 8 +- .../settings/WidgetSettingsMedia.smali | 10 +- .../WidgetSettingsNotifications.smali | 14 +- .../WidgetSettingsNotificationsOs.smali | 6 +- .../settings/WidgetSettingsPrivacy.smali | 40 +- .../settings/WidgetSettingsVoice.smali | 42 +- .../account/WidgetSettingsAccount.smali | 48 +- .../WidgetSettingsAccountBackupCodes.smali | 6 +- ...getSettingsAccountEdit$configureUI$1.smali | 2 +- ...getSettingsAccountEdit$onViewBound$2.smali | 2 +- .../account/WidgetSettingsAccountEdit.smali | 64 +- .../account/mfa/WidgetEnableMFAInput.smali | 2 +- .../settings/billing/PaymentSourceView.smali | 10 +- .../billing/SettingsBillingViewModel.smali | 90 +- .../WidgetPaymentSourceEditDialog.smali | 20 +- .../billing/WidgetSettingsBilling.smali | 4 +- .../WidgetSettingsPaymentMethods.smali | 6 +- ...SettingsPremium$showDowngradeModal$1.smali | 77 + .../nitro/WidgetSettingsPremium.smali | 46 +- .../nitro/WidgetUpgradePremiumDialog.smali | 10 +- .../widgets/share/WidgetIncomingShare.smali | 8 +- .../status/WidgetStatus_ViewBinding.smali | 16 +- .../user/ViewHolderMusicRichPresence.smali | 10 +- .../user/ViewHolderPlatformRichPresence.smali | 4 +- .../user/ViewHolderUserRichPresence.smali | 16 +- .../user/WidgetPruneUsers_ViewBinding.smali | 16 +- ...UserMentions$WidgetUserMentionFilter.smali | 6 +- .../widgets/user/WidgetUserMentions.smali | 2 +- ...ends$MutualFriendsAdapter$ViewHolder.smali | 4 +- ...riendsAdapter$ViewHolder_ViewBinding.smali | 10 +- .../WidgetUserMutualFriends_ViewBinding.smali | 2 +- ...uilds$Adapter$ViewHolder_ViewBinding.smali | 8 +- .../WidgetUserMutualGuilds_ViewBinding.smali | 2 +- ...UserProfileEmptyListItem_ViewBinding.smali | 4 +- .../user/WidgetUserProfileHeader.smali | 14 +- .../WidgetUserProfileInfo_ViewBinding.smali | 12 +- .../widgets/user/WidgetUserProfileStrip.smali | 16 +- .../user/WidgetUserProfile_ViewBinding.smali | 32 +- .../widgets/user/WidgetUserStatusSheet.smali | 14 +- .../captcha/WidgetUserCaptchaVerify.smali | 6 +- .../WidgetUserPhoneAdd_ViewBinding.smali | 8 +- .../WidgetUserPhoneVerify_ViewBinding.smali | 4 +- .../user/search/WidgetGlobalSearch.smali | 8 +- .../user/usersheet/WidgetUserSheet.smali | 54 +- .../widgets/voice/call/WidgetCallFailed.smali | 8 +- .../voice/call/WidgetPrivateCall.smali | 16 +- .../call/WidgetPrivateCallControlsView.smali | 6 +- ...lInline$Adapter$ItemUser_ViewBinding.smali | 2 +- .../WidgetVoiceCallInline_ViewBinding.smali | 22 +- ...Adapter$ViewHolderHeader_ViewBinding.smali | 2 +- ...tsAdapter$ViewHolderUser_ViewBinding.smali | 8 +- .../voice/fullscreen/VoiceControlsView.smali | 14 +- .../settings/WidgetVoiceChannelSettings.smali | 6 +- .../com/google/android/cameraview/R$id.smali | 8 +- .../com/google/android/material/R$id.smali | 140 +- .../com/lytefast/flexinput/R$e.smali | 178 +- .../com/miguelgaeta/media_picker/R$id.smali | 128 +- .../com/yalantis/ucrop/R$d.smali | 124 +- 203 files changed, 2528 insertions(+), 2797 deletions(-) delete mode 100644 com.discord/smali/com/discord/utilities/textprocessing/Rules$createInviteRule$1.smali delete mode 100644 com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$render$clickableSpan$1.smali delete mode 100644 com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali create mode 100644 com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium$showDowngradeModal$1.smali diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 0e5591b232..d1faddab04 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-860.apk +apkFileName: com.discord-861.apk compressionType: false doNotCompress: - arsc @@ -469,5 +469,5 @@ usesFramework: tag: null version: 2.4.1-cc194d-SNAPSHOT versionInfo: - versionCode: '860' - versionName: 8.6.0 + versionCode: '861' + versionName: 8.6.1 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 39f469ab31..49ee6dfc2e 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! # -#Mon Mar 18 21:23:24 UTC 2019 -version_name=8.6.0 +#Tue Mar 19 22:46:21 UTC 2019 +version_name=8.6.1 package_name=com.discord -build_id=4cb5a3cd-6928-4a26-945f-b8df83954e19 -version_code=860 +build_id=fc78d36d-a84f-46f2-abf7-ba80a007cbd0 +version_code=861 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index dc15d1ea467acad5036d0b909d60805218070fc3..6eeee0eda9020b52f956863189607a152388c321 100644 GIT binary patch delta 23 fcmbPpopH`}#tmldjE0-d*;BO{V>iz=`fmXMX~hVj delta 23 fcmbPpopH`}#tmldj0T&{*;BO{V>Zt<`fmXMX|f2O diff --git a/com.discord/res/layout-v17/view_active_subscription.xml b/com.discord/res/layout-v17/view_active_subscription.xml index fc6fae3f76..26e0b9bf15 100644 --- a/com.discord/res/layout-v17/view_active_subscription.xml +++ b/com.discord/res/layout-v17/view_active_subscription.xml @@ -4,7 +4,7 @@ - +