From 557443814361f4ff6050cf37decf430c81b6da86 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 22 May 2023 00:41:02 +0300 Subject: [PATCH 01/11] init --- app/proguard-rules.pro | 9 +- .../libvkx/client/LibVKXClient.java | 4 +- .../java/com/vk/api/audio/AudioGetLyrics.java | 2 +- .../com/vk/core/extensions/TextViewExt.java | 2 +- .../com/vk/core/utils/VerifyInfoHelper.java | 2 +- .../common/DialogActionsHelper.java | 2 +- .../adapter/msgparts/MsgPartCallHolder.java | 2 +- .../im/ui/views/dialogs/DialogItemView.java | 2 +- .../com/vk/medianative/MediaImageEncoder.java | 2 +- .../com/vk/music/view/x/LyricsHolder.java | 2 +- .../com/vk/sharing/view/TargetImageView.java | 4 +- .../BottomNavigationItemView.java | 4 +- .../utils/About.java => hooks/AboutHook.java} | 11 +- .../java/ru/vtosters/hooks/AdBlockHook.java | 21 + .../vtosters/{lite => }/hooks/AppVerHook.java | 4 +- .../{lite => }/hooks/BusinessNotifHook.java | 4 +- .../vtosters/{lite => }/hooks/CallsHook.java | 2 +- .../{lite => }/hooks/CryptImHook.java | 6 +- .../vtosters/{lite => }/hooks/DateHook.java | 4 +- .../DeletedMessagesHook.java} | 16 +- .../{lite => }/hooks/DeviceInfoHook.java | 4 +- .../DialogHeaderInjector.java | 12 +- .../DialogMenuInjectors.java | 12 +- .../DialogMessageInjector.java | 6 +- .../{lite => }/hooks/DockBarInjector.java | 6 +- .../hooks/EncryptionMessagesHook.java | 102 ++++ .../{lite => }/hooks/FragAnimationHook.java | 4 +- .../ru/vtosters/{lite => }/hooks/GcmHook.java | 4 +- .../GmsUtils.java => hooks/GmsHook.java} | 5 +- .../java/ru/vtosters/hooks/JsonInjectors.java | 39 ++ .../hooks/MainActivityInjector.java | 14 +- .../MessagesActivityHook.java} | 4 +- .../{lite => }/hooks/MessagesHook.java | 13 +- .../{lite => }/hooks/NewsfeedHook.java | 6 +- .../{lite => }/hooks/OnlineFormatterHook.java | 20 +- .../{lite => }/hooks/PhotoViewer.java | 4 +- .../{lite => }/hooks/PicRoundingHook.java | 4 +- .../vtosters/{lite => }/hooks/PollHook.java | 4 +- .../{lite => }/hooks/PostViewHook.java | 4 +- .../{lite => }/hooks/PromoStickersHook.java | 4 +- .../vtosters/{lite => }/hooks/ProxyHook.java | 76 ++- .../java/ru/vtosters/hooks/RenameHook.java | 31 ++ .../{lite => }/hooks/ReplyMsgHook.java | 4 +- .../{lite => }/hooks/RequestDumper.java | 4 +- .../{lite => }/hooks/StartFragmentHook.java | 4 +- .../{lite => }/hooks/StoriesHook.java | 9 +- .../vtosters/{lite => }/hooks/SwitchHook.java | 6 +- .../vtosters/hooks/TelegramStickersHook.java | 87 ++++ .../{lite => }/hooks/TogglesHook.java | 4 +- .../vtosters/{lite => }/hooks/VKUIHook.java | 10 +- .../ru/vtosters/hooks/VerificationsHook.java | 53 +++ .../ru/vtosters/hooks/VideoPlayerHook.java | 23 + .../ru/vtosters/hooks/VoiceMessagesHook.java | 9 + .../WebAppHook.java} | 11 +- .../{lite => }/hooks/WritebarHook.java | 6 +- .../utils => hooks/other}/Preferences.java | 9 +- .../utils => hooks/other}/ThemesUtils.java | 7 +- .../ru/vtosters/hooks/ssfs/BannerHook.java | 36 ++ .../ssfs/ProfileHook.java} | 13 +- .../hooks/ui/SystemThemeChangerHook.java | 6 +- .../ru/vtosters/lite/deviceinfo/Device.java | 2 +- .../ru/vtosters/lite/dialogs/DNRPrefs.java | 27 +- .../ru/vtosters/lite/dialogs/Requests.java | 2 +- .../lite/downloaders/VideoDownloader.java | 2 +- .../HtmlDialogDownloaderFormatProvider.java | 2 +- .../downloaders/messages/items/MiniMsg.java | 2 +- .../lite/encryption/EncryptProvider.java | 110 +---- .../lite/encryption/base/IMProcessor.java | 4 +- .../processors/VTostersAESProcessor.java | 2 +- .../ru/vtosters/lite/hooks/AdBlockHook.java | 390 --------------- .../ru/vtosters/lite/hooks/JsonInjectors.java | 240 ---------- .../vtosters/lite/music/LastFMScrobbler.java | 2 +- .../catalog/inject/CatalogJsonInjector.java | 6 +- .../converter/playlist/PlaylistConverter.java | 2 +- .../lite/music/downloader/AudioGet.java | 2 +- .../lite/music/hook/MusicBottomSheetHook.java | 2 +- .../ru/vtosters/lite/proxy/ProxyUtils.java | 2 +- .../ru/vtosters/lite/proxy/RandomProxy.java | 2 +- .../ru/vtosters/lite/proxy/api/ApiProxy.java | 76 --- .../vtosters/lite/proxy/api/VikaMobile.java | 2 +- .../vtosters/lite/proxy/http/CustomHttp.java | 2 +- .../ru/vtosters/lite/proxy/http/Jetkai.java | 2 +- .../vtosters/lite/proxy/http/TheSpeedX.java | 2 +- .../lite/proxy/https/CustomHttps.java | 2 +- .../ru/vtosters/lite/proxy/https/Jetkai.java | 2 +- .../vtosters/lite/proxy/https/Roosterkid.java | 2 +- .../lite/proxy/socks/CustomSocks.java | 2 +- .../ru/vtosters/lite/proxy/socks/Hookzof.java | 2 +- .../ru/vtosters/lite/proxy/socks/Jetkai.java | 2 +- .../vtosters/lite/proxy/socks/Roosterkid.java | 2 +- .../vtosters/lite/proxy/socks/TheSpeedX.java | 2 +- .../java/ru/vtosters/lite/ssfs/ImBanner.java | 31 -- .../ru/vtosters/lite/ssfs/ProfileButtons.java | 2 +- .../java/ru/vtosters/lite/ssfs/UsersList.java | 2 - .../java/ru/vtosters/lite/ssfs/Utils.java | 6 +- .../java/ru/vtosters/lite/tgs/TGRoot.java | 81 +--- .../ru/vtosters/lite/themes/ThemesCore.java | 4 +- .../ru/vtosters/lite/themes/ThemesHacks.java | 4 +- .../vtosters/lite/themes/ThemesManager.java | 4 +- .../ru/vtosters/lite/themes/VTLResources.java | 2 +- .../ru/vtosters/lite/themes/ViewInjector.java | 2 +- .../lite/themes/hooks/ButtonHook.java | 2 +- .../lite/themes/hooks/ImageViewHook.java | 2 +- .../lite/themes/hooks/ProgressWheelHook.java | 2 +- .../lite/themes/hooks/TabLayoutHook.java | 2 +- .../lite/themes/hooks/TextViewHook.java | 2 +- .../lite/themes/hooks/ToolbarHook.java | 2 +- .../lite/themes/hooks/VKImageViewHook.java | 2 +- .../lite/themes/utils/RecolorUtils.java | 2 +- .../lite/themes/utils/VkUiThemer.java | 2 +- .../lite/translators/BaseTranslator.java | 4 +- .../lite/ui/PreferenceFragmentUtils.java | 2 +- .../lite/ui/adapters/CategorizedAdapter.java | 2 +- .../lite/ui/adapters/ColorPickerAdapter.java | 2 +- .../lite/ui/adapters/ImagineArrayAdapter.java | 4 +- .../ui/adapters/MessagesPreviewAdapter.java | 2 +- .../lite/ui/adapters/StickerPackAdapter.java | 4 +- .../lite/ui/components/BackupManager.java | 2 +- .../ui/components/DockBarEditorManager.java | 4 +- .../lite/ui/components/FragAnimationKit.java | 2 +- .../lite/ui/components/IconManager.java | 2 +- .../ui/components/NewsfeedListManager.java | 2 +- .../ui/components/SuperAppEditorManager.java | 2 +- .../lite/ui/dialogs/DisableBattery.java | 2 +- .../vtosters/lite/ui/dialogs/InstallGMS.java | 6 +- .../lite/ui/dialogs/MessageSettings.java | 4 +- .../vtosters/lite/ui/dialogs/OTADialog.java | 2 +- .../ui/dialogs/RoundingSeekbarDialog.java | 2 +- .../lite/ui/dialogs/ServerDialog.java | 6 +- .../ru/vtosters/lite/ui/dialogs/Start.java | 4 +- .../lite/ui/dialogs/ThemeChanging.java | 4 +- .../lite/ui/dialogs/VKIDProtection.java | 2 +- .../lite/ui/fragments/ActivityFragment.java | 2 +- .../ui/fragments/DataSettingsFragment.java | 7 +- .../lite/ui/fragments/FeedFragment.java | 2 +- .../lite/ui/fragments/IconsFragment.java | 6 +- .../lite/ui/fragments/InterfaceFragment.java | 6 +- .../lite/ui/fragments/MediaFragment.java | 6 +- .../lite/ui/fragments/MessagesFragment.java | 2 +- .../lite/ui/fragments/OtherFragment.java | 7 +- .../ui/fragments/SuperAppEditorFragment.java | 2 +- .../lite/ui/fragments/SystemInfo.java | 2 +- .../lite/ui/fragments/ThemesFragment.java | 6 +- .../lite/ui/fragments/VTSettings.java | 13 +- .../tgstickers/StickersFragment.java | 2 +- .../ru/vtosters/lite/ui/vkui/MenuBuilder.java | 2 +- .../vtosters/lite/ui/vkui/VBListBuilder.java | 2 +- .../lite/ui/wallpapers/ImageEffect.java | 2 +- .../ui/wallpapers/WallpaperMenuFragment.java | 2 +- .../lite/ui/wallpapers/WallpapersHooks.java | 4 +- .../lite/utils/AccountManagerUtils.java | 9 - .../vtosters/lite/utils/AnalyticsHelper.java | 1 + .../ru/vtosters/lite/utils/AndroidUtils.java | 3 +- .../ru/vtosters/lite/utils/CacheUtils.java | 4 +- .../lite/utils/ExternalLinkParser.java | 17 +- .../lite/utils/FriendsCatalogUtils.java | 80 ++++ .../ru/vtosters/lite/utils/ImageUtils.java | 2 + .../ru/vtosters/lite/utils/NetworkUtils.java | 2 +- .../lite/utils/NewsFeedFiltersUtils.java | 443 ++++++++++++++++-- .../ru/vtosters/lite/utils/OnlineBypass.java | 86 ++++ .../ru/vtosters/lite/utils/RenameTool.java | 42 +- .../ru/vtosters/lite/utils/SuperAppUtils.java | 49 ++ .../ru/vtosters/lite/utils/VKMeHandler.java | 1 + .../vtosters/lite/utils/VTVerifications.java | 51 +- .../appcompat/app/AppCompatDelegateImpl.smali | 2 +- .../appcompat/widget/ResourcesWrapper.smali | 2 +- .../androidx/appcompat/widget/Toolbar.smali | 6 +- .../widget/ToolbarWidgetWrapper.smali | 2 +- .../androidx/cardview/widget/CardView.smali | 4 +- .../widget/RoundRectDrawableWithShadow.smali | 4 +- .../core/content/res/ResourcesCompat.smali | 2 +- smali/smali/com/facebook/GraphRequest$j.smali | 2 +- .../facebook/appevents/l/ViewIndexer$e.smali | 2 +- .../drawee/generic/RoundingParams.smali | 6 +- .../com/facebook/login/DeviceAuthDialog.smali | 2 +- .../internal/DeviceShareDialogFragment.smali | 2 +- .../facebook/x/k/SimpleImageTranscoder.smali | 2 +- .../datetimepicker/date/SimpleMonthView.smali | 2 +- .../date/TextViewWithCircularIndicator.smali | 2 +- .../datetimepicker/time/AmPmCirclesView.smali | 2 +- .../time/RadialSelectorView.smali | 2 +- .../time/RadialTimePickerDialog.smali | 2 +- .../gms/auth/AccountChangeEventsRequest.smali | 2 +- .../auth/api/signin/GoogleSignInAccount.smali | 2 +- .../auth/api/signin/GoogleSignInOptions.smali | 2 +- .../signin/internal/SignInHubActivity.smali | 2 +- .../smali/com/google/android/gms/auth/g.smali | 8 +- .../gms/common/api/internal/zabq.smali | 2 +- .../com/google/android/gms/common/c.smali | 2 +- .../com/google/android/gms/common/d.smali | 2 +- .../com/google/android/gms/common/e.smali | 16 +- .../common/internal/GetServiceRequest.smali | 2 +- .../android/gms/common/internal/d.smali | 4 +- .../android/gms/common/internal/e.smali | 2 +- .../android/gms/common/internal/f.smali | 2 +- .../google/android/gms/common/stats/b.smali | 4 +- .../google/android/gms/common/stats/c.smali | 4 +- .../google/android/gms/common/util/d.smali | 2 +- .../google/android/gms/common/util/q.smali | 2 +- .../android/gms/dynamite/DynamiteModule.smali | 8 +- .../gms/flags/impl/FlagProviderImpl.smali | 2 +- .../android/gms/internal/clearcut/zzy.smali | 4 +- .../android/gms/internal/phenotype/zzc.smali | 2 +- .../android/gms/internal/phenotype/zze.smali | 6 +- .../android/gms/internal/phenotype/zzf.smali | 4 +- .../com/google/android/gms/phenotype/a.smali | 2 +- .../com/google/android/gms/stats/a.smali | 2 +- smali/smali/com/google/firebase/iid/k.smali | 14 +- smali/smali/com/google/firebase/iid/q.smali | 8 +- smali/smali/com/google/firebase/iid/x.smali | 2 +- smali/smali/com/google/firebase/iid/z0.smali | 4 +- .../messaging/FirebaseMessagingService.smali | 2 +- .../com/google/firebase/messaging/d.smali | 2 +- smali/smali_classes2/b/h/c/b/AdsParams.smali | 6 +- smali/smali_classes2/b/h/g/g/BuildInfo.smali | 6 +- .../com/vk/about/holders2.smali | 6 +- .../com/vk/api/account/AccountGetBanned.smali | 2 +- .../com/vk/api/base/ApiConfig$a$a$a.smali | 4 +- .../com/vk/api/base/ApiRequest.smali | 6 +- .../com/vk/api/base/ListAPIRequest.smali | 4 +- .../com/vk/api/discover/DiscoverGet.smali | 2 +- .../com/vk/api/friends/FriendsGet.smali | 2 +- ...FriendsGetRequestsAndRecommendations.smali | 2 +- .../TokenConfirmationHandlerChainCall.smali | 4 +- .../com/vk/api/polls/PollGetVoters.smali | 2 +- .../com/vk/api/sdk/VKApiConfig$6.smali | 2 +- .../com/vk/api/sdk/auth/VKAuthParams$a.smali | 2 +- .../api/sdk/ui/VKWebViewAuthActivity$b.smali | 2 +- .../vk/api/sdk/ui/VKWebViewAuthActivity.smali | 2 +- .../com/vk/api/store/StoreGetProducts.smali | 2 +- .../vk/api/voip/VoipGetLongPollServer.smali | 2 +- .../com/vk/articles/ArticleFragment.smali | 4 +- .../com/vk/articles/ArticleWebView$a.smali | 2 +- .../vk/attachpicker/GraffitiActivity.smali | 2 +- .../PhotoVideoAttachActivity.smali | 2 +- .../attachpicker/fragment/StoryFragment.smali | 2 +- .../attachpicker/u/j/FiltersController.smali | 2 +- .../vk/attachpicker/widget/TabImageView.smali | 2 +- .../com/vk/auth/RestoreUtils.smali | 2 +- .../com/vk/auth/VkAuthModel.smali | 2 +- .../com/vk/auth/api/VKAccount.smali | 12 +- .../com/vk/auth/base/BaseAuthFragment.smali | 4 +- .../com/vk/auth/ui/VkAuthToolbar.smali | 2 +- .../auth/w/a/ChooseAuthMethodFragment.smali | 2 +- .../com/vk/auth/y/b/UrlCheckFragment$b.smali | 2 +- .../com/vk/balance/BalancePresenter.smali | 2 +- .../com/vk/cameraui/CameraUI$a.smali | 2 +- .../com/vk/cameraui/CameraUIView.smali | 2 +- .../core/api/i/CatalogGetFriends.smali | 2 +- .../core/api/i/CatalogGetSectionFriends.smali | 2 +- .../StickerPackVerticalListItemVh.smali | 2 +- .../vk/catalog2/core/y/ActionFollowVh.smali | 2 +- .../common/links/BrowserUtils$Companion.smali | 6 +- .../com/vk/common/links/LinkParser.smali | 2 +- .../com/vk/common/links/LinkProcessorKt.smali | 4 +- .../com/vk/common/links/OpenFunctionsKt.smali | 2 +- .../widget/LocatorIndicatorDrawable.smali | 2 +- .../LoadersComponentsViewHolder$1.smali | 2 +- .../ContactsSyncAdapterService$c.smali | 2 +- .../dialogs/actionspopup/ActionsPopup$b.smali | 2 +- .../vk/core/dialogs/alert/VkAlertDialog.smali | 2 +- .../vk/core/drawable/VkUiDrawableHelper.smali | 4 +- .../com/vk/core/extensions/ActivityExt.smali | 6 +- .../com/vk/core/extensions/EditTextExt.smali | 2 +- .../vk/core/formatters/OnlineFormatter.smali | 2 +- .../j/b/ParentSupportFragmentManager.smali | 4 +- .../metrics/traffic/TrafficAccumulator.smali | 2 +- .../vk/core/network/proxy/ProxySettings.smali | 2 +- .../network/security/NetworkKeyStore.smali | 2 +- .../security/NetworkTrustManager.smali | 6 +- .../core/network/utils/NetworkUserAgent.smali | 4 +- .../com/vk/core/tips/TipTextWindow.smali | 2 +- .../vk/core/ui/themes/MilkshakeHelper.smali | 2 +- .../com/vk/core/ui/themes/VKTheme.smali | 8 +- .../vk/core/ui/themes/VKThemeHelper$b.smali | 2 +- .../com/vk/core/ui/themes/VKThemeHelper.smali | 18 +- .../com/vk/core/util/DeviceIdProvider.smali | 10 +- .../com/vk/core/util/DeviceState.smali | 2 +- .../com/vk/core/util/StringUtils.smali | 6 +- .../com/vk/core/util/TimeUtils.smali | 4 +- .../com/vk/core/view/AppBarShadowView.smali | 6 +- .../com/vk/core/view/ArrowSendButton.smali | 2 +- .../vk/core/view/BottomConfirmButton.smali | 4 +- ...temWindowsFragmentWrapperFrameLayout.smali | 2 +- .../core/view/search/ModernSearchView.smali | 2 +- .../com/vk/discover/DiscoverFragment.smali | 4 +- .../com/vk/dto/account/VideoConfig.smali | 2 +- .../com/vk/dto/common/VerifyInfo$b.smali | 2 +- .../com/vk/dto/common/VerifyInfo.smali | 6 +- .../dto/feedlikes/FeedLikesResponse$b.smali | 2 +- .../com/vk/dto/menu/MenuResponse$b.smali | 4 +- .../vk/dto/menu/SuperAppMenuResponse$b.smali | 2 +- .../com/vk/dto/music/MusicTrack.smali | 2 +- .../com/vk/dto/newsfeed/Owner$b.smali | 6 +- .../com/vk/dto/stickers/StickerItem$b.smali | 2 +- .../vk/dto/stories/GeoNewsResponse$a1.smali | 2 +- .../stories/model/GetStoriesResponse.smali | 8 +- .../com/vk/dto/user/UserProfile.smali | 2 +- .../com/vk/dto/user/VisibleStatus.smali | 2 +- smali/smali_classes2/com/vk/emoji/Emoji.smali | 2 +- .../com/vk/extensions/ActivityExt.smali | 2 +- .../FriendsRecommendationsFragment.smali | 2 +- .../core/HttpRequestExecutorProvider.smali | 2 +- .../IdentityLabelAdapter$LabelHolder.smali | 2 +- .../commands/chats/ChatsJoinByLinkCmd.smali | 2 +- .../commands/chats/ChatsLoadPreviewCmd.smali | 2 +- .../messages/MsgMarkAsListenedViaBgCmd.smali | 2 +- .../messages/MsgMarkAsReadViaBgCmd.smali | 2 +- .../messages/SetUserActivityCmd.smali | 4 +- ...essagesConversationBarCallbackApiCmd.smali | 2 +- .../messages/MessagesExistsApiCmd.smali | 2 +- .../messages/MessagesGetByIdApiCmd.smali | 2 +- ...ssagesGetConversationMembersApiCmd$a.smali | 2 +- .../MessagesGetConversationsApiCmd$a.smali | 2 +- .../MessagesGetConversationsApiCmd.smali | 2 +- ...MessagesGetConversationsByIdApiCmd$a.smali | 2 +- .../MessagesGetConversationsByIdApiCmd.smali | 2 +- .../messages/MessagesGetCountersApiCmd.smali | 2 +- .../messages/MessagesGetHistoryApiCmd.smali | 6 +- .../messages/MessagesMarkAsReadApiCmd.smali | 6 +- .../messages/MessagesSendApiCmd.smali | 6 +- .../messages/MsgBotBtnSendEventApiCmd1.smali | 2 +- .../RecogniseAudioMessageApiCmd.smali | 2 +- .../api_parsers/AttachApiParser.smali | 2 +- .../api_parsers/ConversationParser$a.smali | 2 +- .../internal/api_parsers/GroupApiParser.smali | 2 +- .../api_parsers/LpAttachApiParser.smali | 2 +- .../internal/api_parsers/UserApiParser.smali | 2 +- .../f/c/BusinessNotifyConfigGetApiCmd$a.smali | 2 +- ...ImGetLongPollHistoryExtendedApiCmd$b.smali | 2 +- ...ImGetLongPollHistoryExtendedApiCmd$c.smali | 2 +- .../f/e/ExecuteImLpInitApiCmd$d.smali | 2 +- .../internal/f/h/UsersGetByIdApiCmd$b.smali | 2 +- .../internal/jobs/msg/MsgMarkAsReadJob.smali | 2 +- .../jobs/msg/MsgSendMultipleJob.smali | 6 +- .../jobs/msg/MsgSendUncheckedJob.smali | 6 +- .../longpoll/tasks/MsgDeleteLpTask.smali | 10 +- .../delegates/messages/MsgDbReader.smali | 2 +- .../messages/MsgStorageManager.smali | 2 +- .../internal/upload/VideoUploader.smali | 2 +- .../engine/models/messages/MsgFromUser.smali | 2 +- .../delegates/DocAttachViewTypeDelegate.smali | 2 +- .../audio_msg_player/AudioMsgPlayerVc.smali | 2 +- .../contacts/vc/contact/ContactVh.smali | 2 +- ...erActionsComponent$copyToClipboard$1.smali | 2 +- .../info/DialogHeaderInfoComponent.smali | 2 +- .../impl/vk/VkDialogsHeaderVc$1.smali | 8 +- .../impl/vk/VkDialogsHeaderVc.smali | 2 +- .../dialogs_list/v/DialogsListModels5.smali | 2 +- .../vc_impl/DialogsListAdapter.smali | 2 +- .../dialogs_list/vc_impl/PopupHelper.smali | 2 +- .../dialogs_list/vc_impl/VhDialog.smali | 8 +- .../install_vk_me/VkMePromoController.smali | 2 +- .../msg_list/MsgListComponent$d.smali | 2 +- .../OnViewControllerCallbackImpl.smali | 2 +- .../msg_send/recording/AudioRecordVc.smali | 2 +- .../dialog_bar/DialogBarVcCallback$a.smali | 2 +- .../info/DialogHeaderInfoVc.smali | 4 +- .../dialog_header/info/IconFormatter.smali | 8 +- .../viewcontrollers/msg_list/MsgListVc.smali | 2 +- .../SwipeToReplyItemTouchCallback.smali | 2 +- .../adapter/msgparts/MsgPartReplyHolder.smali | 4 +- .../msg_list/entry/MsgAttachBuilder.smali | 4 +- .../msg_list/entry/MsgContentBuilder.smali | 4 +- .../popup/DelegateDialogs.smali | 2 +- .../viewcontrollers/popup/DelegateMsg.smali | 2 +- .../drawables/CasperIndicatorDrawable.smali | 2 +- .../im/ui/drawables/MsgStatusDrawable.smali | 4 +- .../im/ui/formatters/MsgBodyFormatter.smali | 2 +- .../com/vk/im/ui/fragments/ChatFragment.smali | 4 +- .../im/ui/utils/DialogScreenshotTracker.smali | 2 +- .../ui/views/ConversationBarButtonsView.smali | 2 +- .../vk/im/ui/views/ScrollToBottomView.smali | 4 +- .../com/vk/im/ui/views/WriteBarDisabled.smali | 2 +- .../avatars/AbbreviationAvatarDrawable.smali | 2 +- .../ui/views/avatars/AvatarDataSource.smali | 2 +- .../views/avatars/CirclePostprocessor.smali | 2 +- .../DialogActionsListView.smali | 4 +- .../ui/views/settings/LabelSettingsView.smali | 2 +- .../views/settings/SwitchSettingsView.smali | 2 +- .../com/vk/imageloader/ImageLoaderUtils.smali | 4 +- .../autoplay/delegate/AutoPlayDelegate.smali | 2 +- .../delegate/NoAutoPlayDelegate.smali | 2 +- .../dialogs/BaseAnimationDialog.smali | 2 +- .../views/chat/g/CommentRoundedDrawable.smali | 2 +- .../libvideo/live/views/gifts/GiftsView.smali | 2 +- .../vk/libvideo/ui/VideoBottomPanelView.smali | 2 +- .../com/vk/libvideo/ui/VideoView.smali | 2 +- .../w/DefaultMentionSpanProvider.smali | 2 +- .../com/vk/menu/MenuFragment.smali | 4 +- .../com/vk/menu/MenuUtils.smali | 4 +- .../com/vk/menu/SearchMenuPresenter.smali | 4 +- .../com/vk/ml/model/BrandsNNModel.smali | 2 +- .../com/vk/music/AudioPlayerActivity.smali | 4 +- .../buttons/MusicPlaylistButtonsHolder.smali | 6 +- .../com/vk/music/view/MusicActionButton.smali | 2 +- .../com/vk/music/view/SmallPlayerView$a.smali | 2 +- .../NavigationDelegateActivity.smali | 2 +- .../NavigationDelegateBottom$k.smali | 2 +- .../navigation/NavigationDelegateBottom.smali | 14 +- .../SpecialEventsNavigationDelegate.smali | 6 +- .../newsfeed/holders/BaseFooterHolder.smali | 2 +- .../comments/VideoThumbnailHolder.smali | 2 +- .../k0/b/b/PostingItemPresenter.smali | 2 +- .../attachments/PostingAttachActivity.smali | 2 +- .../bottom/PosterPreviewAdapter$e$a.smali | 2 +- .../presenters/NewsfeedPresenter.smali | 2 +- .../vk/notifications/NotificationView.smali | 2 +- .../PollBackgroundSmallViewHolders2.smali | 2 +- .../adapters/PollResultAnswerHolder.smali | 2 +- .../vk/poll/views/PollFilterBottomView.smali | 2 +- .../poll/views/PollResultRateDrawable.smali | 2 +- .../polls/ui/views/AbstractPollView$e.smali | 2 +- .../vk/polls/ui/views/PollOptionView$a.smali | 4 +- .../vk/polls/ui/views/PollOptionView.smali | 4 +- .../adapter/items/b0/StubCountersItem$c.smali | 2 +- .../adapter/items/c0/StubMessageItem$c.smali | 2 +- .../CommunityOnlineStatusItem$a.smali | 2 +- .../profile/presenter/UserPresenter$a.smali | 2 +- .../vk/profile/presenter/UserPresenter.smali | 4 +- .../community/CommunityChatsFragment$c.smali | 2 +- .../ui/community/CommunityChatsFragment.smali | 2 +- .../ui/community/CommunityFragment.smali | 2 +- .../user/AdministratorProfileFragment.smali | 4 +- .../im/BusinessNotifyGroupNotification.smali | 2 +- .../im/MessageGroupNotification.smali | 2 +- .../com/vk/qrcode/QRUtils.smali | 2 +- .../com/vk/qrcode/QRViewUtils.smali | 2 +- .../sharing/attachment/AttachmentTypes2.smali | 2 +- .../com/vk/sharing/view/SharingView.smali | 4 +- .../init/BaseSocialGraphInitFragment.smali | 2 +- .../init/SocialGraphLoginFragment.smali | 4 +- .../list/SocialGraphFriendsFragment.smali | 2 +- .../com/vk/stickers/StickerEmojiPage.smali | 2 +- .../vk/stickers/StickerLongtapWindow.smali | 4 +- .../com/vk/stickers/Stickers.smali | 4 +- ...tionAdapter$StickersNavigationHolder.smali | 4 +- .../vk/stickers/StickersKeyboardView.smali | 2 +- .../com/vk/stickers/StickersView.smali | 4 +- .../com/vk/stickers/f0/KeyboardPopup.smali | 6 +- .../com/vk/stories/StoriesController.smali | 4 +- .../music/SelectRangeWaveFormView.smali | 6 +- .../StoryCreateQuestionDataProvider.smali | 2 +- .../clickable/models/StoryQuestionInfo.smali | 2 +- .../clickable/stickers/StoryPollSticker.smali | 2 +- .../com/vk/stories/util/StoriesUtil.smali | 2 +- .../vk/stories/view/VolumeControlView.smali | 4 +- .../question/StoryViewAskQuestionView.smali | 2 +- .../com/vk/toggle/FeatureManager.smali | 4 +- .../photoviewer/BottomPanelController.smali | 2 +- .../vk/ui/photoviewer/MenuController.smali | 4 +- .../vk/wall/replybar/ReplyBarPresenter.smali | 2 +- .../wall/thread/CommentThreadFragment.smali | 2 +- .../com/vk/webapp/VkUiFragment$b.smali | 2 +- .../com/vk/webapp/VkUiFragment.smali | 4 +- .../com/vk/webapp/bridges/AndroidBridge.smali | 14 +- .../webapp/bridges/VkUiConnectBridge$a.smali | 4 +- .../webapp/bridges/VkUiConnectBridge$u.smali | 2 +- .../vk/webapp/helpers/WebAppApiHelper.smali | 2 +- .../com/vk/webapp/helpers/WebClients.smali | 2 +- .../com/vk/webapp/p/a/StatusNavBarUtils.smali | 4 +- .../lite/BirthdayBroadcastReceiver.smali | 2 +- .../com/vtosters/lite/MainActivity.smali | 6 +- .../com/vtosters/lite/NotificationUtils.smali | 2 +- .../com/vtosters/lite/SDKAuthActivity$d.smali | 2 +- .../com/vtosters/lite/SDKAuthActivity.smali | 4 +- .../vtosters/lite/TabletDialogActivity.smali | 4 +- .../com/vtosters/lite/VKActivity.smali | 4 +- .../lite/VKApplication$initNetwork$1.smali | 2 +- .../com/vtosters/lite/VKApplication.smali | 2 +- .../vtosters/lite/ValidationActivity$a.smali | 2 +- .../com/vtosters/lite/ViewUtils.smali | 2 +- .../vtosters/lite/api/AppVKApiCallback.smali | 4 +- .../lite/api/execute/GetFullCommunity.smali | 2 +- .../lite/api/execute/GetFullProfile.smali | 2 +- .../lite/api/execute/GetFullUserProfile.smali | 6 +- .../api/newsfeed/NewsfeedCustomGet$a.smali | 2 +- .../lite/api/newsfeed/NewsfeedCustomGet.smali | 2 +- .../lite/api/newsfeed/NewsfeedGet.smali | 12 +- .../NewsfeedGetRecommendedLiveVideos.smali | 2 +- .../lite/api/newsfeed/NewsfeedSearch.smali | 4 +- .../com/vtosters/lite/api/wall/WallGet.smali | 2 +- .../vtosters/lite/api/wall/WallGetById.smali | 2 +- .../lite/attachments/AttachmentUtils.smali | 2 +- .../com/vtosters/lite/data/Users$a.smali | 4 +- .../com/vtosters/lite/data/Users.smali | 4 +- .../messages/chat/vc/MsgSendVc$i.smali | 2 +- .../messages/chat/vc/MsgSendVc.smali | 8 +- .../accept/ChatInviteActivity.smali | 2 +- .../money/MoneyInfoBottomSheetDialog.smali | 2 +- .../money/MoneyWebViewFragment$a.smali | 2 +- .../fragments/n2/DebugDomainsFilter.smali | 2 +- .../fragments/n2/SettingsDebugFragment.smali | 6 +- .../general/fragments/PhotosFragment.smali | 2 +- .../fragments/SuggestionsFragment.smali | 2 +- .../general/fragments/WebViewFragment$a.smali | 4 +- .../general/fragments/WebViewFragment.smali | 4 +- .../fragments/photos/PhotoListFragment.smali | 2 +- .../lite/fragments/y2/VideosFragment.smali | 2 +- ...neProvider$getApiManager$apiConfig$1.smali | 2 +- .../vtosters/lite/live/LiveUserHolder.smali | 2 +- .../lite/ui/CircleColorDrawable.smali | 4 +- .../com/vtosters/lite/ui/WriteBar.smali | 18 +- .../BottomNavigationMenuView.smali | 10 +- .../BottomNavigationView.smali | 2 +- .../lite/ui/g0/CardItemDecoration.smali | 2 +- .../ui/holder/video/VideoSimpleHolder.smali | 2 +- .../lite/ui/layout/ExpandableBarLayout.smali | 8 +- .../ui/refreshlayout/CircleImageView$a.smali | 4 +- .../VoiceRecordControlPopupWindow.smali | 2 +- .../lite/ui/widget/WaveRecordCircleView.smali | 2 +- .../lite/upload/UploadNotification.smali | 2 +- .../com/vtosters/lite/utils/Utils.smali | 4 +- .../org/chromium/base/BuildInfo.smali | 2 +- .../ru/mail/libverify/accounts/c.smali | 4 +- .../ru/mail/libverify/notifications/h.smali | 2 +- .../ru/mail/libverify/utils/n.smali | 2 +- 517 files changed, 1995 insertions(+), 1903 deletions(-) rename app/src/main/java/ru/vtosters/{lite/utils/About.java => hooks/AboutHook.java} (75%) create mode 100644 app/src/main/java/ru/vtosters/hooks/AdBlockHook.java rename app/src/main/java/ru/vtosters/{lite => }/hooks/AppVerHook.java (75%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/BusinessNotifHook.java (61%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/CallsHook.java (98%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/CryptImHook.java (96%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/DateHook.java (94%) rename app/src/main/java/ru/vtosters/{lite/utils/DeletedMessagesHandler.java => hooks/DeletedMessagesHook.java} (90%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/DeviceInfoHook.java (93%) rename app/src/main/java/ru/vtosters/{lite/dialogs => hooks}/DialogHeaderInjector.java (94%) rename app/src/main/java/ru/vtosters/{lite/dialogs => hooks}/DialogMenuInjectors.java (89%) rename app/src/main/java/ru/vtosters/{lite/dialogs => hooks}/DialogMessageInjector.java (93%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/DockBarInjector.java (98%) create mode 100644 app/src/main/java/ru/vtosters/hooks/EncryptionMessagesHook.java rename app/src/main/java/ru/vtosters/{lite => }/hooks/FragAnimationHook.java (84%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/GcmHook.java (98%) rename app/src/main/java/ru/vtosters/{lite/utils/GmsUtils.java => hooks/GmsHook.java} (95%) create mode 100644 app/src/main/java/ru/vtosters/hooks/JsonInjectors.java rename app/src/main/java/ru/vtosters/{lite => }/hooks/MainActivityInjector.java (86%) rename app/src/main/java/ru/vtosters/{lite/dialogs/DNRModule.java => hooks/MessagesActivityHook.java} (96%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/MessagesHook.java (87%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/NewsfeedHook.java (97%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/OnlineFormatterHook.java (91%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/PhotoViewer.java (99%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/PicRoundingHook.java (97%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/PollHook.java (89%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/PostViewHook.java (96%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/PromoStickersHook.java (65%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/ProxyHook.java (70%) create mode 100644 app/src/main/java/ru/vtosters/hooks/RenameHook.java rename app/src/main/java/ru/vtosters/{lite => }/hooks/ReplyMsgHook.java (91%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/RequestDumper.java (88%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/StartFragmentHook.java (97%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/StoriesHook.java (51%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/SwitchHook.java (97%) create mode 100644 app/src/main/java/ru/vtosters/hooks/TelegramStickersHook.java rename app/src/main/java/ru/vtosters/{lite => }/hooks/TogglesHook.java (97%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/VKUIHook.java (94%) create mode 100644 app/src/main/java/ru/vtosters/hooks/VerificationsHook.java create mode 100644 app/src/main/java/ru/vtosters/hooks/VideoPlayerHook.java create mode 100644 app/src/main/java/ru/vtosters/hooks/VoiceMessagesHook.java rename app/src/main/java/ru/vtosters/{lite/utils/WebAppUtils.java => hooks/WebAppHook.java} (62%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/WritebarHook.java (68%) rename app/src/main/java/ru/vtosters/{lite/utils => hooks/other}/Preferences.java (97%) rename app/src/main/java/ru/vtosters/{lite/utils => hooks/other}/ThemesUtils.java (99%) create mode 100644 app/src/main/java/ru/vtosters/hooks/ssfs/BannerHook.java rename app/src/main/java/ru/vtosters/{lite/ssfs/ProfileHider.java => hooks/ssfs/ProfileHook.java} (82%) rename app/src/main/java/ru/vtosters/{lite => }/hooks/ui/SystemThemeChangerHook.java (91%) delete mode 100644 app/src/main/java/ru/vtosters/lite/hooks/AdBlockHook.java delete mode 100644 app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java delete mode 100644 app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java create mode 100644 app/src/main/java/ru/vtosters/lite/utils/FriendsCatalogUtils.java create mode 100644 app/src/main/java/ru/vtosters/lite/utils/OnlineBypass.java create mode 100644 app/src/main/java/ru/vtosters/lite/utils/SuperAppUtils.java diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 125a3a229b..1b2141860b 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -34,11 +34,18 @@ -optimizations -keepattributes SourceFile, LineNumberTable --keep,allowoptimization class ru.vtosters.lite.** { +-keep,allowoptimization class ru.vtosters.hooks.** { public ; public ; public (...); } + +-keep,allowoptimization class ru.vtosters.lite.utils.AndroidUtils, ru.vtosters.lite.utils.NetworkUtils, ru.vtosters.lite.ui.**, ru.vtosters.lite.themes.**, ru.vtosters.lite.feature.**, ru.vtosters.lite.music.**, ru.vtosters.lite.downloaders.** { + public ; + public ; + public (...); +} + -keep class com.vtosters.lite.** { *; } -keep class com.vk.** { *; } -keep class bruhcollective.itaysonlab.libvkx.client.** { *; } \ No newline at end of file diff --git a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java index 422d8b13d2..2232550d11 100644 --- a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java +++ b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java @@ -11,8 +11,8 @@ import java.util.List; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; -import static ru.vtosters.lite.utils.Preferences.isValidSignature; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.isValidSignature; public class LibVKXClient { @SuppressLint("StaticFieldLeak") diff --git a/app/src/main/java/com/vk/api/audio/AudioGetLyrics.java b/app/src/main/java/com/vk/api/audio/AudioGetLyrics.java index 6e2df114e2..b6a1d8d6f1 100644 --- a/app/src/main/java/com/vk/api/audio/AudioGetLyrics.java +++ b/app/src/main/java/com/vk/api/audio/AudioGetLyrics.java @@ -8,7 +8,7 @@ import org.json.JSONObject; import ru.vtosters.lite.music.Genius; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; +import ru.vtosters.hooks.other.Preferences; import java.util.ArrayList; diff --git a/app/src/main/java/com/vk/core/extensions/TextViewExt.java b/app/src/main/java/com/vk/core/extensions/TextViewExt.java index 07e5293313..f9f023e08b 100644 --- a/app/src/main/java/com/vk/core/extensions/TextViewExt.java +++ b/app/src/main/java/com/vk/core/extensions/TextViewExt.java @@ -14,7 +14,7 @@ import b.h.v.TextViewTextChangeEvent; import b.h.v.TextViewTextChangeEventObservable; import com.vk.core.util.ContextExtKt; -import ru.vtosters.lite.utils.ThemesUtils; +import ru.vtosters.hooks.other.ThemesUtils; public final class TextViewExt { public static void a(TextView textView, Drawable drawable) { diff --git a/app/src/main/java/com/vk/core/utils/VerifyInfoHelper.java b/app/src/main/java/com/vk/core/utils/VerifyInfoHelper.java index 6ddb223830..f32c281dfe 100644 --- a/app/src/main/java/com/vk/core/utils/VerifyInfoHelper.java +++ b/app/src/main/java/com/vk/core/utils/VerifyInfoHelper.java @@ -14,7 +14,7 @@ import com.vk.dto.common.VerifyInfo; import com.vk.extensions.ViewExtKt; import com.vtosters.lite.R; -import ru.vtosters.lite.utils.ThemesUtils; +import ru.vtosters.hooks.other.ThemesUtils; public final class VerifyInfoHelper { diff --git a/app/src/main/java/com/vk/im/ui/components/common/DialogActionsHelper.java b/app/src/main/java/com/vk/im/ui/components/common/DialogActionsHelper.java index 95cc1aff4a..ab52f76555 100644 --- a/app/src/main/java/com/vk/im/ui/components/common/DialogActionsHelper.java +++ b/app/src/main/java/com/vk/im/ui/components/common/DialogActionsHelper.java @@ -11,7 +11,7 @@ import com.vk.im.engine.models.groups.Group; import com.vk.im.engine.utils.DialogPermissionHelper; import com.vk.im.ui.p.ImBridge7; -import ru.vtosters.lite.dialogs.DialogMenuInjectors; +import ru.vtosters.hooks.DialogMenuInjectors; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartCallHolder.java b/app/src/main/java/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartCallHolder.java index f36ed453b0..28e6faff4f 100644 --- a/app/src/main/java/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartCallHolder.java +++ b/app/src/main/java/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartCallHolder.java @@ -21,7 +21,7 @@ import com.vtosters.lite.R; import kotlin.TypeCastException; import kotlin.jvm.internal.Intrinsics; -import ru.vtosters.lite.hooks.CallsHook; +import ru.vtosters.hooks.CallsHook; public final class MsgPartCallHolder extends MsgPartHolderBase { public static final a I = new a(); diff --git a/app/src/main/java/com/vk/im/ui/views/dialogs/DialogItemView.java b/app/src/main/java/com/vk/im/ui/views/dialogs/DialogItemView.java index 3b5c2ec7cb..a2fef7dfb4 100644 --- a/app/src/main/java/com/vk/im/ui/views/dialogs/DialogItemView.java +++ b/app/src/main/java/com/vk/im/ui/views/dialogs/DialogItemView.java @@ -39,7 +39,7 @@ import com.vk.im.ui.views.avatars.StoryBorderView; import static com.vk.im.ui.d.vkim_administration_title; -import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor; +import static ru.vtosters.hooks.other.ThemesUtils.getAccentColor; public class DialogItemView extends ViewGroup { private final int B; diff --git a/app/src/main/java/com/vk/medianative/MediaImageEncoder.java b/app/src/main/java/com/vk/medianative/MediaImageEncoder.java index 7bd6ec433e..e4c263f2f2 100644 --- a/app/src/main/java/com/vk/medianative/MediaImageEncoder.java +++ b/app/src/main/java/com/vk/medianative/MediaImageEncoder.java @@ -4,7 +4,7 @@ import android.graphics.Bitmap.CompressFormat; import android.os.Build; import android.util.Log; -import ru.vtosters.lite.utils.Preferences; +import ru.vtosters.hooks.other.Preferences; import java.io.File; import java.io.FileOutputStream; diff --git a/app/src/main/java/com/vk/music/view/x/LyricsHolder.java b/app/src/main/java/com/vk/music/view/x/LyricsHolder.java index 2fa0644c19..3d72f3a4d2 100644 --- a/app/src/main/java/com/vk/music/view/x/LyricsHolder.java +++ b/app/src/main/java/com/vk/music/view/x/LyricsHolder.java @@ -24,7 +24,7 @@ import com.vtosters.lite.ui.MusicErrorViewHelper; import com.vtosters.lite.ui.holder.RecyclerHolder; import ru.vtosters.lite.music.Genius; -import ru.vtosters.lite.utils.Preferences; +import ru.vtosters.hooks.other.Preferences; import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/app/src/main/java/com/vk/sharing/view/TargetImageView.java b/app/src/main/java/com/vk/sharing/view/TargetImageView.java index dcec58e212..a4f0fa8427 100644 --- a/app/src/main/java/com/vk/sharing/view/TargetImageView.java +++ b/app/src/main/java/com/vk/sharing/view/TargetImageView.java @@ -18,12 +18,12 @@ import com.vk.navigation.NavigatorKeys; import com.vtosters.lite.R; import com.vtosters.lite.a0; -import ru.vtosters.lite.utils.Preferences; +import ru.vtosters.hooks.other.Preferences; import java.util.Arrays; import static b.h.z.f.roboto_medium; -import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor; +import static ru.vtosters.hooks.other.ThemesUtils.getAccentColor; @UiThread public class TargetImageView extends VKMultiImageView { diff --git a/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java b/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java index a800144bac..3582163d42 100644 --- a/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java +++ b/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java @@ -26,8 +26,8 @@ import com.vtosters.lite.R; import me.grishka.appkit.utils.V; -import static ru.vtosters.lite.utils.Preferences.vkme; -import static ru.vtosters.lite.utils.ThemesUtils.getCSTDock; +import static ru.vtosters.hooks.other.Preferences.vkme; +import static ru.vtosters.hooks.other.ThemesUtils.getCSTDock; public class BottomNavigationItemView extends FrameLayout implements MenuView.ItemView { private final TextView mSmallLabel; diff --git a/app/src/main/java/ru/vtosters/lite/utils/About.java b/app/src/main/java/ru/vtosters/hooks/AboutHook.java similarity index 75% rename from app/src/main/java/ru/vtosters/lite/utils/About.java rename to app/src/main/java/ru/vtosters/hooks/AboutHook.java index e7133cc9bf..4e739a368c 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/About.java +++ b/app/src/main/java/ru/vtosters/hooks/AboutHook.java @@ -1,14 +1,17 @@ -package ru.vtosters.lite.utils; +package ru.vtosters.hooks; import android.view.View; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.lite.utils.AndroidUtils; +import ru.vtosters.lite.utils.VersionReader; +import static ru.vtosters.hooks.other.Preferences.devmenu; +import static ru.vtosters.hooks.other.Preferences.getBuildName; import static ru.vtosters.lite.utils.AndroidUtils.getApplicationName; import static ru.vtosters.lite.utils.AndroidUtils.sendToast; -import static ru.vtosters.lite.utils.Preferences.devmenu; -import static ru.vtosters.lite.utils.Preferences.getBuildName; -public class About { +public class AboutHook { public static void inject(View view) { view.setOnLongClickListener(v -> { if (devmenu()) { diff --git a/app/src/main/java/ru/vtosters/hooks/AdBlockHook.java b/app/src/main/java/ru/vtosters/hooks/AdBlockHook.java new file mode 100644 index 0000000000..55cc1fe43a --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/AdBlockHook.java @@ -0,0 +1,21 @@ +package ru.vtosters.hooks; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; +import ru.vtosters.lite.utils.NewsFeedFiltersUtils; + +public class AdBlockHook { + public static JSONObject discoverInject(JSONObject json) throws JSONException { + return NewsFeedFiltersUtils.discoverInject(json); + } + + public static JSONArray feedInject(JSONArray items) { + return NewsFeedFiltersUtils.feedInject(items); + + } + + public static JSONObject storiesads(JSONObject json, boolean isDeleteFix) throws JSONException { + return NewsFeedFiltersUtils.storiesads(json, isDeleteFix); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/hooks/AppVerHook.java b/app/src/main/java/ru/vtosters/hooks/AppVerHook.java similarity index 75% rename from app/src/main/java/ru/vtosters/lite/hooks/AppVerHook.java rename to app/src/main/java/ru/vtosters/hooks/AppVerHook.java index 0b3678fe73..594d1e9166 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/AppVerHook.java +++ b/app/src/main/java/ru/vtosters/hooks/AppVerHook.java @@ -1,8 +1,8 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import b.h.g.g.BuildInfo; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; public class AppVerHook { public static int appBuild() { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/BusinessNotifHook.java b/app/src/main/java/ru/vtosters/hooks/BusinessNotifHook.java similarity index 61% rename from app/src/main/java/ru/vtosters/lite/hooks/BusinessNotifHook.java rename to app/src/main/java/ru/vtosters/hooks/BusinessNotifHook.java index dad0ca24d8..961050051c 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/BusinessNotifHook.java +++ b/app/src/main/java/ru/vtosters/hooks/BusinessNotifHook.java @@ -1,6 +1,6 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; public class BusinessNotifHook { public static boolean hook(boolean i) { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/CallsHook.java b/app/src/main/java/ru/vtosters/hooks/CallsHook.java similarity index 98% rename from app/src/main/java/ru/vtosters/lite/hooks/CallsHook.java rename to app/src/main/java/ru/vtosters/hooks/CallsHook.java index dbb661a506..d7fb8c6ebc 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/CallsHook.java +++ b/app/src/main/java/ru/vtosters/hooks/CallsHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/ru/vtosters/lite/hooks/CryptImHook.java b/app/src/main/java/ru/vtosters/hooks/CryptImHook.java similarity index 96% rename from app/src/main/java/ru/vtosters/lite/hooks/CryptImHook.java rename to app/src/main/java/ru/vtosters/hooks/CryptImHook.java index 2c2bd0c71a..38da7d3dc6 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/CryptImHook.java +++ b/app/src/main/java/ru/vtosters/hooks/CryptImHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.app.Activity; import android.content.Context; @@ -17,11 +17,11 @@ import java.util.List; import java.util.Objects; -import static ru.vtosters.lite.dialogs.DialogHeaderInjector.forceInvalidateDialogActions; +import static ru.vtosters.hooks.DialogHeaderInjector.forceInvalidateDialogActions; +import static ru.vtosters.hooks.other.ThemesUtils.getSTextAttr; import static ru.vtosters.lite.utils.AndroidUtils.dp2px; import static ru.vtosters.lite.utils.AndroidUtils.sendToast; import static ru.vtosters.lite.utils.LifecycleUtils.getCurrentActivity; -import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr; public class CryptImHook { public static boolean isPrivateProcessor(int peerID) { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/DateHook.java b/app/src/main/java/ru/vtosters/hooks/DateHook.java similarity index 94% rename from app/src/main/java/ru/vtosters/lite/hooks/DateHook.java rename to app/src/main/java/ru/vtosters/hooks/DateHook.java index c16ea08fe9..397b5d595a 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/DateHook.java +++ b/app/src/main/java/ru/vtosters/hooks/DateHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.annotation.SuppressLint; import com.vtosters.lite.R; @@ -8,8 +8,8 @@ import java.util.Date; import java.util.Locale; +import static ru.vtosters.hooks.other.Preferences.getString; import static ru.vtosters.lite.utils.AndroidUtils.getStringDate; -import static ru.vtosters.lite.utils.Preferences.getString; public class DateHook { public static boolean fulltime() { diff --git a/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java b/app/src/main/java/ru/vtosters/hooks/DeletedMessagesHook.java similarity index 90% rename from app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java rename to app/src/main/java/ru/vtosters/hooks/DeletedMessagesHook.java index 2579896838..7e708c0edc 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java +++ b/app/src/main/java/ru/vtosters/hooks/DeletedMessagesHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.utils; +package ru.vtosters.hooks; import android.annotation.SuppressLint; import android.content.ContentValues; @@ -12,18 +12,16 @@ import com.vk.libsqliteext.CustomSqliteExtensionsKt; import io.requery.android.database.sqlite.SQLiteDatabase; import io.requery.android.database.sqlite.SQLiteOpenHelper; -import ru.vtosters.lite.encryption.EncryptProvider; import java.util.ArrayList; import java.util.List; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.getString; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; -import static ru.vtosters.lite.utils.Preferences.getString; -public class DeletedMessagesHandler { +public class DeletedMessagesHook { private static List sDeletedMessagesList = new ArrayList<>(); - private static SQLiteDatabase sVKSQLiteDatabase; private static int sBodyIndex = -1; private static DeletedMessagesDBHelper sVTDatabase; @@ -60,13 +58,13 @@ private static void checkForNestedMsg(List nestedMsgs) { for (NestedMsg nestedMsg : nestedMsgs) { if (!nestedMsg.w0().isEmpty()) checkForNestedMsg(nestedMsg.w0()); - nestedMsg.d(EncryptProvider.decryptMessage(nestedMsg.f(), nestedMsg.getFrom().getId())); + nestedMsg.d(EncryptionMessagesHook.decryptMessage(nestedMsg.f(), nestedMsg.getFrom().getId())); } } private static void editTextOfMsg(MsgFromUser msgFromUser) { if (!msgFromUser.f().startsWith(getPrefixUndelete())) { - msgFromUser.d(getPrefixUndelete() + EncryptProvider.decryptMessage(msgFromUser)); + msgFromUser.d(getPrefixUndelete() + EncryptionMessagesHook.decryptMessage(msgFromUser)); } } @@ -87,7 +85,7 @@ public static void updateDialog(MsgDeleteLpTask msgDeleteLpTask) throws NoSuchFi @SuppressLint("Range") int localId = cursor.getInt(cursor.getColumnIndex("local_id")); - var className = DeletedMessagesHandler.class.getSimpleName(); + var className = DeletedMessagesHook.class.getSimpleName(); var imEnvironment = msgDeleteLpTask.b; var cint = msgDeleteLpTask.c; imEnvironment.a(className, new OnMsgUpdateEvent(className, cint, localId)); diff --git a/app/src/main/java/ru/vtosters/lite/hooks/DeviceInfoHook.java b/app/src/main/java/ru/vtosters/hooks/DeviceInfoHook.java similarity index 93% rename from app/src/main/java/ru/vtosters/lite/hooks/DeviceInfoHook.java rename to app/src/main/java/ru/vtosters/hooks/DeviceInfoHook.java index 5cce4f5332..1aa3c40906 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/DeviceInfoHook.java +++ b/app/src/main/java/ru/vtosters/hooks/DeviceInfoHook.java @@ -1,13 +1,13 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.annotation.SuppressLint; import android.os.Build; import android.provider.Settings; import android.util.Log; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; import static ru.vtosters.lite.utils.AndroidUtils.MD5; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; public class DeviceInfoHook { public static String getDeviceInfo(String input) { diff --git a/app/src/main/java/ru/vtosters/lite/dialogs/DialogHeaderInjector.java b/app/src/main/java/ru/vtosters/hooks/DialogHeaderInjector.java similarity index 94% rename from app/src/main/java/ru/vtosters/lite/dialogs/DialogHeaderInjector.java rename to app/src/main/java/ru/vtosters/hooks/DialogHeaderInjector.java index 41259d6f29..e7b2ec6c19 100644 --- a/app/src/main/java/ru/vtosters/lite/dialogs/DialogHeaderInjector.java +++ b/app/src/main/java/ru/vtosters/hooks/DialogHeaderInjector.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.dialogs; +package ru.vtosters.hooks; import android.annotation.SuppressLint; import android.os.Environment; @@ -8,11 +8,11 @@ import com.vk.im.engine.models.dialogs.Dialog; import com.vk.im.ui.components.common.DialogAction; import com.vk.im.ui.views.dialog_actions.DialogActionsListView; +import ru.vtosters.lite.dialogs.Requests; import ru.vtosters.lite.downloaders.messages.HtmlDialogDownloaderFormatProvider; import ru.vtosters.lite.downloaders.messages.MessagesDownloader; import ru.vtosters.lite.encryption.EncryptProvider; import ru.vtosters.lite.encryption.base.IMProcessor; -import ru.vtosters.lite.hooks.CryptImHook; import ru.vtosters.lite.utils.AndroidUtils; import java.io.File; @@ -35,12 +35,12 @@ public static boolean onClick(DialogAction action, Dialog dialog) { // header me forceInvalidateDialogActions(dialog); } case DNR_ON, DNR_OFF -> { - DNRModule.hookDNR(peerId); + MessagesActivityHook.hookDNR(peerId); forceInvalidateDialogActions(dialog); return true; } case DNT_ON, DNT_OFF -> { - DNRModule.hookDNT(peerId); + MessagesActivityHook.hookDNT(peerId); forceInvalidateDialogActions(dialog); return true; } @@ -84,13 +84,13 @@ public static List injectToListAccess(List actions, actions.add(DialogAction.DOWNLOAD); - if (DNRModule.isDnrEnabledFor(peerId)) { + if (MessagesActivityHook.isDnrEnabledFor(peerId)) { actions.add(DialogAction.DNR_OFF); } else { actions.add(DialogAction.DNR_ON); } - if (DNRModule.isDntEnabledFor(peerId)) { + if (MessagesActivityHook.isDntEnabledFor(peerId)) { actions.add(DialogAction.DNT_OFF); } else { actions.add(DialogAction.DNT_ON); diff --git a/app/src/main/java/ru/vtosters/lite/dialogs/DialogMenuInjectors.java b/app/src/main/java/ru/vtosters/hooks/DialogMenuInjectors.java similarity index 89% rename from app/src/main/java/ru/vtosters/lite/dialogs/DialogMenuInjectors.java rename to app/src/main/java/ru/vtosters/hooks/DialogMenuInjectors.java index 2b708e1699..04c99c71d9 100644 --- a/app/src/main/java/ru/vtosters/lite/dialogs/DialogMenuInjectors.java +++ b/app/src/main/java/ru/vtosters/hooks/DialogMenuInjectors.java @@ -1,14 +1,14 @@ -package ru.vtosters.lite.dialogs; +package ru.vtosters.hooks; import android.os.Environment; import com.vk.im.engine.models.dialogs.Dialog; import com.vk.im.ui.components.common.DialogAction; import com.vtosters.lite.R; +import ru.vtosters.lite.dialogs.Requests; import ru.vtosters.lite.downloaders.messages.HtmlDialogDownloaderFormatProvider; import ru.vtosters.lite.downloaders.messages.MessagesDownloader; import ru.vtosters.lite.encryption.EncryptProvider; import ru.vtosters.lite.encryption.base.IMProcessor; -import ru.vtosters.lite.hooks.CryptImHook; import java.io.File; import java.util.LinkedHashMap; @@ -30,9 +30,9 @@ public static void inject(Dialog dialog, List list) { list.add(DialogAction.pinmsg); list.add(DialogAction.unpinmsg); - list.add(DNRModule.isDnrEnabledFor(peerId) ? DialogAction.DNR_OFF : DialogAction.DNR_ON); + list.add(MessagesActivityHook.isDnrEnabledFor(peerId) ? DialogAction.DNR_OFF : DialogAction.DNR_ON); - list.add(DNRModule.isDntEnabledFor(peerId) ? DialogAction.DNT_OFF : DialogAction.DNT_ON); + list.add(MessagesActivityHook.isDntEnabledFor(peerId) ? DialogAction.DNT_OFF : DialogAction.DNT_ON); list.add(DialogAction.ENCRYPT); @@ -83,11 +83,11 @@ public static boolean onClick(Dialog dialog, DialogAction action) { // popup men return true; } case DNR_ON, DNR_OFF -> { - DNRModule.hookDNR(peerId); + MessagesActivityHook.hookDNR(peerId); return true; } case DNT_ON, DNT_OFF -> { - DNRModule.hookDNT(peerId); + MessagesActivityHook.hookDNT(peerId); return true; } case pinmsg -> { diff --git a/app/src/main/java/ru/vtosters/lite/dialogs/DialogMessageInjector.java b/app/src/main/java/ru/vtosters/hooks/DialogMessageInjector.java similarity index 93% rename from app/src/main/java/ru/vtosters/lite/dialogs/DialogMessageInjector.java rename to app/src/main/java/ru/vtosters/hooks/DialogMessageInjector.java index 50c87b5c60..19e8ea8f8d 100644 --- a/app/src/main/java/ru/vtosters/lite/dialogs/DialogMessageInjector.java +++ b/app/src/main/java/ru/vtosters/hooks/DialogMessageInjector.java @@ -1,11 +1,11 @@ -package ru.vtosters.lite.dialogs; +package ru.vtosters.hooks; import android.content.Context; import com.vk.im.engine.models.messages.Msg; import com.vk.im.engine.models.messages.MsgFromUser; import com.vk.im.ui.components.common.MsgAction; import com.vk.im.ui.components.viewcontrollers.popup.DelegateMsg; -import ru.vtosters.lite.encryption.EncryptProvider; +import ru.vtosters.lite.dialogs.Requests; import ru.vtosters.lite.ui.dialogs.Translate; import ru.vtosters.lite.utils.AndroidUtils; @@ -37,7 +37,7 @@ public static boolean onClick(Context context, MsgAction action, Msg msg) { // p var isTextExist = !text.isEmpty() && !text.equals(" "); if (isTextExist) { - Translate.showTranslatedText(context, EncryptProvider.decryptMessage(text, peerId)); + Translate.showTranslatedText(context, EncryptionMessagesHook.decryptMessage(text, peerId)); } else { AndroidUtils.sendToast(context.getString(com.vtosters.lite.R.string.translator_no_text)); } diff --git a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java b/app/src/main/java/ru/vtosters/hooks/DockBarInjector.java similarity index 98% rename from app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java rename to app/src/main/java/ru/vtosters/hooks/DockBarInjector.java index fed5b38e22..08557a531d 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java +++ b/app/src/main/java/ru/vtosters/hooks/DockBarInjector.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.annotation.SuppressLint; import android.view.Menu; @@ -24,10 +24,10 @@ import java.util.*; import static com.vtosters.lite.R.id.*; +import static ru.vtosters.hooks.other.Preferences.*; +import static ru.vtosters.hooks.other.ThemesUtils.getCSTDock; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; import static ru.vtosters.lite.utils.AndroidUtils.getResources; -import static ru.vtosters.lite.utils.Preferences.*; -import static ru.vtosters.lite.utils.ThemesUtils.getCSTDock; public class DockBarInjector { private static final DockBarEditorManager sManager = DockBarEditorManager.getInstance(); diff --git a/app/src/main/java/ru/vtosters/hooks/EncryptionMessagesHook.java b/app/src/main/java/ru/vtosters/hooks/EncryptionMessagesHook.java new file mode 100644 index 0000000000..163acc1b08 --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/EncryptionMessagesHook.java @@ -0,0 +1,102 @@ +package ru.vtosters.hooks; + +import android.util.Log; +import com.vk.im.engine.models.messages.Msg; +import com.vk.im.engine.models.messages.MsgFromUser; +import com.vk.im.ui.components.msg_list.MsgListComponent; +import ru.vtosters.lite.encryption.EncryptProvider; +import ru.vtosters.lite.encryption.base.IMProcessor; + +import static ru.vtosters.hooks.MessagesHook.injectOwnText; +import static ru.vtosters.hooks.MessagesHook.injectOwnTextAll; + +public class EncryptionMessagesHook { + // For message editing + public static String decryptMessage(MsgFromUser msg, boolean showEmoji) { + var decryptedMessage = decryptMessage(EncryptProvider.getBody(msg), EncryptProvider.getPeerId(msg)); + if (!showEmoji && !decryptedMessage.equals(injectOwnTextAll(EncryptProvider.getBody(msg)))) + decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", ""); + return decryptedMessage; + } + + public static String decryptMessage(String msg, MsgListComponent list) { + var peerid = list.G().getId(); + var decryptedMessage = decryptMessage(msg, peerid); + if (!decryptedMessage.equals(injectOwnTextAll(msg))) + decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", ""); + return decryptedMessage; + } + + public static CharSequence decryptMessage(CharSequence msg, int peerid) { + return decryptMessage(msg.toString(), peerid); + } + + public static CharSequence decryptMessage(Msg msg, CharSequence orig) { + if (msg instanceof MsgFromUser) { + var decrypted = decryptMessage(((MsgFromUser) msg).f(), msg.v1()); + + if (decrypted.contains("\uD83D\uDD12")) { + return decrypted; + } + + } + + return orig; + } + + public static String decryptMessages(String msgBody, int peer, boolean showEmoji) { + return (String) decryptMessage(msgBody, peer, showEmoji); + } + + public static CharSequence decryptMessage(CharSequence msgBody, MsgFromUser msgFromUser, boolean showEmoji) { + try { + return decryptMessage((String) msgBody, msgFromUser.v1(), showEmoji); + } catch (Exception e) { + return decryptMessage((String) msgBody, 0, showEmoji); + } + } + + // For MentionsFormatter that requires CharSequence + public static CharSequence decryptMessage(String msgBody, int peer, boolean showEmoji) { + var decryptedMessage = decryptMessage(msgBody, peer); + if (!showEmoji && !decryptedMessage.equals(injectOwnTextAll(msgBody))) + decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", ""); + return decryptedMessage; + } + + // This will run through EVERY single processor available. + public static String decryptMessage(MsgFromUser msg) { + return decryptMessage(EncryptProvider.getBody(msg), EncryptProvider.getPeerId(msg)); + } + + public static String decryptMessage(String msgBody, int peer) { + try { + for (IMProcessor processor : EncryptProvider.processors) { + if ((processor.isUsed() || !processor.isPublic()) && processor.isEncrypted(msgBody) && (processor.isPublic() || EncryptProvider.getKeyForProcessor(processor, peer) != null)) + return "\uD83D\uDD12 " + injectOwnTextAll(processor.decode(msgBody, EncryptProvider.getKeyForProcessor(processor, peer))); + } + } catch (Exception e) { + e.printStackTrace(); + } + + return injectOwnTextAll(msgBody); + } + + // This will use only the processor which was chosen in chat menu + public static String encryptMessage(MsgFromUser msg) { + String msgBody = EncryptProvider.getBody(msg); + + Log.d("EncryptProvider", "encryptMessage: msg = " + msg); + Log.d("EncryptProvider", "encryptMessage: body = " + msgBody); + Log.d("EncryptProvider", "encryptMessage: peerId = " + EncryptProvider.getPeerId(msg)); + + for (IMProcessor processor : EncryptProvider.processors) { + int peer = EncryptProvider.getPeerId(msg); + if (processor.isUsedToEncrypt(peer)) { + return injectOwnText(processor.encode(msgBody, EncryptProvider.getKeyForProcessor(processor, peer))); + } + } + + return injectOwnText(msgBody); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/hooks/FragAnimationHook.java b/app/src/main/java/ru/vtosters/hooks/FragAnimationHook.java similarity index 84% rename from app/src/main/java/ru/vtosters/lite/hooks/FragAnimationHook.java rename to app/src/main/java/ru/vtosters/hooks/FragAnimationHook.java index eacaeff8b2..8dadd29369 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/FragAnimationHook.java +++ b/app/src/main/java/ru/vtosters/hooks/FragAnimationHook.java @@ -1,9 +1,9 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import androidx.fragment.app.FragmentTransaction; +import static ru.vtosters.hooks.other.Preferences.getString; import static ru.vtosters.lite.ui.components.FragAnimationKit.setAnimations; -import static ru.vtosters.lite.utils.Preferences.getString; public class FragAnimationHook { public static boolean animateOpen(FragmentTransaction transaction) { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/GcmHook.java b/app/src/main/java/ru/vtosters/hooks/GcmHook.java similarity index 98% rename from app/src/main/java/ru/vtosters/lite/hooks/GcmHook.java rename to app/src/main/java/ru/vtosters/hooks/GcmHook.java index 35a7280a2d..f385f2414b 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/GcmHook.java +++ b/app/src/main/java/ru/vtosters/hooks/GcmHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.os.Build; import android.util.Base64; @@ -15,7 +15,7 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; -import static ru.vtosters.lite.utils.Preferences.isValidSignature; +import static ru.vtosters.hooks.other.Preferences.isValidSignature; public class GcmHook { diff --git a/app/src/main/java/ru/vtosters/lite/utils/GmsUtils.java b/app/src/main/java/ru/vtosters/hooks/GmsHook.java similarity index 95% rename from app/src/main/java/ru/vtosters/lite/utils/GmsUtils.java rename to app/src/main/java/ru/vtosters/hooks/GmsHook.java index 9b0de444bc..94499d0dec 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/GmsUtils.java +++ b/app/src/main/java/ru/vtosters/hooks/GmsHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.utils; +package ru.vtosters.hooks; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -7,8 +7,9 @@ import com.google.firebase.iid.FirebaseInstanceIdReceiver; import com.google.firebase.iid.FirebaseInstanceIdReceiver2; import com.vtosters.lite.R; +import ru.vtosters.lite.utils.AndroidUtils; -public class GmsUtils { +public class GmsHook { private static final boolean needToSpoof = !isGmsInstalled() && isFakeGmsInstalled(); public static boolean isGmsInstalled() { diff --git a/app/src/main/java/ru/vtosters/hooks/JsonInjectors.java b/app/src/main/java/ru/vtosters/hooks/JsonInjectors.java new file mode 100644 index 0000000000..251a00b494 --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/JsonInjectors.java @@ -0,0 +1,39 @@ +package ru.vtosters.hooks; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; +import ru.vtosters.lite.utils.FriendsCatalogUtils; +import ru.vtosters.lite.utils.NewsFeedFiltersUtils; +import ru.vtosters.lite.utils.OnlineBypass; +import ru.vtosters.lite.utils.SuperAppUtils; + +import java.io.IOException; +import java.text.ParseException; + +public class JsonInjectors { + public static JSONObject menu(JSONObject orig) throws JSONException { + return SuperAppUtils.menu(orig); + } + + public static JSONObject superapp(JSONObject json) throws JSONException { + return SuperAppUtils.superapp(json); + } + + + public static JSONObject setOnlineInfo(JSONObject json) throws JSONException { + return OnlineBypass.setOnlineInfo(json); + } + + public static JSONArray setOnlineInfoUsers(JSONArray profiles) throws JSONException { + return OnlineBypass.setOnlineInfoUsers(profiles); + } + + public static JSONArray newsfeedlist(JSONArray items) throws JSONException { + return NewsFeedFiltersUtils.newsfeedlist(items); + } + + public static JSONObject friends(JSONObject json) throws JSONException, ParseException, IOException { + return FriendsCatalogUtils.inject(json); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/hooks/MainActivityInjector.java b/app/src/main/java/ru/vtosters/hooks/MainActivityInjector.java similarity index 86% rename from app/src/main/java/ru/vtosters/lite/hooks/MainActivityInjector.java rename to app/src/main/java/ru/vtosters/hooks/MainActivityInjector.java index fda5515ca9..97e23ac1c0 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/MainActivityInjector.java +++ b/app/src/main/java/ru/vtosters/hooks/MainActivityInjector.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.app.Activity; import android.content.Intent; @@ -6,21 +6,25 @@ import b.h.g.k.VKProgressDialog; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; +import ru.vtosters.hooks.ui.SystemThemeChangerHook; import ru.vtosters.lite.concurrent.VTExecutors; import ru.vtosters.lite.downloaders.notifications.NotificationChannels; -import ru.vtosters.lite.hooks.ui.SystemThemeChangerHook; import ru.vtosters.lite.ssfs.UsersList; import ru.vtosters.lite.themes.ThemesManager; import ru.vtosters.lite.ui.dialogs.DisableBattery; import ru.vtosters.lite.ui.dialogs.InstallGMS; import ru.vtosters.lite.ui.dialogs.OTADialog; import ru.vtosters.lite.ui.dialogs.Start; -import ru.vtosters.lite.utils.*; +import ru.vtosters.lite.utils.AndroidUtils; +import ru.vtosters.lite.utils.LifecycleUtils; +import ru.vtosters.lite.utils.NavigatorUtils; +import static ru.vtosters.hooks.other.Preferences.checkupdates; import static ru.vtosters.lite.ui.dialogs.ServerDialog.sendRequest; import static ru.vtosters.lite.utils.CacheUtils.getInstance; import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.setupFilters; -import static ru.vtosters.lite.utils.Preferences.checkupdates; public class MainActivityInjector { public static void inject(Activity activity) { @@ -45,7 +49,7 @@ public static void inject(Activity activity) { updateBinsAndTmpArchive(activity); } - VTExecutors.getIoScheduler().a(DeletedMessagesHandler::reloadMessagesList); // ioScheduler + VTExecutors.getIoScheduler().a(DeletedMessagesHook::reloadMessagesList); // ioScheduler if (activity.getIntent().getAction() != null && Intent.ACTION_APPLICATION_PREFERENCES.equals(activity.getIntent().getAction())) { NavigatorUtils.switchToSettings(activity); diff --git a/app/src/main/java/ru/vtosters/lite/dialogs/DNRModule.java b/app/src/main/java/ru/vtosters/hooks/MessagesActivityHook.java similarity index 96% rename from app/src/main/java/ru/vtosters/lite/dialogs/DNRModule.java rename to app/src/main/java/ru/vtosters/hooks/MessagesActivityHook.java index 1b5064ac5a..b6563279f9 100644 --- a/app/src/main/java/ru/vtosters/lite/dialogs/DNRModule.java +++ b/app/src/main/java/ru/vtosters/hooks/MessagesActivityHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.dialogs; +package ru.vtosters.hooks; import com.vk.im.engine.commands.messages.SetUserActivityCmd; import com.vk.im.engine.models.dialogs.Dialog; @@ -7,7 +7,7 @@ import java.util.List; -public class DNRModule { +public class MessagesActivityHook { public static DoNotReadDBHelper mDoNotReadDBHelper = new DoNotReadDBHelper(); public static DoNotTypeDBHelper mDoNotTypeDBHelper = new DoNotTypeDBHelper(); diff --git a/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java b/app/src/main/java/ru/vtosters/hooks/MessagesHook.java similarity index 87% rename from app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java rename to app/src/main/java/ru/vtosters/hooks/MessagesHook.java index 9fd923a10d..64281f0538 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java +++ b/app/src/main/java/ru/vtosters/hooks/MessagesHook.java @@ -1,9 +1,12 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.content.Context; import android.text.TextUtils; import android.view.View; import com.vk.api.internal.MethodCall; +import com.vk.im.ui.providers.audiomsg.ImAudioMsgPlayerProvider; +import com.vk.im.ui.providers.audiomsg.PlayerActionSources; +import com.vtosters.lite.im.ImEngineProvider; import ru.vtosters.lite.translators.BaseTranslator; import ru.vtosters.lite.ui.dialogs.MessageSettings; import ru.vtosters.lite.utils.LifecycleUtils; @@ -11,9 +14,9 @@ import java.util.ArrayList; import java.util.regex.Pattern; +import static ru.vtosters.hooks.other.Preferences.*; import static ru.vtosters.lite.ui.dialogs.MessageSettings.bombCount; import static ru.vtosters.lite.ui.dialogs.MessageSettings.isSilentEnabled; -import static ru.vtosters.lite.utils.Preferences.*; public class MessagesHook { public static String injectOwnText(String oldText) { @@ -104,4 +107,10 @@ private static int expireTime() { default -> 0; }; } + + public static void reloadMessages() { + ImEngineProvider.b().a(); + ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a); + ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a); + } // Delete and reload msg cache } diff --git a/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java b/app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java similarity index 97% rename from app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java rename to app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java index 0a1e4df515..0dc220d5aa 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java +++ b/app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.content.Context; import android.os.PowerManager; @@ -6,14 +6,14 @@ import com.vk.core.preference.Preference; import com.vk.discover.DiscoverItemDecorator; import com.vtosters.lite.api.ExtendedCommunityProfile; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.utils.AccountManagerUtils; -import ru.vtosters.lite.utils.Preferences; import java.util.*; import static java.lang.Long.MAX_VALUE; +import static ru.vtosters.hooks.other.Preferences.*; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; -import static ru.vtosters.lite.utils.Preferences.*; public class NewsfeedHook { public static long getUpdateNewsfeed(boolean refresh_timeout) { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java b/app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java similarity index 91% rename from app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java rename to app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java index e507a67df9..45d8107ac8 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java +++ b/app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.util.Log; import com.vtosters.lite.R; @@ -10,13 +10,11 @@ import java.io.IOException; import java.text.ParseException; -import static ru.vtosters.lite.hooks.JsonInjectors.setOnlineInfo; -import static ru.vtosters.lite.hooks.JsonInjectors.setOnlineInfoUsers; +import static ru.vtosters.hooks.other.Preferences.*; import static ru.vtosters.lite.net.Request.makeRequest; import static ru.vtosters.lite.proxy.ProxyUtils.getApi; import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken; import static ru.vtosters.lite.utils.AndroidUtils.sendToast; -import static ru.vtosters.lite.utils.Preferences.*; public class OnlineFormatterHook { private static String AppName; @@ -117,7 +115,7 @@ public static String getOnline(int appid) { } public static JSONObject onlineHook(JSONObject json) throws ParseException, IOException, JSONException { - if (getBoolValue("onlinefix", false)) setOnlineInfo(json); + if (getBoolValue("onlinefix", false)) JsonInjectors.setOnlineInfo(json); return json; } @@ -126,7 +124,7 @@ public static JSONArray onlineHookList(JSONArray jsonArr) throws ParseException, if (!getBoolValue("onlinefix", false)) return jsonArr; try { - setOnlineInfoUsers(jsonArr); + JsonInjectors.setOnlineInfoUsers(jsonArr); } catch (Exception e) { Log.e("onlineHookProfiles", e.getMessage()); } @@ -138,7 +136,7 @@ public static JSONObject onlineHookProfiles(JSONObject json) throws ParseExcepti if (!getBoolValue("onlinefix", false)) return json; try { - setOnlineInfoUsers(json.optJSONArray("profiles")); + JsonInjectors.setOnlineInfoUsers(json.optJSONArray("profiles")); } catch (Exception e) { Log.e("onlineHookProfiles", e.getMessage()); } @@ -149,7 +147,7 @@ public static JSONObject onlineHookItems(JSONObject json) throws ParseException, if (!getBoolValue("onlinefix", false)) return json; try { - setOnlineInfoUsers(json.optJSONArray("items")); + JsonInjectors.setOnlineInfoUsers(json.optJSONArray("items")); } catch (Exception e) { Log.e("onlineHookItems", e.getMessage()); } @@ -160,19 +158,19 @@ public static JSONObject onlineHookRequestsAndRecommendations(JSONObject json) t if (!getBoolValue("onlinefix", false)) return json; try { - setOnlineInfoUsers(json.optJSONObject("read_requests").optJSONArray("items")); + JsonInjectors.setOnlineInfoUsers(json.optJSONObject("read_requests").optJSONArray("items")); } catch (Exception e) { Log.e("onlineHookItems", e.getMessage()); } try { - setOnlineInfoUsers(json.optJSONObject("recommendations").optJSONArray("items")); + JsonInjectors.setOnlineInfoUsers(json.optJSONObject("recommendations").optJSONArray("items")); } catch (Exception e) { Log.e("onlineHookItems", e.getMessage()); } try { - setOnlineInfoUsers(json.optJSONArray("profiles")); + JsonInjectors.setOnlineInfoUsers(json.optJSONArray("profiles")); } catch (Exception e) { Log.e("onlineHookItems", e.getMessage()); } diff --git a/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java b/app/src/main/java/ru/vtosters/hooks/PhotoViewer.java similarity index 99% rename from app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java rename to app/src/main/java/ru/vtosters/hooks/PhotoViewer.java index 24da274474..c9bbfea13b 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java +++ b/app/src/main/java/ru/vtosters/hooks/PhotoViewer.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.annotation.SuppressLint; @@ -28,10 +28,10 @@ import okio.Okio; import org.json.JSONException; import org.json.JSONObject; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.di.singleton.VtOkHttpClient; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.LifecycleUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/ru/vtosters/lite/hooks/PicRoundingHook.java b/app/src/main/java/ru/vtosters/hooks/PicRoundingHook.java similarity index 97% rename from app/src/main/java/ru/vtosters/lite/hooks/PicRoundingHook.java rename to app/src/main/java/ru/vtosters/hooks/PicRoundingHook.java index e1a36c8b03..b3aa24faa4 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/PicRoundingHook.java +++ b/app/src/main/java/ru/vtosters/hooks/PicRoundingHook.java @@ -1,9 +1,9 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.graphics.*; import com.facebook.drawee.generic.RoundingParams; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; public class PicRoundingHook { private static final int pref = Preferences.getPreferences().getInt("pic_rounding", 0); diff --git a/app/src/main/java/ru/vtosters/lite/hooks/PollHook.java b/app/src/main/java/ru/vtosters/hooks/PollHook.java similarity index 89% rename from app/src/main/java/ru/vtosters/lite/hooks/PollHook.java rename to app/src/main/java/ru/vtosters/hooks/PollHook.java index 273b3fe521..377ffe0bc9 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/PollHook.java +++ b/app/src/main/java/ru/vtosters/hooks/PollHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.view.View; import android.view.ViewGroup; @@ -6,7 +6,7 @@ import com.vk.dto.polls.PollOption; import com.vk.polls.ui.views.PollOptionView; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; public class PollHook { public static void show(PollOptionView view) { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/PostViewHook.java b/app/src/main/java/ru/vtosters/hooks/PostViewHook.java similarity index 96% rename from app/src/main/java/ru/vtosters/lite/hooks/PostViewHook.java rename to app/src/main/java/ru/vtosters/hooks/PostViewHook.java index cc54a97ded..42c37643d8 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/PostViewHook.java +++ b/app/src/main/java/ru/vtosters/hooks/PostViewHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.view.View; import android.view.ViewGroup; @@ -6,7 +6,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.vk.newsfeed.holders.BaseFooterHolder; import com.vtosters.lite.R; -import ru.vtosters.lite.utils.Preferences; +import ru.vtosters.hooks.other.Preferences; public class PostViewHook { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/PromoStickersHook.java b/app/src/main/java/ru/vtosters/hooks/PromoStickersHook.java similarity index 65% rename from app/src/main/java/ru/vtosters/lite/hooks/PromoStickersHook.java rename to app/src/main/java/ru/vtosters/hooks/PromoStickersHook.java index e7b3522e76..70fd682e00 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/PromoStickersHook.java +++ b/app/src/main/java/ru/vtosters/hooks/PromoStickersHook.java @@ -1,6 +1,6 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; public class PromoStickersHook { public static String hook() { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java b/app/src/main/java/ru/vtosters/hooks/ProxyHook.java similarity index 70% rename from app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java rename to app/src/main/java/ru/vtosters/hooks/ProxyHook.java index 696de6d87b..b0ddc40429 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java +++ b/app/src/main/java/ru/vtosters/hooks/ProxyHook.java @@ -1,7 +1,8 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.annotation.SuppressLint; import android.content.Context; +import android.util.Log; import android.util.TypedValue; import android.view.View; import android.widget.RadioButton; @@ -10,18 +11,87 @@ import com.vk.auth.ui.VkAuthTextView; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.lite.proxy.api.VikaMobile; import ru.vtosters.lite.ui.fragments.DataSettingsFragment; import ru.vtosters.lite.ui.fragments.ProxySettingsFragment; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.NavigatorUtils; -import ru.vtosters.lite.utils.Preferences; +import static ru.vtosters.hooks.other.Preferences.getString; +import static ru.vtosters.hooks.other.ThemesUtils.getTextAttr; import static ru.vtosters.lite.proxy.ProxyUtils.*; import static ru.vtosters.lite.utils.AndroidUtils.dp2px; import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication; -import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr; public class ProxyHook { + public static String linkReplacer(String link) { + var vkapi = "api.vk.com"; + var oauth = "oauth.vk.com"; + var vkstatic = "static.vk.com"; + + var proxyapi = getString("proxyapi"); + var proxyoauth = getString("proxyoauth"); + var proxystatic = getString("proxystatic"); + + if (isVikaProxyEnabled()) { + proxyapi = VikaMobile.getApiHost(); + proxyoauth = VikaMobile.getOauthHost(); + proxystatic = VikaMobile.getStaticHost(); + } + + if (!isAnyProxyEnabled() || link.isEmpty()) { + return link; + } + + if (proxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()) { + Log.d("VTLite", "Proxy is not set" + " " + proxyapi + " " + proxyoauth + " " + proxystatic); + return link; + } + + if (link.contains(vkapi)) { + return link.replaceAll(vkapi, proxyapi); + } + + if (link.contains(oauth)) { + return link.replaceAll(oauth, proxyoauth); + } + + if (link.contains(vkstatic)) { + return link.replaceAll(vkstatic, proxystatic); + } + + return link; + } + + public static String staticFix(String str) { + var string = getString("proxystatic"); + + if (isVikaProxyEnabled()) { + string = VikaMobile.getStaticHost(); + } + + if (isAnyProxyEnabled() && !string.isEmpty()) { + return str.replaceAll(string, "static.vk.com"); + } + + return str; + } + + public static String getAwayPhpCom() { + var proxyapi = getString("proxyapi"); + + if (isVikaProxyEnabled()) { + proxyapi = VikaMobile.getApiHost(); + } + + if (isAnyProxyEnabled() && !proxyapi.isEmpty()) { + return proxyapi; + } + + return "m.vk.com"; + } + public static void hookAuth(View v) { VkAuthTextView button = v.findViewById(AndroidUtils.getIdentifier("already_have_account", "id")); button.setText(R.string.proxy_setup); diff --git a/app/src/main/java/ru/vtosters/hooks/RenameHook.java b/app/src/main/java/ru/vtosters/hooks/RenameHook.java new file mode 100644 index 0000000000..a859ba572f --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/RenameHook.java @@ -0,0 +1,31 @@ +package ru.vtosters.hooks; + +import androidx.core.util.Pair; +import org.json.JSONException; +import org.json.JSONObject; +import ru.vtosters.lite.utils.RenameTool; + +public class RenameHook { + public static void injectIntoJson(JSONObject obj) throws JSONException { + int i = obj.getInt("id"); + if (RenameTool.updateRequested) { + RenameTool.reloadDB(); + } + + Pair user = RenameTool.renamedUsers.get(i); + if (user == null) return; + obj.put(RenameTool.COLUMN_FIRSTNAME, user.first).put(RenameTool.COLUMN_LASTNAME, user.second); + } + + public static void injectIntoJsonGroup(JSONObject obj) throws JSONException { + int i = obj.getInt("id"); + + if (RenameTool.updateRequested) { + RenameTool.reloadDB(); + } + + String user = RenameTool.renamedGroups.get(i); + if (user == null) return; + obj.put("name", user); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/hooks/ReplyMsgHook.java b/app/src/main/java/ru/vtosters/hooks/ReplyMsgHook.java similarity index 91% rename from app/src/main/java/ru/vtosters/lite/hooks/ReplyMsgHook.java rename to app/src/main/java/ru/vtosters/hooks/ReplyMsgHook.java index bdfd9c2e31..e098eb0d28 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/ReplyMsgHook.java +++ b/app/src/main/java/ru/vtosters/hooks/ReplyMsgHook.java @@ -1,11 +1,11 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import com.vk.im.engine.models.ProfilesSimpleInfo; import com.vk.im.engine.models.messages.MsgFromUser; import com.vk.im.engine.models.messages.NestedMsg; import com.vk.im.ui.views.ReplyView; -import static ru.vtosters.lite.encryption.EncryptProvider.decryptMessage; +import static ru.vtosters.hooks.EncryptionMessagesHook.decryptMessage; public class ReplyMsgHook { public static void injectWithDecrypt(ReplyView replyView, MsgFromUser msgFromUser, ProfilesSimpleInfo profilesSimpleInfo, boolean someBool) { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/RequestDumper.java b/app/src/main/java/ru/vtosters/hooks/RequestDumper.java similarity index 88% rename from app/src/main/java/ru/vtosters/lite/hooks/RequestDumper.java rename to app/src/main/java/ru/vtosters/hooks/RequestDumper.java index 09fa8ccc13..5ec2b53a5b 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/RequestDumper.java +++ b/app/src/main/java/ru/vtosters/hooks/RequestDumper.java @@ -1,11 +1,11 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.util.Log; import com.vk.api.internal.MethodCall; import java.util.LinkedHashMap; -import static ru.vtosters.lite.utils.Preferences.dev; +import static ru.vtosters.hooks.other.Preferences.dev; public class RequestDumper { public static void addParams(MethodCall.a paramslist, String method, LinkedHashMap params, String apiver) { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java b/app/src/main/java/ru/vtosters/hooks/StartFragmentHook.java similarity index 97% rename from app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java rename to app/src/main/java/ru/vtosters/hooks/StartFragmentHook.java index 35d160a729..568829f017 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java +++ b/app/src/main/java/ru/vtosters/hooks/StartFragmentHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import com.vk.apps.AppsFragment; import com.vk.discover.DiscoverFragment; @@ -23,8 +23,8 @@ import com.vtosters.lite.general.fragments.GamesFragment; import com.vtosters.lite.general.fragments.PhotosFragment; +import static ru.vtosters.hooks.other.Preferences.*; import static ru.vtosters.lite.ui.components.DockBarEditorManager.getInstance; -import static ru.vtosters.lite.utils.Preferences.*; public class StartFragmentHook { public static Class getStartFragment() { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/StoriesHook.java b/app/src/main/java/ru/vtosters/hooks/StoriesHook.java similarity index 51% rename from app/src/main/java/ru/vtosters/lite/hooks/StoriesHook.java rename to app/src/main/java/ru/vtosters/hooks/StoriesHook.java index 7a5492b039..0a130c1bd4 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/StoriesHook.java +++ b/app/src/main/java/ru/vtosters/hooks/StoriesHook.java @@ -1,7 +1,6 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; -import static ru.vtosters.lite.utils.Preferences.adsstories; -import static ru.vtosters.lite.utils.Preferences.stories; +import static ru.vtosters.hooks.other.Preferences.*; public class StoriesHook { public static String ads() { @@ -11,4 +10,8 @@ public static String ads() { public static boolean showstories() { return stories(); } + + public static boolean getStoriesRead() { + return getBoolValue("read_s", false); + } } diff --git a/app/src/main/java/ru/vtosters/lite/hooks/SwitchHook.java b/app/src/main/java/ru/vtosters/hooks/SwitchHook.java similarity index 97% rename from app/src/main/java/ru/vtosters/lite/hooks/SwitchHook.java rename to app/src/main/java/ru/vtosters/hooks/SwitchHook.java index bbcd69fbf7..3ebc7c87ee 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/SwitchHook.java +++ b/app/src/main/java/ru/vtosters/hooks/SwitchHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.content.Context; import android.content.res.ColorStateList; @@ -10,9 +10,9 @@ import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.widget.CompoundButtonCompat; import com.vk.core.util.ColorUtils; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; -import ru.vtosters.lite.utils.ThemesUtils; import static com.vtosters.lite.R.color.*; diff --git a/app/src/main/java/ru/vtosters/hooks/TelegramStickersHook.java b/app/src/main/java/ru/vtosters/hooks/TelegramStickersHook.java new file mode 100644 index 0000000000..123b738d8e --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/TelegramStickersHook.java @@ -0,0 +1,87 @@ +package ru.vtosters.hooks; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import com.aefyr.tsg.g2.TelegramStickersPack; +import com.aefyr.tsg.g2.TelegramStickersService; +import com.vk.dto.common.Attachment; +import com.vk.dto.stickers.StickerItem; +import com.vk.dto.stickers.StickerStockItem; +import com.vk.im.engine.models.attaches.Attach; +import com.vtosters.lite.attachments.PendingGraffitiAttachment; +import com.vtosters.lite.im.AppAttachToImAttachConverter; +import com.vtosters.lite.upload.Upload; +import ru.vtosters.lite.tgs.TGRoot; +import ru.vtosters.lite.utils.AndroidUtils; + +import java.util.List; + +import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; + +public class TelegramStickersHook { + public static StickerStockItem getPackBySticker(int stickerId) { + if (stickerId < TGRoot.N) return null; + int index = (stickerId - TGRoot.N) / 120; + + TelegramStickersPack p = null; + for (TelegramStickersPack p_ : TelegramStickersService.getInstance(AndroidUtils.getGlobalContext()) + .getActivePacksListReference()) { + if (p_.index == index) { + p = p_; + break; + } + } + if (p == null) return null; + + try { + return TGRoot.toStickerPack(p); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public static Attachment processSticker(StickerItem item) { + int id = item.getId(); + if (id < TGRoot.N) return null; + + int index = (id - TGRoot.N) / 120; + int stickerId = (id - TGRoot.N) % 120; + + TelegramStickersPack pack = null; + for (TelegramStickersPack p : TelegramStickersService.getInstance(getGlobalContext()).getActivePacksListReference()) { + if (p.index == index) { + pack = p; + break; + } + } + + String image = pack.getStickerFile(stickerId).getAbsolutePath(); + + Bitmap bm = BitmapFactory.decodeFile(image); + int upid = Upload.a(); + TGRoot.pendingStickers.push(upid); + + Attachment att = new PendingGraffitiAttachment(upid, 0, image, bm.getWidth(), bm.getHeight(), null); + bm.recycle(); + + return att; + } + + public static void injectStickers(List list) { + try { + List packs = TelegramStickersService.getInstance(getGlobalContext()).getActivePacksListReference(); + for (int i = packs.size() - 1; i >= 0; i--) + list.add(0, TGRoot.toStickerPack(packs.get(i))); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static Attach modifyStickerIM(int i, StickerItem stickerItem, String str) { + if (stickerItem.getId() < 76820000) { + return AppAttachToImAttachConverter.a.a(i, stickerItem, str); + } + return AppAttachToImAttachConverter.a.a(processSticker(stickerItem)); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java b/app/src/main/java/ru/vtosters/hooks/TogglesHook.java similarity index 97% rename from app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java rename to app/src/main/java/ru/vtosters/hooks/TogglesHook.java index 35322822d7..95d98d8497 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java +++ b/app/src/main/java/ru/vtosters/hooks/TogglesHook.java @@ -1,10 +1,10 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import com.vk.medianative.MediaImageEncoder; import com.vk.toggle.FeatureManager; import com.vk.toggle.Features; -import static ru.vtosters.lite.utils.Preferences.*; +import static ru.vtosters.hooks.other.Preferences.*; public class TogglesHook { public static boolean shouldPatch(Features.Type feature) { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/VKUIHook.java b/app/src/main/java/ru/vtosters/hooks/VKUIHook.java similarity index 94% rename from app/src/main/java/ru/vtosters/lite/hooks/VKUIHook.java rename to app/src/main/java/ru/vtosters/hooks/VKUIHook.java index ed8b21e16d..80f109ede8 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/VKUIHook.java +++ b/app/src/main/java/ru/vtosters/hooks/VKUIHook.java @@ -1,12 +1,12 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import android.webkit.WebView; import com.vk.articles.preload.WebCachePreloader; import com.vtosters.lite.R; import com.vtosters.lite.data.ThemeTracker; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.ThemesCore; -import ru.vtosters.lite.utils.Preferences; -import ru.vtosters.lite.utils.ThemesUtils; import java.io.BufferedReader; import java.io.IOException; @@ -15,9 +15,9 @@ import java.nio.charset.StandardCharsets; import static android.util.Base64.encodeToString; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.ThemesUtils.*; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; -import static ru.vtosters.lite.utils.ThemesUtils.*; public class VKUIHook { public static boolean isLoaded = false; diff --git a/app/src/main/java/ru/vtosters/hooks/VerificationsHook.java b/app/src/main/java/ru/vtosters/hooks/VerificationsHook.java new file mode 100644 index 0000000000..79d59ae1d4 --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/VerificationsHook.java @@ -0,0 +1,53 @@ +package ru.vtosters.hooks; + +import com.vk.dto.common.VerifyInfo; +import org.json.JSONObject; +import ru.vtosters.lite.utils.VTVerifications; + +import static ru.vtosters.hooks.other.Preferences.getBoolValue; + +public class VerificationsHook { + public static boolean isVerified(int id) { + return VTVerifications.sVerifications.contains(id); + } + + public static boolean vtverif() { + return getBoolValue("VT_Verification", true); + } + + public static boolean isVerified(JSONObject jSONObject) { + if (jSONObject.optInt("verified", 0) == 1) { + return true; + } + + if (!getBoolValue("VT_Verification", true)) { + return false; + } + + return isVerified(VTVerifications.getId(jSONObject)); + } + + public static boolean hasPrometheus(JSONObject jSONObject) { + if (jSONObject.optInt("trending", 0) == 1) { + return true; + } + + if (!getBoolValue("VT_Fire", true)) { + return false; + } + + return VTVerifications.isPrometheus(VTVerifications.getId(jSONObject)); + } + + public static boolean hasDeveloper(JSONObject jSONObject) { + if (!getBoolValue("VT_Dev", true)) { + return false; + } + + return VTVerifications.isDeveloper(VTVerifications.getId(jSONObject)); + } + + public static VerifyInfo VerifyInfo(JSONObject jSONObject) { + return new VerifyInfo(isVerified(jSONObject), hasPrometheus(jSONObject)); + } +} diff --git a/app/src/main/java/ru/vtosters/hooks/VideoPlayerHook.java b/app/src/main/java/ru/vtosters/hooks/VideoPlayerHook.java new file mode 100644 index 0000000000..a69da7c459 --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/VideoPlayerHook.java @@ -0,0 +1,23 @@ +package ru.vtosters.hooks; + +import android.app.Activity; +import android.content.Context; +import com.vk.dto.common.VideoFile; +import ru.vtosters.lite.utils.ExternalLinkParser; + +import static ru.vtosters.hooks.other.Preferences.isEnableExternalOpening; +import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; + +public class VideoPlayerHook { + public static boolean parseVideoFile(VideoFile file) { + return ExternalLinkParser.parseVideoFile(file, getGlobalContext(), isEnableExternalOpening()); + } + + public static boolean parseVideoFile(VideoFile file, Context context) { + return ExternalLinkParser.parseVideoFile(file, context, isEnableExternalOpening()); + } + + public static boolean parseVideoFile(VideoFile file, Activity activity) { + return ExternalLinkParser.parseVideoFile(file, activity, isEnableExternalOpening()); + } +} diff --git a/app/src/main/java/ru/vtosters/hooks/VoiceMessagesHook.java b/app/src/main/java/ru/vtosters/hooks/VoiceMessagesHook.java new file mode 100644 index 0000000000..c74e15a1bc --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/VoiceMessagesHook.java @@ -0,0 +1,9 @@ +package ru.vtosters.hooks; + +import static ru.vtosters.hooks.other.Preferences.getBoolValue; + +public class VoiceMessagesHook { + public static boolean getVoiceListened() { + return getBoolValue("listen_v", false); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/utils/WebAppUtils.java b/app/src/main/java/ru/vtosters/hooks/WebAppHook.java similarity index 62% rename from app/src/main/java/ru/vtosters/lite/utils/WebAppUtils.java rename to app/src/main/java/ru/vtosters/hooks/WebAppHook.java index 49a88db345..326b7ab82b 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/WebAppUtils.java +++ b/app/src/main/java/ru/vtosters/hooks/WebAppHook.java @@ -1,21 +1,18 @@ -package ru.vtosters.lite.utils; +package ru.vtosters.hooks; import com.vk.api.base.ApiConfig; import com.vk.core.preference.Preference; import com.vk.core.ui.themes.VKThemeHelper; import org.json.JSONException; import org.json.JSONObject; -import ru.vtosters.lite.proxy.api.ApiProxy; - -public class WebAppUtils { +public class WebAppHook { public static JSONObject getWebAppConfig() throws JSONException { - JSONObject jSONObject = new JSONObject() + return new JSONObject() .put("scheme", VKThemeHelper.l().b()) .put("app", "vkclient") .put("app_id", ApiConfig.a) .put("appearance", VKThemeHelper.l().a() ? "light" : "dark") - .put("api_host", ApiProxy.linkReplacer(Preference.a().getString("apiHost", "api.vk.com"))); - return jSONObject; + .put("api_host", ProxyHook.linkReplacer(Preference.a().getString("apiHost", "api.vk.com"))); } } diff --git a/app/src/main/java/ru/vtosters/lite/hooks/WritebarHook.java b/app/src/main/java/ru/vtosters/hooks/WritebarHook.java similarity index 68% rename from app/src/main/java/ru/vtosters/lite/hooks/WritebarHook.java rename to app/src/main/java/ru/vtosters/hooks/WritebarHook.java index 81a06192f7..c6df90111e 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/WritebarHook.java +++ b/app/src/main/java/ru/vtosters/hooks/WritebarHook.java @@ -1,9 +1,9 @@ -package ru.vtosters.lite.hooks; +package ru.vtosters.hooks; import com.vtosters.lite.R; -import ru.vtosters.lite.utils.ThemesUtils; +import ru.vtosters.hooks.other.ThemesUtils; -import static ru.vtosters.lite.utils.Preferences.wbios; +import static ru.vtosters.hooks.other.Preferences.wbios; public class WritebarHook { public static int getWriteBar() { diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/hooks/other/Preferences.java similarity index 97% rename from app/src/main/java/ru/vtosters/lite/utils/Preferences.java rename to app/src/main/java/ru/vtosters/hooks/other/Preferences.java index 954d3e9a01..8dc3d30bcd 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/hooks/other/Preferences.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.utils; +package ru.vtosters.hooks.other; import android.app.Application; import android.content.Context; @@ -9,9 +9,12 @@ import com.vk.medianative.MediaImageEncoder; import com.vtosters.lite.data.Users; import com.vtosters.lite.fragments.SettingsListFragment; +import ru.vtosters.hooks.GmsHook; +import ru.vtosters.hooks.VerificationsHook; import ru.vtosters.lite.BuildConfig; import ru.vtosters.lite.proxy.ProxyUtils; import ru.vtosters.lite.ui.fragments.VTSettings; +import ru.vtosters.lite.utils.*; import java.security.NoSuchAlgorithmException; @@ -21,7 +24,7 @@ public static void init(Application application) throws Exception { StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); StrictMode.setThreadPolicy(policy); - GmsUtils.fixGapps(); + GmsHook.fixGapps(); ProxyUtils.setProxy(); NewsFeedFiltersUtils.setupFilters(); VTVerifications.load(application); @@ -312,7 +315,7 @@ public static boolean isValidSignature() { } public static boolean hasVerification() { - return VTVerifications.isVerified(AccountManagerUtils.getUserId()); + return VerificationsHook.isVerified(AccountManagerUtils.getUserId()); } public static boolean hasSpecialVerif() { diff --git a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java b/app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java similarity index 99% rename from app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java rename to app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java index 44b10782ef..3011282822 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java +++ b/app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.utils; +package ru.vtosters.hooks.other; import android.annotation.SuppressLint; import android.app.Activity; @@ -27,15 +27,16 @@ import com.vk.core.ui.themes.VKThemeHelper; import com.vtosters.lite.R; import com.vtosters.lite.data.ThemeTracker; +import ru.vtosters.hooks.VKUIHook; import ru.vtosters.lite.deviceinfo.OEMDetector; -import ru.vtosters.lite.hooks.VKUIHook; import ru.vtosters.lite.themes.ThemesHacks; import ru.vtosters.lite.ui.wallpapers.WallpapersHooks; +import ru.vtosters.lite.utils.LifecycleUtils; import java.lang.reflect.Field; +import static ru.vtosters.hooks.other.Preferences.*; import static ru.vtosters.lite.utils.AndroidUtils.*; -import static ru.vtosters.lite.utils.Preferences.*; public class ThemesUtils { public static void applyTheme(VKTheme theme, Boolean restartActivity) { diff --git a/app/src/main/java/ru/vtosters/hooks/ssfs/BannerHook.java b/app/src/main/java/ru/vtosters/hooks/ssfs/BannerHook.java new file mode 100644 index 0000000000..bff8d055fc --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/ssfs/BannerHook.java @@ -0,0 +1,36 @@ +package ru.vtosters.hooks.ssfs; + +import com.vk.core.dialogs.alert.VkAlertDialog; +import org.json.JSONException; +import org.json.JSONObject; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.lite.ssfs.ImBanner; +import ru.vtosters.lite.utils.AndroidUtils; +import ru.vtosters.lite.utils.LifecycleUtils; + +public class BannerHook { + public static JSONObject convBar(JSONObject orig) throws JSONException { + return ImBanner.convBar(orig); + } + + public static boolean showAlert() { + var context = LifecycleUtils.getCurrentActivity(); + var bool = Preferences.getBoolValue("linkalert", false); + + if (!bool) { + new VkAlertDialog.Builder(context) + .setTitle(com.vtosters.lite.R.string.warning) + .setMessage(AndroidUtils.getString("custom_links_warning")) + .setCancelable(false) + .setPositiveButton(com.vtosters.lite.R.string.continue_, (dialogInterface, i) -> { + Preferences.getPreferences().edit().putBoolean("linkalert", true).commit(); + }) + .setNeutralButton(com.vtosters.lite.R.string.cancel, (dialogInterface, i) -> { + dialogInterface.cancel(); + }) + .show(); + } + + return bool; + } +} diff --git a/app/src/main/java/ru/vtosters/lite/ssfs/ProfileHider.java b/app/src/main/java/ru/vtosters/hooks/ssfs/ProfileHook.java similarity index 82% rename from app/src/main/java/ru/vtosters/lite/ssfs/ProfileHider.java rename to app/src/main/java/ru/vtosters/hooks/ssfs/ProfileHook.java index 7d273c9077..4838eb8d0b 100644 --- a/app/src/main/java/ru/vtosters/lite/ssfs/ProfileHider.java +++ b/app/src/main/java/ru/vtosters/hooks/ssfs/ProfileHook.java @@ -1,15 +1,18 @@ -package ru.vtosters.lite.ssfs; +package ru.vtosters.hooks.ssfs; import android.text.TextUtils; import android.util.Log; import com.vk.profile.presenter.UserPresenter; import com.vtosters.lite.api.ExtendedUserProfile; import org.json.JSONObject; +import ru.vtosters.lite.ssfs.Handler; +import ru.vtosters.lite.ssfs.ProfileButtons; +import ru.vtosters.lite.ssfs.UsersList; import static ru.vtosters.lite.utils.AccountManagerUtils.getUserID; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; -public class ProfileHider { +public class ProfileHook { private static final String TAG = "ProfileHider"; public static boolean isService(Integer id) { @@ -39,4 +42,8 @@ public static String getInfo(ExtendedUserProfile extendedUserProfile) { } return getGlobalContext().getString(UserPresenter.q0.a(userID)); } -} \ No newline at end of file + + public static JSONObject getProfileButton(JSONObject orig) { + return ProfileButtons.profileButton(orig); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/hooks/ui/SystemThemeChangerHook.java b/app/src/main/java/ru/vtosters/hooks/ui/SystemThemeChangerHook.java similarity index 91% rename from app/src/main/java/ru/vtosters/lite/hooks/ui/SystemThemeChangerHook.java rename to app/src/main/java/ru/vtosters/hooks/ui/SystemThemeChangerHook.java index 166c6c88e7..d4a51592c2 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/ui/SystemThemeChangerHook.java +++ b/app/src/main/java/ru/vtosters/hooks/ui/SystemThemeChangerHook.java @@ -1,11 +1,11 @@ -package ru.vtosters.lite.hooks.ui; +package ru.vtosters.hooks.ui; import android.app.Activity; import android.content.res.Configuration; import com.vk.core.ui.themes.VKTheme; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.utils.LifecycleUtils; -import ru.vtosters.lite.utils.Preferences; -import ru.vtosters.lite.utils.ThemesUtils; public class SystemThemeChangerHook { public static void onThemeChanged(Configuration configuration) { diff --git a/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java b/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java index c1c9d3d3cf..4d722e2af1 100644 --- a/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java +++ b/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.deviceinfo; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.ThemesUtils; import ru.vtosters.lite.utils.VersionReader; import static ru.vtosters.lite.deviceinfo.OEMDetector.*; diff --git a/app/src/main/java/ru/vtosters/lite/dialogs/DNRPrefs.java b/app/src/main/java/ru/vtosters/lite/dialogs/DNRPrefs.java index 93dcefe3c9..77bc2b413a 100644 --- a/app/src/main/java/ru/vtosters/lite/dialogs/DNRPrefs.java +++ b/app/src/main/java/ru/vtosters/lite/dialogs/DNRPrefs.java @@ -1,15 +1,10 @@ package ru.vtosters.lite.dialogs; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import ru.vtosters.hooks.MessagesActivityHook; -public class DNRPrefs { - public static boolean getStoriesRead() { - return getBoolValue("read_s", false); - } +import static ru.vtosters.hooks.other.Preferences.getBoolValue; - public static boolean getVoiceListened() { - return getBoolValue("listen_v", false); - } +public class DNRPrefs { public static boolean getMarkAsReadWithoutExceptions(int peerId) { if (readPM(peerId)) @@ -24,34 +19,34 @@ public static boolean getMarkAsRead(int peerId) { } public static boolean isInDNRExceptions(int peerId) { - return DNRModule.mDoNotReadDBHelper.isEnabledForPeerId(peerId); + return MessagesActivityHook.mDoNotReadDBHelper.isEnabledForPeerId(peerId); } public static boolean isInDNTExceptions(int peerId) { - return DNRModule.mDoNotTypeDBHelper.isEnabledForPeerId(peerId); + return MessagesActivityHook.mDoNotTypeDBHelper.isEnabledForPeerId(peerId); } - public static boolean readPM(int peer) { + private static boolean readPM(int peer) { return (peer > 0 && peer < 2000000000) && getBoolValue("read_pm", false); } - public static boolean readConversations(int peer) { + private static boolean readConversations(int peer) { return (peer > 2000000000) && getBoolValue("read_conversations", false); } - public static boolean readBots(int peer) { + private static boolean readBots(int peer) { return (peer < 0) && getBoolValue("read_bot", false); } - public static boolean writePM(int peer) { + private static boolean writePM(int peer) { return (peer > 0 && peer < 2000000000) && getBoolValue("write_pm", false); } - public static boolean writeConversations(int peer) { + private static boolean writeConversations(int peer) { return (peer > 2000000000) && getBoolValue("write_conversations", false); } - public static boolean writeBots(int peer) { + private static boolean writeBots(int peer) { return (peer < 0) && getBoolValue("write_bot", false); } diff --git a/app/src/main/java/ru/vtosters/lite/dialogs/Requests.java b/app/src/main/java/ru/vtosters/lite/dialogs/Requests.java index 29c5f924eb..3328e5e647 100644 --- a/app/src/main/java/ru/vtosters/lite/dialogs/Requests.java +++ b/app/src/main/java/ru/vtosters/lite/dialogs/Requests.java @@ -7,12 +7,12 @@ import com.vk.im.engine.utils.ImDialogsUtils; import okhttp3.Headers; import okhttp3.OkHttpClient; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.net.Request; import ru.vtosters.lite.proxy.ProxyUtils; import ru.vtosters.lite.utils.AccountManagerUtils; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.LifecycleUtils; -import ru.vtosters.lite.utils.ThemesUtils; public class Requests { public static void hookRead(Dialog dialog) { diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java index d954c20ba6..eecf825149 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java @@ -26,10 +26,10 @@ import java.util.ArrayList; import java.util.List; +import static ru.vtosters.hooks.other.ThemesUtils.getTextAttr; import static ru.vtosters.lite.net.Request.makeRequest; import static ru.vtosters.lite.proxy.ProxyUtils.getApi; import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken; -import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr; public class VideoDownloader { private static final int DOWNLOAD_ID = 0; diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/messages/HtmlDialogDownloaderFormatProvider.java b/app/src/main/java/ru/vtosters/lite/downloaders/messages/HtmlDialogDownloaderFormatProvider.java index b96fc1fed3..cdc0f49f34 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/messages/HtmlDialogDownloaderFormatProvider.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/messages/HtmlDialogDownloaderFormatProvider.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.regex.Pattern; -import static ru.vtosters.lite.encryption.EncryptProvider.decryptMessage; +import static ru.vtosters.hooks.EncryptionMessagesHook.decryptMessage; import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId; import static ru.vtosters.lite.utils.AndroidUtils.getArray; diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/messages/items/MiniMsg.java b/app/src/main/java/ru/vtosters/lite/downloaders/messages/items/MiniMsg.java index 659569dc53..89d5f8b175 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/messages/items/MiniMsg.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/messages/items/MiniMsg.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import static ru.vtosters.lite.encryption.EncryptProvider.decryptMessage; +import static ru.vtosters.hooks.EncryptionMessagesHook.decryptMessage; public class MiniMsg { public long date; diff --git a/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java b/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java index 431958c27d..afea669ad4 100644 --- a/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java +++ b/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java @@ -1,10 +1,8 @@ package ru.vtosters.lite.encryption; -import android.util.Log; import android.util.Pair; import com.vk.im.engine.models.messages.Msg; import com.vk.im.engine.models.messages.MsgFromUser; -import com.vk.im.ui.components.msg_list.MsgListComponent; import ru.vtosters.lite.encryption.base.IMProcessor; import ru.vtosters.lite.encryption.processors.*; @@ -13,9 +11,6 @@ import java.util.ArrayList; import java.util.List; -import static ru.vtosters.lite.hooks.MessagesHook.injectOwnText; -import static ru.vtosters.lite.hooks.MessagesHook.injectOwnTextAll; - public class EncryptProvider { public static List processors = new ArrayList<>(); @@ -46,78 +41,19 @@ public static int getPeerId(Msg msg) { return msg.v1(); } - // For message editing - public static String decryptMessage(MsgFromUser msg, boolean showEmoji) { - var decryptedMessage = decryptMessage(getBody(msg), getPeerId(msg)); - if (!showEmoji && !decryptedMessage.equals(injectOwnTextAll(getBody(msg)))) - decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", ""); - return decryptedMessage; - } - - public static String decryptMessage(String msg, MsgListComponent list) { - var peerid = list.G().getId(); - var decryptedMessage = decryptMessage(msg, peerid); - if (!decryptedMessage.equals(injectOwnTextAll(msg))) - decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", ""); - return decryptedMessage; - } - - public static CharSequence decryptMessage(CharSequence msg, int peerid) { - return decryptMessage(msg.toString(), peerid); - } - - public static CharSequence decryptMessage(Msg msg, CharSequence orig) { - if (msg instanceof MsgFromUser) { - var decrypted = decryptMessage(((MsgFromUser) msg).f(), msg.v1()); - - if (decrypted.contains("\uD83D\uDD12")) { - return decrypted; - } - - } - - return orig; - } - - public static String decryptMessages(String msgBody, int peer, boolean showEmoji) { - return (String) decryptMessage(msgBody, peer, showEmoji); - } - - public static CharSequence decryptMessage(CharSequence msgBody, MsgFromUser msgFromUser, boolean showEmoji) { - try { - return decryptMessage((String) msgBody, msgFromUser.v1(), showEmoji); - } catch (Exception e) { - return decryptMessage((String) msgBody, 0, showEmoji); - } - } - - // For MentionsFormatter that requires CharSequence - public static CharSequence decryptMessage(String msgBody, int peer, boolean showEmoji) { - var decryptedMessage = decryptMessage(msgBody, peer); - if (!showEmoji && !decryptedMessage.equals(injectOwnTextAll(msgBody))) - decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", ""); - return decryptedMessage; - } - - // This will run through EVERY single processor available. - public static String decryptMessage(MsgFromUser msg) { - return decryptMessage(getBody(msg), getPeerId(msg)); - } + // For rendering UI + public static List> getUserVisibleEncoders() { + List> theList = new ArrayList<>(); - public static String decryptMessage(String msgBody, int peer) { - try { - for (IMProcessor processor : processors) { - if ((processor.isUsed() || !processor.isPublic()) && processor.isEncrypted(msgBody) && (processor.isPublic() || getKeyForProcessor(processor, peer) != null)) - return "\uD83D\uDD12 " + injectOwnTextAll(processor.decode(msgBody, getKeyForProcessor(processor, peer))); - } - } catch (Exception e) { - e.printStackTrace(); + for (IMProcessor processor : processors) { + if (processor.isPublic()) + theList.add(new Pair<>("VT_IMDecode_" + processor.getPrefKey(), processor.getUIName())); } - return injectOwnTextAll(msgBody); + return theList; } - private static byte[] getKeyForProcessor(IMProcessor processor, int peer) { + public static byte[] getKeyForProcessor(IMProcessor processor, int peer) { if (processor.isPublic()) return null; String keyString = processor.getEncryptionKeyFor(peer); if (keyString == null) return null; @@ -134,34 +70,4 @@ private static byte[] getKeyForProcessor(IMProcessor processor, int peer) { return keyString.getBytes(); } - - // This will use only the processor which was chosen in chat menu - public static String encryptMessage(MsgFromUser msg) { - String msgBody = getBody(msg); - - Log.d("EncryptProvider", "encryptMessage: msg = " + msg); - Log.d("EncryptProvider", "encryptMessage: body = " + msgBody); - Log.d("EncryptProvider", "encryptMessage: peerId = " + getPeerId(msg)); - - for (IMProcessor processor : processors) { - int peer = getPeerId(msg); - if (processor.isUsedToEncrypt(peer)) { - return injectOwnText(processor.encode(msgBody, getKeyForProcessor(processor, peer))); - } - } - - return injectOwnText(msgBody); - } - - // For rendering UI - public static List> getUserVisibleEncoders() { - List> theList = new ArrayList<>(); - - for (IMProcessor processor : processors) { - if (processor.isPublic()) - theList.add(new Pair<>("VT_IMDecode_" + processor.getPrefKey(), processor.getUIName())); - } - - return theList; - } } diff --git a/app/src/main/java/ru/vtosters/lite/encryption/base/IMProcessor.java b/app/src/main/java/ru/vtosters/lite/encryption/base/IMProcessor.java index afc3d5307c..dc4f0fba21 100644 --- a/app/src/main/java/ru/vtosters/lite/encryption/base/IMProcessor.java +++ b/app/src/main/java/ru/vtosters/lite/encryption/base/IMProcessor.java @@ -2,9 +2,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import ru.vtosters.lite.utils.Preferences; +import ru.vtosters.hooks.other.Preferences; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; public abstract class IMProcessor { // By default it checks start and end tag. diff --git a/app/src/main/java/ru/vtosters/lite/encryption/processors/VTostersAESProcessor.java b/app/src/main/java/ru/vtosters/lite/encryption/processors/VTostersAESProcessor.java index 6b9fef5552..865a23abef 100644 --- a/app/src/main/java/ru/vtosters/lite/encryption/processors/VTostersAESProcessor.java +++ b/app/src/main/java/ru/vtosters/lite/encryption/processors/VTostersAESProcessor.java @@ -3,8 +3,8 @@ import android.util.Base64; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.encryption.base.IMProcessor; -import ru.vtosters.lite.utils.Preferences; import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; diff --git a/app/src/main/java/ru/vtosters/lite/hooks/AdBlockHook.java b/app/src/main/java/ru/vtosters/lite/hooks/AdBlockHook.java deleted file mode 100644 index 0146f0fba5..0000000000 --- a/app/src/main/java/ru/vtosters/lite/hooks/AdBlockHook.java +++ /dev/null @@ -1,390 +0,0 @@ -package ru.vtosters.lite.hooks; - -import android.util.Log; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import ru.vtosters.lite.utils.NewsFeedFiltersUtils; -import ru.vtosters.lite.utils.Preferences; - -import java.util.Collections; - -import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.*; -import static ru.vtosters.lite.utils.Preferences.*; - -public class AdBlockHook { - public static Boolean discoverAdBlock(JSONObject jsonObject) { - if (jsonObject == null) return true; - - try { - var type = jsonObject.optString("type"); - var post = jsonObject.optJSONObject("post"); - - if (jsonObject.optString("template").contains("ads") || jsonObject.has("ads")) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: ads"); - return false; - } - - if (isAds(post, type)) { - return false; - } - - if (authorsrecomm() && (type.equals("authors_rec") - || type.startsWith("recommended_") && (type.endsWith("audios") - || type.endsWith("artists") - || type.endsWith("playlists") - || type.endsWith("groups")))) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: authorsrecomm"); - return false; - } - - if (postsrecomm() && (type.equals("inline_user_rec") || type.equals("live_recommended"))) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: postsrecomm"); - return false; - } - - if (friendsrecomm() && (type.equals("user_rec") || type.equals("friends_recomm"))) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: friendsrecomm"); - return false; - } - - if (adsgroup() && (post != null ? post.optInt("marked_as_ads") : 0) == 1 && !isWhitelistedAd(post)) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: marked_as_ads is true"); - return false; - } - - if (post != null) { - if (isBadNews(post.optString("text")) && !isWhitelistedFilters(post)) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: text filters"); - return false; - } - - if (checkCopyright(post) && !isWhitelistedFilters(post)) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: copyright filters"); - return false; - } - - if (checkCaption(post) && !isWhitelistedFilters(post)) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: caption filters"); - return false; - } - - if (NewsFeedFiltersUtils.injectFiltersReposts(post) && !isWhitelistedFilters(post)) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: repost ad"); - return false; - } - } - } catch (Exception e) { - Log.d("NewsfeedAdBlockV2", "discover: " + e.getMessage()); - } - - return true; - } - - public static JSONObject discoverInject(JSONObject json) throws JSONException { - var items = json.optJSONArray("items"); - var newObj = new JSONArray(); - -// newObj.put(discoverObj()); // template injection - - for (int i = 0; i < (items != null ? items.length() : 0); i++) { - try { - var curr = items.getJSONObject(i); - if (!curr.optString("template").contains("info") && discoverAdBlock(curr)) { - newObj.put(items.optJSONObject(i)); - } - } catch (Exception e) { - Log.d("NewsfeedAdBlockV2", "discover: " + e); - } - } - - json.put("items", newObj); - - return json; - } - - public static JSONObject discoverObj() throws JSONException { - var mainjson = new JSONObject(); - - var info = new JSONObject(); - info.put("title", "Test Injection"); - info.put("text_color", "#ffffff"); - info.put("description", "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat"); - - var image = new JSONArray(); - var imageQuality1 = new JSONObject(); - imageQuality1.put("url", "https://w7.pngwing.com/pngs/505/1021/png-transparent-konata-izumi-lucky-star-desktop-anime-anime-blue-mammal-face.png"); - imageQuality1.put("width", 72); // 72, 108, 144, 216, 288 - imageQuality1.put("height", 72); // 72, 108, 144, 216, 288 - image.put(imageQuality1); - - var background = new JSONArray(); - var backgroundQuality1 = new JSONObject(); - backgroundQuality1.put("url", "https://2ch.life/vg/arch/2022-08-22/src/38524739/16440606579870.jpg"); - backgroundQuality1.put("width", 344); // 344, 516, 680, 1032, 1376 - backgroundQuality1.put("height", 215); // 215, 323, 426, 645, 860 - background.put(backgroundQuality1); - - info.put("image", image); - info.put("background", background); - - mainjson.put("info", info); - mainjson.put("track_code", "info_banner_donut_catalog"); - mainjson.put("template", "info"); - - var action = new JSONObject(); - action.put("type", "open_url"); - action.put("url", "vk.com/vtosters_official"); - action.put("target", "internal"); - - mainjson.put("action", action); - - return mainjson; - } - - public static JSONArray feedInject(JSONArray items) { - if (items.length() == 0) return items; - - try { - var newItems = new JSONArray(); - - for (int j = 0; j < items.length(); j++) { - var list = items.optJSONObject(j); - - if (list == null) continue; - - var type = list.optString("type"); - - if (isAds(list, type)) { - continue; - } - - if (authorsrecomm() && (type.equals("authors_rec") - || type.startsWith("recommended_") && (type.endsWith("audios") - || type.endsWith("artists") - || type.endsWith("playlists") - || type.endsWith("groups")))) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: authorsrecomm"); - continue; - } - - if (postsrecomm() && (type.equals("inline_user_rec") || type.equals("live_recommended"))) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: postsrecomm"); - continue; - } - - if (friendsrecomm() && (type.equals("user_rec") || type.equals("friends_recomm"))) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: friendsrecomm"); - continue; - } - - if (adsgroup() && list.optInt("marked_as_ads") == 1 && !isWhitelistedAd(list)) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: marked_as_ads is true"); - continue; - } - - if (isBadNews(list.optString("text")) && !isWhitelistedFilters(list)) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: text filters"); - continue; - } - - if (checkCopyright(list) && !isWhitelistedFilters(list)) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: copyright filters"); - continue; - } - - if (checkCaption(list) && !isWhitelistedFilters(list)) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: caption filters"); - continue; - } - - if (hasMiniAppAds(list) && !isWhitelistedFilters(list)) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: MiniApp filters"); - continue; - } - - try { - if (NewsFeedFiltersUtils.injectFiltersReposts(list) && !isWhitelistedFilters(list)) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: repost ad"); - continue; - } - } catch (Exception ex) { - Log.d("RepostInj", ex.getMessage()); - } - - newItems.put(list); - } - - return newItems; - } catch (Exception e) { - Log.d("NewsfeedAdBlockV2", e.getMessage()); - } - - return items; - } - - private static void parseStoriesItem(JSONObject item) throws JSONException { - var stories = item.optJSONArray("stories"); - var newStories = new JSONArray(); - - if (stories == null) return; - - for (int j = 0; j < stories.length(); j++) { - var story = stories.optJSONObject(j); - - if (!story.optBoolean("is_ads") && !story.optBoolean("is_promo")) { - if (isStoryNotAd(story)) { - newStories.put(story); - } - } else { - if (dev()) - Log.d("StoriesAds", "Fetched ad, owner id " + story.optString("owner_id") + ", caption " + story.optString("caption")); - } - } - - item.put("stories", newStories); - } - - private static Boolean isStoryNotAd(JSONObject json) { - return !getBoolValue("storiesGroupsAdBlock", false) || (json.has("link") ? isWhitelistedAdStories(json) : true); - } - - public static JSONObject storiesads(JSONObject json, boolean isDeleteFix) throws JSONException { - if (!adsstories()) { - return json; - } - - if (json.has("ads")) { - var ad = json.optJSONObject("ads"); - if (isDeleteFix) { - if (ad != null) { - ad.optJSONObject("settings") - .put("stories_interval", 0) - .put("authors_interval", 0) - .put("time_interval", 0) - .put("stories_init", 0) - .put("authors_init", 0) - .put("time_init", 0); - } - if (dev()) Log.d("StoriesAds", "Set ads settings at zero values"); - } else { - json.remove("ads"); - if (dev()) Log.d("StoriesAds", "Removed ads block"); - } - } - - var items = json.optJSONArray("items"); - if (items != null) { - for (int i = 0; i < items.length(); i++) { - var item = items.optJSONObject(i); - if (item != null) { - parseStoriesItem(item); - } - } - } - - return json; - } - - public static Boolean isAds(JSONObject list, String type) { - if (list == null || type == null || !ads()) return false; - - if (list.has("ads") - || type.equals("ads") - || type.equals("carousel") - || type.equals("html5_ad") - || type.equals("ads_easy_promote")) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: ads"); - return true; - } - - if (type.equals("promo_button") - || type.equals("app_widget") - || type.equals("app_video") - || type.equals("app_slider") - || type.equals("tags_suggestions")) { - if (dev()) - Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: promo"); - return true; - } - - return false; - } - - public static Boolean isWhitelistedFilters(JSONObject list) { - var id = String.valueOf(list.optInt("owner_id")); - - if (id.equals("0")) { - id = String.valueOf(list.optInt("source_id")); - } - - if (id.equals("-189659924")) { - return true; - } - - var whitelist = Preferences.getPreferences().getStringSet( - "whitelisted_filters_groups", - Collections.emptySet() - ); - - return whitelist.contains(id); - } - - public static Boolean isWhitelistedAd(JSONObject list) { - var id = String.valueOf(list.optInt("owner_id")); - - if (id.equals("0")) { - id = String.valueOf(list.optInt("source_id")); - } - - var whitelist = Preferences.getPreferences().getStringSet( - "whitelisted_ad_groups", - Collections.emptySet() - ); - - return whitelist.contains(id); - } - - public static Boolean isWhitelistedAdStories(JSONObject list) { - var id = String.valueOf(list.optInt("owner_id")); - - var whitelist = Preferences.getPreferences().getStringSet( - "whitelisted_stories_ad", - Collections.emptySet() - ); - - return whitelist.contains(id); - } - - public static Boolean hasMiniAppAds(JSONObject list) { - var attachments = list.optJSONArray("attachments"); - - if (attachments != null && getBoolValue("blockminiapps", false)) { - for (int j = 0; j < attachments.length(); j++) { - var type = attachments.optJSONObject(j).optString("type"); - if (type.contains("mini_app")) return true; - } - } - - return false; - } -} diff --git a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java deleted file mode 100644 index 6596b2bbd8..0000000000 --- a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java +++ /dev/null @@ -1,240 +0,0 @@ -package ru.vtosters.lite.hooks; - -import android.text.TextUtils; -import android.util.Log; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import ru.vtosters.lite.utils.AccountManagerUtils; -import ru.vtosters.lite.utils.Preferences; - -import java.io.IOException; -import java.text.ParseException; -import java.util.LinkedHashSet; - -import static ru.vtosters.lite.foaf.FoafBase.getBypassedOnlineInfo; -import static ru.vtosters.lite.hooks.OnlineFormatterHook.onlineHookProfiles; -import static ru.vtosters.lite.utils.Preferences.dev; -import static ru.vtosters.lite.utils.Preferences.friendsblock; - -public class JsonInjectors { - public static JSONObject menu(JSONObject orig) throws JSONException { - var Special = orig.optJSONArray("special"); - var Main = orig.getJSONArray("main"); - var Other = orig.optJSONArray("other"); - - if (Special != null) { - orig.remove("special"); - } - - return orig; - } - - public static JSONObject superapp(JSONObject json) throws JSONException { - var superApps = Preferences.getPreferences().getString("superapp_items", - "menu,miniapps,vkpay_slim,greeting,promo,holiday,weather,sport,games,informer,food,event,music,vk_run").split(","); - if (superApps.length == 0) return json; - - var oldItems = json.optJSONArray("items"); - var newItems = new JSONArray(); - if (oldItems != null) { - for (int i = 0; i < oldItems.length(); i++) { - var item = oldItems.optJSONObject(i); - var type = item.optString("type"); - for (String superApp : superApps) { - if (type.equals(superApp)) - newItems.put(item); - } - } - for (int i = 0; i < superApps.length; i++) { - for (int j = i; j < newItems.length(); j++) { - var item = newItems.optJSONObject(j); - if (superApps[i].equals(item.optString("type"))) - newItems.put(j, newItems.getJSONObject(i)) - .put(i, item); - } - } - } - - return json.putOpt("items", newItems); - } - - - public static JSONObject setOnlineInfo(JSONObject json) throws JSONException { - var id = json.optInt("id"); - if (id == AccountManagerUtils.getUserId()) { - return json; - } - var onlineinfo = json.optJSONObject("online_info"); - if (onlineinfo != null && !onlineinfo.optBoolean("visible")) { - var bypassed = getBypassedOnlineInfo(id); - if (bypassed.optInt("last_seen", 0) != 0) { - json.remove("online_info"); - - var online_info = new JSONObject() - .put("visible", true) - .put("last_seen", bypassed.optInt("last_seen")) - .put("is_online", bypassed.optBoolean("is_online")) - .put("app_id", bypassed.optInt("app_id")) - .put("is_mobile", bypassed.optBoolean("is_mobile")); - - var last_seen = new JSONObject() - .put("platform", bypassed.optInt("platform")) - .put("time", bypassed.optInt("last_seen")); - - json.put("last_seen", last_seen).put("online_info", online_info); - } - } - - return json; - } - - public static JSONArray setOnlineInfoUsers(JSONArray profiles) throws JSONException { - if (profiles == null || profiles.length() == 0) return profiles; - StringBuilder sb = new StringBuilder(); - var curVkId = AccountManagerUtils.getUserId(); - for (int i = 0; i < profiles.length(); i++) { - JSONObject profile = profiles.getJSONObject(i); - int id = profile.optInt("id", -1); - JSONObject onlinfo = profile.optJSONObject("online_info"); - if (id == curVkId || id < 0 || onlinfo == null || onlinfo.optBoolean("visible")) { - continue; - } - sb.append(id); - sb.append(","); - } - var ids = sb.toString(); - if (ids.length() > 0) { - ids = ids.substring(0, ids.length() - 1); - } else { - return profiles; - } - - JSONObject bypassedObj = getBypassedOnlineInfo(ids); - for (int i = 0; i < profiles.length(); i++) { - JSONObject profile = profiles.getJSONObject(i); - int id = profile.optInt("id"); - JSONObject bypassed = bypassedObj.optJSONObject(Integer.toString(id)); - if (bypassed == null) { - continue; - } - profile.remove("online_info"); - - var online_info = new JSONObject() - .put("visible", true) - .put("last_seen", bypassed.optInt("last_seen")) - .put("is_online", bypassed.optBoolean("is_online")) - .put("app_id", bypassed.optInt("app_id")) - .put("is_mobile", bypassed.optBoolean("is_mobile")); - - var last_seen = new JSONObject() - .put("platform", bypassed.optInt("platform")) - .put("time", bypassed.optInt("last_seen")); - - profile.put("last_seen", last_seen).put("online_info", online_info); - } - - return profiles; - } - - public static JSONArray newsfeedlist(JSONArray items) throws JSONException { - var selectedItems = Preferences.getPreferences().getString("news_feed_selected_items", ""); - var filtersSet = Preferences.getPreferences().getStringSet("news_feed_items_set", null); - var mutableFiltersSet = new LinkedHashSet(); - if (filtersSet != null) - mutableFiltersSet.addAll(filtersSet); - - for (int i = 0; i < items.length(); i++) { - var item = items.optJSONObject(i); - if (item == null) continue; - - var id = item.optString("id"); - var title = item.optString("title"); - - if (TextUtils.isEmpty(id) || TextUtils.isEmpty(title) - // this items not working - || id.equals("kpop") || id.equals("foryou") - || id.equals("qazaqstan") || id.equals("podcasts")) - continue; - - mutableFiltersSet.add(id + "|" + title); - - var hide = selectedItems.contains(id); - - Log.d("NewsfeedList", "Added list " + id + " to feed"); - item.put("is_hidden", hide) - .put("is_unavailable", hide); - Log.d("NewsfeedListInj", "Unlocked " + id + " in newsfeed list"); - } - Preferences.getPreferences().edit().putStringSet("news_feed_items_set", mutableFiltersSet) - .apply(); - - return items; - } - - public static JSONObject friends(JSONObject json) throws JSONException, ParseException, IOException { - JSONObject catalog = onlineHookProfiles(json); - boolean sectionexecute = true; - boolean hasBirthday = false; - - if (json.optJSONObject("catalog") != null) { - catalog = json.optJSONObject("catalog"); - sectionexecute = false; - } - - JSONArray section = null; - JSONObject sections = null; - - if (sectionexecute) { - sections = catalog.optJSONObject("section"); - } else { - section = catalog.optJSONArray("sections"); - } - - JSONArray oldItems; - - if (sectionexecute) { - oldItems = sections.optJSONArray("blocks"); - } else { - oldItems = section.optJSONObject(0).optJSONArray("blocks"); - } - - var newItems = new JSONArray(); - if (oldItems != null) { - for (int i = 0; i < oldItems.length(); i++) { - var type = oldItems.optJSONObject(i); - var name = type.optJSONObject("layout").optString("name"); - var buttons = ""; - var skip = false; - if (type.optJSONArray("buttons") != null) { - buttons = type.optJSONArray("buttons").optJSONObject(0).optString("ref_layout_name"); - } - if (name.contains("list_friend_suggests") || buttons.contains("list_friend_suggests") || name.contains("separator")) { - skip = friendsblock(); - } - - if (buttons.contains("friends_birthdays_list")) { - hasBirthday = true; - } - - if (name.contains("separator") && hasBirthday) { - skip = false; - hasBirthday = false; - } - - if (!skip) { - newItems.put(type); - } - - } - } - - if (sectionexecute) { - sections.putOpt("blocks", newItems); - } else { - section.optJSONObject(0).putOpt("blocks", newItems); - } - - return json; - } -} diff --git a/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java b/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java index 70c1cfc946..5f33f274c6 100644 --- a/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java +++ b/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java @@ -11,11 +11,11 @@ import okhttp3.*; import org.json.JSONException; import org.json.JSONObject; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.di.singleton.VtOkHttpClient; import ru.vtosters.lite.downloaders.AudioDownloader; import ru.vtosters.lite.music.cache.CacheDatabaseDelegate; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java b/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java index 74a5c388a5..c25f99795e 100644 --- a/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java +++ b/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java @@ -10,20 +10,20 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.di.singleton.VtOkHttpClient; import ru.vtosters.lite.music.cache.CacheDatabaseDelegate; import ru.vtosters.lite.utils.AccountManagerUtils; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; +import static ru.vtosters.hooks.DateHook.getLocale; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; import static ru.vtosters.lite.feature.groupslist.GroupsCatalogInjector.injectIntoCatalog; -import static ru.vtosters.lite.hooks.DateHook.getLocale; import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.*; import static ru.vtosters.lite.proxy.ProxyUtils.getApi; import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; public class CatalogJsonInjector { private static final OkHttpClient mClient = VtOkHttpClient.getInstance(); diff --git a/app/src/main/java/ru/vtosters/lite/music/converter/playlist/PlaylistConverter.java b/app/src/main/java/ru/vtosters/lite/music/converter/playlist/PlaylistConverter.java index e67a95b267..6b24fa4b4a 100644 --- a/app/src/main/java/ru/vtosters/lite/music/converter/playlist/PlaylistConverter.java +++ b/app/src/main/java/ru/vtosters/lite/music/converter/playlist/PlaylistConverter.java @@ -19,7 +19,7 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import static ru.vtosters.lite.hooks.DateHook.getLocale; +import static ru.vtosters.hooks.DateHook.getLocale; import static ru.vtosters.lite.proxy.ProxyUtils.getApi; /** diff --git a/app/src/main/java/ru/vtosters/lite/music/downloader/AudioGet.java b/app/src/main/java/ru/vtosters/lite/music/downloader/AudioGet.java index 9453c18a02..5ee2312c81 100644 --- a/app/src/main/java/ru/vtosters/lite/music/downloader/AudioGet.java +++ b/app/src/main/java/ru/vtosters/lite/music/downloader/AudioGet.java @@ -18,7 +18,7 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import static ru.vtosters.lite.hooks.DateHook.getLocale; +import static ru.vtosters.hooks.DateHook.getLocale; import static ru.vtosters.lite.proxy.ProxyUtils.getApi; import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId; import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken; diff --git a/app/src/main/java/ru/vtosters/lite/music/hook/MusicBottomSheetHook.java b/app/src/main/java/ru/vtosters/lite/music/hook/MusicBottomSheetHook.java index de8f2bd910..2efc348657 100644 --- a/app/src/main/java/ru/vtosters/lite/music/hook/MusicBottomSheetHook.java +++ b/app/src/main/java/ru/vtosters/lite/music/hook/MusicBottomSheetHook.java @@ -14,10 +14,10 @@ import java.util.ArrayList; import static bruhcollective.itaysonlab.libvkx.client.LibVKXClient.*; +import static ru.vtosters.hooks.other.Preferences.milkshake; import static ru.vtosters.lite.music.cache.CacheDatabaseDelegate.isCached; import static ru.vtosters.lite.music.cache.CacheDatabaseDelegate.isVkxCached; import static ru.vtosters.lite.utils.NetworkUtils.isNetworkConnected; -import static ru.vtosters.lite.utils.Preferences.milkshake; public class MusicBottomSheetHook { public static ArrayList hook(ArrayList actions, MusicTrack musicTrack) { diff --git a/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java b/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java index 771dcc123b..e609259115 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java @@ -5,11 +5,11 @@ import android.content.Intent; import android.util.ArrayMap; import android.util.Log; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.proxy.http.CustomHttp; import ru.vtosters.lite.proxy.https.CustomHttps; import ru.vtosters.lite.proxy.socks.CustomSocks; import ru.vtosters.lite.proxy.socks.Zaborona; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; import java.lang.reflect.Field; diff --git a/app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java b/app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java index 6e85036bfc..592f38d72a 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java @@ -1,10 +1,10 @@ package ru.vtosters.lite.proxy; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.proxy.socks.Hookzof; import ru.vtosters.lite.proxy.socks.Jetkai; import ru.vtosters.lite.proxy.socks.Roosterkid; import ru.vtosters.lite.proxy.socks.TheSpeedX; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; diff --git a/app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java b/app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java deleted file mode 100644 index afbf235328..0000000000 --- a/app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java +++ /dev/null @@ -1,76 +0,0 @@ -package ru.vtosters.lite.proxy.api; - -import android.util.Log; - -import static ru.vtosters.lite.proxy.ProxyUtils.isAnyProxyEnabled; -import static ru.vtosters.lite.proxy.ProxyUtils.isVikaProxyEnabled; -import static ru.vtosters.lite.utils.Preferences.getString; - -public class ApiProxy { - public static String linkReplacer(String link) { - var vkapi = "api.vk.com"; - var oauth = "oauth.vk.com"; - var vkstatic = "static.vk.com"; - - var proxyapi = getString("proxyapi"); - var proxyoauth = getString("proxyoauth"); - var proxystatic = getString("proxystatic"); - - if (isVikaProxyEnabled()) { - proxyapi = VikaMobile.getApiHost(); - proxyoauth = VikaMobile.getOauthHost(); - proxystatic = VikaMobile.getStaticHost(); - } - - if (!isAnyProxyEnabled() || link.isEmpty()) { - return link; - } - - if (proxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()) { - Log.d("VTLite", "Proxy is not set" + " " + proxyapi + " " + proxyoauth + " " + proxystatic); - return link; - } - - if (link.contains(vkapi)) { - return link.replaceAll(vkapi, proxyapi); - } - - if (link.contains(oauth)) { - return link.replaceAll(oauth, proxyoauth); - } - - if (link.contains(vkstatic)) { - return link.replaceAll(vkstatic, proxystatic); - } - - return link; - } - - public static String staticFix(String str) { - var string = getString("proxystatic"); - - if (isVikaProxyEnabled()) { - string = VikaMobile.getStaticHost(); - } - - if (isAnyProxyEnabled() && !string.isEmpty()) { - return str.replaceAll(string, "static.vk.com"); - } - - return str; - } - - public static String getAwayPhpCom() { - var proxyapi = getString("proxyapi"); - - if (isVikaProxyEnabled()) { - proxyapi = VikaMobile.getApiHost(); - } - - if (isAnyProxyEnabled() && !proxyapi.isEmpty()) { - return proxyapi; - } - - return "m.vk.com"; - } -} diff --git a/app/src/main/java/ru/vtosters/lite/proxy/api/VikaMobile.java b/app/src/main/java/ru/vtosters/lite/proxy/api/VikaMobile.java index 0bb6abb952..d8776dffab 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/api/VikaMobile.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/api/VikaMobile.java @@ -1,6 +1,6 @@ package ru.vtosters.lite.proxy.api; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; public class VikaMobile { public static String getApiHost() { diff --git a/app/src/main/java/ru/vtosters/lite/proxy/http/CustomHttp.java b/app/src/main/java/ru/vtosters/lite/proxy/http/CustomHttp.java index 33dfe6b298..0afe2827f5 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/http/CustomHttp.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/http/CustomHttp.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.proxy.http; +import static ru.vtosters.hooks.other.Preferences.getString; import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying; -import static ru.vtosters.lite.utils.Preferences.getString; public class CustomHttp { public static void loadProxy() { diff --git a/app/src/main/java/ru/vtosters/lite/proxy/http/Jetkai.java b/app/src/main/java/ru/vtosters/lite/proxy/http/Jetkai.java index 71adda20d2..48b779b772 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/http/Jetkai.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/http/Jetkai.java @@ -2,9 +2,9 @@ import android.util.Log; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.proxy.RandomProxy; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/ru/vtosters/lite/proxy/http/TheSpeedX.java b/app/src/main/java/ru/vtosters/lite/proxy/http/TheSpeedX.java index 833d6faf0c..64df5457cb 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/http/TheSpeedX.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/http/TheSpeedX.java @@ -2,9 +2,9 @@ import android.util.Log; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.proxy.RandomProxy; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/ru/vtosters/lite/proxy/https/CustomHttps.java b/app/src/main/java/ru/vtosters/lite/proxy/https/CustomHttps.java index 5a6af8c21b..10b64022f7 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/https/CustomHttps.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/https/CustomHttps.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.proxy.https; +import static ru.vtosters.hooks.other.Preferences.getString; import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying; -import static ru.vtosters.lite.utils.Preferences.getString; public class CustomHttps { public static void loadProxy() { diff --git a/app/src/main/java/ru/vtosters/lite/proxy/https/Jetkai.java b/app/src/main/java/ru/vtosters/lite/proxy/https/Jetkai.java index 7c41ec94fa..5bf0c9bff9 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/https/Jetkai.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/https/Jetkai.java @@ -2,9 +2,9 @@ import android.util.Log; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.proxy.RandomProxy; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/ru/vtosters/lite/proxy/https/Roosterkid.java b/app/src/main/java/ru/vtosters/lite/proxy/https/Roosterkid.java index 8c8c8d1b40..5920ddc838 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/https/Roosterkid.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/https/Roosterkid.java @@ -2,9 +2,9 @@ import android.util.Log; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.proxy.RandomProxy; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/ru/vtosters/lite/proxy/socks/CustomSocks.java b/app/src/main/java/ru/vtosters/lite/proxy/socks/CustomSocks.java index 711b683288..722c03182a 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/socks/CustomSocks.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/socks/CustomSocks.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.proxy.socks; +import static ru.vtosters.hooks.other.Preferences.getString; import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying; -import static ru.vtosters.lite.utils.Preferences.getString; public class CustomSocks { public static void loadProxy() { diff --git a/app/src/main/java/ru/vtosters/lite/proxy/socks/Hookzof.java b/app/src/main/java/ru/vtosters/lite/proxy/socks/Hookzof.java index aaa8b6492b..cc3fc5c7db 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/socks/Hookzof.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/socks/Hookzof.java @@ -2,9 +2,9 @@ import android.util.Log; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.proxy.RandomProxy; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/ru/vtosters/lite/proxy/socks/Jetkai.java b/app/src/main/java/ru/vtosters/lite/proxy/socks/Jetkai.java index b36624b2e3..84b2b25b1a 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/socks/Jetkai.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/socks/Jetkai.java @@ -2,9 +2,9 @@ import android.util.Log; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.proxy.RandomProxy; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/ru/vtosters/lite/proxy/socks/Roosterkid.java b/app/src/main/java/ru/vtosters/lite/proxy/socks/Roosterkid.java index 7c61aca9d8..18adf6601e 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/socks/Roosterkid.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/socks/Roosterkid.java @@ -2,9 +2,9 @@ import android.util.Log; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.proxy.RandomProxy; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/ru/vtosters/lite/proxy/socks/TheSpeedX.java b/app/src/main/java/ru/vtosters/lite/proxy/socks/TheSpeedX.java index 0098049c5b..c51415ed80 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/socks/TheSpeedX.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/socks/TheSpeedX.java @@ -2,9 +2,9 @@ import android.util.Log; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.proxy.RandomProxy; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/ru/vtosters/lite/ssfs/ImBanner.java b/app/src/main/java/ru/vtosters/lite/ssfs/ImBanner.java index 6ee323557b..b07f148d9c 100644 --- a/app/src/main/java/ru/vtosters/lite/ssfs/ImBanner.java +++ b/app/src/main/java/ru/vtosters/lite/ssfs/ImBanner.java @@ -1,14 +1,9 @@ package ru.vtosters.lite.ssfs; import android.util.Log; -import com.vk.core.dialogs.alert.VkAlertDialog; -import com.vtosters.lite.R; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.LifecycleUtils; -import ru.vtosters.lite.utils.Preferences; public class ImBanner { private static final String TAG = "ImBanner"; @@ -17,11 +12,6 @@ public static JSONObject convBar(JSONObject orig) throws JSONException { var user_id = orig.getJSONObject("peer").getInt("id"); if (!UsersList.hasBanner(user_id) || user_id == 0) { -// if (getBoolValue("convBarRecomm", false)) { -// return null; -// } else { -// return orig.optJSONObject("conversation_bar"); -// } return null; } @@ -63,25 +53,4 @@ public static JSONObject convBar(JSONObject orig) throws JSONException { return null; } } - - public static boolean showAlert() { - var context = LifecycleUtils.getCurrentActivity(); - var bool = Preferences.getBoolValue("linkalert", false); - - if (!bool) { - new VkAlertDialog.Builder(context) - .setTitle(R.string.warning) - .setMessage(AndroidUtils.getString("custom_links_warning")) - .setCancelable(false) - .setPositiveButton(R.string.continue_, (dialogInterface, i) -> { - Preferences.getPreferences().edit().putBoolean("linkalert", true).commit(); - }) - .setNeutralButton(R.string.cancel, (dialogInterface, i) -> { - dialogInterface.cancel(); - }) - .show(); - } - - return bool; - } } diff --git a/app/src/main/java/ru/vtosters/lite/ssfs/ProfileButtons.java b/app/src/main/java/ru/vtosters/lite/ssfs/ProfileButtons.java index bcc1db9087..363cfcccc8 100644 --- a/app/src/main/java/ru/vtosters/lite/ssfs/ProfileButtons.java +++ b/app/src/main/java/ru/vtosters/lite/ssfs/ProfileButtons.java @@ -64,7 +64,7 @@ public static JSONObject profileButton(JSONObject orig) { return orig; } - public static JSONObject generateJsonObject(String title, String link, String text_color, String url_type, HashMap iconsList) { + private static JSONObject generateJsonObject(String title, String link, String text_color, String url_type, HashMap iconsList) { try { var json = new JSONObject(); var icons = new JSONArray(); diff --git a/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java b/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java index 58c063d5c5..cfe032c535 100644 --- a/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java +++ b/app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java @@ -17,8 +17,6 @@ import java.util.ArrayList; import java.util.List; -import static ru.vtosters.lite.utils.Preferences.dev; - public class UsersList { private static final String TAG = "UsersList"; private static final List descriptionsList = new ArrayList<>(); diff --git a/app/src/main/java/ru/vtosters/lite/ssfs/Utils.java b/app/src/main/java/ru/vtosters/lite/ssfs/Utils.java index 6a9ccc8d21..2453327822 100644 --- a/app/src/main/java/ru/vtosters/lite/ssfs/Utils.java +++ b/app/src/main/java/ru/vtosters/lite/ssfs/Utils.java @@ -1,12 +1,12 @@ package ru.vtosters.lite.ssfs; import com.vk.core.network.Network; -import ru.vtosters.lite.hooks.DateHook; +import ru.vtosters.hooks.DateHook; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.proxy.ProxyUtils; import ru.vtosters.lite.utils.AccountManagerUtils; import ru.vtosters.lite.utils.Base64Utils; -import ru.vtosters.lite.utils.Preferences; -import ru.vtosters.lite.utils.ThemesUtils; public class Utils { public static String getVKUILink() { diff --git a/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java b/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java index 235cc0fedb..0f8dfa5f1f 100644 --- a/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java +++ b/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java @@ -1,32 +1,19 @@ package ru.vtosters.lite.tgs; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import com.aefyr.tsg.g2.TelegramStickersPack; -import com.aefyr.tsg.g2.TelegramStickersService; -import com.vk.dto.common.Attachment; -import com.vk.dto.stickers.StickerItem; import com.vk.dto.stickers.StickerStockItem; -import com.vk.im.engine.models.attaches.Attach; import com.vtosters.lite.R; -import com.vtosters.lite.attachments.PendingGraffitiAttachment; -import com.vtosters.lite.im.AppAttachToImAttachConverter; -import com.vtosters.lite.upload.Upload; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import ru.vtosters.lite.utils.AndroidUtils; -import java.util.List; import java.util.Stack; -import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; - public class TGRoot { public static final int N = 76820000; public static final int X = 976820000; - private final static Stack pendingStickers = new Stack<>(); - private static final String TAG = "TGRoot"; + public final static Stack pendingStickers = new Stack<>(); public static String getSummary() { return switch (TGPref.getTGConnectMethod()) { @@ -36,65 +23,6 @@ public static String getSummary() { }; } - public static Attachment processSticker(StickerItem item) { - int id = item.getId(); - if (id < N) return null; - - int index = (id - N) / 120; - int stickerId = (id - N) % 120; - - TelegramStickersPack pack = null; - for (TelegramStickersPack p : TelegramStickersService.getInstance(getGlobalContext()).getActivePacksListReference()) { - if (p.index == index) { - pack = p; - break; - } - } - - String image = pack.getStickerFile(stickerId).getAbsolutePath(); - - Bitmap bm = BitmapFactory.decodeFile(image); - int upid = Upload.a(); - pendingStickers.push(upid); - - Attachment att = new PendingGraffitiAttachment(upid, 0, image, bm.getWidth(), bm.getHeight(), null); - bm.recycle(); - - return att; - } - - public static void injectStickers(List list) { - try { - List packs = TelegramStickersService.getInstance(getGlobalContext()).getActivePacksListReference(); - for (int i = packs.size() - 1; i >= 0; i--) - list.add(0, toStickerPack(packs.get(i))); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static StickerStockItem getPackBySticker(int stickerId) { - if (stickerId < N) return null; - int index = (stickerId - N) / 120; - - TelegramStickersPack p = null; - for (TelegramStickersPack p_ : TelegramStickersService.getInstance(getGlobalContext()) - .getActivePacksListReference()) { - if (p_.index == index) { - p = p_; - break; - } - } - if (p == null) return null; - - try { - return toStickerPack(p); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - public static StickerStockItem toStickerPack(TelegramStickersPack p) throws JSONException { JSONArray arr = new JSONArray(); @@ -138,12 +66,5 @@ public static StickerStockItem toStickerPack(TelegramStickersPack p) throws JSON .put("photo_296", photo) .put("photo_592", photo), X + p.index); } - - public static Attach modifyStickerIM(int i, StickerItem stickerItem, String str) { - if (stickerItem.getId() < 76820000) { - return AppAttachToImAttachConverter.a.a(i, stickerItem, str); - } - return AppAttachToImAttachConverter.a.a(processSticker(stickerItem)); - } } diff --git a/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java b/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java index f34b82fd44..23e8c0c265 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java +++ b/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java @@ -7,8 +7,8 @@ import android.util.SparseIntArray; import androidx.annotation.IdRes; import com.vtosters.lite.R; -import ru.vtosters.lite.utils.Preferences; -import ru.vtosters.lite.utils.ThemesUtils; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; public class ThemesCore { diff --git a/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java b/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java index 0da42787ff..462ef1c28c 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java +++ b/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java @@ -9,9 +9,9 @@ import androidx.annotation.ColorRes; import androidx.annotation.NonNull; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.utils.RecolorUtils; -import ru.vtosters.lite.utils.Preferences; -import ru.vtosters.lite.utils.ThemesUtils; public class ThemesHacks { public static void fixDropdown(Drawable drawable) { diff --git a/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java b/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java index 6c0a80fa26..e813a5a74d 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java +++ b/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java @@ -6,11 +6,11 @@ import android.util.Log; import com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceFile; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.loaders.ResourcesLoader; import ru.vtosters.lite.themes.utils.ArscEditor; import ru.vtosters.lite.utils.IOUtils; -import ru.vtosters.lite.utils.Preferences; -import ru.vtosters.lite.utils.ThemesUtils; import java.io.*; import java.util.zip.CRC32; diff --git a/app/src/main/java/ru/vtosters/lite/themes/VTLResources.java b/app/src/main/java/ru/vtosters/lite/themes/VTLResources.java index 4fa09733f9..97f5265cf4 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/VTLResources.java +++ b/app/src/main/java/ru/vtosters/lite/themes/VTLResources.java @@ -8,7 +8,7 @@ import android.util.Log; import android.util.TypedValue; import androidx.annotation.Nullable; -import ru.vtosters.lite.utils.ThemesUtils; +import ru.vtosters.hooks.other.ThemesUtils; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/app/src/main/java/ru/vtosters/lite/themes/ViewInjector.java b/app/src/main/java/ru/vtosters/lite/themes/ViewInjector.java index d0e5a4f712..4cc863265c 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/ViewInjector.java +++ b/app/src/main/java/ru/vtosters/lite/themes/ViewInjector.java @@ -2,8 +2,8 @@ import android.view.View; import android.view.ViewGroup; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.hooks.*; -import ru.vtosters.lite.utils.ThemesUtils; import java.util.ArrayList; diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/ButtonHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/ButtonHook.java index c3d9155582..89d5e77ff6 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/hooks/ButtonHook.java +++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/ButtonHook.java @@ -3,8 +3,8 @@ import android.content.res.ColorStateList; import android.view.View; import android.widget.Button; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.ColorReferences; -import ru.vtosters.lite.utils.ThemesUtils; public class ButtonHook implements BaseHook { @Override diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/ImageViewHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/ImageViewHook.java index 59cf0dd0c3..9256793c24 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/hooks/ImageViewHook.java +++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/ImageViewHook.java @@ -3,9 +3,9 @@ import android.content.res.ColorStateList; import android.view.View; import android.widget.ImageView; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.ColorReferences; import ru.vtosters.lite.themes.ThemesCore; -import ru.vtosters.lite.utils.ThemesUtils; public class ImageViewHook implements BaseHook { @Override diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/ProgressWheelHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/ProgressWheelHook.java index 6a0f78f5d4..26b9fb5bd0 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/hooks/ProgressWheelHook.java +++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/ProgressWheelHook.java @@ -2,8 +2,8 @@ import android.view.View; import com.pnikosis.materialishprogress.ProgressWheel; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.ThemesCore; -import ru.vtosters.lite.utils.ThemesUtils; public class ProgressWheelHook implements BaseHook { @Override diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/TabLayoutHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/TabLayoutHook.java index 764c34737d..743f9954f2 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/hooks/TabLayoutHook.java +++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/TabLayoutHook.java @@ -3,7 +3,7 @@ import android.content.res.ColorStateList; import android.view.View; import com.vk.core.view.VKTabLayout; -import ru.vtosters.lite.utils.ThemesUtils; +import ru.vtosters.hooks.other.ThemesUtils; public class TabLayoutHook implements BaseHook { diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java index 8ed223f37c..f7036c0768 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java +++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/TextViewHook.java @@ -11,10 +11,10 @@ import com.vk.core.view.TintTextView; import com.vk.core.view.links.LinkedTextView; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.ColorReferences; import ru.vtosters.lite.themes.ThemesHacks; import ru.vtosters.lite.themes.utils.VkUiThemer; -import ru.vtosters.lite.utils.ThemesUtils; public class TextViewHook implements BaseHook { diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/ToolbarHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/ToolbarHook.java index 38c5097dae..7617a48ba7 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/hooks/ToolbarHook.java +++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/ToolbarHook.java @@ -3,7 +3,7 @@ import android.view.View; import androidx.appcompat.widget.Toolbar; import com.vk.core.drawable.RecoloredDrawable; -import ru.vtosters.lite.utils.ThemesUtils; +import ru.vtosters.hooks.other.ThemesUtils; public class ToolbarHook implements BaseHook { @Override diff --git a/app/src/main/java/ru/vtosters/lite/themes/hooks/VKImageViewHook.java b/app/src/main/java/ru/vtosters/lite/themes/hooks/VKImageViewHook.java index 52eabf6bf3..5d8bd19923 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/hooks/VKImageViewHook.java +++ b/app/src/main/java/ru/vtosters/lite/themes/hooks/VKImageViewHook.java @@ -5,8 +5,8 @@ import android.graphics.PorterDuffColorFilter; import android.view.View; import com.vk.imageloader.view.VKImageView; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.utils.RecolorUtils; -import ru.vtosters.lite.utils.ThemesUtils; public class VKImageViewHook implements BaseHook { private static final Paint paint = new Paint(); diff --git a/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java b/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java index 991bd74063..46a17a8b7b 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java +++ b/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java @@ -9,9 +9,9 @@ import android.os.Build; import android.widget.TextView; import com.vk.core.drawable.RecoloredDrawable; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.ColorReferences; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.ThemesUtils; public class RecolorUtils { public static Drawable recolorDrawableToolbar(Drawable drawable) { diff --git a/app/src/main/java/ru/vtosters/lite/themes/utils/VkUiThemer.java b/app/src/main/java/ru/vtosters/lite/themes/utils/VkUiThemer.java index db93f58eb0..64716a3938 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/utils/VkUiThemer.java +++ b/app/src/main/java/ru/vtosters/lite/themes/utils/VkUiThemer.java @@ -4,8 +4,8 @@ import android.graphics.drawable.*; import android.os.Build; import android.widget.TextView; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.ColorReferences; -import ru.vtosters.lite.utils.ThemesUtils; public class VkUiThemer { public static void autoThemeVkuiButtons(TextView view) { diff --git a/app/src/main/java/ru/vtosters/lite/translators/BaseTranslator.java b/app/src/main/java/ru/vtosters/lite/translators/BaseTranslator.java index 5096e8d9f2..52e435b002 100644 --- a/app/src/main/java/ru/vtosters/lite/translators/BaseTranslator.java +++ b/app/src/main/java/ru/vtosters/lite/translators/BaseTranslator.java @@ -2,11 +2,11 @@ import androidx.annotation.NonNull; import androidx.collection.LruCache; -import ru.vtosters.lite.utils.Preferences; +import ru.vtosters.hooks.other.Preferences; import java.util.Locale; -import static ru.vtosters.lite.utils.Preferences.getPreferences; +import static ru.vtosters.hooks.other.Preferences.getPreferences; public abstract class BaseTranslator { diff --git a/app/src/main/java/ru/vtosters/lite/ui/PreferenceFragmentUtils.java b/app/src/main/java/ru/vtosters/lite/ui/PreferenceFragmentUtils.java index 0ebddbeb6d..9b87c9b12f 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/PreferenceFragmentUtils.java +++ b/app/src/main/java/ru/vtosters/lite/ui/PreferenceFragmentUtils.java @@ -13,9 +13,9 @@ import androidx.preference.PreferenceScreen; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.ui.MaterialSwitchPreference; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.ImageUtils; -import ru.vtosters.lite.utils.ThemesUtils; public class PreferenceFragmentUtils { diff --git a/app/src/main/java/ru/vtosters/lite/ui/adapters/CategorizedAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/adapters/CategorizedAdapter.java index 09e9d48d81..cc4165378a 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/adapters/CategorizedAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/adapters/CategorizedAdapter.java @@ -12,10 +12,10 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.ui.components.IItemMovingListener; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.LayoutUtils; -import ru.vtosters.lite.utils.ThemesUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/ru/vtosters/lite/ui/adapters/ColorPickerAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/adapters/ColorPickerAdapter.java index e290f34dd7..18f64e6c96 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/adapters/ColorPickerAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/adapters/ColorPickerAdapter.java @@ -11,9 +11,9 @@ import com.vk.core.drawable.BorderDrawable; import com.vk.core.util.Screen; import com.vk.stories.view.StoryCircleImageView; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.items.VTLColor; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.ThemesUtils; import java.util.List; diff --git a/app/src/main/java/ru/vtosters/lite/ui/adapters/ImagineArrayAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/adapters/ImagineArrayAdapter.java index 6d94075bd4..b25337a914 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/adapters/ImagineArrayAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/adapters/ImagineArrayAdapter.java @@ -15,14 +15,14 @@ import androidx.annotation.Nullable; import androidx.core.widget.TextViewCompat; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.LayoutUtils; -import ru.vtosters.lite.utils.ThemesUtils; import java.util.ArrayList; import java.util.List; -import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr; +import static ru.vtosters.hooks.other.ThemesUtils.getTextAttr; public class ImagineArrayAdapter extends ArrayAdapter { diff --git a/app/src/main/java/ru/vtosters/lite/ui/adapters/MessagesPreviewAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/adapters/MessagesPreviewAdapter.java index 782db998e6..8d2e269eb5 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/adapters/MessagesPreviewAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/adapters/MessagesPreviewAdapter.java @@ -14,8 +14,8 @@ import com.vk.im.ui.views.msg.bubble.MsgBubbleStyle; import com.vk.im.ui.views.msg.bubble.MsgBubbleView; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.ThemesUtils; public class MessagesPreviewAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java index 783e799df6..d36b3e3560 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java @@ -24,7 +24,7 @@ import com.vk.stickers.details.StickerDetailsView; import com.vtosters.lite.R; import org.json.JSONException; -import ru.vtosters.lite.hooks.SwitchHook; +import ru.vtosters.hooks.SwitchHook; import ru.vtosters.lite.tgs.TGPref; import ru.vtosters.lite.tgs.TGRoot; import ru.vtosters.lite.ui.components.IItemMovingListener; @@ -32,9 +32,9 @@ import java.io.File; import java.util.ArrayList; +import static ru.vtosters.hooks.other.ThemesUtils.*; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; import static ru.vtosters.lite.utils.AndroidUtils.getResources; -import static ru.vtosters.lite.utils.ThemesUtils.*; public class StickerPackAdapter extends RecyclerView.Adapter implements IItemMovingListener { private static final TelegramStickersService sService = TelegramStickersService.getInstance(getGlobalContext()); diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/BackupManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/BackupManager.java index c6032c8ff0..b53b891dcb 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/BackupManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/components/BackupManager.java @@ -6,10 +6,10 @@ import android.util.Log; import android.widget.Toast; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.IOUtils; import ru.vtosters.lite.utils.LifecycleUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.File; import java.io.FileWriter; diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java index ed8b03f5a5..7b31462ca4 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java @@ -24,16 +24,16 @@ import com.vtosters.lite.fragments.y2.VideoCatalogFragment; import com.vtosters.lite.general.fragments.GamesFragment; import com.vtosters.lite.general.fragments.PhotosFragment; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.ui.items.DockBarTab; -import ru.vtosters.lite.utils.Preferences; import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static ru.vtosters.hooks.other.Preferences.*; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; -import static ru.vtosters.lite.utils.Preferences.*; public class DockBarEditorManager { public static final int MIN_SELECTED_TABS = 3; diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/FragAnimationKit.java b/app/src/main/java/ru/vtosters/lite/ui/components/FragAnimationKit.java index 0cfab19aa3..acf3fb0e80 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/FragAnimationKit.java +++ b/app/src/main/java/ru/vtosters/lite/ui/components/FragAnimationKit.java @@ -4,7 +4,7 @@ import androidx.fragment.app.FragmentTransaction; import com.vtosters.lite.R; -import static ru.vtosters.lite.utils.Preferences.getString; +import static ru.vtosters.hooks.other.Preferences.getString; public class FragAnimationKit { diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/IconManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/IconManager.java index 6ff5e86b1a..a89de8b5de 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/IconManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/components/IconManager.java @@ -3,8 +3,8 @@ import android.content.ComponentName; import android.content.pm.PackageManager; import android.util.Log; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/NewsfeedListManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/NewsfeedListManager.java index ee3696df67..67b9ba61b0 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/NewsfeedListManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/components/NewsfeedListManager.java @@ -2,9 +2,9 @@ import android.app.Activity; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.ui.vkui.VBottomSheetBuilder; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java index 58dde7ccea..f65fd9594a 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java @@ -2,9 +2,9 @@ import android.os.Build; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.ui.items.SuperAppItem; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/DisableBattery.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/DisableBattery.java index cf4da7d9fa..128f77ff6a 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/DisableBattery.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/DisableBattery.java @@ -10,8 +10,8 @@ import android.provider.Settings; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.deviceinfo.OEMDetector; -import ru.vtosters.lite.utils.Preferences; public class DisableBattery { public static void alert(Activity activity) { diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/InstallGMS.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/InstallGMS.java index 1eefd583a5..73223b94ce 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/InstallGMS.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/InstallGMS.java @@ -3,14 +3,14 @@ import android.app.Activity; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; +import ru.vtosters.hooks.GmsHook; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.ui.fragments.InstallGMSFragment; -import ru.vtosters.lite.utils.GmsUtils; import ru.vtosters.lite.utils.NavigatorUtils; -import ru.vtosters.lite.utils.Preferences; public class InstallGMS { public static void alert(final Activity activity) { - if (!GmsUtils.isAnyServicesInstalled() && Preferences.getBoolValue("showAlertGms", true)) { + if (!GmsHook.isAnyServicesInstalled() && Preferences.getBoolValue("showAlertGms", true)) { new VkAlertDialog.Builder(activity) .setTitle(activity.getString(R.string.warning)) .setMessage(activity.getString(R.string.gmsissuesumm)) diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/MessageSettings.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/MessageSettings.java index 34c063c396..0dd1a80d31 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/MessageSettings.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/MessageSettings.java @@ -10,11 +10,11 @@ import androidx.appcompat.widget.SwitchCompat; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; -import ru.vtosters.lite.hooks.SwitchHook; +import ru.vtosters.hooks.SwitchHook; import ru.vtosters.lite.utils.LayoutUtils; +import static ru.vtosters.hooks.other.ThemesUtils.getTextAttr; import static ru.vtosters.lite.utils.AndroidUtils.dp2px; -import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr; public class MessageSettings { public static Boolean isSilentEnabled = false; diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java index 377845f6b3..b2d8b6721d 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java @@ -5,11 +5,11 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.downloaders.OTADownloader; import ru.vtosters.lite.ui.vkui.ModalBottomSheetWrapper; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.OTAUtils; -import ru.vtosters.lite.utils.ThemesUtils; public class OTADialog extends ModalBottomSheetWrapper implements OTAUtils.OTAListener { private final Activity mActivity; diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/RoundingSeekbarDialog.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/RoundingSeekbarDialog.java index c71b2af9b5..1e541e23d8 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/RoundingSeekbarDialog.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/RoundingSeekbarDialog.java @@ -5,10 +5,10 @@ import android.widget.SeekBar; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.LayoutUtils; import ru.vtosters.lite.utils.LifecycleUtils; -import ru.vtosters.lite.utils.Preferences; public class RoundingSeekbarDialog { public static void dialog(Context context) { diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java index 2037c3c876..1f60ae0427 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java @@ -7,16 +7,16 @@ import com.vk.core.dialogs.alert.VkAlertDialog; import okhttp3.*; import org.json.JSONObject; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.di.singleton.VtOkHttpClient; import ru.vtosters.lite.utils.LifecycleUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.IOException; import java.util.Random; import static android.content.ContentValues.TAG; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; -import static ru.vtosters.lite.utils.Preferences.hasVerification; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.hasVerification; public class ServerDialog { private static final OkHttpClient client = VtOkHttpClient.getInstance(); diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/Start.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/Start.java index eca713aa96..06dfc80389 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/Start.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/Start.java @@ -6,11 +6,11 @@ import android.os.Build; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.deviceinfo.OEMDetector; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; public class Start { public static void alert(final Activity activity) { diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java index 1bdc6efcf9..262191c17c 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java @@ -3,8 +3,8 @@ import android.app.Activity; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; -import ru.vtosters.lite.utils.Preferences; -import ru.vtosters.lite.utils.ThemesUtils; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; public class ThemeChanging { public static void changeTheme(Activity activity, float[] f) { diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java index 182e79e5ac..bc8e97a2bf 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java @@ -3,10 +3,10 @@ import android.app.Activity; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.proxy.ProxyUtils; import ru.vtosters.lite.ui.fragments.VKUIwrapper; import ru.vtosters.lite.utils.NavigatorUtils; -import ru.vtosters.lite.utils.Preferences; public class VKIDProtection { public static void alert(final Activity activity) { diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java index 2e924991d0..905f5a425b 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java @@ -4,7 +4,7 @@ import androidx.preference.Preference; import com.vtosters.lite.R; -import static ru.vtosters.lite.utils.Preferences.offline; +import static ru.vtosters.hooks.other.Preferences.offline; public class ActivityFragment extends TrackedMaterialPreferenceToolbarFragment { @Override diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/DataSettingsFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/DataSettingsFragment.java index 35e989288c..cd72eb5ac2 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/DataSettingsFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/DataSettingsFragment.java @@ -8,9 +8,14 @@ import android.view.WindowInsetsController; import android.widget.Toast; import com.vk.core.dialogs.alert.VkAlertDialog; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.ui.PreferenceFragmentUtils; import ru.vtosters.lite.ui.components.BackupManager; -import ru.vtosters.lite.utils.*; +import ru.vtosters.lite.utils.AccountManagerUtils; +import ru.vtosters.lite.utils.AndroidUtils; +import ru.vtosters.lite.utils.LifecycleUtils; +import ru.vtosters.lite.utils.VKAccountDB; import java.io.IOException; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java index fe75aa3e97..4602284139 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java @@ -9,10 +9,10 @@ import com.vk.newsfeed.controllers.NewsfeedController; import com.vtosters.lite.R; import com.vtosters.lite.ui.SummaryListPreference; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.ui.components.NewsfeedListManager; import ru.vtosters.lite.utils.NavigatorUtils; import ru.vtosters.lite.utils.NewsFeedFiltersUtils; -import ru.vtosters.lite.utils.Preferences; import java.util.Objects; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java index acfe67517e..a6780d4b38 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java @@ -13,12 +13,12 @@ import androidx.core.content.res.ResourcesCompat; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; -import ru.vtosters.lite.hooks.SwitchHook; +import ru.vtosters.hooks.SwitchHook; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.ui.PreferenceFragmentUtils; import ru.vtosters.lite.ui.components.IconManager; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; -import ru.vtosters.lite.utils.ThemesUtils; public class IconsFragment extends TrackedMaterialPreferenceToolbarFragment { @SuppressLint("SetTextI18n") diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java index ca514b6dcb..9149686095 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java @@ -2,9 +2,13 @@ import android.os.Bundle; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.ui.components.SuperAppEditorManager; import ru.vtosters.lite.ui.dialogs.RoundingSeekbarDialog; -import ru.vtosters.lite.utils.*; +import ru.vtosters.lite.utils.AndroidUtils; +import ru.vtosters.lite.utils.LifecycleUtils; +import ru.vtosters.lite.utils.NavigatorUtils; public class InterfaceFragment extends TrackedMaterialPreferenceToolbarFragment { @Override diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java index cd4c836ca1..5d63d4dd94 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java @@ -18,13 +18,17 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import org.json.JSONObject; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.downloaders.AudioDownloader; import ru.vtosters.lite.downloaders.VideoDownloader; import ru.vtosters.lite.music.LastFMScrobbler; import ru.vtosters.lite.music.cache.CacheDatabaseDelegate; import ru.vtosters.lite.proxy.ProxyUtils; import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter; -import ru.vtosters.lite.utils.*; +import ru.vtosters.lite.utils.AccountManagerUtils; +import ru.vtosters.lite.utils.AndroidUtils; +import ru.vtosters.lite.utils.LifecycleUtils; import java.io.IOException; import java.util.Arrays; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java index b4e533991a..f8f25510b7 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java @@ -5,12 +5,12 @@ import androidx.preference.Preference; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter; import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.LifecycleUtils; import ru.vtosters.lite.utils.NavigatorUtils; -import ru.vtosters.lite.utils.Preferences; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java index 8a587a9a11..921d8c7a8f 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java @@ -26,8 +26,11 @@ import com.vtosters.lite.R; import com.vtosters.lite.auth.VKAccountManager; import com.vtosters.lite.im.ImEngineProvider; +import ru.vtosters.hooks.GmsHook; +import ru.vtosters.hooks.SwitchHook; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.deviceinfo.DeviceInfoCollector; -import ru.vtosters.lite.hooks.SwitchHook; import ru.vtosters.lite.ssfs.UsersList; import ru.vtosters.lite.ui.activities.VKAdminTokenActivity; import ru.vtosters.lite.utils.*; @@ -76,7 +79,7 @@ private void prefs() { return true; }); - findPreference("microgsettings").setVisible(GmsUtils.isFakeGmsInstalled() && !GmsUtils.isGmsInstalled()); + findPreference("microgsettings").setVisible(GmsHook.isFakeGmsInstalled() && !GmsHook.isGmsInstalled()); findPreference("microgsettings").setOnPreferenceClickListener(preference -> { try { diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/SuperAppEditorFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/SuperAppEditorFragment.java index e132a407bd..385c68993c 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/SuperAppEditorFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/SuperAppEditorFragment.java @@ -15,13 +15,13 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.hooks.TextViewHook; import ru.vtosters.lite.ui.adapters.CategorizedAdapter; import ru.vtosters.lite.ui.components.ItemMovingCallback; import ru.vtosters.lite.ui.components.SuperAppEditorManager; import ru.vtosters.lite.ui.items.SuperAppItem; import ru.vtosters.lite.utils.LayoutUtils; -import ru.vtosters.lite.utils.ThemesUtils; import static ru.vtosters.lite.utils.AndroidUtils.dp2px; import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java index f664814d9c..ec3bdc1f21 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java @@ -6,10 +6,10 @@ import android.os.Build; import android.os.Bundle; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.deviceinfo.OEMDetector; import ru.vtosters.lite.ui.PreferenceFragmentUtils; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import ru.vtosters.lite.utils.VersionReader; public class SystemInfo extends TrackedMaterialPreferenceToolbarFragment { diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java index ae62f2f9ee..859058b8b3 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java @@ -10,6 +10,8 @@ import b.h.g.k.VKProgressDialog; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.concurrent.VTExecutors; import ru.vtosters.lite.themes.ThemesCore; import ru.vtosters.lite.themes.ThemesManager; @@ -17,7 +19,9 @@ import ru.vtosters.lite.ui.components.DockBarEditorManager; import ru.vtosters.lite.ui.dialogs.PalettesBottomSheetDialog; import ru.vtosters.lite.ui.views.rarepebble.ColorPickerView; -import ru.vtosters.lite.utils.*; +import ru.vtosters.lite.utils.AndroidUtils; +import ru.vtosters.lite.utils.LifecycleUtils; +import ru.vtosters.lite.utils.NavigatorUtils; public class ThemesFragment extends TrackedMaterialPreferenceToolbarFragment { diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java index 379c7f94d1..60585f3d61 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java @@ -25,9 +25,14 @@ import com.vtosters.lite.general.fragments.SettingsAccountFragment; import com.vtosters.lite.general.fragments.SettingsGeneralFragment; import com.vtosters.lite.ui.MaterialSwitchPreference; +import ru.vtosters.hooks.AboutHook; +import ru.vtosters.hooks.GmsHook; +import ru.vtosters.hooks.VerificationsHook; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; +import ru.vtosters.hooks.ui.SystemThemeChangerHook; import ru.vtosters.lite.BuildConfig; import ru.vtosters.lite.concurrent.VTExecutors; -import ru.vtosters.lite.hooks.ui.SystemThemeChangerHook; import ru.vtosters.lite.ssfs.Utils; import ru.vtosters.lite.ui.PreferenceFragmentUtils; import ru.vtosters.lite.ui.dialogs.OTADialog; @@ -192,7 +197,7 @@ public void onCreate(Bundle bundle) { ); } - if (!GmsUtils.isAnyServicesInstalled()) { + if (!GmsHook.isAnyServicesInstalled()) { PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), R.string.gmsname); PreferenceFragmentUtils.addPreference( @@ -507,7 +512,7 @@ public void onCreate(Bundle bundle) { getPreferenceScreen(), "", requireContext().getString(R.string.vtlother), - getValAsString(R.string.vtlothersumm, VTVerifications.vtverif()), + getValAsString(R.string.vtlothersumm, VerificationsHook.vtverif()), R.drawable.ic_more_horizontal_28, preference -> { NavigatorUtils.switchFragment(requireContext(), OtherFragment.class); @@ -536,7 +541,7 @@ public void onCreate(Bundle bundle) { "", R.drawable.ic_link_outline_28, preference -> { - requireContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(About.getCommitLink()))); + requireContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(AboutHook.getCommitLink()))); return false; } ); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java index a6030209ed..73c77e98e0 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java @@ -23,13 +23,13 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.vk.core.dialogs.alert.VkAlertDialog; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.tgs.TGPref; import ru.vtosters.lite.ui.adapters.StickerPackAdapter; import ru.vtosters.lite.ui.components.StickerTouchHelperCallback; import ru.vtosters.lite.ui.fragments.BaseToolbarFragment; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.NavigatorUtils; -import ru.vtosters.lite.utils.ThemesUtils; import java.io.File; diff --git a/app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java b/app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java index 7d1129034c..3f9bc190ef 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java +++ b/app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java @@ -14,8 +14,8 @@ import com.vtosters.lite.api.ExtendedUserProfile; import kotlin.Unit; import kotlin.jvm.b.Functions; +import ru.vtosters.hooks.NewsfeedHook; import ru.vtosters.lite.foaf.FoafBase; -import ru.vtosters.lite.hooks.NewsfeedHook; import ru.vtosters.lite.utils.AccountManagerUtils; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.RenameTool; diff --git a/app/src/main/java/ru/vtosters/lite/ui/vkui/VBListBuilder.java b/app/src/main/java/ru/vtosters/lite/ui/vkui/VBListBuilder.java index 9c0fccd893..ebc2d2ef39 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/vkui/VBListBuilder.java +++ b/app/src/main/java/ru/vtosters/lite/ui/vkui/VBListBuilder.java @@ -8,8 +8,8 @@ import java.util.List; +import static ru.vtosters.hooks.other.ThemesUtils.getTextAttr; import static ru.vtosters.lite.utils.AndroidUtils.dp2px; -import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr; public class VBListBuilder { public static ViewGroup buildListOf(Context ctx, List items) { diff --git a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/ImageEffect.java b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/ImageEffect.java index eba36bc4af..b8fb22d83b 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/ImageEffect.java +++ b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/ImageEffect.java @@ -3,8 +3,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; import java.nio.ByteBuffer; diff --git a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java index 6062cb005c..5d91b4d458 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java @@ -7,8 +7,8 @@ import androidx.annotation.Nullable; import com.vtosters.lite.R; import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.ui.PreferenceFragmentUtils; -import ru.vtosters.lite.utils.Preferences; import java.io.FileOutputStream; import java.io.IOException; diff --git a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java index 88019cf413..5e71962415 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java +++ b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java @@ -9,9 +9,9 @@ import android.widget.ImageView; import com.vk.im.engine.h; import com.vtosters.lite.R; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.Preferences; -import ru.vtosters.lite.utils.ThemesUtils; import vigo.sdk.Log; import java.io.File; diff --git a/app/src/main/java/ru/vtosters/lite/utils/AccountManagerUtils.java b/app/src/main/java/ru/vtosters/lite/utils/AccountManagerUtils.java index 1021f3aff8..b16bb0c2f4 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/AccountManagerUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/AccountManagerUtils.java @@ -1,11 +1,8 @@ package ru.vtosters.lite.utils; import com.vk.dto.user.UserProfile; -import com.vk.im.ui.providers.audiomsg.ImAudioMsgPlayerProvider; -import com.vk.im.ui.providers.audiomsg.PlayerActionSources; import com.vtosters.lite.api.ExtendedUserProfile; import com.vtosters.lite.auth.VKAccountManager; -import com.vtosters.lite.im.ImEngineProvider; public class AccountManagerUtils { @@ -72,10 +69,4 @@ public static int getUserID(ExtendedUserProfile extendedUserProfile) { public static UserProfile fromEup(ExtendedUserProfile extendedUserProfile) { return extendedUserProfile.a; } - - public static void reloadMSG() { - ImEngineProvider.b().a(); - ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a); - ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a); - } // Delete and reload msg cache } diff --git a/app/src/main/java/ru/vtosters/lite/utils/AnalyticsHelper.java b/app/src/main/java/ru/vtosters/lite/utils/AnalyticsHelper.java index dff026ed75..3261bbf69b 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/AnalyticsHelper.java +++ b/app/src/main/java/ru/vtosters/lite/utils/AnalyticsHelper.java @@ -9,6 +9,7 @@ import com.microsoft.appcenter.channel.Channel; import com.microsoft.appcenter.crashes.Crashes; import com.microsoft.appcenter.ingestion.models.Log; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.BuildConfig; import ru.vtosters.lite.ui.fragments.TrackedMaterialPreferenceToolbarFragment; diff --git a/app/src/main/java/ru/vtosters/lite/utils/AndroidUtils.java b/app/src/main/java/ru/vtosters/lite/utils/AndroidUtils.java index 8dda1db8b1..c79090c1a7 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/AndroidUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/AndroidUtils.java @@ -18,6 +18,7 @@ import com.vk.core.util.Screen; import com.vk.core.util.ToastUtils; import com.vtosters.lite.general.fragments.WebViewFragment; +import ru.vtosters.hooks.other.Preferences; import java.io.File; import java.io.FileOutputStream; @@ -29,7 +30,7 @@ import java.util.Map; import java.util.Random; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; public class AndroidUtils { private static final String ALLOWED_CHARACTERS = "0123456789qwertyuiopasdfghjklzxcvbnm"; diff --git a/app/src/main/java/ru/vtosters/lite/utils/CacheUtils.java b/app/src/main/java/ru/vtosters/lite/utils/CacheUtils.java index 17b7aa31d3..4aa6e8caea 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/CacheUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/CacheUtils.java @@ -13,10 +13,10 @@ import java.text.CharacterIterator; import java.text.StringCharacterIterator; +import static ru.vtosters.hooks.other.Preferences.dev; +import static ru.vtosters.hooks.other.Preferences.getSizeForDelete; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; import static ru.vtosters.lite.utils.AndroidUtils.sendToast; -import static ru.vtosters.lite.utils.Preferences.dev; -import static ru.vtosters.lite.utils.Preferences.getSizeForDelete; public class CacheUtils { private static CacheUtils sInstance = new CacheUtils(); diff --git a/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkParser.java b/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkParser.java index be7b129bdd..ac93dcb32c 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkParser.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkParser.java @@ -1,7 +1,6 @@ package ru.vtosters.lite.utils; import android.annotation.SuppressLint; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -14,9 +13,7 @@ import java.util.Arrays; import java.util.List; -import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; -import static ru.vtosters.lite.utils.Preferences.isEnableExternalOpening; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; public class ExternalLinkParser { @@ -27,18 +24,6 @@ public class ExternalLinkParser { "m.youtube.com" ); - public static boolean parseVideoFile(VideoFile file) { - return parseVideoFile(file, getGlobalContext(), isEnableExternalOpening()); - } - - public static boolean parseVideoFile(VideoFile file, Context context) { - return parseVideoFile(file, context, isEnableExternalOpening()); - } - - public static boolean parseVideoFile(VideoFile file, Activity activity) { - return parseVideoFile(file, activity, isEnableExternalOpening()); - } - public static boolean parseVideoFile(VideoFile videoFile, Context context, Boolean isEnabled) { if (checkYoutubeLink(videoFile)) { try { diff --git a/app/src/main/java/ru/vtosters/lite/utils/FriendsCatalogUtils.java b/app/src/main/java/ru/vtosters/lite/utils/FriendsCatalogUtils.java new file mode 100644 index 0000000000..ce494c3574 --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/utils/FriendsCatalogUtils.java @@ -0,0 +1,80 @@ +package ru.vtosters.lite.utils; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.text.ParseException; + +import static ru.vtosters.hooks.OnlineFormatterHook.onlineHookProfiles; +import static ru.vtosters.hooks.other.Preferences.friendsblock; + +public class FriendsCatalogUtils { + public static JSONObject inject(JSONObject json) throws JSONException, ParseException, IOException { + JSONObject catalog = onlineHookProfiles(json); + boolean sectionexecute = true; + boolean hasBirthday = false; + + if (json.optJSONObject("catalog") != null) { + catalog = json.optJSONObject("catalog"); + sectionexecute = false; + } + + JSONArray section = null; + JSONObject sections = null; + + if (sectionexecute) { + sections = catalog.optJSONObject("section"); + } else { + section = catalog.optJSONArray("sections"); + } + + JSONArray oldItems; + + if (sectionexecute) { + oldItems = sections.optJSONArray("blocks"); + } else { + oldItems = section.optJSONObject(0).optJSONArray("blocks"); + } + + var newItems = new JSONArray(); + if (oldItems != null) { + for (int i = 0; i < oldItems.length(); i++) { + var type = oldItems.optJSONObject(i); + var name = type.optJSONObject("layout").optString("name"); + var buttons = ""; + var skip = false; + if (type.optJSONArray("buttons") != null) { + buttons = type.optJSONArray("buttons").optJSONObject(0).optString("ref_layout_name"); + } + if (name.contains("list_friend_suggests") || buttons.contains("list_friend_suggests") || name.contains("separator")) { + skip = friendsblock(); + } + + if (buttons.contains("friends_birthdays_list")) { + hasBirthday = true; + } + + if (name.contains("separator") && hasBirthday) { + skip = false; + hasBirthday = false; + } + + if (!skip) { + newItems.put(type); + } + + } + } + + if (sectionexecute) { + sections.putOpt("blocks", newItems); + } else { + section.optJSONObject(0).putOpt("blocks", newItems); + } + + return json; + } + +} diff --git a/app/src/main/java/ru/vtosters/lite/utils/ImageUtils.java b/app/src/main/java/ru/vtosters/lite/utils/ImageUtils.java index 8ba6c38130..624d9425e2 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ImageUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ImageUtils.java @@ -6,6 +6,8 @@ import android.graphics.drawable.Drawable; import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; +import ru.vtosters.hooks.other.Preferences; +import ru.vtosters.hooks.other.ThemesUtils; import java.net.URL; diff --git a/app/src/main/java/ru/vtosters/lite/utils/NetworkUtils.java b/app/src/main/java/ru/vtosters/lite/utils/NetworkUtils.java index 0d83bb3ac0..78472608ae 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/NetworkUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/NetworkUtils.java @@ -7,7 +7,7 @@ import android.os.Build; import android.telephony.TelephonyManager; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; public class NetworkUtils { public static boolean isNetworkConnected() { diff --git a/app/src/main/java/ru/vtosters/lite/utils/NewsFeedFiltersUtils.java b/app/src/main/java/ru/vtosters/lite/utils/NewsFeedFiltersUtils.java index 5be172a7cc..470fe0e81e 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/NewsFeedFiltersUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/NewsFeedFiltersUtils.java @@ -1,18 +1,17 @@ package ru.vtosters.lite.utils; +import android.text.TextUtils; import android.util.Log; +import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import ru.vtosters.lite.hooks.AdBlockHook; +import ru.vtosters.hooks.other.Preferences; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Scanner; +import java.util.*; +import static ru.vtosters.hooks.other.Preferences.*; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; -import static ru.vtosters.lite.utils.Preferences.*; public class NewsFeedFiltersUtils { public static List mFilters; @@ -77,7 +76,7 @@ public static boolean injectFiltersReposts(JSONObject obj) throws JSONException if (dev()) Log.d("RepostFilter", "Fetched repost ad (isBadNews), owner id " + item.optString("owner_id") + ", text: " + text); return true; - } else if (AdBlockHook.isAds(item, item.optString("post_type"))) { + } else if (isAds(item, item.optString("post_type"))) { if (dev()) Log.d("RepostFilter", "Fetched repost ad (ads), owner id " + item.optString("owner_id") + ", text: " + text); return true; @@ -132,22 +131,6 @@ public static boolean checkCopyright(JSONObject json) throws JSONException { return false; } - public static boolean isRecomsGroup(String src) { - return authorsrecomm() && src.equals("recommended_groups"); - } - - public static boolean isMusicBlock(String src) { - return authorsrecomm() && (src.equals("recommended_audios") || src.equals("recommended_artists") || src.equals("recommended_playlists")); - } - - public static boolean isNewsBlock(String src) { - return ads() && src.equals("tags_suggestions"); - } - - public static String getAllFilters() { - return getString("spamfilters"); - } - public static boolean isBadNews(String text) { var textInLowerCase = text.toLowerCase(); @@ -189,29 +172,411 @@ public static boolean checkCaption(JSONObject postJson) { return false; } - public static boolean isAds(String optString) { - return ads() && (optString.equals("ads_easy_promote") || - optString.equals("promo_button") || - optString.equals("app_widget") || - optString.equals("ads")); + public static JSONArray newsfeedlist(JSONArray items) throws JSONException { + var selectedItems = Preferences.getPreferences().getString("news_feed_selected_items", ""); + var filtersSet = Preferences.getPreferences().getStringSet("news_feed_items_set", null); + var mutableFiltersSet = new LinkedHashSet(); + if (filtersSet != null) + mutableFiltersSet.addAll(filtersSet); + + for (int i = 0; i < items.length(); i++) { + var item = items.optJSONObject(i); + if (item == null) continue; + + var id = item.optString("id"); + var title = item.optString("title"); + + if (TextUtils.isEmpty(id) || TextUtils.isEmpty(title) + // this items not working + || id.equals("kpop") || id.equals("foryou") + || id.equals("qazaqstan") || id.equals("podcasts")) + continue; + + mutableFiltersSet.add(id + "|" + title); + + var hide = selectedItems.contains(id); + + Log.d("NewsfeedList", "Added list " + id + " to feed"); + item.put("is_hidden", hide) + .put("is_unavailable", hide); + Log.d("NewsfeedListInj", "Unlocked " + id + " in newsfeed list"); + } + Preferences.getPreferences().edit().putStringSet("news_feed_items_set", mutableFiltersSet) + .apply(); + + return items; + } + + public static Boolean discoverAdBlock(JSONObject jsonObject) { + if (jsonObject == null) return true; + + try { + var type = jsonObject.optString("type"); + var post = jsonObject.optJSONObject("post"); + + if (jsonObject.optString("template").contains("ads") || jsonObject.has("ads")) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: ads"); + return false; + } + + if (isAds(post, type)) { + return false; + } + + if (authorsrecomm() && (type.equals("authors_rec") + || type.startsWith("recommended_") && (type.endsWith("audios") + || type.endsWith("artists") + || type.endsWith("playlists") + || type.endsWith("groups")))) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: authorsrecomm"); + return false; + } + + if (postsrecomm() && (type.equals("inline_user_rec") || type.equals("live_recommended"))) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: postsrecomm"); + return false; + } + + if (friendsrecomm() && (type.equals("user_rec") || type.equals("friends_recomm"))) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: friendsrecomm"); + return false; + } + + if (adsgroup() && (post != null ? post.optInt("marked_as_ads") : 0) == 1 && !isWhitelistedAd(post)) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: marked_as_ads is true"); + return false; + } + + if (post != null) { + if (isBadNews(post.optString("text")) && !isWhitelistedFilters(post)) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: text filters"); + return false; + } + + if (checkCopyright(post) && !isWhitelistedFilters(post)) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: copyright filters"); + return false; + } + + if (checkCaption(post) && !isWhitelistedFilters(post)) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: caption filters"); + return false; + } + + if (NewsFeedFiltersUtils.injectFiltersReposts(post) && !isWhitelistedFilters(post)) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: repost ad"); + return false; + } + } + } catch (Exception e) { + Log.d("NewsfeedAdBlockV2", "discover: " + e.getMessage()); + } + + return true; + } + + public static JSONObject discoverObj() throws JSONException { + var mainjson = new JSONObject(); + + var info = new JSONObject(); + info.put("title", "Test Injection"); + info.put("text_color", "#ffffff"); + info.put("description", "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat"); + + var image = new JSONArray(); + var imageQuality1 = new JSONObject(); + imageQuality1.put("url", "https://w7.pngwing.com/pngs/505/1021/png-transparent-konata-izumi-lucky-star-desktop-anime-anime-blue-mammal-face.png"); + imageQuality1.put("width", 72); // 72, 108, 144, 216, 288 + imageQuality1.put("height", 72); // 72, 108, 144, 216, 288 + image.put(imageQuality1); + + var background = new JSONArray(); + var backgroundQuality1 = new JSONObject(); + backgroundQuality1.put("url", "https://2ch.life/vg/arch/2022-08-22/src/38524739/16440606579870.jpg"); + backgroundQuality1.put("width", 344); // 344, 516, 680, 1032, 1376 + backgroundQuality1.put("height", 215); // 215, 323, 426, 645, 860 + background.put(backgroundQuality1); + + info.put("image", image); + info.put("background", background); + + mainjson.put("info", info); + mainjson.put("track_code", "info_banner_donut_catalog"); + mainjson.put("template", "info"); + + var action = new JSONObject(); + action.put("type", "open_url"); + action.put("url", "vk.com/vtosters_official"); + action.put("target", "internal"); + + mainjson.put("action", action); + + return mainjson; + } + + public static void parseStoriesItem(JSONObject item) throws JSONException { + var stories = item.optJSONArray("stories"); + var newStories = new JSONArray(); + + if (stories == null) return; + + for (int j = 0; j < stories.length(); j++) { + var story = stories.optJSONObject(j); + + if (!story.optBoolean("is_ads") && !story.optBoolean("is_promo")) { + if (isStoryNotAd(story)) { + newStories.put(story); + } + } else { + if (dev()) + Log.d("StoriesAds", "Fetched ad, owner id " + story.optString("owner_id") + ", caption " + story.optString("caption")); + } + } + + item.put("stories", newStories); + } + + private static Boolean isStoryNotAd(JSONObject json) { + return !getBoolValue("storiesGroupsAdBlock", false) || (json.has("link") ? isWhitelistedAdStories(json) : true); + } + + public static Boolean isAds(JSONObject list, String type) { + if (list == null || type == null || !ads()) return false; + + if (list.has("ads") + || type.equals("ads") + || type.equals("carousel") + || type.equals("html5_ad") + || type.equals("ads_easy_promote")) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: ads"); + return true; + } + + if (type.equals("promo_button") + || type.equals("app_widget") + || type.equals("app_video") + || type.equals("app_slider") + || type.equals("tags_suggestions")) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: promo"); + return true; + } + + return false; + } + + public static Boolean isWhitelistedFilters(JSONObject list) { + var id = String.valueOf(list.optInt("owner_id")); + + if (id.equals("0")) { + id = String.valueOf(list.optInt("source_id")); + } + + if (id.equals("-189659924")) { + return true; + } + + var whitelist = Preferences.getPreferences().getStringSet( + "whitelisted_filters_groups", + Collections.emptySet() + ); + + return whitelist.contains(id); + } + + public static Boolean isWhitelistedAd(JSONObject list) { + var id = String.valueOf(list.optInt("owner_id")); + + if (id.equals("0")) { + id = String.valueOf(list.optInt("source_id")); + } + + var whitelist = Preferences.getPreferences().getStringSet( + "whitelisted_ad_groups", + Collections.emptySet() + ); + + return whitelist.contains(id); } - public static boolean isAuthorRecommendations(String optString) { - return authorsrecomm() && optString.equals("authors_rec"); + public static Boolean isWhitelistedAdStories(JSONObject list) { + var id = String.valueOf(list.optInt("owner_id")); + + var whitelist = Preferences.getPreferences().getStringSet( + "whitelisted_stories_ad", + Collections.emptySet() + ); + + return whitelist.contains(id); } - public static boolean isPostRecommendations(String optString) { - return postsrecomm() && (optString.equals("live_recommended") || - optString.equals("inline_user_rec")); + public static Boolean hasMiniAppAds(JSONObject list) { + var attachments = list.optJSONArray("attachments"); + + if (attachments != null && getBoolValue("blockminiapps", false)) { + for (int j = 0; j < attachments.length(); j++) { + var type = attachments.optJSONObject(j).optString("type"); + if (type.contains("mini_app")) return true; + } + } + + return false; } - public static boolean isFriendsRecommendations(String optString) { - return friendsrecomm() && (optString.equals("user_rec") || - optString.equals("friends_recommendations") || - optString.equals("friends_recomm")); + public static JSONObject discoverInject(JSONObject json) throws JSONException { + var items = json.optJSONArray("items"); + var newObj = new JSONArray(); + + for (int i = 0; i < (items != null ? items.length() : 0); i++) { + try { + var curr = items.getJSONObject(i); + if (!curr.optString("template").contains("info") && discoverAdBlock(curr)) { + newObj.put(items.optJSONObject(i)); + } + } catch (Exception e) { + Log.d("NewsfeedAdBlockV2", "discover: " + e); + } + } + + json.put("items", newObj); + + return json; } - public static boolean isGroupAds(JSONObject obj) { - return adsgroup() && obj.optInt("marked_as_ads", 0) == 1; + public static JSONArray feedInject(JSONArray items) { + if (items.length() == 0) return items; + + try { + var newItems = new JSONArray(); + + for (int j = 0; j < items.length(); j++) { + var list = items.optJSONObject(j); + + if (list == null) continue; + + var type = list.optString("type"); + + if (isAds(list, type)) { + continue; + } + + if (authorsrecomm() && (type.equals("authors_rec") + || type.startsWith("recommended_") && (type.endsWith("audios") + || type.endsWith("artists") + || type.endsWith("playlists") + || type.endsWith("groups")))) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: authorsrecomm"); + continue; + } + + if (postsrecomm() && (type.equals("inline_user_rec") || type.equals("live_recommended"))) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: postsrecomm"); + continue; + } + + if (friendsrecomm() && (type.equals("user_rec") || type.equals("friends_recomm"))) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: friendsrecomm"); + continue; + } + + if (adsgroup() && list.optInt("marked_as_ads") == 1 && !isWhitelistedAd(list)) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: marked_as_ads is true"); + continue; + } + + if (isBadNews(list.optString("text")) && !isWhitelistedFilters(list)) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: text filters"); + continue; + } + + if (checkCopyright(list) && !isWhitelistedFilters(list)) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: copyright filters"); + continue; + } + + if (checkCaption(list) && !isWhitelistedFilters(list)) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: caption filters"); + continue; + } + + if (hasMiniAppAds(list) && !isWhitelistedFilters(list)) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: MiniApp filters"); + continue; + } + + try { + if (NewsFeedFiltersUtils.injectFiltersReposts(list) && !isWhitelistedFilters(list)) { + if (dev()) + Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: repost ad"); + continue; + } + } catch (Exception ex) { + Log.d("RepostInj", ex.getMessage()); + } + + newItems.put(list); + } + + return newItems; + } catch (Exception e) { + Log.d("NewsfeedAdBlockV2", e.getMessage()); + } + + return items; + } + + public static JSONObject storiesads(JSONObject json, boolean isDeleteFix) throws JSONException { + if (!adsstories()) { + return json; + } + + if (json.has("ads")) { + var ad = json.optJSONObject("ads"); + if (isDeleteFix) { + if (ad != null) { + ad.optJSONObject("settings") + .put("stories_interval", 0) + .put("authors_interval", 0) + .put("time_interval", 0) + .put("stories_init", 0) + .put("authors_init", 0) + .put("time_init", 0); + } + if (dev()) Log.d("StoriesAds", "Set ads settings at zero values"); + } else { + json.remove("ads"); + if (dev()) Log.d("StoriesAds", "Removed ads block"); + } + } + + var items = json.optJSONArray("items"); + if (items != null) { + for (int i = 0; i < items.length(); i++) { + var item = items.optJSONObject(i); + if (item != null) { + parseStoriesItem(item); + } + } + } + + return json; } } diff --git a/app/src/main/java/ru/vtosters/lite/utils/OnlineBypass.java b/app/src/main/java/ru/vtosters/lite/utils/OnlineBypass.java new file mode 100644 index 0000000000..293dbed14e --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/utils/OnlineBypass.java @@ -0,0 +1,86 @@ +package ru.vtosters.lite.utils; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import static ru.vtosters.lite.foaf.FoafBase.getBypassedOnlineInfo; + +public class OnlineBypass { + public static JSONObject setOnlineInfo(JSONObject json) throws JSONException { + var id = json.optInt("id"); + if (id == AccountManagerUtils.getUserId()) { + return json; + } + var onlineinfo = json.optJSONObject("online_info"); + if (onlineinfo != null && !onlineinfo.optBoolean("visible")) { + var bypassed = getBypassedOnlineInfo(id); + if (bypassed.optInt("last_seen", 0) != 0) { + json.remove("online_info"); + + var online_info = new JSONObject() + .put("visible", true) + .put("last_seen", bypassed.optInt("last_seen")) + .put("is_online", bypassed.optBoolean("is_online")) + .put("app_id", bypassed.optInt("app_id")) + .put("is_mobile", bypassed.optBoolean("is_mobile")); + + var last_seen = new JSONObject() + .put("platform", bypassed.optInt("platform")) + .put("time", bypassed.optInt("last_seen")); + + json.put("last_seen", last_seen).put("online_info", online_info); + } + } + + return json; + } + + public static JSONArray setOnlineInfoUsers(JSONArray profiles) throws JSONException { + if (profiles == null || profiles.length() == 0) return profiles; + StringBuilder sb = new StringBuilder(); + var curVkId = AccountManagerUtils.getUserId(); + for (int i = 0; i < profiles.length(); i++) { + JSONObject profile = profiles.getJSONObject(i); + int id = profile.optInt("id", -1); + JSONObject onlinfo = profile.optJSONObject("online_info"); + if (id == curVkId || id < 0 || onlinfo == null || onlinfo.optBoolean("visible")) { + continue; + } + sb.append(id); + sb.append(","); + } + var ids = sb.toString(); + if (ids.length() > 0) { + ids = ids.substring(0, ids.length() - 1); + } else { + return profiles; + } + + JSONObject bypassedObj = getBypassedOnlineInfo(ids); + for (int i = 0; i < profiles.length(); i++) { + JSONObject profile = profiles.getJSONObject(i); + int id = profile.optInt("id"); + JSONObject bypassed = bypassedObj.optJSONObject(Integer.toString(id)); + if (bypassed == null) { + continue; + } + profile.remove("online_info"); + + var online_info = new JSONObject() + .put("visible", true) + .put("last_seen", bypassed.optInt("last_seen")) + .put("is_online", bypassed.optBoolean("is_online")) + .put("app_id", bypassed.optInt("app_id")) + .put("is_mobile", bypassed.optBoolean("is_mobile")); + + var last_seen = new JSONObject() + .put("platform", bypassed.optInt("platform")) + .put("time", bypassed.optInt("last_seen")); + + profile.put("last_seen", last_seen).put("online_info", online_info); + } + + return profiles; + } +} diff --git a/app/src/main/java/ru/vtosters/lite/utils/RenameTool.java b/app/src/main/java/ru/vtosters/lite/utils/RenameTool.java index d9a9e9aa80..d1d178e98c 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/RenameTool.java +++ b/app/src/main/java/ru/vtosters/lite/utils/RenameTool.java @@ -16,31 +16,30 @@ import com.vtosters.lite.R; import com.vtosters.lite.api.ExtendedCommunityProfile; import com.vtosters.lite.api.ExtendedUserProfile; -import org.json.JSONException; -import org.json.JSONObject; +import ru.vtosters.hooks.other.ThemesUtils; import java.lang.reflect.Field; import java.net.URLDecoder; import java.net.URLEncoder; +import static ru.vtosters.hooks.other.ThemesUtils.getSTextAttr; +import static ru.vtosters.hooks.other.ThemesUtils.getTextAttr; import static ru.vtosters.lite.utils.AndroidUtils.*; -import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr; -import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr; public class RenameTool { private static final int DB_VERSION = 2; private static final String COLUMN_NAME = "name"; - private static final String COLUMN_FIRSTNAME = "first_name"; - private static final String COLUMN_LASTNAME = "last_name"; + public static final String COLUMN_FIRSTNAME = "first_name"; + public static final String COLUMN_LASTNAME = "last_name"; private static final String COLUMN_VKID = "vk_id"; private static final String DB_NAME = "vt_rename.db"; private static final String TABLE_NAME = "renames"; private static final String TABLE_NAME_GROUP = "renames_group"; - private static final SparseArray> renamedUsers = new SparseArray<>(); - private static final SparseArray renamedGroups = new SparseArray<>(); + public static final SparseArray> renamedUsers = new SparseArray<>(); + public static final SparseArray renamedGroups = new SparseArray<>(); private static RenameTool.DbHelper helperInstance; - private static boolean updateRequested = true; + public static boolean updateRequested = true; protected static RenameTool.DbHelper getHelper() { if (helperInstance == null) { @@ -64,31 +63,8 @@ public static String getCurrentModifiedUser() { return null; } - public static void injectIntoJson(JSONObject obj) throws JSONException { - int i = obj.getInt("id"); - if (updateRequested) { - reloadDB(); - } - - Pair user = renamedUsers.get(i); - if (user == null) return; - obj.put(COLUMN_FIRSTNAME, user.first).put(COLUMN_LASTNAME, user.second); - } - - public static void injectIntoJsonGroup(JSONObject obj) throws JSONException { - int i = obj.getInt("id"); - - if (updateRequested) { - reloadDB(); - } - - String user = renamedGroups.get(i); - if (user == null) return; - obj.put("name", user); - } - // Reload all values from DB - private static void reloadDB() { + public static void reloadDB() { renamedGroups.clear(); renamedUsers.clear(); updateRequested = false; diff --git a/app/src/main/java/ru/vtosters/lite/utils/SuperAppUtils.java b/app/src/main/java/ru/vtosters/lite/utils/SuperAppUtils.java new file mode 100644 index 0000000000..20df6e8e34 --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/utils/SuperAppUtils.java @@ -0,0 +1,49 @@ +package ru.vtosters.lite.utils; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; +import ru.vtosters.hooks.other.Preferences; + +public class SuperAppUtils { + public static JSONObject menu(JSONObject orig) throws JSONException { + var Special = orig.optJSONArray("special"); + var Main = orig.getJSONArray("main"); + var Other = orig.optJSONArray("other"); + + if (Special != null) { + orig.remove("special"); + } + + return orig; + } + + public static JSONObject superapp(JSONObject json) throws JSONException { + var superApps = Preferences.getPreferences().getString("superapp_items", + "menu,miniapps,vkpay_slim,greeting,promo,holiday,weather,sport,games,informer,food,event,music,vk_run").split(","); + if (superApps.length == 0) return json; + + var oldItems = json.optJSONArray("items"); + var newItems = new JSONArray(); + if (oldItems != null) { + for (int i = 0; i < oldItems.length(); i++) { + var item = oldItems.optJSONObject(i); + var type = item.optString("type"); + for (String superApp : superApps) { + if (type.equals(superApp)) + newItems.put(item); + } + } + for (int i = 0; i < superApps.length; i++) { + for (int j = i; j < newItems.length(); j++) { + var item = newItems.optJSONObject(j); + if (superApps[i].equals(item.optString("type"))) + newItems.put(j, newItems.getJSONObject(i)) + .put(i, item); + } + } + } + + return json.putOpt("items", newItems); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/utils/VKMeHandler.java b/app/src/main/java/ru/vtosters/lite/utils/VKMeHandler.java index 91187ebb89..5ef0bb82f4 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/VKMeHandler.java +++ b/app/src/main/java/ru/vtosters/lite/utils/VKMeHandler.java @@ -4,6 +4,7 @@ import com.vtosters.lite.R; import org.json.JSONException; import org.json.JSONObject; +import ru.vtosters.hooks.other.Preferences; import static ru.vtosters.lite.net.Request.makeRequest; import static ru.vtosters.lite.proxy.ProxyUtils.getApi; diff --git a/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java b/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java index 935ec7dcc9..5fd584c71e 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java +++ b/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java @@ -2,7 +2,6 @@ import android.content.Context; import android.util.Log; -import com.vk.dto.common.VerifyInfo; import com.vk.navigation.NavigatorKeys; import okhttp3.*; import org.json.JSONArray; @@ -15,8 +14,8 @@ import java.util.List; import java.util.Random; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; -import static ru.vtosters.lite.utils.Preferences.hasVerification; +import static ru.vtosters.hooks.other.Preferences.getBoolValue; +import static ru.vtosters.hooks.other.Preferences.hasVerification; public class VTVerifications { public static final List sVerifications = new ArrayList<>(); @@ -87,10 +86,6 @@ private static void processIds(JSONArray jsonIds, List member) { member.add(jsonIds.optInt(i)); } - public static boolean isVerified(int id) { - return sVerifications.contains(id); - } - public static boolean isPrometheus(int id) { return sPrometheuses.contains(id); } @@ -103,11 +98,7 @@ public static boolean isServiceAccount(int id) { return sServiceAccounts.contains(id); } - public static boolean vtverif() { - return getBoolValue("VT_Verification", true); - } - - private static int getId(JSONObject json) { + public static int getId(JSONObject json) { var id = json.optInt("id", 0); if (!json.optString(NavigatorKeys.e).equals("group") && !json.optString(NavigatorKeys.e).equals("page") || json.optString(NavigatorKeys.e).isEmpty()) @@ -116,42 +107,6 @@ private static int getId(JSONObject json) { return -id; } - public static boolean isVerified(JSONObject jSONObject) { - if (jSONObject.optInt("verified", 0) == 1) { - return true; - } - - if (!getBoolValue("VT_Verification", true)) { - return false; - } - - return isVerified(getId(jSONObject)); - } - - public static boolean hasPrometheus(JSONObject jSONObject) { - if (jSONObject.optInt("trending", 0) == 1) { - return true; - } - - if (!getBoolValue("VT_Fire", true)) { - return false; - } - - return isPrometheus(getId(jSONObject)); - } - - public static boolean hasDeveloper(JSONObject jSONObject) { - if (!getBoolValue("VT_Dev", true)) { - return false; - } - - return isDeveloper(getId(jSONObject)); - } - - public static VerifyInfo VerifyInfo(JSONObject jSONObject) { - return new VerifyInfo(isVerified(jSONObject), hasPrometheus(jSONObject)); - } - public static boolean haveDonateButton() { return hasVerification() || new Random().nextInt(6) != 1; } diff --git a/smali/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali b/smali/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali index 21190f970d..6f61eaa233 100644 --- a/smali/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali +++ b/smali/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali @@ -5723,7 +5723,7 @@ sget v5, Landroidx/appcompat/R$color;->abc_input_method_navigation_guard:I .line 19 - invoke-static {v5}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {v5}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result v4 diff --git a/smali/smali/androidx/appcompat/widget/ResourcesWrapper.smali b/smali/smali/androidx/appcompat/widget/ResourcesWrapper.smali index 5e342888de..cd1597b08f 100644 --- a/smali/smali/androidx/appcompat/widget/ResourcesWrapper.smali +++ b/smali/smali/androidx/appcompat/widget/ResourcesWrapper.smali @@ -79,7 +79,7 @@ .end annotation .line 1 - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result p1 diff --git a/smali/smali/androidx/appcompat/widget/Toolbar.smali b/smali/smali/androidx/appcompat/widget/Toolbar.smali index 3d371290b9..e721dc0581 100644 --- a/smali/smali/androidx/appcompat/widget/Toolbar.smali +++ b/smali/smali/androidx/appcompat/widget/Toolbar.smali @@ -2084,7 +2084,7 @@ iget-object v1, p0, Landroidx/appcompat/widget/Toolbar;->mCollapseIcon:Landroid/graphics/drawable/Drawable; - invoke-static {v1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {v1}, Lru/vtosters/hooks/other/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object v1 @@ -5307,7 +5307,7 @@ if-eqz v0, :cond_2 - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object p1 @@ -5654,7 +5654,7 @@ if-eqz v0, :cond_2 - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object p1 diff --git a/smali/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali b/smali/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali index 30256634cf..f7d61eaedf 100644 --- a/smali/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali +++ b/smali/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali @@ -1585,7 +1585,7 @@ .method public setNavigationIcon(Landroid/graphics/drawable/Drawable;)V .locals 0 - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object p1 diff --git a/smali/smali/androidx/cardview/widget/CardView.smali b/smali/smali/androidx/cardview/widget/CardView.smali index 6b79426f9c..b71cb06662 100644 --- a/smali/smali/androidx/cardview/widget/CardView.smali +++ b/smali/smali/androidx/cardview/widget/CardView.smali @@ -235,7 +235,7 @@ sget v1, Landroidx/cardview/R$color;->cardview_light_background:I - invoke-static {v1}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {v1}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result p3 @@ -249,7 +249,7 @@ sget v1, Landroidx/cardview/R$color;->cardview_dark_background:I - invoke-static {v1}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {v1}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result p3 diff --git a/smali/smali/androidx/cardview/widget/RoundRectDrawableWithShadow.smali b/smali/smali/androidx/cardview/widget/RoundRectDrawableWithShadow.smali index c811f82805..6dfc8abcd5 100644 --- a/smali/smali/androidx/cardview/widget/RoundRectDrawableWithShadow.smali +++ b/smali/smali/androidx/cardview/widget/RoundRectDrawableWithShadow.smali @@ -95,7 +95,7 @@ .line 5 sget v1, Landroidx/cardview/R$color;->cardview_shadow_start_color:I - invoke-static {v1}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {v1}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result v1 @@ -104,7 +104,7 @@ .line 6 sget v1, Landroidx/cardview/R$color;->cardview_shadow_end_color:I - invoke-static {v1}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {v1}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result v1 diff --git a/smali/smali/androidx/core/content/res/ResourcesCompat.smali b/smali/smali/androidx/core/content/res/ResourcesCompat.smali index 19ce40c106..dd42c922b2 100644 --- a/smali/smali/androidx/core/content/res/ResourcesCompat.smali +++ b/smali/smali/androidx/core/content/res/ResourcesCompat.smali @@ -48,7 +48,7 @@ } .end annotation - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result p0 diff --git a/smali/smali/com/facebook/GraphRequest$j.smali b/smali/smali/com/facebook/GraphRequest$j.smali index 8a6c351205..ea336ef9a6 100644 --- a/smali/smali/com/facebook/GraphRequest$j.smali +++ b/smali/smali/com/facebook/GraphRequest$j.smali @@ -139,7 +139,7 @@ const/16 v2, 0x64 - invoke-static {v2}, Lru/vtosters/lite/utils/Preferences;->compress(I)I + invoke-static {v2}, Lru/vtosters/hooks/other/Preferences;->compress(I)I move-result v2 diff --git a/smali/smali/com/facebook/appevents/l/ViewIndexer$e.smali b/smali/smali/com/facebook/appevents/l/ViewIndexer$e.smali index f886d346c4..a8190ac9d5 100644 --- a/smali/smali/com/facebook/appevents/l/ViewIndexer$e.smali +++ b/smali/smali/com/facebook/appevents/l/ViewIndexer$e.smali @@ -137,7 +137,7 @@ const/16 v3, 0xa - invoke-static {v3}, Lru/vtosters/lite/utils/Preferences;->compress(I)I + invoke-static {v3}, Lru/vtosters/hooks/other/Preferences;->compress(I)I move-result v3 diff --git a/smali/smali/com/facebook/drawee/generic/RoundingParams.smali b/smali/smali/com/facebook/drawee/generic/RoundingParams.smali index c550e44e12..7413cc5c81 100644 --- a/smali/smali/com/facebook/drawee/generic/RoundingParams.smali +++ b/smali/smali/com/facebook/drawee/generic/RoundingParams.smali @@ -74,7 +74,7 @@ .method public static b(FFFF)Lcom/facebook/drawee/generic/RoundingParams; .locals 1 - invoke-static {p0, p1, p2, p3}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(FFFF)Lcom/facebook/drawee/generic/RoundingParams; + invoke-static {p0, p1, p2, p3}, Lru/vtosters/hooks/PicRoundingHook;->inject(FFFF)Lcom/facebook/drawee/generic/RoundingParams; move-result-object v0 @@ -84,7 +84,7 @@ .method public static d(F)Lcom/facebook/drawee/generic/RoundingParams; .locals 1 - invoke-static {p0}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(F)Lcom/facebook/drawee/generic/RoundingParams; + invoke-static {p0}, Lru/vtosters/hooks/PicRoundingHook;->inject(F)Lcom/facebook/drawee/generic/RoundingParams; move-result-object v0 @@ -94,7 +94,7 @@ .method public static i()Lcom/facebook/drawee/generic/RoundingParams; .locals 2 - invoke-static {}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject()Lcom/facebook/drawee/generic/RoundingParams; + invoke-static {}, Lru/vtosters/hooks/PicRoundingHook;->inject()Lcom/facebook/drawee/generic/RoundingParams; move-result-object v0 diff --git a/smali/smali/com/facebook/login/DeviceAuthDialog.smali b/smali/smali/com/facebook/login/DeviceAuthDialog.smali index 3124ca0a70..180782f23f 100644 --- a/smali/smali/com/facebook/login/DeviceAuthDialog.smali +++ b/smali/smali/com/facebook/login/DeviceAuthDialog.smali @@ -872,7 +872,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p1}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; move-result-object p1 diff --git a/smali/smali/com/facebook/share/internal/DeviceShareDialogFragment.smali b/smali/smali/com/facebook/share/internal/DeviceShareDialogFragment.smali index 4cd3360919..0c918f03fc 100644 --- a/smali/smali/com/facebook/share/internal/DeviceShareDialogFragment.smali +++ b/smali/smali/com/facebook/share/internal/DeviceShareDialogFragment.smali @@ -221,7 +221,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/facebook/x/k/SimpleImageTranscoder.smali b/smali/smali/com/facebook/x/k/SimpleImageTranscoder.smali index 93f0f41316..2beba1717d 100644 --- a/smali/smali/com/facebook/x/k/SimpleImageTranscoder.smali +++ b/smali/smali/com/facebook/x/k/SimpleImageTranscoder.smali @@ -344,7 +344,7 @@ move-object/from16 v9, p2 - invoke-static {v3}, Lru/vtosters/lite/utils/Preferences;->compress(I)I + invoke-static {v3}, Lru/vtosters/hooks/other/Preferences;->compress(I)I move-result v3 diff --git a/smali/smali/com/fourmob/datetimepicker/date/SimpleMonthView.smali b/smali/smali/com/fourmob/datetimepicker/date/SimpleMonthView.smali index d42eba2a08..d13d553544 100644 --- a/smali/smali/com/fourmob/datetimepicker/date/SimpleMonthView.smali +++ b/smali/smali/com/fourmob/datetimepicker/date/SimpleMonthView.smali @@ -203,7 +203,7 @@ iput v0, p0, Lcom/fourmob/datetimepicker/date/SimpleMonthView;->e:I .line 20 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali/com/fourmob/datetimepicker/date/TextViewWithCircularIndicator.smali b/smali/smali/com/fourmob/datetimepicker/date/TextViewWithCircularIndicator.smali index 3c130b6fa6..102962de78 100644 --- a/smali/smali/com/fourmob/datetimepicker/date/TextViewWithCircularIndicator.smali +++ b/smali/smali/com/fourmob/datetimepicker/date/TextViewWithCircularIndicator.smali @@ -33,7 +33,7 @@ move-result-object p2 .line 4 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p2 diff --git a/smali/smali/com/fourmob/datetimepicker/time/AmPmCirclesView.smali b/smali/smali/com/fourmob/datetimepicker/time/AmPmCirclesView.smali index ef7f74e965..a8fec6cdd5 100644 --- a/smali/smali/com/fourmob/datetimepicker/time/AmPmCirclesView.smali +++ b/smali/smali/com/fourmob/datetimepicker/time/AmPmCirclesView.smali @@ -204,7 +204,7 @@ iput v0, p0, Lcom/fourmob/datetimepicker/time/AmPmCirclesView;->c:I .line 6 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali/com/fourmob/datetimepicker/time/RadialSelectorView.smali b/smali/smali/com/fourmob/datetimepicker/time/RadialSelectorView.smali index a235086227..1501fc9c91 100644 --- a/smali/smali/com/fourmob/datetimepicker/time/RadialSelectorView.smali +++ b/smali/smali/com/fourmob/datetimepicker/time/RadialSelectorView.smali @@ -496,7 +496,7 @@ move-result-object p1 .line 4 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali/com/fourmob/datetimepicker/time/RadialTimePickerDialog.smali b/smali/smali/com/fourmob/datetimepicker/time/RadialTimePickerDialog.smali index 5ee236e4d3..8938495392 100644 --- a/smali/smali/com/fourmob/datetimepicker/time/RadialTimePickerDialog.smali +++ b/smali/smali/com/fourmob/datetimepicker/time/RadialTimePickerDialog.smali @@ -2820,7 +2820,7 @@ iput-object v2, p0, Lcom/fourmob/datetimepicker/time/RadialTimePickerDialog;->V:Ljava/lang/String; .line 10 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v2 diff --git a/smali/smali/com/google/android/gms/auth/AccountChangeEventsRequest.smali b/smali/smali/com/google/android/gms/auth/AccountChangeEventsRequest.smali index 7c91be8719..2a040be0ad 100644 --- a/smali/smali/com/google/android/gms/auth/AccountChangeEventsRequest.smali +++ b/smali/smali/com/google/android/gms/auth/AccountChangeEventsRequest.smali @@ -84,7 +84,7 @@ const-string p2, "com.google" - invoke-static {p2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p2}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object p2 diff --git a/smali/smali/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali b/smali/smali/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali index 37f8d9d433..e86c1ff1f4 100644 --- a/smali/smali/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali +++ b/smali/smali/com/google/android/gms/auth/api/signin/GoogleSignInAccount.smali @@ -757,7 +757,7 @@ const-string v2, "com.google" - invoke-static {v2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 diff --git a/smali/smali/com/google/android/gms/auth/api/signin/GoogleSignInOptions.smali b/smali/smali/com/google/android/gms/auth/api/signin/GoogleSignInOptions.smali index 1b0a9e8833..f7156f6b61 100644 --- a/smali/smali/com/google/android/gms/auth/api/signin/GoogleSignInOptions.smali +++ b/smali/smali/com/google/android/gms/auth/api/signin/GoogleSignInOptions.smali @@ -403,7 +403,7 @@ const-string v4, "com.google" - invoke-static {v4}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 diff --git a/smali/smali/com/google/android/gms/auth/api/signin/internal/SignInHubActivity.smali b/smali/smali/com/google/android/gms/auth/api/signin/internal/SignInHubActivity.smali index 5ce0fd50e4..070b25d0ad 100644 --- a/smali/smali/com/google/android/gms/auth/api/signin/internal/SignInHubActivity.smali +++ b/smali/smali/com/google/android/gms/auth/api/signin/internal/SignInHubActivity.smali @@ -426,7 +426,7 @@ const-string v1, "com.google.android.gms" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali/com/google/android/gms/auth/g.smali b/smali/smali/com/google/android/gms/auth/g.smali index 58647545c0..7fe6d27f1f 100644 --- a/smali/smali/com/google/android/gms/auth/g.smali +++ b/smali/smali/com/google/android/gms/auth/g.smali @@ -32,7 +32,7 @@ const-string v0, "com.google" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -62,13 +62,13 @@ const-string v1, "com.google.android.gms" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 const-string v2, "com.google.android.gms.auth.GetToken" - invoke-static {v2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 @@ -338,7 +338,7 @@ const-string v1, "com.google" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali/com/google/android/gms/common/api/internal/zabq.smali b/smali/smali/com/google/android/gms/common/api/internal/zabq.smali index 3ed1392bbf..126f66ef7f 100644 --- a/smali/smali/com/google/android/gms/common/api/internal/zabq.smali +++ b/smali/smali/com/google/android/gms/common/api/internal/zabq.smali @@ -92,7 +92,7 @@ :goto_0 const-string p2, "com.google.android.gms" - invoke-static {p2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p2}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object p2 diff --git a/smali/smali/com/google/android/gms/common/c.smali b/smali/smali/com/google/android/gms/common/c.smali index c06cb37250..d87fbabcba 100644 --- a/smali/smali/com/google/android/gms/common/c.smali +++ b/smali/smali/com/google/android/gms/common/c.smali @@ -712,7 +712,7 @@ const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/common/d.smali b/smali/smali/com/google/android/gms/common/d.smali index 45c099fdc5..1d1ae6ebef 100644 --- a/smali/smali/com/google/android/gms/common/d.smali +++ b/smali/smali/com/google/android/gms/common/d.smali @@ -239,7 +239,7 @@ const-string v1, "com.google.android.gms" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali/com/google/android/gms/common/e.smali b/smali/smali/com/google/android/gms/common/e.smali index cfbe8bcb81..2bafd47e6d 100644 --- a/smali/smali/com/google/android/gms/common/e.smali +++ b/smali/smali/com/google/android/gms/common/e.smali @@ -215,7 +215,7 @@ const-string v1, "com.google.android.gms" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -312,7 +312,7 @@ :try_start_0 const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -344,7 +344,7 @@ const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -383,7 +383,7 @@ const-string v3, "com.google.android.gms" - invoke-static {v3}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 @@ -518,7 +518,7 @@ const-string v1, "com.google.android.gms" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -657,7 +657,7 @@ const-string p1, "com.google.android.gms" - invoke-static {p1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object p1 @@ -777,7 +777,7 @@ const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -940,7 +940,7 @@ const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/common/internal/GetServiceRequest.smali b/smali/smali/com/google/android/gms/common/internal/GetServiceRequest.smali index 94c3ff4d6d..b10254b0f6 100644 --- a/smali/smali/com/google/android/gms/common/internal/GetServiceRequest.smali +++ b/smali/smali/com/google/android/gms/common/internal/GetServiceRequest.smali @@ -96,7 +96,7 @@ const-string p2, "com.google.android.gms" - invoke-static {p2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p2}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object p2 diff --git a/smali/smali/com/google/android/gms/common/internal/d.smali b/smali/smali/com/google/android/gms/common/internal/d.smali index 4d7e036880..f93b97c465 100644 --- a/smali/smali/com/google/android/gms/common/internal/d.smali +++ b/smali/smali/com/google/android/gms/common/internal/d.smali @@ -2086,7 +2086,7 @@ const-string v2, "com.google" - invoke-static {v2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 @@ -2389,7 +2389,7 @@ const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/common/internal/e.smali b/smali/smali/com/google/android/gms/common/internal/e.smali index be7e58411c..67aa74fefd 100644 --- a/smali/smali/com/google/android/gms/common/internal/e.smali +++ b/smali/smali/com/google/android/gms/common/internal/e.smali @@ -301,7 +301,7 @@ const-string v2, "com.google" - invoke-static {v2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 diff --git a/smali/smali/com/google/android/gms/common/internal/f.smali b/smali/smali/com/google/android/gms/common/internal/f.smali index 0837720956..075f8fe8b3 100644 --- a/smali/smali/com/google/android/gms/common/internal/f.smali +++ b/smali/smali/com/google/android/gms/common/internal/f.smali @@ -188,7 +188,7 @@ const-string v3, "com.google.android.gms" - invoke-static {v3}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali/com/google/android/gms/common/stats/b.smali b/smali/smali/com/google/android/gms/common/stats/b.smali index d7a5faf1a3..3d2db9051c 100644 --- a/smali/smali/com/google/android/gms/common/stats/b.smali +++ b/smali/smali/com/google/android/gms/common/stats/b.smali @@ -15,13 +15,13 @@ const-string v1, "com.google.android.gms" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 const-string v2, "com.google.android.gms.common.stats.GmsCoreStatsService" - invoke-static {v2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 diff --git a/smali/smali/com/google/android/gms/common/stats/c.smali b/smali/smali/com/google/android/gms/common/stats/c.smali index 728cfa4b8d..5b4444cbe3 100644 --- a/smali/smali/com/google/android/gms/common/stats/c.smali +++ b/smali/smali/com/google/android/gms/common/stats/c.smali @@ -75,7 +75,7 @@ const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -133,7 +133,7 @@ const-string v1, "com.google.android.gms" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali/com/google/android/gms/common/util/d.smali b/smali/smali/com/google/android/gms/common/util/d.smali index 2a804b7421..2e5590c2e3 100644 --- a/smali/smali/com/google/android/gms/common/util/d.smali +++ b/smali/smali/com/google/android/gms/common/util/d.smali @@ -86,7 +86,7 @@ const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/common/util/q.smali b/smali/smali/com/google/android/gms/common/util/q.smali index 1f1546a588..a8ceb24c2c 100644 --- a/smali/smali/com/google/android/gms/common/util/q.smali +++ b/smali/smali/com/google/android/gms/common/util/q.smali @@ -8,7 +8,7 @@ const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/dynamite/DynamiteModule.smali b/smali/smali/com/google/android/gms/dynamite/DynamiteModule.smali index af385fc157..2027d9be5f 100644 --- a/smali/smali/com/google/android/gms/dynamite/DynamiteModule.smali +++ b/smali/smali/com/google/android/gms/dynamite/DynamiteModule.smali @@ -440,7 +440,7 @@ :cond_1 const-string v4, "com.google.android.gms" - invoke-static {v4}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 @@ -1351,7 +1351,7 @@ :try_start_1 const-string v1, "com.google.android.gms" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -1369,7 +1369,7 @@ const-string v1, "com.google.android.gms.chimera.container.DynamiteLoaderImpl" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -1975,7 +1975,7 @@ const-string p2, "content://com.google.android.gms.chimera/" - invoke-static {p2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p2}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object p2 diff --git a/smali/smali/com/google/android/gms/flags/impl/FlagProviderImpl.smali b/smali/smali/com/google/android/gms/flags/impl/FlagProviderImpl.smali index 691261e22e..004e6a0f9c 100644 --- a/smali/smali/com/google/android/gms/flags/impl/FlagProviderImpl.smali +++ b/smali/smali/com/google/android/gms/flags/impl/FlagProviderImpl.smali @@ -165,7 +165,7 @@ :try_start_0 const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/internal/clearcut/zzy.smali b/smali/smali/com/google/android/gms/internal/clearcut/zzy.smali index 4882e3eef1..3089a6211c 100644 --- a/smali/smali/com/google/android/gms/internal/clearcut/zzy.smali +++ b/smali/smali/com/google/android/gms/internal/clearcut/zzy.smali @@ -81,7 +81,7 @@ const-string v0, "content://com.google.android.gsf.gservices" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -93,7 +93,7 @@ const-string v0, "content://com.google.android.gsf.gservices/prefix" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/internal/phenotype/zzc.smali b/smali/smali/com/google/android/gms/internal/phenotype/zzc.smali index 83b8606c35..17188ae992 100644 --- a/smali/smali/com/google/android/gms/internal/phenotype/zzc.smali +++ b/smali/smali/com/google/android/gms/internal/phenotype/zzc.smali @@ -11,7 +11,7 @@ const-string v0, "com.google.android.gms.phenotype.internal.IPhenotypeService" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/internal/phenotype/zze.smali b/smali/smali/com/google/android/gms/internal/phenotype/zze.smali index e3c4cad194..b0242e2b9b 100644 --- a/smali/smali/com/google/android/gms/internal/phenotype/zze.smali +++ b/smali/smali/com/google/android/gms/internal/phenotype/zze.smali @@ -49,7 +49,7 @@ :cond_0 const-string v0, "com.google.android.gms.phenotype.internal.IPhenotypeService" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -86,7 +86,7 @@ const-string v0, "com.google.android.gms.phenotype.internal.IPhenotypeService" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -98,7 +98,7 @@ const-string v0, "com.google.android.gms.phenotype.service.START" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/internal/phenotype/zzf.smali b/smali/smali/com/google/android/gms/internal/phenotype/zzf.smali index e5e0884468..43c96bfb38 100644 --- a/smali/smali/com/google/android/gms/internal/phenotype/zzf.smali +++ b/smali/smali/com/google/android/gms/internal/phenotype/zzf.smali @@ -81,7 +81,7 @@ const-string v0, "content://com.google.android.gsf.gservices" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -93,7 +93,7 @@ const-string v0, "content://com.google.android.gsf.gservices/prefix" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/android/gms/phenotype/a.smali b/smali/smali/com/google/android/gms/phenotype/a.smali index 5e5212cf29..2f87f11f48 100644 --- a/smali/smali/com/google/android/gms/phenotype/a.smali +++ b/smali/smali/com/google/android/gms/phenotype/a.smali @@ -75,7 +75,7 @@ const-string v1, "content://com.google.android.gms.phenotype/" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali/com/google/android/gms/stats/a.smali b/smali/smali/com/google/android/gms/stats/a.smali index d94c14246b..e0e5c320d2 100644 --- a/smali/smali/com/google/android/gms/stats/a.smali +++ b/smali/smali/com/google/android/gms/stats/a.smali @@ -235,7 +235,7 @@ const-string p6, "com.google.android.gms" - invoke-static {p6}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p6}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object p6 diff --git a/smali/smali/com/google/firebase/iid/k.smali b/smali/smali/com/google/firebase/iid/k.smali index 8b6ba99b87..db76340f5b 100644 --- a/smali/smali/com/google/firebase/iid/k.smali +++ b/smali/smali/com/google/firebase/iid/k.smali @@ -300,13 +300,13 @@ const-string v1, "com.google.android.c2dm.permission.SEND" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 const-string v2, "com.google.android.gms" - invoke-static {v2}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 @@ -351,7 +351,7 @@ const-string v4, "com.google.android.c2dm.intent.REGISTER" - invoke-static {v4}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 @@ -359,7 +359,7 @@ const-string v4, "com.google.android.gms" - invoke-static {v4}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 @@ -399,7 +399,7 @@ const-string v4, "com.google.iid.TOKEN_REQUEST" - invoke-static {v4}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 @@ -407,7 +407,7 @@ const-string v4, "com.google.android.gms" - invoke-static {v4}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 @@ -555,7 +555,7 @@ const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/firebase/iid/q.smali b/smali/smali/com/google/firebase/iid/q.smali index eb2203e83f..7c2e7fa629 100644 --- a/smali/smali/com/google/firebase/iid/q.smali +++ b/smali/smali/com/google/firebase/iid/q.smali @@ -234,7 +234,7 @@ const-string v1, "com.google.android.c2dm.intent.REGISTRATION" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -785,7 +785,7 @@ const-string v3, "com.google.android.gms" - invoke-static {v3}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 @@ -805,7 +805,7 @@ const-string v3, "com.google.iid.TOKEN_REQUEST" - invoke-static {v3}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 @@ -817,7 +817,7 @@ :cond_0 const-string v3, "com.google.android.c2dm.intent.REGISTER" - invoke-static {v3}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali/com/google/firebase/iid/x.smali b/smali/smali/com/google/firebase/iid/x.smali index ed3f5e3197..aae45876ee 100644 --- a/smali/smali/com/google/firebase/iid/x.smali +++ b/smali/smali/com/google/firebase/iid/x.smali @@ -220,7 +220,7 @@ .line 13 new-instance v6, Landroid/content/Intent; - invoke-static {}, Lru/vtosters/lite/utils/GmsUtils;->getFirebaseInstanceIdReceiverClass()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/hooks/GmsHook;->getFirebaseInstanceIdReceiverClass()Ljava/lang/Class; move-result-object v7 diff --git a/smali/smali/com/google/firebase/iid/z0.smali b/smali/smali/com/google/firebase/iid/z0.smali index 46e3dd4048..a5363c5f9b 100644 --- a/smali/smali/com/google/firebase/iid/z0.smali +++ b/smali/smali/com/google/firebase/iid/z0.smali @@ -682,7 +682,7 @@ const-string v0, "com.google.android.c2dm.intent.REGISTER" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -690,7 +690,7 @@ const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/google/firebase/messaging/FirebaseMessagingService.smali b/smali/smali/com/google/firebase/messaging/FirebaseMessagingService.smali index c9c593ae53..2a764b1366 100644 --- a/smali/smali/com/google/firebase/messaging/FirebaseMessagingService.smali +++ b/smali/smali/com/google/firebase/messaging/FirebaseMessagingService.smali @@ -193,7 +193,7 @@ const-string v1, "com.google.android.c2dm.intent.RECEIVE" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali/com/google/firebase/messaging/d.smali b/smali/smali/com/google/firebase/messaging/d.smali index 7c90deeafe..645177329a 100644 --- a/smali/smali/com/google/firebase/messaging/d.smali +++ b/smali/smali/com/google/firebase/messaging/d.smali @@ -202,7 +202,7 @@ new-instance v2, Landroid/content/ComponentName; - invoke-static {}, Lru/vtosters/lite/utils/GmsUtils;->getFirebaseInstanceIdReceiver()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/GmsHook;->getFirebaseInstanceIdReceiver()Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes2/b/h/c/b/AdsParams.smali b/smali/smali_classes2/b/h/c/b/AdsParams.smali index 190539df9d..fc9c708148 100644 --- a/smali/smali_classes2/b/h/c/b/AdsParams.smali +++ b/smali/smali_classes2/b/h/c/b/AdsParams.smali @@ -48,7 +48,7 @@ if-eqz v0, :cond_0 - invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -62,7 +62,7 @@ if-eqz v0, :cond_1 - invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -76,7 +76,7 @@ if-eqz v0, :cond_2 - invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/b/h/g/g/BuildInfo.smali b/smali/smali_classes2/b/h/g/g/BuildInfo.smali index fb047bac48..b9cef3fac5 100644 --- a/smali/smali_classes2/b/h/g/g/BuildInfo.smali +++ b/smali/smali_classes2/b/h/g/g/BuildInfo.smali @@ -118,7 +118,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dev()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->dev()Z move-result v0 @@ -152,7 +152,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dev()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->dev()Z move-result v0 @@ -171,7 +171,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dev()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->dev()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/about/holders2.smali b/smali/smali_classes2/com/vk/about/holders2.smali index 61288b6094..54b8b7c2a5 100644 --- a/smali/smali_classes2/com/vk/about/holders2.smali +++ b/smali/smali_classes2/com/vk/about/holders2.smali @@ -17,7 +17,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/utils/About;->inject(Landroid/view/View;)V + invoke-static {v0}, Lru/vtosters/hooks/AboutHook;->inject(Landroid/view/View;)V const v0, 0x7f0a0e71 @@ -26,7 +26,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/utils/About;->inject(Landroid/view/View;)V + invoke-static {v0}, Lru/vtosters/hooks/AboutHook;->inject(Landroid/view/View;)V const-string v1, "itemView.findViewById(R.id.version_name)" @@ -71,7 +71,7 @@ move-result-object p1 - invoke-static {}, Lru/vtosters/lite/utils/About;->getAppVersion()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/AboutHook;->getAppVersion()Ljava/lang/String; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/api/account/AccountGetBanned.smali b/smali/smali_classes2/com/vk/api/account/AccountGetBanned.smali index 9b7b90c52b..fa89b7098f 100644 --- a/smali/smali_classes2/com/vk/api/account/AccountGetBanned.smali +++ b/smali/smali_classes2/com/vk/api/account/AccountGetBanned.smali @@ -82,7 +82,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali b/smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali index 7ebfa7d71b..0fa81a97a6 100644 --- a/smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali +++ b/smali/smali_classes2/com/vk/api/base/ApiConfig$a$a$a.smali @@ -103,7 +103,7 @@ const-string v0, "api.vk.com" - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -123,7 +123,7 @@ const-string v0, "api.vk.com" - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/api/base/ApiRequest.smali b/smali/smali_classes2/com/vk/api/base/ApiRequest.smali index c01e1be67b..8de9137d43 100644 --- a/smali/smali_classes2/com/vk/api/base/ApiRequest.smali +++ b/smali/smali_classes2/com/vk/api/base/ApiRequest.smali @@ -842,7 +842,7 @@ move-result-object v3 - invoke-static {v0, v1, v2, v3}, Lru/vtosters/lite/hooks/RequestDumper;->addParams(Lcom/vk/api/internal/MethodCall$a;Ljava/lang/String;Ljava/util/LinkedHashMap;Ljava/lang/String;)V + invoke-static {v0, v1, v2, v3}, Lru/vtosters/hooks/RequestDumper;->addParams(Lcom/vk/api/internal/MethodCall$a;Ljava/lang/String;Ljava/util/LinkedHashMap;Ljava/lang/String;)V .line 11 @@ -1258,7 +1258,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -1267,7 +1267,7 @@ :cond_0 const-string v0, "api.vk.com" - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/api/base/ListAPIRequest.smali b/smali/smali_classes2/com/vk/api/base/ListAPIRequest.smali index 692bf7983f..1e433e259d 100644 --- a/smali/smali_classes2/com/vk/api/base/ListAPIRequest.smali +++ b/smali/smali_classes2/com/vk/api/base/ListAPIRequest.smali @@ -186,11 +186,11 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->onlineHookItems(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookItems(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/api/discover/DiscoverGet.smali b/smali/smali_classes2/com/vk/api/discover/DiscoverGet.smali index c61a0f6f35..6232133264 100644 --- a/smali/smali_classes2/com/vk/api/discover/DiscoverGet.smali +++ b/smali/smali_classes2/com/vk/api/discover/DiscoverGet.smali @@ -89,7 +89,7 @@ move-result-object v1 - invoke-static {v1}, Lru/vtosters/lite/hooks/AdBlockHook;->discoverInject(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {v1}, Lru/vtosters/hooks/AdBlockHook;->discoverInject(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object v1 diff --git a/smali/smali_classes2/com/vk/api/friends/FriendsGet.smali b/smali/smali_classes2/com/vk/api/friends/FriendsGet.smali index e90620e3e9..0d54e599ac 100644 --- a/smali/smali_classes2/com/vk/api/friends/FriendsGet.smali +++ b/smali/smali_classes2/com/vk/api/friends/FriendsGet.smali @@ -297,7 +297,7 @@ move-result-object v5 - invoke-static {v5}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->onlineHookItems(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {v5}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookItems(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object v5 diff --git a/smali/smali_classes2/com/vk/api/friends/FriendsGetRequestsAndRecommendations.smali b/smali/smali_classes2/com/vk/api/friends/FriendsGetRequestsAndRecommendations.smali index 8bb83d6ffe..791d427d72 100644 --- a/smali/smali_classes2/com/vk/api/friends/FriendsGetRequestsAndRecommendations.smali +++ b/smali/smali_classes2/com/vk/api/friends/FriendsGetRequestsAndRecommendations.smali @@ -57,7 +57,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->onlineHookRequestsAndRecommendations(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookRequestsAndRecommendations(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali b/smali/smali_classes2/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali index 25f7a68227..4386cc3611 100644 --- a/smali/smali_classes2/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali +++ b/smali/smali_classes2/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali @@ -137,7 +137,7 @@ const-string v4, "receipt" - invoke-static {v3}, Lru/vtosters/lite/hooks/GcmHook;->requestToken(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/GcmHook;->requestToken(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 @@ -169,7 +169,7 @@ const-string v5, "receipt2" - invoke-static {v4}, Lru/vtosters/lite/hooks/GcmHook;->requestTokenV2(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/GcmHook;->requestTokenV2(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes2/com/vk/api/polls/PollGetVoters.smali b/smali/smali_classes2/com/vk/api/polls/PollGetVoters.smali index b18f4e5778..88097d0d31 100644 --- a/smali/smali_classes2/com/vk/api/polls/PollGetVoters.smali +++ b/smali/smali_classes2/com/vk/api/polls/PollGetVoters.smali @@ -184,7 +184,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->onlineHookItems(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookItems(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali b/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali index 506c985e6a..91e102eb75 100644 --- a/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali +++ b/smali/smali_classes2/com/vk/api/sdk/VKApiConfig$6.smali @@ -71,7 +71,7 @@ const-string v0, "api.vk.com" - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali b/smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali index 02c8fd670d..406b08d508 100644 --- a/smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali +++ b/smali/smali_classes2/com/vk/api/sdk/auth/VKAuthParams$a.smali @@ -114,7 +114,7 @@ const-string v3, "https://oauth.vk.com/blank.html" - invoke-static {v3}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity$b.smali b/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity$b.smali index 1eada947ea..7f19567cc8 100644 --- a/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity$b.smali +++ b/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity$b.smali @@ -335,7 +335,7 @@ .method public onPageFinished(Landroid/webkit/WebView;Ljava/lang/String;)V .locals 0 - invoke-static/range {p1 .. p1}, Lru/vtosters/lite/hooks/VKUIHook;->inject(Landroid/webkit/WebView;)V + invoke-static/range {p1 .. p1}, Lru/vtosters/hooks/VKUIHook;->inject(Landroid/webkit/WebView;)V .line 1 invoke-super {p0, p1, p2}, Landroid/webkit/WebViewClient;->onPageFinished(Landroid/webkit/WebView;Ljava/lang/String;)V diff --git a/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali b/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali index a035c9a7a0..494d79cde2 100644 --- a/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali +++ b/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali @@ -202,7 +202,7 @@ :cond_0 const-string v0, "https://oauth.vk.com/authorize" - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/api/store/StoreGetProducts.smali b/smali/smali_classes2/com/vk/api/store/StoreGetProducts.smali index f09dea805d..8a65f435cb 100644 --- a/smali/smali_classes2/com/vk/api/store/StoreGetProducts.smali +++ b/smali/smali_classes2/com/vk/api/store/StoreGetProducts.smali @@ -40,7 +40,7 @@ const-string v0, "filters" - invoke-static {}, Lru/vtosters/lite/hooks/PromoStickersHook;->hook()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/PromoStickersHook;->hook()Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes2/com/vk/api/voip/VoipGetLongPollServer.smali b/smali/smali_classes2/com/vk/api/voip/VoipGetLongPollServer.smali index d361affc58..b549a41515 100644 --- a/smali/smali_classes2/com/vk/api/voip/VoipGetLongPollServer.smali +++ b/smali/smali_classes2/com/vk/api/voip/VoipGetLongPollServer.smali @@ -100,7 +100,7 @@ invoke-virtual {v0, p1}, Lcom/vk/api/voip/VoipGetLongPollServer$a;->b(Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object v0 .end method diff --git a/smali/smali_classes2/com/vk/articles/ArticleFragment.smali b/smali/smali_classes2/com/vk/articles/ArticleFragment.smali index c8ce08c347..bf74ec2be4 100644 --- a/smali/smali_classes2/com/vk/articles/ArticleFragment.smali +++ b/smali/smali_classes2/com/vk/articles/ArticleFragment.smali @@ -3494,14 +3494,14 @@ const v1, 0x7f060018 - invoke-static {v1}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {v1}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result v2 const v3, 0x7f060105 .line 20 - invoke-static {v3}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {v3}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result v4 diff --git a/smali/smali_classes2/com/vk/articles/ArticleWebView$a.smali b/smali/smali_classes2/com/vk/articles/ArticleWebView$a.smali index 556ec05570..7e3de482d6 100644 --- a/smali/smali_classes2/com/vk/articles/ArticleWebView$a.smali +++ b/smali/smali_classes2/com/vk/articles/ArticleWebView$a.smali @@ -82,7 +82,7 @@ .method public onPageFinished(Landroid/webkit/WebView;Ljava/lang/String;)V .locals 2 - invoke-static/range {p1 .. p1}, Lru/vtosters/lite/hooks/VKUIHook;->inject(Landroid/webkit/WebView;)V + invoke-static/range {p1 .. p1}, Lru/vtosters/hooks/VKUIHook;->inject(Landroid/webkit/WebView;)V .line 1 iget-object v0, p0, Lcom/vk/articles/ArticleWebView$a;->c:Lcom/vk/articles/ArticleWebView; diff --git a/smali/smali_classes2/com/vk/attachpicker/GraffitiActivity.smali b/smali/smali_classes2/com/vk/attachpicker/GraffitiActivity.smali index 3c7da15bb2..9c1f0513bb 100644 --- a/smali/smali_classes2/com/vk/attachpicker/GraffitiActivity.smali +++ b/smali/smali_classes2/com/vk/attachpicker/GraffitiActivity.smali @@ -1038,7 +1038,7 @@ const/16 v4, 0x64 - invoke-static {v4}, Lru/vtosters/lite/utils/Preferences;->compress(I)I + invoke-static {v4}, Lru/vtosters/hooks/other/Preferences;->compress(I)I move-result v4 diff --git a/smali/smali_classes2/com/vk/attachpicker/PhotoVideoAttachActivity.smali b/smali/smali_classes2/com/vk/attachpicker/PhotoVideoAttachActivity.smali index c5a5d72cfe..43438a790c 100644 --- a/smali/smali_classes2/com/vk/attachpicker/PhotoVideoAttachActivity.smali +++ b/smali/smali_classes2/com/vk/attachpicker/PhotoVideoAttachActivity.smali @@ -846,7 +846,7 @@ invoke-virtual {v8, v4}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v8, v4}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v8, v4}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V .line 37 :cond_3 diff --git a/smali/smali_classes2/com/vk/attachpicker/fragment/StoryFragment.smali b/smali/smali_classes2/com/vk/attachpicker/fragment/StoryFragment.smali index 5b498f2942..27abf627c9 100644 --- a/smali/smali_classes2/com/vk/attachpicker/fragment/StoryFragment.smali +++ b/smali/smali_classes2/com/vk/attachpicker/fragment/StoryFragment.smali @@ -75,7 +75,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali b/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali index fd862a9ba7..32b2999262 100644 --- a/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali +++ b/smali/smali_classes2/com/vk/attachpicker/u/j/FiltersController.smali @@ -21,7 +21,7 @@ const-string v1, "{\"response\":{\"catalog_version\":11,\"filters\":{\"count\":9,\"items\":[{\"id\":\"snow\",\"app_version\":\"v2.0.0(14077)\",\"preset\":{\"col\":[{\"lumAdj\":0.036000,\"satAdj\":0.145000,\"sm\":0.350000,\"fG\":0.500000,\"fB\":0.500000,\"thr\":0.350000,\"fR\":0.500000,\"hue\":0},{\"lumAdj\":0.099000,\"satAdj\":0,\"sm\":0.350000,\"fG\":1,\"fB\":1,\"thr\":0.034000,\"fR\":1,\"hue\":0.567000},{\"lumAdj\":0.061000,\"satAdj\":0.860000,\"sm\":0.224000,\"fG\":0.451000,\"fB\":0.451000,\"thr\":0.069000,\"fR\":1,\"hue\":0.057000},{\"lumAdj\":0,\"satAdj\":0.224000,\"sm\":0.111000,\"fG\":0,\"fB\":0,\"thr\":0.051000,\"fR\":0.702000,\"hue\":0.018000},{\"lumAdj\":-0.038000,\"satAdj\":0.136000,\"sm\":0.332000,\"fG\":0,\"fB\":0,\"thr\":0.177000,\"fR\":1,\"hue\":0.018000},{\"lumAdj\":0.111000,\"satAdj\":0.864000,\"sm\":0.348000,\"fG\":1,\"fB\":1,\"thr\":0.071000,\"fR\":0,\"hue\":0.572000},{\"lumAdj\":-0.069000,\"satAdj\":0.178000,\"sm\":0.068000,\"fG\":0,\"fB\":0,\"thr\":0,\"fR\":0,\"hue\":0.949000}],\"red_curve\":[0,64,128,192,255],\"sat\":-0.025000,\"con\":-0.299000,\"green_curve\":[0,64,128,192,255],\"blue_curve\":[0,64,128,192,255],\"rgb_curve\":[0,57,132,194,255],\"br\":-0.102000,\"enh\":0.399000,\"tint\":-0.138000},\"name\":\"Snow\",\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/snow@2x.jpg?3\"},{\"id\":\"lake\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.018145,\"col\":[{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.441830,\"lumAdj\":-0.095000,\"satAdj\":0.311000,\"sm\":0.264000,\"thr\":0.185000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.021000,\"satAdj\":0.000000,\"sm\":0.350000,\"thr\":0.409000},{\"fB\":0.176000,\"fG\":0.192000,\"fR\":0.243000,\"hue\":0.662092,\"lumAdj\":-0.003000,\"satAdj\":0.122984,\"sm\":0.146000,\"thr\":0.026000},{\"fB\":0.251000,\"fG\":0.251000,\"fR\":0.251000,\"hue\":0.418954,\"lumAdj\":-0.035685,\"satAdj\":-0.012097,\"sm\":0.311000,\"thr\":0.120000},{\"fB\":0.600000,\"fG\":1.000000,\"fR\":0.992000,\"hue\":0.170000,\"lumAdj\":0.023000,\"satAdj\":-0.347000,\"sm\":0.271000,\"thr\":0.130000},{\"fB\":0.302000,\"fG\":0.302000,\"fR\":1.000000,\"hue\":0.022000,\"lumAdj\":0.021000,\"satAdj\":0.250000,\"sm\":0.255000,\"thr\":0.087000},{\"fB\":0.424000,\"fG\":0.525000,\"fR\":0.765000,\"hue\":0.069935,\"lumAdj\":0.040524,\"satAdj\":-0.177419,\"sm\":0.129486,\"thr\":0.038199},{\"fB\":0.188000,\"fG\":0.220000,\"fR\":0.329000,\"hue\":0.037000,\"lumAdj\":-0.016000,\"satAdj\":0.333000,\"sm\":0.097000,\"thr\":0.006000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":0.350980,\"lumAdj\":0.061000,\"satAdj\":0.052000,\"sm\":0.319000,\"thr\":0.009000}],\"con\":0.119000,\"localCurrentColor\":3,\"enh\":0.000000,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,71,134,192,255],\"sat\":0.370968,\"shar\":0.000000,\"tem\":-0.415000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Lake\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/lake@2x.jpg?3\"},{\"id\":\"dew\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.505000,\"lumAdj\":-0.041000,\"satAdj\":0.089000,\"sm\":0.194000,\"thr\":0.039000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.108000,\"lumAdj\":-0.031000,\"satAdj\":-0.084000,\"sm\":0.350000,\"thr\":0.096000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":1.000000,\"hue\":0.071895,\"lumAdj\":-0.031000,\"satAdj\":0.038000,\"sm\":0.172000,\"thr\":0.243000},{\"fB\":0.000000,\"fG\":0.549000,\"fR\":0.012000,\"hue\":0.506000,\"lumAdj\":-0.096000,\"satAdj\":1.000000,\"sm\":0.204000,\"thr\":0.096000},{\"fB\":0.451000,\"fG\":0.427000,\"fR\":0.467000,\"hue\":0.900000,\"lumAdj\":0.000000,\"satAdj\":0.190000,\"sm\":0.030000,\"thr\":0.000000},{\"fB\":0.431000,\"fG\":0.420000,\"fR\":0.392000,\"hue\":0.550000,\"lumAdj\":0.000000,\"satAdj\":0.482000,\"sm\":0.077000,\"thr\":0.002000},{\"fB\":0.780000,\"fG\":0.792000,\"fR\":0.745000,\"hue\":0.542000,\"lumAdj\":0.000000,\"satAdj\":-1.000000,\"sm\":0.297000,\"thr\":0.003000},{\"fB\":0.200000,\"fG\":0.200000,\"fR\":0.200000,\"hue\":0.966013,\"lumAdj\":-0.029032,\"satAdj\":0.098790,\"sm\":0.350000,\"thr\":0.023000},{\"fB\":0.337000,\"fG\":0.047000,\"fR\":0.035000,\"hue\":0.837908,\"lumAdj\":-0.001000,\"satAdj\":0.216000,\"sm\":0.117000,\"thr\":0.105000},{\"fB\":1.000000,\"fG\":0.835000,\"fR\":0.690000,\"hue\":0.480000,\"lumAdj\":-0.110000,\"satAdj\":0.201000,\"sm\":0.086000,\"thr\":0.002000},{\"fB\":0.490000,\"fG\":0.659000,\"fR\":0.698000,\"hue\":0.022000,\"lumAdj\":-0.002000,\"satAdj\":0.318000,\"sm\":0.307000,\"thr\":0.028000},{\"fB\":0.478000,\"fG\":0.592000,\"fR\":0.835000,\"hue\":0.053000,\"lumAdj\":0.108000,\"satAdj\":0.333000,\"sm\":0.221000,\"thr\":0.004000},{\"fB\":0.886000,\"fG\":0.612000,\"fR\":0.380000,\"hue\":0.476000,\"lumAdj\":-0.052000,\"satAdj\":0.571000,\"sm\":0.155000,\"thr\":0.010000}],\"con\":0.000000,\"localCurrentColor\":8,\"enh\":0.000000,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":0.000000,\"shar\":0.000000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.007000},\"isDisabled\":false,\"name\":\"Dew\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/dew@2x.jpg?3\"},{\"id\":\"ash\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":-0.027000,\"satAdj\":-0.636000,\"sm\":0.348000,\"thr\":0.018000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":0.032026,\"lumAdj\":-0.041129,\"satAdj\":0.100806,\"sm\":0.348000,\"thr\":0.138000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.167320,\"lumAdj\":-0.062298,\"satAdj\":0.062500,\"sm\":0.256000,\"thr\":0.000000},{\"fB\":0.561000,\"fG\":0.651000,\"fR\":0.745000,\"hue\":0.104000,\"lumAdj\":-0.025000,\"satAdj\":0.309000,\"sm\":0.092000,\"thr\":0.019000},{\"fB\":0.149000,\"fG\":0.149000,\"fR\":0.149000,\"hue\":0.986000,\"lumAdj\":-0.043000,\"satAdj\":0.206000,\"sm\":0.188000,\"thr\":0.008000},{\"fB\":0.961000,\"fG\":0.631000,\"fR\":0.412000,\"hue\":0.535294,\"lumAdj\":0.000000,\"satAdj\":0.989919,\"sm\":0.202000,\"thr\":0.000000}],\"con\":0.000000,\"localCurrentColor\":5,\"enh\":0.179000,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":0.000000,\"shar\":0.000000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Ash\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/ash@2x.jpg?3\"},{\"id\":\"fen\",\"date\":0,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.058000,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":-0.044000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":-0.032000,\"satAdj\":0.000000,\"sm\":0.344000,\"thr\":0.358000},{\"fB\":0.176000,\"fG\":0.196000,\"fR\":0.294000,\"hue\":0.030065,\"lumAdj\":-0.019000,\"satAdj\":0.336000,\"sm\":0.037000,\"thr\":0.000000},{\"fB\":0.200000,\"fG\":0.216000,\"fR\":0.235000,\"hue\":0.601307,\"lumAdj\":-0.047177,\"satAdj\":0.133065,\"sm\":0.095000,\"thr\":0.006000},{\"fB\":0.780000,\"fG\":0.471000,\"fR\":0.329000,\"hue\":0.437255,\"lumAdj\":0.000000,\"satAdj\":0.344758,\"sm\":0.150000,\"thr\":0.031000}],\"con\":-0.516000,\"localCurrentColor\":3,\"enh\":0.000000,\"fade\":0.163000,\"gr\":0.000000,\"green_curve\":[0,65,124,192,255],\"red_curve\":[0,65,126,192,255],\"rgb_curve\":[0,42,119,185,249],\"sat\":0.000000,\"shar\":0.000000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Fen\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/fen@2x.jpg?3\"},{\"id\":\"drama\",\"date\":0,\"preset\":{\"blue_curve\":[0,62,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.153000,\"fG\":0.180000,\"fR\":0.337000,\"hue\":0.025000,\"lumAdj\":0.000000,\"satAdj\":0.284000,\"sm\":0.103000,\"thr\":0.021000},{\"fB\":0.537000,\"fG\":0.565000,\"fR\":0.804000,\"hue\":0.016993,\"lumAdj\":0.037500,\"satAdj\":0.161290,\"sm\":0.108000,\"thr\":0.010000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":-0.031452,\"satAdj\":0.800403,\"sm\":0.338004,\"thr\":0.038588},{\"fB\":0.549000,\"fG\":0.631000,\"fR\":0.824000,\"hue\":1.000000,\"lumAdj\":0.058669,\"satAdj\":0.175403,\"sm\":0.155000,\"thr\":0.035000},{\"fB\":0.270588,\"fG\":0.270588,\"fR\":0.325490,\"hue\":1.000000,\"lumAdj\":0.059879,\"satAdj\":0.008065,\"sm\":0.083266,\"thr\":0.008340}],\"con\":0.054435,\"localCurrentColor\":6,\"enh\":0.163306,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,60,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,49,118,196,255],\"sat\":-0.514113,\"shar\":0.000000,\"tem\":-0.328000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Drama\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/drama@2x.jpg?3\"},{\"id\":\"sunset\",\"date\":1457719798,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.004032,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.533000,\"lumAdj\":-0.177000,\"satAdj\":-0.234000,\"sm\":0.350000,\"thr\":0.000000},{\"fB\":0.337000,\"fG\":0.047000,\"fR\":0.035000,\"hue\":0.570000,\"lumAdj\":-0.052000,\"satAdj\":0.201000,\"sm\":0.117000,\"thr\":0.105000},{\"fB\":0.514000,\"fG\":0.384000,\"fR\":0.361000,\"hue\":0.596078,\"lumAdj\":0.000000,\"satAdj\":0.252000,\"sm\":0.203000,\"thr\":0.025368},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.400000,\"hue\":0.985000,\"lumAdj\":-0.069000,\"satAdj\":0.276000,\"sm\":0.100000,\"thr\":0.057000},{\"fB\":0.400000,\"fG\":0.000000,\"fR\":0.008000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.108871,\"sm\":0.150000,\"thr\":0.100000},{\"fB\":0.043000,\"fG\":0.090000,\"fR\":0.153000,\"hue\":0.041000,\"lumAdj\":-0.036000,\"satAdj\":0.327000,\"sm\":0.059000,\"thr\":0.000000},{\"fB\":0.945000,\"fG\":0.961000,\"fR\":0.961000,\"hue\":0.580000,\"lumAdj\":0.119000,\"satAdj\":0.584000,\"sm\":0.114000,\"thr\":0.000000},{\"fB\":0.333000,\"fG\":0.506000,\"fR\":0.725000,\"hue\":0.083000,\"lumAdj\":0.018000,\"satAdj\":0.679000,\"sm\":0.173000,\"thr\":0.067000},{\"fB\":0.251000,\"fG\":0.251000,\"fR\":0.251000,\"hue\":1.000000,\"lumAdj\":-0.059000,\"satAdj\":0.163000,\"sm\":0.350000,\"thr\":0.000000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.619000,\"lumAdj\":-0.013000,\"satAdj\":0.000000,\"sm\":0.177000,\"thr\":0.053000}],\"con\":0.268145,\"localCurrentColor\":3,\"enh\":0.157258,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":-0.155000,\"shar\":0.250000,\"tem\":-0.488510,\"tint\":-0.186000,\"vig\":0.293000},\"isDisabled\":false,\"name\":\"Sunset\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/sunset@2x.jpg?3\"},{\"id\":\"downpour\",\"date\":1457719647,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":0.000000,\"col\":[{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":0.560131,\"lumAdj\":-0.047177,\"satAdj\":0.107000,\"sm\":0.157000,\"thr\":0.025368},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":1.000000,\"hue\":0.026797,\"lumAdj\":-0.034476,\"satAdj\":0.320564,\"sm\":0.200000,\"thr\":0.243000},{\"fB\":0.337000,\"fG\":0.047000,\"fR\":0.035000,\"hue\":0.466013,\"lumAdj\":-0.020565,\"satAdj\":0.092742,\"sm\":0.117000,\"thr\":0.105000},{\"fB\":0.247000,\"fG\":0.416000,\"fR\":0.580000,\"hue\":0.090196,\"lumAdj\":-0.035081,\"satAdj\":0.391129,\"sm\":0.186290,\"thr\":0.008739},{\"fB\":0.514000,\"fG\":0.384000,\"fR\":0.361000,\"hue\":0.549020,\"lumAdj\":-0.032661,\"satAdj\":0.252000,\"sm\":0.233216,\"thr\":0.003378},{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":0.532680,\"lumAdj\":0.000000,\"satAdj\":-0.285000,\"sm\":0.200000,\"thr\":0.038000},{\"fB\":0.137255,\"fG\":0.133333,\"fR\":0.105882,\"hue\":1.000000,\"lumAdj\":-0.053831,\"satAdj\":0.308468,\"sm\":0.185585,\"thr\":0.000624},{\"fB\":0.470588,\"fG\":0.529412,\"fR\":0.639216,\"hue\":0.058170,\"lumAdj\":0.095565,\"satAdj\":0.118952,\"sm\":0.221573,\"thr\":0.018977}],\"con\":-0.143145,\"localCurrentColor\":8,\"enh\":0.146169,\"fade\":0.000000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,62,141,205,255],\"sat\":-0.348790,\"shar\":0.232000,\"tem\":-0.314516,\"tint\":-0.135000,\"vig\":0.008000},\"isDisabled\":false,\"name\":\"Downpour\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/downpour@2x.jpg?3\"},{\"id\":\"dark\",\"date\":1457715727,\"preset\":{\"blue_curve\":[0,64,128,192,255],\"br\":-0.107500,\"col\":[{\"fB\":1.000000,\"fG\":1.000000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.500000,\"fG\":0.500000,\"fR\":0.500000,\"hue\":1.000000,\"lumAdj\":0.211694,\"satAdj\":-0.629032,\"sm\":0.349647,\"thr\":0.761176},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.000000,\"hue\":1.000000,\"lumAdj\":0.000000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.000000,\"fG\":0.000000,\"fR\":0.549000,\"hue\":1.000000,\"lumAdj\":0.168750,\"satAdj\":0.000000,\"sm\":0.325302,\"thr\":0.814856},{\"fB\":0.302000,\"fG\":0.302000,\"fR\":1.000000,\"hue\":1.000000,\"lumAdj\":0.091000,\"satAdj\":0.000000,\"sm\":0.163000,\"thr\":0.129000},{\"fB\":0.914000,\"fG\":0.761000,\"fR\":0.612000,\"hue\":0.584000,\"lumAdj\":-0.121000,\"satAdj\":0.000000,\"sm\":0.120000,\"thr\":0.060000},{\"fB\":0.102000,\"fG\":0.102000,\"fR\":0.102000,\"hue\":1.000000,\"lumAdj\":0.052000,\"satAdj\":0.000000,\"sm\":0.287000,\"thr\":0.000000},{\"fB\":0.647059,\"fG\":0.745098,\"fR\":0.968627,\"hue\":0.050980,\"lumAdj\":0.137903,\"satAdj\":0.000000,\"sm\":0.340474,\"thr\":0.156163}],\"con\":0.295000,\"localCurrentColor\":7,\"enh\":0.212000,\"fade\":0.028000,\"gr\":0.000000,\"green_curve\":[0,64,128,192,255],\"red_curve\":[0,64,128,192,255],\"rgb_curve\":[0,64,128,192,255],\"sat\":-1.000000,\"shar\":0.240000,\"tem\":0.000000,\"tint\":0.000000,\"vig\":0.000000},\"isDisabled\":false,\"name\":\"Dark\",\"uploadedToServer\":false,\"v\":2,\"image_url\":\"https:\\/\\/api.vk.com\\/images\\/filters\\/chronicle\\/dark@2x.jpg?3\"}]},\"instagram_suffix\":\"\",\"instagram_fallback\":0}}" - invoke-static {v1}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes2/com/vk/attachpicker/widget/TabImageView.smali b/smali/smali_classes2/com/vk/attachpicker/widget/TabImageView.smali index 1736680aba..80275c1194 100644 --- a/smali/smali_classes2/com/vk/attachpicker/widget/TabImageView.smali +++ b/smali/smali_classes2/com/vk/attachpicker/widget/TabImageView.smali @@ -315,7 +315,7 @@ iget-object v3, p0, Lcom/vk/attachpicker/widget/TabImageView;->b:Landroid/graphics/Paint; - invoke-static {p1, v1, v2, v0, v3}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V + invoke-static {p1, v1, v2, v0, v3}, Lru/vtosters/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V .line 7 invoke-super {p0, p1}, Landroid/widget/ImageView;->onDraw(Landroid/graphics/Canvas;)V diff --git a/smali/smali_classes2/com/vk/auth/RestoreUtils.smali b/smali/smali_classes2/com/vk/auth/RestoreUtils.smali index 2f3540322b..8a5e03d2b0 100644 --- a/smali/smali_classes2/com/vk/auth/RestoreUtils.smali +++ b/smali/smali_classes2/com/vk/auth/RestoreUtils.smali @@ -47,7 +47,7 @@ const-string v1, "static.vk.com/restore" - invoke-static {v1}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes2/com/vk/auth/VkAuthModel.smali b/smali/smali_classes2/com/vk/auth/VkAuthModel.smali index a27f19b06f..5b81694359 100644 --- a/smali/smali_classes2/com/vk/auth/VkAuthModel.smali +++ b/smali/smali_classes2/com/vk/auth/VkAuthModel.smali @@ -657,7 +657,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/auth/api/VKAccount.smali b/smali/smali_classes2/com/vk/auth/api/VKAccount.smali index af9605df0d..d2eb2cd446 100644 --- a/smali/smali_classes2/com/vk/auth/api/VKAccount.smali +++ b/smali/smali_classes2/com/vk/auth/api/VKAccount.smali @@ -1534,7 +1534,7 @@ invoke-virtual {p0, v0, v1}, Lcom/vk/core/bundle/Container;->a(Lcom/vk/core/bundle/Fields4;Z)Z - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->hasMusicSubscription()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->hasMusicSubscription()Z move-result v0 @@ -1932,7 +1932,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->miniapps()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->miniapps()Z move-result v0 @@ -2072,7 +2072,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkpay()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->vkpay()Z move-result v0 @@ -2397,7 +2397,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dev()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->dev()Z move-result v0 @@ -2414,7 +2414,7 @@ invoke-virtual {p0, v0, v1}, Lcom/vk/core/bundle/Container;->a(Lcom/vk/core/bundle/Fields4;Z)Z - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->isMusicRestricted()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->isMusicRestricted()Z move-result v0 @@ -4946,7 +4946,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dev()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->dev()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/auth/base/BaseAuthFragment.smali b/smali/smali_classes2/com/vk/auth/base/BaseAuthFragment.smali index 78f23ee07d..72b31092ef 100644 --- a/smali/smali_classes2/com/vk/auth/base/BaseAuthFragment.smali +++ b/smali/smali_classes2/com/vk/auth/base/BaseAuthFragment.smali @@ -188,7 +188,7 @@ .line 13 invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v0, v1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, v1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V const/4 v1, 0x0 @@ -223,7 +223,7 @@ .line 15 invoke-virtual {v0, p1}, Landroid/view/Window;->setNavigationBarColor(I)V - invoke-static {v0, p1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, p1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V .line 16 new-instance v1, Landroid/graphics/drawable/ColorDrawable; diff --git a/smali/smali_classes2/com/vk/auth/ui/VkAuthToolbar.smali b/smali/smali_classes2/com/vk/auth/ui/VkAuthToolbar.smali index aec508b059..275fd11ebf 100644 --- a/smali/smali_classes2/com/vk/auth/ui/VkAuthToolbar.smali +++ b/smali/smali_classes2/com/vk/auth/ui/VkAuthToolbar.smali @@ -882,7 +882,7 @@ .line 1 iget-object v0, p0, Lcom/vk/auth/ui/VkAuthToolbar;->c:Landroidx/appcompat/widget/AppCompatImageButton; - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/auth/w/a/ChooseAuthMethodFragment.smali b/smali/smali_classes2/com/vk/auth/w/a/ChooseAuthMethodFragment.smali index 78ef166888..857e94b35c 100644 --- a/smali/smali_classes2/com/vk/auth/w/a/ChooseAuthMethodFragment.smali +++ b/smali/smali_classes2/com/vk/auth/w/a/ChooseAuthMethodFragment.smali @@ -210,7 +210,7 @@ invoke-virtual {p2, v0}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V - invoke-static {p1}, Lru/vtosters/lite/hooks/ProxyHook;->hookAuth(Landroid/view/View;)V + invoke-static {p1}, Lru/vtosters/hooks/ProxyHook;->hookAuth(Landroid/view/View;)V .line 7 invoke-direct {p0}, Lcom/vk/auth/w/a/ChooseAuthMethodFragment;->K4()V diff --git a/smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali b/smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali index a1c3ad44b9..186541f078 100644 --- a/smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali +++ b/smali/smali_classes2/com/vk/auth/y/b/UrlCheckFragment$b.smali @@ -56,7 +56,7 @@ const-string v0, "oauth.vk.com" - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/balance/BalancePresenter.smali b/smali/smali_classes2/com/vk/balance/BalancePresenter.smali index 6d3f3a30c0..aac3bd0cae 100644 --- a/smali/smali_classes2/com/vk/balance/BalancePresenter.smali +++ b/smali/smali_classes2/com/vk/balance/BalancePresenter.smali @@ -166,7 +166,7 @@ const-string v2, "https://static.vk.com/promo_codes/" - invoke-static {v2}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 diff --git a/smali/smali_classes2/com/vk/cameraui/CameraUI$a.smali b/smali/smali_classes2/com/vk/cameraui/CameraUI$a.smali index 1bc977efd3..121e3aa82b 100644 --- a/smali/smali_classes2/com/vk/cameraui/CameraUI$a.smali +++ b/smali/smali_classes2/com/vk/cameraui/CameraUI$a.smali @@ -497,7 +497,7 @@ invoke-static {v2, v3}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v3 diff --git a/smali/smali_classes2/com/vk/cameraui/CameraUIView.smali b/smali/smali_classes2/com/vk/cameraui/CameraUIView.smali index 423f4db13a..43cd71fe96 100644 --- a/smali/smali_classes2/com/vk/cameraui/CameraUIView.smali +++ b/smali/smali_classes2/com/vk/cameraui/CameraUIView.smali @@ -4160,7 +4160,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetFriends.smali b/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetFriends.smali index acb6a2ee69..92a593e3c3 100644 --- a/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetFriends.smali +++ b/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetFriends.smali @@ -107,7 +107,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/JsonInjectors;->friends(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/JsonInjectors;->friends(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetSectionFriends.smali b/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetSectionFriends.smali index 855ad8472b..53a7cddba0 100644 --- a/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetSectionFriends.smali +++ b/smali/smali_classes2/com/vk/catalog2/core/api/i/CatalogGetSectionFriends.smali @@ -79,7 +79,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/JsonInjectors;->friends(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/JsonInjectors;->friends(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/catalog2/core/holders/stickers/StickerPackVerticalListItemVh.smali b/smali/smali_classes2/com/vk/catalog2/core/holders/stickers/StickerPackVerticalListItemVh.smali index bfc7fc4309..23a41d92de 100644 --- a/smali/smali_classes2/com/vk/catalog2/core/holders/stickers/StickerPackVerticalListItemVh.smali +++ b/smali/smali_classes2/com/vk/catalog2/core/holders/stickers/StickerPackVerticalListItemVh.smali @@ -298,7 +298,7 @@ invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p2 diff --git a/smali/smali_classes2/com/vk/catalog2/core/y/ActionFollowVh.smali b/smali/smali_classes2/com/vk/catalog2/core/y/ActionFollowVh.smali index c07d091f5c..37cd2af78d 100644 --- a/smali/smali_classes2/com/vk/catalog2/core/y/ActionFollowVh.smali +++ b/smali/smali_classes2/com/vk/catalog2/core/y/ActionFollowVh.smali @@ -534,7 +534,7 @@ .line 7 :cond_3 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p1 diff --git a/smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali b/smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali index 59536881ff..97be4c6475 100644 --- a/smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali +++ b/smali/smali_classes2/com/vk/common/links/BrowserUtils$Companion.smali @@ -640,7 +640,7 @@ const-string v0, "" :goto_0 - invoke-static {}, Lru/vtosters/lite/proxy/api/ApiProxy;->getAwayPhpCom()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/ProxyHook;->getAwayPhpCom()Ljava/lang/String; move-result-object v0 @@ -1086,7 +1086,7 @@ .method public final a(Landroid/net/Uri;Landroid/os/Bundle;)Landroid/net/Uri; .locals 1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->awayphp()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->awayphp()Z move-result v0 @@ -1170,7 +1170,7 @@ } .end annotation - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->awayphp()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->awayphp()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/common/links/LinkParser.smali b/smali/smali_classes2/com/vk/common/links/LinkParser.smali index 986a7cdd4f..06ecd035a3 100644 --- a/smali/smali_classes2/com/vk/common/links/LinkParser.smali +++ b/smali/smali_classes2/com/vk/common/links/LinkParser.smali @@ -1606,7 +1606,7 @@ .method public static a(Ljava/lang/CharSequence;ZF)Ljava/lang/CharSequence; .locals 8 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortpost()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->shortpost()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/common/links/LinkProcessorKt.smali b/smali/smali_classes2/com/vk/common/links/LinkProcessorKt.smali index 0b9e42d407..6e670cb618 100644 --- a/smali/smali_classes2/com/vk/common/links/LinkProcessorKt.smali +++ b/smali/smali_classes2/com/vk/common/links/LinkProcessorKt.smali @@ -2706,7 +2706,7 @@ :cond_21 new-instance v0, Lcom/vk/navigation/Navigator; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->useNewSettings()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->useNewSettings()Ljava/lang/Class; move-result-object v1 @@ -2801,7 +2801,7 @@ :goto_9 new-instance v0, Lcom/vk/navigation/Navigator; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->useNewSettings()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->useNewSettings()Ljava/lang/Class; move-result-object v1 diff --git a/smali/smali_classes2/com/vk/common/links/OpenFunctionsKt.smali b/smali/smali_classes2/com/vk/common/links/OpenFunctionsKt.smali index 8b2578c9f0..80ede5e9c7 100644 --- a/smali/smali_classes2/com/vk/common/links/OpenFunctionsKt.smali +++ b/smali/smali_classes2/com/vk/common/links/OpenFunctionsKt.smali @@ -1427,7 +1427,7 @@ .method public static final a(Landroid/content/Context;Lcom/vk/dto/common/VideoFile;Ljava/lang/String;Lcom/vk/libvideo/ad/AdsDataProvider;Ljava/lang/String;Lcom/vk/statistic/Statistic;ZLcom/vk/common/links/OpenCallback;Ljava/lang/Integer;)V .locals 14 - invoke-static {p1, p0}, Lru/vtosters/lite/utils/ExternalLinkParser;->parseVideoFile(Lcom/vk/dto/common/VideoFile;Landroid/content/Context;)Z + invoke-static {p1, p0}, Lru/vtosters/hooks/VideoPlayerHook;->parseVideoFile(Lcom/vk/dto/common/VideoFile;Landroid/content/Context;)Z move-result v9 diff --git a/smali/smali_classes2/com/vk/common/widget/LocatorIndicatorDrawable.smali b/smali/smali_classes2/com/vk/common/widget/LocatorIndicatorDrawable.smali index 940b03164e..cf60a5505c 100644 --- a/smali/smali_classes2/com/vk/common/widget/LocatorIndicatorDrawable.smali +++ b/smali/smali_classes2/com/vk/common/widget/LocatorIndicatorDrawable.smali @@ -226,7 +226,7 @@ move-result-object p1 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p1 diff --git a/smali/smali_classes2/com/vk/components/holders/LoadersComponentsViewHolder$1.smali b/smali/smali_classes2/com/vk/components/holders/LoadersComponentsViewHolder$1.smali index 661ce97e1f..9ff5e307c2 100644 --- a/smali/smali_classes2/com/vk/components/holders/LoadersComponentsViewHolder$1.smali +++ b/smali/smali_classes2/com/vk/components/holders/LoadersComponentsViewHolder$1.smali @@ -68,7 +68,7 @@ move-result-object v1 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes2/com/vk/contacts/ContactsSyncAdapterService$c.smali b/smali/smali_classes2/com/vk/contacts/ContactsSyncAdapterService$c.smali index 5fabed72c0..491d2dc94d 100644 --- a/smali/smali_classes2/com/vk/contacts/ContactsSyncAdapterService$c.smali +++ b/smali/smali_classes2/com/vk/contacts/ContactsSyncAdapterService$c.smali @@ -276,7 +276,7 @@ const/16 v10, 0x55 - invoke-static {v10}, Lru/vtosters/lite/utils/Preferences;->compress(I)I + invoke-static {v10}, Lru/vtosters/hooks/other/Preferences;->compress(I)I move-result v10 diff --git a/smali/smali_classes2/com/vk/core/dialogs/actionspopup/ActionsPopup$b.smali b/smali/smali_classes2/com/vk/core/dialogs/actionspopup/ActionsPopup$b.smali index 650633750c..7f04e5b209 100644 --- a/smali/smali_classes2/com/vk/core/dialogs/actionspopup/ActionsPopup$b.smali +++ b/smali/smali_classes2/com/vk/core/dialogs/actionspopup/ActionsPopup$b.smali @@ -85,7 +85,7 @@ if-eqz p4, :cond_0 .line 3 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p3 diff --git a/smali/smali_classes2/com/vk/core/dialogs/alert/VkAlertDialog.smali b/smali/smali_classes2/com/vk/core/dialogs/alert/VkAlertDialog.smali index 4cc5cb8133..2bd82a1b4c 100644 --- a/smali/smali_classes2/com/vk/core/dialogs/alert/VkAlertDialog.smali +++ b/smali/smali_classes2/com/vk/core/dialogs/alert/VkAlertDialog.smali @@ -40,7 +40,7 @@ sput-object v0, Lcom/vk/core/dialogs/alert/VkAlertDialog;->e:Lcom/vk/core/dialogs/alert/VkAlertDialog$a; .line 1 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAlertStyle()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAlertStyle()I move-result v0 diff --git a/smali/smali_classes2/com/vk/core/drawable/VkUiDrawableHelper.smali b/smali/smali_classes2/com/vk/core/drawable/VkUiDrawableHelper.smali index e5b9fd1a8f..edfd28988c 100644 --- a/smali/smali_classes2/com/vk/core/drawable/VkUiDrawableHelper.smali +++ b/smali/smali_classes2/com/vk/core/drawable/VkUiDrawableHelper.smali @@ -213,7 +213,7 @@ if-eqz p2, :cond_2 .line 3 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p4 @@ -486,7 +486,7 @@ if-eqz p2, :cond_2 .line 3 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p4 diff --git a/smali/smali_classes2/com/vk/core/extensions/ActivityExt.smali b/smali/smali_classes2/com/vk/core/extensions/ActivityExt.smali index cd835448fb..195af44d9d 100644 --- a/smali/smali_classes2/com/vk/core/extensions/ActivityExt.smali +++ b/smali/smali_classes2/com/vk/core/extensions/ActivityExt.smali @@ -96,7 +96,7 @@ :cond_0 invoke-virtual {p0, p1}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {p0, p1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p0, p1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V :cond_1 return-void @@ -159,7 +159,7 @@ :goto_0 invoke-virtual {p0, p1}, Landroid/view/Window;->setNavigationBarColor(I)V - invoke-static {p0, p1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p0, p1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V :cond_1 return-void @@ -224,7 +224,7 @@ invoke-virtual {p0, p2}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {p0, p2}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p0, p2}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V .line 20 invoke-static {}, Lcom/vk/core/util/OsUtil;->b()Z diff --git a/smali/smali_classes2/com/vk/core/extensions/EditTextExt.smali b/smali/smali_classes2/com/vk/core/extensions/EditTextExt.smali index f09c09b4f5..fdf2dabf61 100644 --- a/smali/smali_classes2/com/vk/core/extensions/EditTextExt.smali +++ b/smali/smali_classes2/com/vk/core/extensions/EditTextExt.smali @@ -95,7 +95,7 @@ .line 11 sget-object v6, Landroid/graphics/PorterDuff$Mode;->SRC_IN:Landroid/graphics/PorterDuff$Mode; - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p1 diff --git a/smali/smali_classes2/com/vk/core/formatters/OnlineFormatter.smali b/smali/smali_classes2/com/vk/core/formatters/OnlineFormatter.smali index 8cefc1d044..5b24c44a51 100644 --- a/smali/smali_classes2/com/vk/core/formatters/OnlineFormatter.smali +++ b/smali/smali_classes2/com/vk/core/formatters/OnlineFormatter.smali @@ -219,7 +219,7 @@ .method private final a(ZJ)Ljava/lang/String; .locals 2 - invoke-static {p1, p2, p3}, Lru/vtosters/lite/hooks/DateHook;->getFormattedDate(ZJ)Ljava/lang/String; + invoke-static {p1, p2, p3}, Lru/vtosters/hooks/DateHook;->getFormattedDate(ZJ)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali b/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali index a662143713..80b63ba12d 100644 --- a/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali +++ b/smali/smali_classes2/com/vk/core/fragments/j/b/ParentSupportFragmentManager.smali @@ -186,7 +186,7 @@ if-eqz v0, :cond_0 - invoke-static {v0}, Lru/vtosters/lite/hooks/FragAnimationHook;->animateOpen(Landroidx/fragment/app/FragmentTransaction;)Z + invoke-static {v0}, Lru/vtosters/hooks/FragAnimationHook;->animateOpen(Landroidx/fragment/app/FragmentTransaction;)Z move-result v1 @@ -355,7 +355,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/hooks/FragAnimationHook;->animateClose(Landroidx/fragment/app/FragmentTransaction;)V + invoke-static {v0}, Lru/vtosters/hooks/FragAnimationHook;->animateClose(Landroidx/fragment/app/FragmentTransaction;)V iput-object v0, p0, Lcom/vk/core/fragments/j/b/ParentSupportFragmentManager;->b:Landroidx/fragment/app/FragmentTransaction; diff --git a/smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali b/smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali index 20d2b99247..35128f3a2c 100644 --- a/smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali +++ b/smali/smali_classes2/com/vk/core/network/metrics/traffic/TrafficAccumulator.smali @@ -187,7 +187,7 @@ const-string v3, "https://api.vk.com/method/execute" - invoke-static {v3}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes2/com/vk/core/network/proxy/ProxySettings.smali b/smali/smali_classes2/com/vk/core/network/proxy/ProxySettings.smali index 9fbc8a108b..8f37836a6d 100644 --- a/smali/smali_classes2/com/vk/core/network/proxy/ProxySettings.smali +++ b/smali/smali_classes2/com/vk/core/network/proxy/ProxySettings.smali @@ -696,7 +696,7 @@ return v0 :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->ssl()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali b/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali index 13cda9d6ad..afcf701212 100644 --- a/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali +++ b/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali @@ -82,7 +82,7 @@ .method private final a(Landroid/content/Context;)V .locals 7 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->ssl()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/core/network/security/NetworkTrustManager.smali b/smali/smali_classes2/com/vk/core/network/security/NetworkTrustManager.smali index 3d29405f19..ea59d24d32 100644 --- a/smali/smali_classes2/com/vk/core/network/security/NetworkTrustManager.smali +++ b/smali/smali_classes2/com/vk/core/network/security/NetworkTrustManager.smali @@ -358,7 +358,7 @@ } .end annotation - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->ssl()Z move-result v0 @@ -385,7 +385,7 @@ } .end annotation - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->ssl()Z move-result v0 @@ -407,7 +407,7 @@ .method public getAcceptedIssuers()[Ljava/security/cert/X509Certificate; .locals 1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->ssl()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/core/network/utils/NetworkUserAgent.smali b/smali/smali_classes2/com/vk/core/network/utils/NetworkUserAgent.smali index 9112792010..71752a6aa8 100644 --- a/smali/smali_classes2/com/vk/core/network/utils/NetworkUserAgent.smali +++ b/smali/smali_classes2/com/vk/core/network/utils/NetworkUserAgent.smali @@ -119,11 +119,11 @@ if-nez v0, :cond_0 - invoke-static {}, Lru/vtosters/lite/hooks/AppVerHook;->appVer()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/AppVerHook;->appVer()Ljava/lang/String; move-result-object v0 - invoke-static {}, Lru/vtosters/lite/hooks/AppVerHook;->appBuild()I + invoke-static {}, Lru/vtosters/hooks/AppVerHook;->appBuild()I move-result v1 diff --git a/smali/smali_classes2/com/vk/core/tips/TipTextWindow.smali b/smali/smali_classes2/com/vk/core/tips/TipTextWindow.smali index 516764c599..d0427a6f57 100644 --- a/smali/smali_classes2/com/vk/core/tips/TipTextWindow.smali +++ b/smali/smali_classes2/com/vk/core/tips/TipTextWindow.smali @@ -620,7 +620,7 @@ .line 31 invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {p1, v0}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p1, v0}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V .line 32 iget-boolean v0, p0, Lcom/vk/core/tips/TipTextWindow;->l:Z diff --git a/smali/smali_classes2/com/vk/core/ui/themes/MilkshakeHelper.smali b/smali/smali_classes2/com/vk/core/ui/themes/MilkshakeHelper.smali index 37655e24f3..65786656c0 100644 --- a/smali/smali_classes2/com/vk/core/ui/themes/MilkshakeHelper.smali +++ b/smali/smali_classes2/com/vk/core/ui/themes/MilkshakeHelper.smali @@ -231,7 +231,7 @@ .method public static final e()Z .locals 3 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->milkshake()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->milkshake()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/core/ui/themes/VKTheme.smali b/smali/smali_classes2/com/vk/core/ui/themes/VKTheme.smali index c487b12ce9..c58cbdcd70 100644 --- a/smali/smali_classes2/com/vk/core/ui/themes/VKTheme.smali +++ b/smali/smali_classes2/com/vk/core/ui/themes/VKTheme.smali @@ -60,7 +60,7 @@ new-instance v10, Lcom/vk/core/ui/themes/VKTheme; .line 1 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getLightThemeRes()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getLightThemeRes()I move-result v8 @@ -91,7 +91,7 @@ .line 2 sget v18, Lb/h/g/e;->VkDarkStyle:I - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getDarkThemeRes()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getDarkThemeRes()I move-result v18 @@ -172,7 +172,7 @@ new-instance v1, Lcom/vk/core/ui/themes/VKTheme; .line 5 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getLightThemeRes()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getLightThemeRes()I move-result v10 @@ -203,7 +203,7 @@ .line 6 sget v10, Lb/h/g/e;->VkMilkDarkStyle:I - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getDarkThemeRes()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getDarkThemeRes()I move-result v10 diff --git a/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper$b.smali b/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper$b.smali index 6db03cf1d4..5a5441ca64 100644 --- a/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper$b.smali +++ b/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper$b.smali @@ -157,7 +157,7 @@ .method public getResources()Landroid/content/res/Resources; .registers 3 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->isCustomAccentEnabled()Z + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->isCustomAccentEnabled()Z move-result v1 diff --git a/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali b/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali index 9e9f838607..1eee068cad 100644 --- a/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali +++ b/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali @@ -984,7 +984,7 @@ invoke-virtual {p0, p1}, Landroid/view/Window;->setNavigationBarColor(I)V - invoke-static {p0, p1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p0, p1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V return-void @@ -1006,7 +1006,7 @@ .line 70 invoke-virtual {p0, p1}, Landroid/view/Window;->setNavigationBarColor(I)V - invoke-static {p0, p1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p0, p1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V const/4 p0, 0x1 @@ -1188,7 +1188,7 @@ aput v1, v0, v3 .line 84 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 @@ -1212,7 +1212,7 @@ aput v1, v0, v2 .line 86 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 @@ -2573,7 +2573,7 @@ const/4 v1, 0x3 .line 4 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v2 @@ -2607,7 +2607,7 @@ aput v1, v0, v2 .line 2 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 @@ -2633,7 +2633,7 @@ aput v1, v0, v2 .line 4 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 @@ -2787,7 +2787,7 @@ move-result-object v1 - invoke-static {p1, v1}, Lru/vtosters/lite/hooks/SwitchHook;->setSwitchColors(Landroid/widget/Switch;Landroid/content/Context;)V + invoke-static {p1, v1}, Lru/vtosters/hooks/SwitchHook;->setSwitchColors(Landroid/widget/Switch;Landroid/content/Context;)V return-void @@ -2847,7 +2847,7 @@ move-result-object v1 - invoke-static {p1, v1}, Lru/vtosters/lite/hooks/SwitchHook;->setSwitchCompatColors(Landroidx/appcompat/widget/SwitchCompat;Landroid/content/Context;)V + invoke-static {p1, v1}, Lru/vtosters/hooks/SwitchHook;->setSwitchCompatColors(Landroidx/appcompat/widget/SwitchCompat;Landroid/content/Context;)V return-void diff --git a/smali/smali_classes2/com/vk/core/util/DeviceIdProvider.smali b/smali/smali_classes2/com/vk/core/util/DeviceIdProvider.smali index 1338634e50..ec7ad7efbb 100644 --- a/smali/smali_classes2/com/vk/core/util/DeviceIdProvider.smali +++ b/smali/smali_classes2/com/vk/core/util/DeviceIdProvider.smali @@ -43,7 +43,7 @@ move-result-object p0 - invoke-static {p0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p0}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; move-result-object p0 @@ -193,7 +193,7 @@ move-result-object v0 :cond_1 - invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -222,7 +222,7 @@ monitor-exit v0 - invoke-static {p0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p0}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; move-result-object p0 @@ -271,7 +271,7 @@ monitor-exit v0 - invoke-static {p0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p0}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; move-result-object p0 @@ -441,7 +441,7 @@ monitor-exit v0 - invoke-static {p0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p0}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; move-result-object p0 diff --git a/smali/smali_classes2/com/vk/core/util/DeviceState.smali b/smali/smali_classes2/com/vk/core/util/DeviceState.smali index 9d0072dca4..35f60eddc8 100644 --- a/smali/smali_classes2/com/vk/core/util/DeviceState.smali +++ b/smali/smali_classes2/com/vk/core/util/DeviceState.smali @@ -1081,7 +1081,7 @@ # move-result v0 - invoke-static {}, Lru/vtosters/lite/hooks/NewsfeedHook;->isPowerSaveMode()Z + invoke-static {}, Lru/vtosters/hooks/NewsfeedHook;->isPowerSaveMode()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/core/util/StringUtils.smali b/smali/smali_classes2/com/vk/core/util/StringUtils.smali index 61f3d32ef8..7b6be337cc 100644 --- a/smali/smali_classes2/com/vk/core/util/StringUtils.smali +++ b/smali/smali_classes2/com/vk/core/util/StringUtils.smali @@ -126,7 +126,7 @@ .method public static final a(I)Ljava/lang/String; .locals 6 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortinfo()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->shortinfo()Z move-result v5 @@ -312,7 +312,7 @@ new-array p1, v2, [Ljava/lang/Object; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortinfo()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->shortinfo()Z move-result v5 @@ -392,7 +392,7 @@ if-lt p0, v3, :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortinfo()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->shortinfo()Z move-result v5 diff --git a/smali/smali_classes2/com/vk/core/util/TimeUtils.smali b/smali/smali_classes2/com/vk/core/util/TimeUtils.smali index 989247ef98..4b64c78dc9 100644 --- a/smali/smali_classes2/com/vk/core/util/TimeUtils.smali +++ b/smali/smali_classes2/com/vk/core/util/TimeUtils.smali @@ -1571,7 +1571,7 @@ .param p0, "s" # I .line 17 - invoke-static {}, Lru/vtosters/lite/hooks/DateHook;->fulltime()Z + invoke-static {}, Lru/vtosters/hooks/DateHook;->fulltime()Z move-result v0 @@ -1592,7 +1592,7 @@ .local v0, "d":Ljava/util/Date; new-instance v1, Ljava/text/SimpleDateFormat; - invoke-static {}, Lru/vtosters/lite/hooks/DateHook;->getDateFormat()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/DateHook;->getDateFormat()Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes2/com/vk/core/view/AppBarShadowView.smali b/smali/smali_classes2/com/vk/core/view/AppBarShadowView.smali index 4ba896fbff..cc7ba57037 100644 --- a/smali/smali_classes2/com/vk/core/view/AppBarShadowView.smali +++ b/smali/smali_classes2/com/vk/core/view/AppBarShadowView.smali @@ -233,7 +233,7 @@ if-eqz v0, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->isMonetTheme()Z + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->isMonetTheme()Z move-result v0 @@ -257,7 +257,7 @@ .method private final a(Landroid/view/ViewGroup;)Lcom/google/android/material/appbar/AppBarLayout; .locals 4 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->isMonetTheme()Z + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->isMonetTheme()Z move-result v0 @@ -625,7 +625,7 @@ if-eq v0, p1, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->isMonetTheme()Z + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->isMonetTheme()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/core/view/ArrowSendButton.smali b/smali/smali_classes2/com/vk/core/view/ArrowSendButton.smali index 05910ffa7c..7ff6b3a65e 100644 --- a/smali/smali_classes2/com/vk/core/view/ArrowSendButton.smali +++ b/smali/smali_classes2/com/vk/core/view/ArrowSendButton.smali @@ -131,7 +131,7 @@ invoke-direct {v0, v1}, Landroid/graphics/drawable/ShapeDrawable;->(Landroid/graphics/drawable/shapes/Shape;)V .line 10 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes2/com/vk/core/view/BottomConfirmButton.smali b/smali/smali_classes2/com/vk/core/view/BottomConfirmButton.smali index 0039dcab58..9227401ba1 100644 --- a/smali/smali_classes2/com/vk/core/view/BottomConfirmButton.smali +++ b/smali/smali_classes2/com/vk/core/view/BottomConfirmButton.smali @@ -217,7 +217,7 @@ .line 15 sget v5, Lb/h/z/m;->BottomConfirmButton_bcb_send_bg_color:I - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I # move-result v6 @@ -241,7 +241,7 @@ .line 17 sget v7, Lb/h/z/m;->BottomConfirmButton_bcb_cancel_bg_color:I - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v8 diff --git a/smali/smali_classes2/com/vk/core/view/FitSystemWindowsFragmentWrapperFrameLayout.smali b/smali/smali_classes2/com/vk/core/view/FitSystemWindowsFragmentWrapperFrameLayout.smali index 5df8a85dcc..92e716097a 100644 --- a/smali/smali_classes2/com/vk/core/view/FitSystemWindowsFragmentWrapperFrameLayout.smali +++ b/smali/smali_classes2/com/vk/core/view/FitSystemWindowsFragmentWrapperFrameLayout.smali @@ -153,7 +153,7 @@ .line 15 invoke-virtual {v0, p3}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v0, p3}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, p3}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V :cond_2 return-void diff --git a/smali/smali_classes2/com/vk/core/view/search/ModernSearchView.smali b/smali/smali_classes2/com/vk/core/view/search/ModernSearchView.smali index f0046d5441..bd6693793c 100644 --- a/smali/smali_classes2/com/vk/core/view/search/ModernSearchView.smali +++ b/smali/smali_classes2/com/vk/core/view/search/ModernSearchView.smali @@ -912,7 +912,7 @@ if-eqz p2, :cond_2 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p2 diff --git a/smali/smali_classes2/com/vk/discover/DiscoverFragment.smali b/smali/smali_classes2/com/vk/discover/DiscoverFragment.smali index 9a6e892972..dc20e63e30 100644 --- a/smali/smali_classes2/com/vk/discover/DiscoverFragment.smali +++ b/smali/smali_classes2/com/vk/discover/DiscoverFragment.smali @@ -744,7 +744,7 @@ .line 50 # invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView;->removeItemDecoration(Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;)V - invoke-static {p1, v0}, Lru/vtosters/lite/hooks/NewsfeedHook;->samsungFixRem(Landroidx/recyclerview/widget/RecyclerView;Lcom/vk/discover/DiscoverItemDecorator;)Z + invoke-static {p1, v0}, Lru/vtosters/hooks/NewsfeedHook;->samsungFixRem(Landroidx/recyclerview/widget/RecyclerView;Lcom/vk/discover/DiscoverItemDecorator;)Z move-result v0 @@ -818,7 +818,7 @@ .line 55 # invoke-virtual {p1, v3}, Landroidx/recyclerview/widget/RecyclerView;->addItemDecoration(Landroidx/recyclerview/widget/RecyclerView$ItemDecoration;)V - invoke-static {p1, v3}, Lru/vtosters/lite/hooks/NewsfeedHook;->samsungFixAdd(Landroidx/recyclerview/widget/RecyclerView;Lcom/vk/discover/DiscoverItemDecorator;)Z + invoke-static {p1, v3}, Lru/vtosters/hooks/NewsfeedHook;->samsungFixAdd(Landroidx/recyclerview/widget/RecyclerView;Lcom/vk/discover/DiscoverItemDecorator;)Z move-result v0 diff --git a/smali/smali_classes2/com/vk/dto/account/VideoConfig.smali b/smali/smali_classes2/com/vk/dto/account/VideoConfig.smali index 2596719c71..f933a4b946 100644 --- a/smali/smali_classes2/com/vk/dto/account/VideoConfig.smali +++ b/smali/smali_classes2/com/vk/dto/account/VideoConfig.smali @@ -1210,7 +1210,7 @@ .method public final w1()Z .locals 2 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->isEnableExternalOpening()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->isEnableExternalOpening()Z move-result v1 diff --git a/smali/smali_classes2/com/vk/dto/common/VerifyInfo$b.smali b/smali/smali_classes2/com/vk/dto/common/VerifyInfo$b.smali index 767788930e..54cc9db979 100644 --- a/smali/smali_classes2/com/vk/dto/common/VerifyInfo$b.smali +++ b/smali/smali_classes2/com/vk/dto/common/VerifyInfo$b.smali @@ -125,7 +125,7 @@ .method public final a(Lorg/json/JSONObject;)Lcom/vk/dto/common/VerifyInfo; .locals 4 - invoke-static {p1}, Lru/vtosters/lite/utils/VTVerifications;->VerifyInfo(Lorg/json/JSONObject;)Lcom/vk/dto/common/VerifyInfo; + invoke-static {p1}, Lru/vtosters/hooks/VerificationsHook;->VerifyInfo(Lorg/json/JSONObject;)Lcom/vk/dto/common/VerifyInfo; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/dto/common/VerifyInfo.smali b/smali/smali_classes2/com/vk/dto/common/VerifyInfo.smali index f7b200d32c..a8211bfd83 100644 --- a/smali/smali_classes2/com/vk/dto/common/VerifyInfo.smali +++ b/smali/smali_classes2/com/vk/dto/common/VerifyInfo.smali @@ -178,19 +178,19 @@ .method public final b(Lorg/json/JSONObject;)Lcom/vk/dto/common/VerifyInfo; .locals 3 - invoke-static {p1}, Lru/vtosters/lite/utils/VTVerifications;->isVerified(Lorg/json/JSONObject;)Z + invoke-static {p1}, Lru/vtosters/hooks/VerificationsHook;->isVerified(Lorg/json/JSONObject;)Z move-result v1 iput-boolean v1, p0, Lcom/vk/dto/common/VerifyInfo;->a:Z - invoke-static {p1}, Lru/vtosters/lite/utils/VTVerifications;->hasPrometheus(Lorg/json/JSONObject;)Z + invoke-static {p1}, Lru/vtosters/hooks/VerificationsHook;->hasPrometheus(Lorg/json/JSONObject;)Z move-result v0 iput-boolean v0, p0, Lcom/vk/dto/common/VerifyInfo;->b:Z - invoke-static {p1}, Lru/vtosters/lite/utils/VTVerifications;->hasDeveloper(Lorg/json/JSONObject;)Z + invoke-static {p1}, Lru/vtosters/hooks/VerificationsHook;->hasDeveloper(Lorg/json/JSONObject;)Z move-result v0 diff --git a/smali/smali_classes2/com/vk/dto/feedlikes/FeedLikesResponse$b.smali b/smali/smali_classes2/com/vk/dto/feedlikes/FeedLikesResponse$b.smali index ea7a594d09..3babe4adb4 100644 --- a/smali/smali_classes2/com/vk/dto/feedlikes/FeedLikesResponse$b.smali +++ b/smali/smali_classes2/com/vk/dto/feedlikes/FeedLikesResponse$b.smali @@ -171,7 +171,7 @@ .line 14 :cond_4 - invoke-static {v4}, Lru/vtosters/lite/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; + invoke-static {v4}, Lru/vtosters/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; move-result-object v4 diff --git a/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali b/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali index 4b8a60a7c5..5d75f008c9 100644 --- a/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali +++ b/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali @@ -38,7 +38,7 @@ .method public final a(Lorg/json/JSONObject;)Lcom/vk/dto/menu/MenuResponse; .locals 9 - invoke-static {p1}, Lru/vtosters/lite/hooks/JsonInjectors;->menu(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/JsonInjectors;->menu(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 @@ -55,7 +55,7 @@ if-eqz v0, :cond_1 -# invoke-static {v0}, Lru/vtosters/lite/hooks/DockBarInjector;->injectMenuJSON(Lorg/json/JSONArray;)Lorg/json/JSONArray; +# invoke-static {v0}, Lru/vtosters/hooks/DockBarInjector;->injectMenuJSON(Lorg/json/JSONArray;)Lorg/json/JSONArray; # move-result-object v0 diff --git a/smali/smali_classes2/com/vk/dto/menu/SuperAppMenuResponse$b.smali b/smali/smali_classes2/com/vk/dto/menu/SuperAppMenuResponse$b.smali index 4e64a7b501..116c41f9aa 100644 --- a/smali/smali_classes2/com/vk/dto/menu/SuperAppMenuResponse$b.smali +++ b/smali/smali_classes2/com/vk/dto/menu/SuperAppMenuResponse$b.smali @@ -181,7 +181,7 @@ .method public final a(Lorg/json/JSONObject;)Lcom/vk/dto/menu/SuperAppMenuResponse; .locals 9 - invoke-static {p1}, Lru/vtosters/lite/hooks/JsonInjectors;->superapp(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/JsonInjectors;->superapp(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/dto/music/MusicTrack.smali b/smali/smali_classes2/com/vk/dto/music/MusicTrack.smali index d2ba4e7b89..305fefbf55 100644 --- a/smali/smali_classes2/com/vk/dto/music/MusicTrack.smali +++ b/smali/smali_classes2/com/vk/dto/music/MusicTrack.smali @@ -2992,7 +2992,7 @@ move-result-object v3 - invoke-static {v2, v3}, Lru/vtosters/lite/utils/Preferences;->getBoolValue(Ljava/lang/String;Ljava/lang/Boolean;)Z + invoke-static {v2, v3}, Lru/vtosters/hooks/other/Preferences;->getBoolValue(Ljava/lang/String;Ljava/lang/Boolean;)Z move-result v3 diff --git a/smali/smali_classes2/com/vk/dto/newsfeed/Owner$b.smali b/smali/smali_classes2/com/vk/dto/newsfeed/Owner$b.smali index d2a6bda7ef..e167a7b170 100644 --- a/smali/smali_classes2/com/vk/dto/newsfeed/Owner$b.smali +++ b/smali/smali_classes2/com/vk/dto/newsfeed/Owner$b.smali @@ -131,7 +131,7 @@ .method public final a(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/Owner; .locals 10 - invoke-static {p1}, Lru/vtosters/lite/utils/RenameTool;->injectIntoJsonGroup(Lorg/json/JSONObject;)V + invoke-static {p1}, Lru/vtosters/hooks/RenameHook;->injectIntoJsonGroup(Lorg/json/JSONObject;)V .line 3 new-instance v9, Lcom/vk/dto/newsfeed/Owner; @@ -225,7 +225,7 @@ .method public final b(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/Owner; .locals 10 - invoke-static {p1}, Lru/vtosters/lite/utils/RenameTool;->injectIntoJsonGroup(Lorg/json/JSONObject;)V + invoke-static {p1}, Lru/vtosters/hooks/RenameHook;->injectIntoJsonGroup(Lorg/json/JSONObject;)V .line 1 new-instance v9, Lcom/vk/dto/newsfeed/Owner; @@ -427,7 +427,7 @@ .method public final c(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/Owner; .locals 10 - invoke-static {p1}, Lru/vtosters/lite/utils/RenameTool;->injectIntoJsonGroup(Lorg/json/JSONObject;)V + invoke-static {p1}, Lru/vtosters/hooks/RenameHook;->injectIntoJsonGroup(Lorg/json/JSONObject;)V .line 1 new-instance v9, Lcom/vk/dto/newsfeed/Owner; diff --git a/smali/smali_classes2/com/vk/dto/stickers/StickerItem$b.smali b/smali/smali_classes2/com/vk/dto/stickers/StickerItem$b.smali index 2b603e1ba6..802a82b7b7 100644 --- a/smali/smali_classes2/com/vk/dto/stickers/StickerItem$b.smali +++ b/smali/smali_classes2/com/vk/dto/stickers/StickerItem$b.smali @@ -47,7 +47,7 @@ const-string v0, "images" - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getBackgroundStickers()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getBackgroundStickers()Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/dto/stories/GeoNewsResponse$a1.smali b/smali/smali_classes2/com/vk/dto/stories/GeoNewsResponse$a1.smali index a5c8559d48..2ebea9ec1c 100644 --- a/smali/smali_classes2/com/vk/dto/stories/GeoNewsResponse$a1.smali +++ b/smali/smali_classes2/com/vk/dto/stories/GeoNewsResponse$a1.smali @@ -235,7 +235,7 @@ .line 20 :cond_5 - invoke-static {v11}, Lru/vtosters/lite/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; + invoke-static {v11}, Lru/vtosters/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; move-result-object v11 diff --git a/smali/smali_classes2/com/vk/dto/stories/model/GetStoriesResponse.smali b/smali/smali_classes2/com/vk/dto/stories/model/GetStoriesResponse.smali index 6f4d03c4ac..dcac73e48d 100644 --- a/smali/smali_classes2/com/vk/dto/stories/model/GetStoriesResponse.smali +++ b/smali/smali_classes2/com/vk/dto/stories/model/GetStoriesResponse.smali @@ -208,7 +208,7 @@ .method public constructor (Lorg/json/JSONObject;Z)V .locals 7 - invoke-static {p1, p2}, Lru/vtosters/lite/hooks/AdBlockHook;->storiesads(Lorg/json/JSONObject;Z)Lorg/json/JSONObject; + invoke-static {p1, p2}, Lru/vtosters/hooks/AdBlockHook;->storiesads(Lorg/json/JSONObject;Z)Lorg/json/JSONObject; move-result-object p1 @@ -313,7 +313,7 @@ invoke-static {v5, v6, v2, v3}, Lcom/vk/dto/stories/model/GetStoriesResponse;->a(Lorg/json/JSONArray;Ljava/util/Collection;Landroid/util/SparseArray;Landroid/util/SparseArray;)V - invoke-static {}, Lru/vtosters/lite/hooks/StoriesHook;->ads()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/StoriesHook;->ads()Ljava/lang/String; move-result-object v5 @@ -398,7 +398,7 @@ const v0, 0x0 - invoke-static {p1, v0}, Lru/vtosters/lite/hooks/AdBlockHook;->storiesads(Lorg/json/JSONObject;Z)Lorg/json/JSONObject; + invoke-static {p1, v0}, Lru/vtosters/hooks/AdBlockHook;->storiesads(Lorg/json/JSONObject;Z)Lorg/json/JSONObject; move-result-object p1 @@ -503,7 +503,7 @@ invoke-static {v5, v6, v2, v3}, Lcom/vk/dto/stories/model/GetStoriesResponse;->a(Lorg/json/JSONArray;Ljava/util/Collection;Landroid/util/SparseArray;Landroid/util/SparseArray;)V - invoke-static {}, Lru/vtosters/lite/hooks/StoriesHook;->ads()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/StoriesHook;->ads()Ljava/lang/String; move-result-object v5 diff --git a/smali/smali_classes2/com/vk/dto/user/UserProfile.smali b/smali/smali_classes2/com/vk/dto/user/UserProfile.smali index 98426b373b..ee5b79ac7f 100644 --- a/smali/smali_classes2/com/vk/dto/user/UserProfile.smali +++ b/smali/smali_classes2/com/vk/dto/user/UserProfile.smali @@ -1215,7 +1215,7 @@ } .end annotation - invoke-static/range {p1 .. p1}, Lru/vtosters/lite/utils/RenameTool;->injectIntoJson(Lorg/json/JSONObject;)V + invoke-static/range {p1 .. p1}, Lru/vtosters/hooks/RenameHook;->injectIntoJson(Lorg/json/JSONObject;)V move-object/from16 v0, p0 diff --git a/smali/smali_classes2/com/vk/dto/user/VisibleStatus.smali b/smali/smali_classes2/com/vk/dto/user/VisibleStatus.smali index 24263ac365..aa0d8777a6 100644 --- a/smali/smali_classes2/com/vk/dto/user/VisibleStatus.smali +++ b/smali/smali_classes2/com/vk/dto/user/VisibleStatus.smali @@ -342,7 +342,7 @@ .line 1 iget v1, p0, Lcom/vk/dto/user/VisibleStatus;->c:I - invoke-static {v1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->getOnline(I)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/OnlineFormatterHook;->getOnline(I)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/emoji/Emoji.smali b/smali/smali_classes2/com/vk/emoji/Emoji.smali index 2e955ffe51..c21cf371c0 100644 --- a/smali/smali_classes2/com/vk/emoji/Emoji.smali +++ b/smali/smali_classes2/com/vk/emoji/Emoji.smali @@ -832,7 +832,7 @@ .method public a(Ljava/lang/CharSequence;II)Ljava/lang/CharSequence; .locals 8 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->systememoji()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->systememoji()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/extensions/ActivityExt.smali b/smali/smali_classes2/com/vk/extensions/ActivityExt.smali index 8949bf9f6e..7a2ccf767e 100644 --- a/smali/smali_classes2/com/vk/extensions/ActivityExt.smali +++ b/smali/smali_classes2/com/vk/extensions/ActivityExt.smali @@ -223,7 +223,7 @@ invoke-virtual {p0, p1}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {p0, p1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p0, p1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V .line 6 :cond_0 diff --git a/smali/smali_classes2/com/vk/friends/recommendations/FriendsRecommendationsFragment.smali b/smali/smali_classes2/com/vk/friends/recommendations/FriendsRecommendationsFragment.smali index 5b2047f89d..3626428bdc 100644 --- a/smali/smali_classes2/com/vk/friends/recommendations/FriendsRecommendationsFragment.smali +++ b/smali/smali_classes2/com/vk/friends/recommendations/FriendsRecommendationsFragment.smali @@ -881,7 +881,7 @@ const-string v1, "com.google" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali b/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali index ffb511dc6a..9645964b9d 100644 --- a/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali +++ b/smali/smali_classes2/com/vk/httpexecutor/core/HttpRequestExecutorProvider.smali @@ -275,7 +275,7 @@ const-string v3, "api.vk.com" - invoke-static {v3}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes2/com/vk/identity/adapters/IdentityLabelAdapter$LabelHolder.smali b/smali/smali_classes2/com/vk/identity/adapters/IdentityLabelAdapter$LabelHolder.smali index d1e122ef4b..3298125696 100644 --- a/smali/smali_classes2/com/vk/identity/adapters/IdentityLabelAdapter$LabelHolder.smali +++ b/smali/smali_classes2/com/vk/identity/adapters/IdentityLabelAdapter$LabelHolder.smali @@ -125,7 +125,7 @@ move-result-object v1 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes2/com/vk/im/engine/commands/chats/ChatsJoinByLinkCmd.smali b/smali/smali_classes2/com/vk/im/engine/commands/chats/ChatsJoinByLinkCmd.smali index 7021a9727b..c4f74c243e 100644 --- a/smali/smali_classes2/com/vk/im/engine/commands/chats/ChatsJoinByLinkCmd.smali +++ b/smali/smali_classes2/com/vk/im/engine/commands/chats/ChatsJoinByLinkCmd.smali @@ -78,7 +78,7 @@ check-cast p1, Ljava/lang/Integer; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes2/com/vk/im/engine/commands/chats/ChatsLoadPreviewCmd.smali b/smali/smali_classes2/com/vk/im/engine/commands/chats/ChatsLoadPreviewCmd.smali index 4f2f69e25d..abb09782bc 100644 --- a/smali/smali_classes2/com/vk/im/engine/commands/chats/ChatsLoadPreviewCmd.smali +++ b/smali/smali_classes2/com/vk/im/engine/commands/chats/ChatsLoadPreviewCmd.smali @@ -97,7 +97,7 @@ check-cast p1, Lcom/vk/im/engine/models/chats/ChatPreview; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/commands/messages/MsgMarkAsListenedViaBgCmd.smali b/smali/smali_classes3/com/vk/im/engine/commands/messages/MsgMarkAsListenedViaBgCmd.smali index feddb49ca6..664d6972f2 100644 --- a/smali/smali_classes3/com/vk/im/engine/commands/messages/MsgMarkAsListenedViaBgCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/commands/messages/MsgMarkAsListenedViaBgCmd.smali @@ -49,7 +49,7 @@ .method public a(Lcom/vk/im/engine/ImEnvironment;)V .locals 4 - invoke-static {}, Lru/vtosters/lite/dialogs/DNRPrefs;->getVoiceListened()Z + invoke-static {}, Lru/vtosters/hooks/VoiceMessagesHook;->getVoiceListened()Z move-result v1 diff --git a/smali/smali_classes3/com/vk/im/engine/commands/messages/MsgMarkAsReadViaBgCmd.smali b/smali/smali_classes3/com/vk/im/engine/commands/messages/MsgMarkAsReadViaBgCmd.smali index bf9b7b5a69..e9be4c9c91 100644 --- a/smali/smali_classes3/com/vk/im/engine/commands/messages/MsgMarkAsReadViaBgCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/commands/messages/MsgMarkAsReadViaBgCmd.smali @@ -226,7 +226,7 @@ iget v0, p0, Lcom/vk/im/engine/commands/messages/MsgMarkAsReadViaBgCmd;->b:I - invoke-static {v0}, Lru/vtosters/lite/dialogs/DNRModule;->isDnrEnabledFor(I)Z + invoke-static {v0}, Lru/vtosters/hooks/MessagesActivityHook;->isDnrEnabledFor(I)Z move-result v0 diff --git a/smali/smali_classes3/com/vk/im/engine/commands/messages/SetUserActivityCmd.smali b/smali/smali_classes3/com/vk/im/engine/commands/messages/SetUserActivityCmd.smali index d25d12907b..6f4b5a82a9 100644 --- a/smali/smali_classes3/com/vk/im/engine/commands/messages/SetUserActivityCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/commands/messages/SetUserActivityCmd.smali @@ -157,7 +157,7 @@ .line 10 iget v1, p0, Lcom/vk/im/engine/commands/messages/SetUserActivityCmd;->b:I - invoke-static {v1}, Lru/vtosters/lite/dialogs/DNRModule;->isDntEnabledFor(I)Z + invoke-static {v1}, Lru/vtosters/hooks/MessagesActivityHook;->isDntEnabledFor(I)Z move-result v2 @@ -187,7 +187,7 @@ .line 13 invoke-virtual {p1, p2}, Lcom/vk/api/sdk/VKApiManager;->a(Lcom/vk/api/sdk/VKMethodCall;)V - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-void .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesConversationBarCallbackApiCmd.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesConversationBarCallbackApiCmd.smali index fa2b75f671..4e7efdb845 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesConversationBarCallbackApiCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesConversationBarCallbackApiCmd.smali @@ -90,7 +90,7 @@ move-result-object p1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesExistsApiCmd.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesExistsApiCmd.smali index 54afbaedaf..9302fb8454 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesExistsApiCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesExistsApiCmd.smali @@ -151,7 +151,7 @@ goto :goto_0 :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object v0 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetByIdApiCmd.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetByIdApiCmd.smali index 2a386362f6..d145232f88 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetByIdApiCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetByIdApiCmd.smali @@ -178,7 +178,7 @@ goto :goto_0 :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object v0 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationMembersApiCmd$a.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationMembersApiCmd$a.smali index 60e4211ecf..95679f6629 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationMembersApiCmd$a.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationMembersApiCmd$a.smali @@ -50,7 +50,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd$a.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd$a.smali index 612d5d6a80..8853b86214 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd$a.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd$a.smali @@ -50,7 +50,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 const-string v0, "items" diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd.smali index bc4e2b2dc4..287e6d5810 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd.smali @@ -324,7 +324,7 @@ check-cast p1, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd$b; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd$a.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd$a.smali index 223f4072f2..6605ab7146 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd$a.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd$a.smali @@ -50,7 +50,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd.smali index 817194990f..138538fb33 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd.smali @@ -122,7 +122,7 @@ check-cast p1, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd$b; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetCountersApiCmd.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetCountersApiCmd.smali index 0883dae527..d246919b98 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetCountersApiCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetCountersApiCmd.smali @@ -76,7 +76,7 @@ check-cast p1, Lcom/vk/im/engine/models/messages/MsgCounters; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd.smali index 49fd4ea646..155ebec72f 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd.smali @@ -354,7 +354,7 @@ .line 20 invoke-direct/range {v4 .. v9}, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd$e;->(Lcom/vk/im/engine/models/dialogs/DialogApiModel;Ljava/util/List;ZZLcom/vk/im/engine/models/ProfilesSimpleInfo;)V - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object v0 .end method @@ -498,7 +498,7 @@ .line 18 invoke-direct/range {v0 .. v5}, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd$e;->(Lcom/vk/im/engine/models/dialogs/DialogApiModel;Ljava/util/List;ZZLcom/vk/im/engine/models/ProfilesSimpleInfo;)V - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object v6 .end method @@ -663,7 +663,7 @@ .line 19 invoke-direct/range {v4 .. v9}, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd$e;->(Lcom/vk/im/engine/models/dialogs/DialogApiModel;Ljava/util/List;ZZLcom/vk/im/engine/models/ProfilesSimpleInfo;)V - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object v0 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali index a35777d053..60a7158c41 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali @@ -55,7 +55,7 @@ .line 4 iget v1, p0, Lcom/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd;->a:I - invoke-static {v1}, Lru/vtosters/lite/dialogs/DNRModule;->isDnrEnabledFor(I)Z + invoke-static {v1}, Lru/vtosters/hooks/MessagesActivityHook;->isDnrEnabledFor(I)Z move-result v3 @@ -100,7 +100,7 @@ move-result-object p1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object p1 @@ -113,7 +113,7 @@ move-result-object p1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesSendApiCmd.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesSendApiCmd.smali index 9254c40487..d81323cd3f 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesSendApiCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesSendApiCmd.smali @@ -249,7 +249,7 @@ :goto_2 if-eqz v8, :cond_7 - invoke-static {p1}, Lru/vtosters/lite/encryption/EncryptProvider;->encryptMessage(Lcom/vk/im/engine/models/messages/MsgFromUser;)Ljava/lang/String; + invoke-static {p1}, Lru/vtosters/hooks/EncryptionMessagesHook;->encryptMessage(Lcom/vk/im/engine/models/messages/MsgFromUser;)Ljava/lang/String; move-result-object v8 @@ -805,7 +805,7 @@ # .line 18 # :cond_4 - invoke-static {v0}, Lru/vtosters/lite/hooks/MessagesHook;->injRequest(Lcom/vk/api/internal/MethodCall$a;)V + invoke-static {v0}, Lru/vtosters/hooks/MessagesHook;->injRequest(Lcom/vk/api/internal/MethodCall$a;)V iget-boolean v1, p0, Lcom/vk/im/engine/internal/api_commands/messages/MessagesSendApiCmd;->f:Z @@ -828,7 +828,7 @@ check-cast p1, Ljava/lang/Integer; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MsgBotBtnSendEventApiCmd1.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MsgBotBtnSendEventApiCmd1.smali index 22ae3007d3..80fed89db7 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MsgBotBtnSendEventApiCmd1.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MsgBotBtnSendEventApiCmd1.smali @@ -106,7 +106,7 @@ check-cast p1, Ljava/lang/String; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/RecogniseAudioMessageApiCmd.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/RecogniseAudioMessageApiCmd.smali index 66bd13c698..f689b8e94d 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/RecogniseAudioMessageApiCmd.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/RecogniseAudioMessageApiCmd.smali @@ -112,7 +112,7 @@ move-result-object p1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali index 14d6e4c53e..86e04f0d8a 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali @@ -4015,7 +4015,7 @@ const-string v4, "images" - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getBackgroundStickers()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getBackgroundStickers()Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/ConversationParser$a.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/ConversationParser$a.smali index 8668d3651e..c7d806c4eb 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/ConversationParser$a.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/ConversationParser$a.smali @@ -622,7 +622,7 @@ move-result-object v4 - invoke-static {v1}, Lru/vtosters/lite/ssfs/ImBanner;->convBar(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {v1}, Lru/vtosters/hooks/ssfs/BannerHook;->convBar(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object v6 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/GroupApiParser.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/GroupApiParser.smali index 9f673e9019..988b47eadb 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/GroupApiParser.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/GroupApiParser.smali @@ -140,7 +140,7 @@ move-object/from16 v0, p1 - invoke-static {v0}, Lru/vtosters/lite/utils/RenameTool;->injectIntoJsonGroup(Lorg/json/JSONObject;)V + invoke-static {v0}, Lru/vtosters/hooks/RenameHook;->injectIntoJsonGroup(Lorg/json/JSONObject;)V const-string v2, "online_status" diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/LpAttachApiParser.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/LpAttachApiParser.smali index e618a8cfb4..e5c3d7bc8c 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/LpAttachApiParser.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/LpAttachApiParser.smali @@ -622,7 +622,7 @@ const-string v4, "images" - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getBackgroundStickers()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getBackgroundStickers()Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/UserApiParser.smali b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/UserApiParser.smali index c1055a60cf..b3c4bec309 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/UserApiParser.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/api_parsers/UserApiParser.smali @@ -162,7 +162,7 @@ move-object/from16 v0, p1 - invoke-static {v0}, Lru/vtosters/lite/utils/RenameTool;->injectIntoJson(Lorg/json/JSONObject;)V + invoke-static {v0}, Lru/vtosters/hooks/RenameHook;->injectIntoJson(Lorg/json/JSONObject;)V const-string v2, "" diff --git a/smali/smali_classes3/com/vk/im/engine/internal/f/c/BusinessNotifyConfigGetApiCmd$a.smali b/smali/smali_classes3/com/vk/im/engine/internal/f/c/BusinessNotifyConfigGetApiCmd$a.smali index 4625acacbb..28e0440a43 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/f/c/BusinessNotifyConfigGetApiCmd$a.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/f/c/BusinessNotifyConfigGetApiCmd$a.smali @@ -80,7 +80,7 @@ move-result p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/BusinessNotifHook;->hook(Z)Z + invoke-static {p1}, Lru/vtosters/hooks/BusinessNotifHook;->hook(Z)Z move-result p1 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImGetLongPollHistoryExtendedApiCmd$b.smali b/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImGetLongPollHistoryExtendedApiCmd$b.smali index 538b15e962..54a01be024 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImGetLongPollHistoryExtendedApiCmd$b.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImGetLongPollHistoryExtendedApiCmd$b.smali @@ -123,7 +123,7 @@ move v1, p10 - invoke-static {v1}, Lru/vtosters/lite/hooks/BusinessNotifHook;->hook(Z)Z + invoke-static {v1}, Lru/vtosters/hooks/BusinessNotifHook;->hook(Z)Z move-result v1 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImGetLongPollHistoryExtendedApiCmd$c.smali b/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImGetLongPollHistoryExtendedApiCmd$c.smali index 9bb6e0fb0f..8382ccf749 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImGetLongPollHistoryExtendedApiCmd$c.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImGetLongPollHistoryExtendedApiCmd$c.smali @@ -167,7 +167,7 @@ move-result v0 - invoke-static {v0}, Lru/vtosters/lite/hooks/BusinessNotifHook;->hook(Z)Z + invoke-static {v0}, Lru/vtosters/hooks/BusinessNotifHook;->hook(Z)Z move-result v0 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImLpInitApiCmd$d.smali b/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImLpInitApiCmd$d.smali index fc64a357f6..eb7a8944f9 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImLpInitApiCmd$d.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/f/e/ExecuteImLpInitApiCmd$d.smali @@ -140,7 +140,7 @@ move-result p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/BusinessNotifHook;->hook(Z)Z + invoke-static {p1}, Lru/vtosters/hooks/BusinessNotifHook;->hook(Z)Z move-result p1 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/f/h/UsersGetByIdApiCmd$b.smali b/smali/smali_classes3/com/vk/im/engine/internal/f/h/UsersGetByIdApiCmd$b.smali index 5c7dfa3bec..94188a29e9 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/f/h/UsersGetByIdApiCmd$b.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/f/h/UsersGetByIdApiCmd$b.smali @@ -64,7 +64,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->onlineHookList(Lorg/json/JSONArray;)Lorg/json/JSONArray; + invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookList(Lorg/json/JSONArray;)Lorg/json/JSONArray; move-result-object p1 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgMarkAsReadJob.smali b/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgMarkAsReadJob.smali index bd1519f8a0..88df656bba 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgMarkAsReadJob.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgMarkAsReadJob.smali @@ -68,7 +68,7 @@ iget v0, p0, Lcom/vk/im/engine/internal/jobs/msg/MsgMarkAsReadJob;->b:I - invoke-static {v0}, Lru/vtosters/lite/dialogs/DNRModule;->isDnrEnabledFor(I)Z + invoke-static {v0}, Lru/vtosters/hooks/MessagesActivityHook;->isDnrEnabledFor(I)Z move-result v3 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgSendMultipleJob.smali b/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgSendMultipleJob.smali index 1070a2641e..52e3f95cfc 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgSendMultipleJob.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgSendMultipleJob.smali @@ -243,13 +243,13 @@ const-string v1, "message" - invoke-static {v0}, Lru/vtosters/lite/hooks/MessagesHook;->injectOwnText(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/MessagesHook;->injectOwnText(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 invoke-virtual {p2, v1, v0}, Lcom/vk/api/internal/MethodCall$a;->a(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/internal/MethodCall$a; - invoke-static {p2}, Lru/vtosters/lite/hooks/MessagesHook;->injRequest(Lcom/vk/api/internal/MethodCall$a;)V + invoke-static {p2}, Lru/vtosters/hooks/MessagesHook;->injRequest(Lcom/vk/api/internal/MethodCall$a;)V .line 6 invoke-interface {p1}, Lcom/vk/im/engine/ImEnvironment;->m0()I @@ -298,7 +298,7 @@ invoke-virtual {p1, p2}, Lcom/vk/api/sdk/VKApiManager;->a(Lcom/vk/api/sdk/VKMethodCall;)V - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-void .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgSendUncheckedJob.smali b/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgSendUncheckedJob.smali index fab14c633e..07ba330450 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgSendUncheckedJob.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/jobs/msg/MsgSendUncheckedJob.smali @@ -120,13 +120,13 @@ const-string v1, "message" - invoke-static {v0}, Lru/vtosters/lite/hooks/MessagesHook;->injectOwnText(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/MessagesHook;->injectOwnText(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 invoke-virtual {p2, v1, v0}, Lcom/vk/api/internal/MethodCall$a;->a(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/internal/MethodCall$a; - invoke-static {p2}, Lru/vtosters/lite/hooks/MessagesHook;->injRequest(Lcom/vk/api/internal/MethodCall$a;)V + invoke-static {p2}, Lru/vtosters/hooks/MessagesHook;->injRequest(Lcom/vk/api/internal/MethodCall$a;)V .line 6 iget-object v0, p0, Lcom/vk/im/engine/internal/jobs/msg/MsgSendUncheckedJob;->d:Ljava/lang/String; @@ -176,7 +176,7 @@ invoke-virtual {p1, p2}, Lcom/vk/api/sdk/VKApiManager;->a(Lcom/vk/api/sdk/VKMethodCall;)V - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-void .end method diff --git a/smali/smali_classes3/com/vk/im/engine/internal/longpoll/tasks/MsgDeleteLpTask.smali b/smali/smali_classes3/com/vk/im/engine/internal/longpoll/tasks/MsgDeleteLpTask.smali index e98d408a7d..eea3ba37a5 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/longpoll/tasks/MsgDeleteLpTask.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/longpoll/tasks/MsgDeleteLpTask.smali @@ -59,7 +59,7 @@ .method protected b(Lcom/vk/im/engine/internal/longpoll/LongPollChanges;)V .locals 2 - invoke-static {}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->hook()Z + invoke-static {}, Lru/vtosters/hooks/DeletedMessagesHook;->hook()Z move-result v0 @@ -86,13 +86,13 @@ .method protected b(Lcom/vk/im/engine/internal/longpoll/LongPollEntityInfo;)V .locals 3 - invoke-static {}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->hook()Z + invoke-static {}, Lru/vtosters/hooks/DeletedMessagesHook;->hook()Z move-result v0 if-eqz v0, :cond_a - invoke-static {p0}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->updateDialog(Lcom/vk/im/engine/internal/longpoll/tasks/MsgDeleteLpTask;)V + invoke-static {p0}, Lru/vtosters/hooks/DeletedMessagesHook;->updateDialog(Lcom/vk/im/engine/internal/longpoll/tasks/MsgDeleteLpTask;)V return-void @@ -142,9 +142,9 @@ .method protected b(Lcom/vk/im/engine/internal/longpoll/LongPollEntityInfo;Lcom/vk/im/engine/internal/longpoll/LongPollEntityMissed;)V .locals 1 - invoke-static {p0}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->hookDeletedMessageId(Lcom/vk/im/engine/internal/longpoll/tasks/MsgDeleteLpTask;)V + invoke-static {p0}, Lru/vtosters/hooks/DeletedMessagesHook;->hookDeletedMessageId(Lcom/vk/im/engine/internal/longpoll/tasks/MsgDeleteLpTask;)V - invoke-static {}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->hook()Z + invoke-static {}, Lru/vtosters/hooks/DeletedMessagesHook;->hook()Z move-result v0 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/storage/delegates/messages/MsgDbReader.smali b/smali/smali_classes3/com/vk/im/engine/internal/storage/delegates/messages/MsgDbReader.smali index e0dd372ffb..a352848143 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/storage/delegates/messages/MsgDbReader.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/storage/delegates/messages/MsgDbReader.smali @@ -821,7 +821,7 @@ invoke-virtual {v0, p1}, Lcom/vk/im/engine/models/messages/Msg;->j(I)V - invoke-static {v0}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->setBodyDBParser(Lcom/vk/im/engine/models/messages/Msg;)V + invoke-static {v0}, Lru/vtosters/hooks/DeletedMessagesHook;->setBodyDBParser(Lcom/vk/im/engine/models/messages/Msg;)V return-object v0 diff --git a/smali/smali_classes3/com/vk/im/engine/internal/storage/delegates/messages/MsgStorageManager.smali b/smali/smali_classes3/com/vk/im/engine/internal/storage/delegates/messages/MsgStorageManager.smali index 13e2726916..efe193b96f 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/storage/delegates/messages/MsgStorageManager.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/storage/delegates/messages/MsgStorageManager.smali @@ -26,7 +26,7 @@ iput-object p1, p0, Lcom/vk/im/engine/internal/storage/delegates/messages/MsgStorageManager;->b:Lcom/vk/im/engine/internal/storage/StorageEnvironment; - invoke-static {p1}, Lru/vtosters/lite/utils/DeletedMessagesHandler;->grabVKDatabase(Lcom/vk/im/engine/internal/storage/StorageEnvironment;)V + invoke-static {p1}, Lru/vtosters/hooks/DeletedMessagesHook;->grabVKDatabase(Lcom/vk/im/engine/internal/storage/StorageEnvironment;)V .line 2 new-instance p1, Lcom/vk/im/engine/internal/storage/memcache/StorageMemCacheByIdHelper; diff --git a/smali/smali_classes3/com/vk/im/engine/internal/upload/VideoUploader.smali b/smali/smali_classes3/com/vk/im/engine/internal/upload/VideoUploader.smali index d4fe35cb8c..9a5c1fb032 100644 --- a/smali/smali_classes3/com/vk/im/engine/internal/upload/VideoUploader.smali +++ b/smali/smali_classes3/com/vk/im/engine/internal/upload/VideoUploader.smali @@ -1266,7 +1266,7 @@ const/16 v5, 0x5a - invoke-static {v5}, Lru/vtosters/lite/utils/Preferences;->compress(I)I + invoke-static {v5}, Lru/vtosters/hooks/other/Preferences;->compress(I)I move-result v5 diff --git a/smali/smali_classes3/com/vk/im/engine/models/messages/MsgFromUser.smali b/smali/smali_classes3/com/vk/im/engine/models/messages/MsgFromUser.smali index 3e4b924fa6..6c671130fd 100644 --- a/smali/smali_classes3/com/vk/im/engine/models/messages/MsgFromUser.smali +++ b/smali/smali_classes3/com/vk/im/engine/models/messages/MsgFromUser.smali @@ -672,7 +672,7 @@ iput-object v0, p0, Lcom/vk/im/engine/models/messages/MsgFromUser;->W:Ljava/lang/String; - invoke-static {p1}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Lcom/vk/im/engine/models/messages/MsgFromUser;)Ljava/lang/String; + invoke-static {p1}, Lru/vtosters/hooks/EncryptionMessagesHook;->decryptMessage(Lcom/vk/im/engine/models/messages/MsgFromUser;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes3/com/vk/im/ui/components/attaches_history/attaches/adapter/delegates/DocAttachViewTypeDelegate.smali b/smali/smali_classes3/com/vk/im/ui/components/attaches_history/attaches/adapter/delegates/DocAttachViewTypeDelegate.smali index 80df698b6b..a620397e9a 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/attaches_history/attaches/adapter/delegates/DocAttachViewTypeDelegate.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/attaches_history/attaches/adapter/delegates/DocAttachViewTypeDelegate.smali @@ -45,7 +45,7 @@ invoke-direct {p1, v0}, Ljava/text/SimpleDateFormat;->(Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/hooks/DateHook;->setDateFormat()Ljava/text/SimpleDateFormat; + invoke-static {}, Lru/vtosters/hooks/DateHook;->setDateFormat()Ljava/text/SimpleDateFormat; move-result-object p1 diff --git a/smali/smali_classes3/com/vk/im/ui/components/audio_msg_player/AudioMsgPlayerVc.smali b/smali/smali_classes3/com/vk/im/ui/components/audio_msg_player/AudioMsgPlayerVc.smali index f16a10726a..78db6f6dac 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/audio_msg_player/AudioMsgPlayerVc.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/audio_msg_player/AudioMsgPlayerVc.smali @@ -327,7 +327,7 @@ .line 30 iget-object p3, p0, Lcom/vk/im/ui/components/audio_msg_player/AudioMsgPlayerVc;->a:Landroid/content/Context; - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p3 diff --git a/smali/smali_classes3/com/vk/im/ui/components/contacts/vc/contact/ContactVh.smali b/smali/smali_classes3/com/vk/im/ui/components/contacts/vc/contact/ContactVh.smali index 9b1f08e647..740e17f7d4 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/contacts/vc/contact/ContactVh.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/contacts/vc/contact/ContactVh.smali @@ -174,7 +174,7 @@ invoke-static {p2, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p2 diff --git a/smali/smali_classes3/com/vk/im/ui/components/dialog_header/actions/DialogHeaderActionsComponent$copyToClipboard$1.smali b/smali/smali_classes3/com/vk/im/ui/components/dialog_header/actions/DialogHeaderActionsComponent$copyToClipboard$1.smali index 64267b6746..731f292f05 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/dialog_header/actions/DialogHeaderActionsComponent$copyToClipboard$1.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/dialog_header/actions/DialogHeaderActionsComponent$copyToClipboard$1.smali @@ -67,7 +67,7 @@ const v2, 0x0 - invoke-static {p1, v1, v2}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessages(Ljava/lang/String;IZ)Ljava/lang/String; + invoke-static {p1, v1, v2}, Lru/vtosters/hooks/EncryptionMessagesHook;->decryptMessages(Ljava/lang/String;IZ)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes3/com/vk/im/ui/components/dialog_header/info/DialogHeaderInfoComponent.smali b/smali/smali_classes3/com/vk/im/ui/components/dialog_header/info/DialogHeaderInfoComponent.smali index aca233f246..9a4d3443f5 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/dialog_header/info/DialogHeaderInfoComponent.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/dialog_header/info/DialogHeaderInfoComponent.smali @@ -440,7 +440,7 @@ move-result-object v3 - invoke-static {v0, v3}, Lru/vtosters/lite/dialogs/DialogHeaderInjector;->injectToListAccess(Ljava/util/List;Lcom/vk/im/engine/models/dialogs/Dialog;)Ljava/util/List; + invoke-static {v0, v3}, Lru/vtosters/hooks/DialogHeaderInjector;->injectToListAccess(Ljava/util/List;Lcom/vk/im/engine/models/dialogs/Dialog;)Ljava/util/List; move-result-object v0 diff --git a/smali/smali_classes3/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc$1.smali b/smali/smali_classes3/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc$1.smali index 8edb3859dc..8788db5bd8 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc$1.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc$1.smali @@ -54,13 +54,7 @@ move-result p1 - const-string v0, "id" - - const-string v1, "msgupdate" - - invoke-static {v1, v0}, Lru/vtosters/lite/utils/AndroidUtils;->getIdentifier(Ljava/lang/String;Ljava/lang/String;)I - - move-result v0 + const v0, 0x7f0a1016 ## "msgupdate" if-ne p1, v0, :cond_2 diff --git a/smali/smali_classes3/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc.smali b/smali/smali_classes3/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc.smali index 98cffc1e19..9919cdddc5 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc.smali @@ -260,7 +260,7 @@ .locals 0 .line 1 - invoke-static {}, Lru/vtosters/lite/utils/AccountManagerUtils;->reloadMSG()V + invoke-static {}, Lru/vtosters/hooks/MessagesHook;->reloadMessages()V return-void .end method diff --git a/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/v/DialogsListModels5.smali b/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/v/DialogsListModels5.smali index a90b802cee..0581054c22 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/v/DialogsListModels5.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/v/DialogsListModels5.smali @@ -78,7 +78,7 @@ iput p4, p0, Lcom/vk/im/ui/components/dialogs_list/v/DialogsListModels5;->d:I - invoke-static {p5}, Lru/vtosters/lite/hooks/BusinessNotifHook;->hook(Z)Z + invoke-static {p5}, Lru/vtosters/hooks/BusinessNotifHook;->hook(Z)Z move-result p5 diff --git a/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/DialogsListAdapter.smali b/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/DialogsListAdapter.smali index 8646c8f6c1..a256f83550 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/DialogsListAdapter.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/DialogsListAdapter.smali @@ -277,7 +277,7 @@ move-result-object v3 - invoke-static {v2, v3}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Lcom/vk/im/engine/models/messages/Msg;Ljava/lang/CharSequence;)Ljava/lang/CharSequence; + invoke-static {v2, v3}, Lru/vtosters/hooks/EncryptionMessagesHook;->decryptMessage(Lcom/vk/im/engine/models/messages/Msg;Ljava/lang/CharSequence;)Ljava/lang/CharSequence; move-result-object v3 diff --git a/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/PopupHelper.smali b/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/PopupHelper.smali index ac0fec20a8..70c4aac538 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/PopupHelper.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/PopupHelper.smali @@ -95,7 +95,7 @@ .method private final a(Lcom/vk/im/engine/models/dialogs/Dialog;Lcom/vk/im/engine/models/ProfilesSimpleInfo;Lcom/vk/im/ui/components/common/DialogAction;)V .locals 2 - invoke-static {p1, p3}, Lru/vtosters/lite/dialogs/DialogMenuInjectors;->onClick(Lcom/vk/im/engine/models/dialogs/Dialog;Lcom/vk/im/ui/components/common/DialogAction;)Z + invoke-static {p1, p3}, Lru/vtosters/hooks/DialogMenuInjectors;->onClick(Lcom/vk/im/engine/models/dialogs/Dialog;Lcom/vk/im/ui/components/common/DialogAction;)Z move-result v0 diff --git a/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/VhDialog.smali b/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/VhDialog.smali index 4887c045bb..0a5cc4bf24 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/VhDialog.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/dialogs_list/vc_impl/VhDialog.smali @@ -1466,7 +1466,7 @@ if-eqz p1, :cond_1 .line 181 - invoke-static {}, Lru/vtosters/lite/utils/VTVerifications;->vtverif()Z + invoke-static {}, Lru/vtosters/hooks/VerificationsHook;->vtverif()Z move-result p2 @@ -1476,7 +1476,7 @@ move-result p2 - invoke-static {p2}, Lru/vtosters/lite/utils/VTVerifications;->isVerified(I)Z + invoke-static {p2}, Lru/vtosters/hooks/VerificationsHook;->isVerified(I)Z move-result v0 @@ -1485,7 +1485,7 @@ goto :goto_51 :cond_45 - invoke-static {}, Lru/vtosters/lite/utils/VTVerifications;->vtverif()Z + invoke-static {}, Lru/vtosters/hooks/VerificationsHook;->vtverif()Z move-result p2 @@ -1495,7 +1495,7 @@ move-result p2 - invoke-static {p2}, Lru/vtosters/lite/utils/VTVerifications;->isVerified(I)Z + invoke-static {p2}, Lru/vtosters/hooks/VerificationsHook;->isVerified(I)Z move-result v0 diff --git a/smali/smali_classes3/com/vk/im/ui/components/install_vk_me/VkMePromoController.smali b/smali/smali_classes3/com/vk/im/ui/components/install_vk_me/VkMePromoController.smali index d168d05b4f..d6acaf35ef 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/install_vk_me/VkMePromoController.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/install_vk_me/VkMePromoController.smali @@ -479,7 +479,7 @@ .line 18 iget-object v0, p0, Lcom/vk/im/ui/components/install_vk_me/VkMePromoController;->a:Landroid/content/Context; - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes3/com/vk/im/ui/components/msg_list/MsgListComponent$d.smali b/smali/smali_classes3/com/vk/im/ui/components/msg_list/MsgListComponent$d.smali index a804feac51..dbee6d7622 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/msg_list/MsgListComponent$d.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/msg_list/MsgListComponent$d.smali @@ -52,7 +52,7 @@ .line 1 iget-object v0, p0, Lcom/vk/im/ui/components/msg_list/MsgListComponent$d;->a:Lcom/vk/im/ui/components/msg_list/MsgListComponent; - invoke-static {p1, v0}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Ljava/lang/String;Lcom/vk/im/ui/components/msg_list/MsgListComponent;)Ljava/lang/String; + invoke-static {p1, v0}, Lru/vtosters/hooks/EncryptionMessagesHook;->decryptMessage(Ljava/lang/String;Lcom/vk/im/ui/components/msg_list/MsgListComponent;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes3/com/vk/im/ui/components/msg_list/OnViewControllerCallbackImpl.smali b/smali/smali_classes3/com/vk/im/ui/components/msg_list/OnViewControllerCallbackImpl.smali index e658ef31f9..d180aee16f 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/msg_list/OnViewControllerCallbackImpl.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/msg_list/OnViewControllerCallbackImpl.smali @@ -587,7 +587,7 @@ move-result-object v0 - invoke-static {v0, p1, p2}, Lru/vtosters/lite/dialogs/DialogMessageInjector;->onClick(Landroid/content/Context;Lcom/vk/im/ui/components/common/MsgAction;Lcom/vk/im/engine/models/messages/Msg;)Z + invoke-static {v0, p1, p2}, Lru/vtosters/hooks/DialogMessageInjector;->onClick(Landroid/content/Context;Lcom/vk/im/ui/components/common/MsgAction;Lcom/vk/im/engine/models/messages/Msg;)Z move-result v0 diff --git a/smali/smali_classes3/com/vk/im/ui/components/msg_send/recording/AudioRecordVc.smali b/smali/smali_classes3/com/vk/im/ui/components/msg_send/recording/AudioRecordVc.smali index 16b34067b0..d3e67c3e37 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/msg_send/recording/AudioRecordVc.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/msg_send/recording/AudioRecordVc.smali @@ -810,7 +810,7 @@ .locals 2 .line 1 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_bar/DialogBarVcCallback$a.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_bar/DialogBarVcCallback$a.smali index a3a875788a..2fd4b50fc0 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_bar/DialogBarVcCallback$a.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_bar/DialogBarVcCallback$a.smali @@ -18,7 +18,7 @@ .method public static synthetic a(Lcom/vk/im/ui/components/viewcontrollers/dialog_bar/DialogBarVcCallback;Ljava/lang/String;Lcom/vk/im/engine/models/dialogs/ConversationBar$ButtonType;ILjava/lang/Object;)V .locals 1 - invoke-static {}, Lru/vtosters/lite/ssfs/ImBanner;->showAlert()Z + invoke-static {}, Lru/vtosters/hooks/ssfs/BannerHook;->showAlert()Z move-result v0 diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_header/info/DialogHeaderInfoVc.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_header/info/DialogHeaderInfoVc.smali index 5a2e611a5c..dd4cbdd928 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_header/info/DialogHeaderInfoVc.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_header/info/DialogHeaderInfoVc.smali @@ -1280,7 +1280,7 @@ move-result-object v3 - invoke-static {p1, v3}, Lru/vtosters/lite/dialogs/DialogHeaderInjector;->onClick(Lcom/vk/im/ui/components/common/DialogAction;Lcom/vk/im/engine/models/dialogs/Dialog;)Z + invoke-static {p1, v3}, Lru/vtosters/hooks/DialogHeaderInjector;->onClick(Lcom/vk/im/ui/components/common/DialogAction;Lcom/vk/im/engine/models/dialogs/Dialog;)Z move-result v0 @@ -2082,7 +2082,7 @@ move-result-object p0 - invoke-static {p0, v3}, Lru/vtosters/lite/hooks/CallsHook;->forwardToVkOffApps(Landroid/view/View;Lcom/vk/im/engine/models/dialogs/Dialog;)V + invoke-static {p0, v3}, Lru/vtosters/hooks/CallsHook;->forwardToVkOffApps(Landroid/view/View;Lcom/vk/im/engine/models/dialogs/Dialog;)V return-void diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_header/info/IconFormatter.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_header/info/IconFormatter.smali index 0de550cdb7..2fece0b4b9 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_header/info/IconFormatter.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/dialog_header/info/IconFormatter.smali @@ -125,7 +125,7 @@ if-eqz p1, :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/VTVerifications;->vtverif()Z + invoke-static {}, Lru/vtosters/hooks/VerificationsHook;->vtverif()Z move-result p2 @@ -135,7 +135,7 @@ move-result p2 - invoke-static {p2}, Lru/vtosters/lite/utils/VTVerifications;->isVerified(I)Z + invoke-static {p2}, Lru/vtosters/hooks/VerificationsHook;->isVerified(I)Z move-result v0 @@ -144,7 +144,7 @@ goto :goto_0 :cond_45 - invoke-static {}, Lru/vtosters/lite/utils/VTVerifications;->vtverif()Z + invoke-static {}, Lru/vtosters/hooks/VerificationsHook;->vtverif()Z move-result p2 @@ -154,7 +154,7 @@ move-result p2 - invoke-static {p2}, Lru/vtosters/lite/utils/VTVerifications;->isVerified(I)Z + invoke-static {p2}, Lru/vtosters/hooks/VerificationsHook;->isVerified(I)Z move-result v0 diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/MsgListVc.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/MsgListVc.smali index fb3a0c6fbf..23795300c8 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/MsgListVc.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/MsgListVc.smali @@ -1873,7 +1873,7 @@ if-eqz p1, :cond_2 - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object p1 diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/SwipeToReplyItemTouchCallback.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/SwipeToReplyItemTouchCallback.smali index 50f90ce1ff..36968b5248 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/SwipeToReplyItemTouchCallback.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/SwipeToReplyItemTouchCallback.smali @@ -172,7 +172,7 @@ if-eqz p1, :cond_0 - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object p1 diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartReplyHolder.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartReplyHolder.smali index b39b0856af..5a8780f125 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartReplyHolder.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartReplyHolder.smali @@ -103,7 +103,7 @@ const/4 v6, 0x4 - invoke-static/range {v2 .. v6}, Lru/vtosters/lite/hooks/ReplyMsgHook;->injectWithDecrypt(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/NestedMsg;Lcom/vk/im/engine/models/ProfilesSimpleInfo;ZI)V + invoke-static/range {v2 .. v6}, Lru/vtosters/hooks/ReplyMsgHook;->injectWithDecrypt(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/NestedMsg;Lcom/vk/im/engine/models/ProfilesSimpleInfo;ZI)V goto :goto_0 @@ -293,7 +293,7 @@ invoke-static {p1, v6}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v2, v5, p1, v1}, Lru/vtosters/lite/hooks/ReplyMsgHook;->injectWithDecrypt(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/NestedMsg;Lcom/vk/im/engine/models/ProfilesSimpleInfo;Z)V + invoke-static {v2, v5, p1, v1}, Lru/vtosters/hooks/ReplyMsgHook;->injectWithDecrypt(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/NestedMsg;Lcom/vk/im/engine/models/ProfilesSimpleInfo;Z)V .line 11 iget-object p1, p0, Lcom/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartReplyHolder;->C:Lcom/vk/im/ui/views/ReplyView; diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgAttachBuilder.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgAttachBuilder.smali index cfd1de05ef..d70e1b9767 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgAttachBuilder.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgAttachBuilder.smali @@ -2110,7 +2110,7 @@ move-result-object v2 - invoke-static {v2}, Lru/vtosters/lite/hooks/MessagesHook;->injectOwnTextAll(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/hooks/MessagesHook;->injectOwnTextAll(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 @@ -2521,7 +2521,7 @@ move-result-object v2 - invoke-static {v2}, Lru/vtosters/lite/hooks/MessagesHook;->injectOwnTextAll(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/hooks/MessagesHook;->injectOwnTextAll(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgContentBuilder.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgContentBuilder.smali index 1a0eada514..442cab398a 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgContentBuilder.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgContentBuilder.smali @@ -302,7 +302,7 @@ .line 39 iget-object v3, p0, Lcom/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgContentBuilder;->c:Lcom/vk/im/ui/components/viewcontrollers/msg_list/entry/MsgTextBuilder; - invoke-static {p1}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Lcom/vk/im/engine/models/messages/MsgFromUser;)Ljava/lang/String; + invoke-static {p1}, Lru/vtosters/hooks/EncryptionMessagesHook;->decryptMessage(Lcom/vk/im/engine/models/messages/MsgFromUser;)Ljava/lang/String; move-result-object v4 @@ -678,7 +678,7 @@ move-result v3 - invoke-static {v2, v3}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Ljava/lang/String;I)Ljava/lang/String; + invoke-static {v2, v3}, Lru/vtosters/hooks/EncryptionMessagesHook;->decryptMessage(Ljava/lang/String;I)Ljava/lang/String; move-result-object v2 diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/popup/DelegateDialogs.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/popup/DelegateDialogs.smali index 588026867c..479f0bd55c 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/popup/DelegateDialogs.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/popup/DelegateDialogs.smali @@ -409,7 +409,7 @@ move-result-object v1 - invoke-static {v1}, Lru/vtosters/lite/dialogs/DialogMenuInjectors;->injectToHashMap(Ljava/util/LinkedHashMap;)Ljava/util/LinkedHashMap; + invoke-static {v1}, Lru/vtosters/hooks/DialogMenuInjectors;->injectToHashMap(Ljava/util/LinkedHashMap;)Ljava/util/LinkedHashMap; move-result-object v1 diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/popup/DelegateMsg.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/popup/DelegateMsg.smali index 515825dd83..0c1f446824 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/popup/DelegateMsg.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/popup/DelegateMsg.smali @@ -668,7 +668,7 @@ sget-object v1, Lcom/vk/im/ui/components/viewcontrollers/popup/DelegateMsg;->g:Ljava/util/LinkedHashMap; - invoke-static {v1}, Lru/vtosters/lite/dialogs/DialogMessageInjector;->injectToHashMap(Ljava/util/LinkedHashMap;)Ljava/util/LinkedHashMap; + invoke-static {v1}, Lru/vtosters/hooks/DialogMessageInjector;->injectToHashMap(Ljava/util/LinkedHashMap;)Ljava/util/LinkedHashMap; move-result-object v1 diff --git a/smali/smali_classes3/com/vk/im/ui/drawables/CasperIndicatorDrawable.smali b/smali/smali_classes3/com/vk/im/ui/drawables/CasperIndicatorDrawable.smali index 677fec00a1..8066d09e2d 100644 --- a/smali/smali_classes3/com/vk/im/ui/drawables/CasperIndicatorDrawable.smali +++ b/smali/smali_classes3/com/vk/im/ui/drawables/CasperIndicatorDrawable.smali @@ -81,7 +81,7 @@ invoke-virtual {v1, v2}, Landroid/graphics/drawable/GradientDrawable;->setShape(I)V .line 6 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v3 diff --git a/smali/smali_classes3/com/vk/im/ui/drawables/MsgStatusDrawable.smali b/smali/smali_classes3/com/vk/im/ui/drawables/MsgStatusDrawable.smali index 71ffbb33b7..28927e309d 100644 --- a/smali/smali_classes3/com/vk/im/ui/drawables/MsgStatusDrawable.smali +++ b/smali/smali_classes3/com/vk/im/ui/drawables/MsgStatusDrawable.smali @@ -79,7 +79,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/utils/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {v0}, Lru/vtosters/hooks/other/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object v0 @@ -96,7 +96,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/utils/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {v0}, Lru/vtosters/hooks/other/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object v0 diff --git a/smali/smali_classes3/com/vk/im/ui/formatters/MsgBodyFormatter.smali b/smali/smali_classes3/com/vk/im/ui/formatters/MsgBodyFormatter.smali index 2b049cdc1e..5a5cacdb45 100644 --- a/smali/smali_classes3/com/vk/im/ui/formatters/MsgBodyFormatter.smali +++ b/smali/smali_classes3/com/vk/im/ui/formatters/MsgBodyFormatter.smali @@ -834,7 +834,7 @@ .line 23 :cond_0 - invoke-static {p1}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Lcom/vk/im/engine/models/messages/MsgFromUser;)Ljava/lang/String; + invoke-static {p1}, Lru/vtosters/hooks/EncryptionMessagesHook;->decryptMessage(Lcom/vk/im/engine/models/messages/MsgFromUser;)Ljava/lang/String; move-result-object p1 diff --git a/smali/smali_classes3/com/vk/im/ui/fragments/ChatFragment.smali b/smali/smali_classes3/com/vk/im/ui/fragments/ChatFragment.smali index 83279a0233..f23f59b038 100644 --- a/smali/smali_classes3/com/vk/im/ui/fragments/ChatFragment.smali +++ b/smali/smali_classes3/com/vk/im/ui/fragments/ChatFragment.smali @@ -4409,7 +4409,7 @@ move-result-object v6 - invoke-static {v6}, Lru/vtosters/lite/hooks/MessagesHook;->fixCTX(Landroid/content/Context;)Landroid/content/Context; + invoke-static {v6}, Lru/vtosters/hooks/MessagesHook;->fixCTX(Landroid/content/Context;)Landroid/content/Context; move-result-object v6 @@ -6123,7 +6123,7 @@ .line 1 iget-object v0, p0, Lcom/vk/im/ui/fragments/ChatFragment;->L:Landroid/content/Context; - invoke-static {v0}, Lru/vtosters/lite/hooks/MessagesHook;->fixCTX(Landroid/content/Context;)Landroid/content/Context; + invoke-static {v0}, Lru/vtosters/hooks/MessagesHook;->fixCTX(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes3/com/vk/im/ui/utils/DialogScreenshotTracker.smali b/smali/smali_classes3/com/vk/im/ui/utils/DialogScreenshotTracker.smali index 9f02f32f19..18a0628e4e 100644 --- a/smali/smali_classes3/com/vk/im/ui/utils/DialogScreenshotTracker.smali +++ b/smali/smali_classes3/com/vk/im/ui/utils/DialogScreenshotTracker.smali @@ -181,7 +181,7 @@ .method public final a()V .locals 8 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->screenshotdetect()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->screenshotdetect()Z move-result v0 diff --git a/smali/smali_classes3/com/vk/im/ui/views/ConversationBarButtonsView.smali b/smali/smali_classes3/com/vk/im/ui/views/ConversationBarButtonsView.smali index dc491b9ce2..d4d30aec86 100644 --- a/smali/smali_classes3/com/vk/im/ui/views/ConversationBarButtonsView.smali +++ b/smali/smali_classes3/com/vk/im/ui/views/ConversationBarButtonsView.smali @@ -494,7 +494,7 @@ invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p1 diff --git a/smali/smali_classes3/com/vk/im/ui/views/ScrollToBottomView.smali b/smali/smali_classes3/com/vk/im/ui/views/ScrollToBottomView.smali index d6be5d1e30..875129c688 100644 --- a/smali/smali_classes3/com/vk/im/ui/views/ScrollToBottomView.smali +++ b/smali/smali_classes3/com/vk/im/ui/views/ScrollToBottomView.smali @@ -205,7 +205,7 @@ .method private final b(I)Ljava/lang/CharSequence; .locals 2 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortinfo()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->shortinfo()Z move-result v1 @@ -321,7 +321,7 @@ invoke-virtual {v0, v1}, Landroid/widget/TextView;->setBackground(Landroid/graphics/drawable/Drawable;)V - invoke-static {v0}, Lru/vtosters/lite/utils/ThemesUtils;->recolorTextView(Landroid/widget/TextView;)V + invoke-static {v0}, Lru/vtosters/hooks/other/ThemesUtils;->recolorTextView(Landroid/widget/TextView;)V .line 6 sget v1, Lcom/vk/im/ui/o;->ScrollToBottomView_vkim_stb_counter_fontFamily:I diff --git a/smali/smali_classes3/com/vk/im/ui/views/WriteBarDisabled.smali b/smali/smali_classes3/com/vk/im/ui/views/WriteBarDisabled.smali index a15b327d89..52e7729dd7 100644 --- a/smali/smali_classes3/com/vk/im/ui/views/WriteBarDisabled.smali +++ b/smali/smali_classes3/com/vk/im/ui/views/WriteBarDisabled.smali @@ -182,7 +182,7 @@ invoke-static {v0, v1}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes3/com/vk/im/ui/views/avatars/AbbreviationAvatarDrawable.smali b/smali/smali_classes3/com/vk/im/ui/views/avatars/AbbreviationAvatarDrawable.smali index 7f2cf573f8..f7e37e40e7 100644 --- a/smali/smali_classes3/com/vk/im/ui/views/avatars/AbbreviationAvatarDrawable.smali +++ b/smali/smali_classes3/com/vk/im/ui/views/avatars/AbbreviationAvatarDrawable.smali @@ -498,7 +498,7 @@ iget-object v3, p0, Lcom/vk/im/ui/views/avatars/AbbreviationAvatarDrawable;->a:Landroid/graphics/Paint; - invoke-static {p1, v3, v2}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;Landroid/graphics/Paint;F)V + invoke-static {p1, v3, v2}, Lru/vtosters/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;Landroid/graphics/Paint;F)V .line 2 iget-object v0, p0, Lcom/vk/im/ui/views/avatars/AbbreviationAvatarDrawable;->b:Landroid/graphics/Paint; diff --git a/smali/smali_classes3/com/vk/im/ui/views/avatars/AvatarDataSource.smali b/smali/smali_classes3/com/vk/im/ui/views/avatars/AvatarDataSource.smali index 2e40534a25..0a04a57a3a 100644 --- a/smali/smali_classes3/com/vk/im/ui/views/avatars/AvatarDataSource.smali +++ b/smali/smali_classes3/com/vk/im/ui/views/avatars/AvatarDataSource.smali @@ -769,7 +769,7 @@ .line 33 sget-object v1, Lcom/vk/im/ui/views/avatars/AvatarDataSource;->o:Landroid/graphics/Paint; - invoke-static {v0, p1, v1}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(FLandroid/graphics/Canvas;Landroid/graphics/Paint;)V + invoke-static {v0, p1, v1}, Lru/vtosters/hooks/PicRoundingHook;->inject(FLandroid/graphics/Canvas;Landroid/graphics/Paint;)V return-void .end method diff --git a/smali/smali_classes3/com/vk/im/ui/views/avatars/CirclePostprocessor.smali b/smali/smali_classes3/com/vk/im/ui/views/avatars/CirclePostprocessor.smali index eaafdb59d1..3e6488191f 100644 --- a/smali/smali_classes3/com/vk/im/ui/views/avatars/CirclePostprocessor.smali +++ b/smali/smali_classes3/com/vk/im/ui/views/avatars/CirclePostprocessor.smali @@ -119,7 +119,7 @@ move-result-object v0 - invoke-static {p1, p2, v0}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Bitmap;Landroid/graphics/Bitmap;Landroid/graphics/Paint;)V + invoke-static {p1, p2, v0}, Lru/vtosters/hooks/PicRoundingHook;->inject(Landroid/graphics/Bitmap;Landroid/graphics/Bitmap;Landroid/graphics/Paint;)V return-void .end method diff --git a/smali/smali_classes3/com/vk/im/ui/views/dialog_actions/DialogActionsListView.smali b/smali/smali_classes3/com/vk/im/ui/views/dialog_actions/DialogActionsListView.smali index a6d1b9f1a9..e61bf7c0ff 100644 --- a/smali/smali_classes3/com/vk/im/ui/views/dialog_actions/DialogActionsListView.smali +++ b/smali/smali_classes3/com/vk/im/ui/views/dialog_actions/DialogActionsListView.smali @@ -409,7 +409,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/dialogs/DialogHeaderInjector;->injectToList(Ljava/util/List;)Ljava/util/List; + invoke-static {v0}, Lru/vtosters/hooks/DialogHeaderInjector;->injectToList(Ljava/util/List;)Ljava/util/List; move-result-object v0 @@ -472,7 +472,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object p1 diff --git a/smali/smali_classes3/com/vk/im/ui/views/settings/LabelSettingsView.smali b/smali/smali_classes3/com/vk/im/ui/views/settings/LabelSettingsView.smali index 8667415c4d..872de98dc0 100644 --- a/smali/smali_classes3/com/vk/im/ui/views/settings/LabelSettingsView.smali +++ b/smali/smali_classes3/com/vk/im/ui/views/settings/LabelSettingsView.smali @@ -876,7 +876,7 @@ if-eqz v0, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes3/com/vk/im/ui/views/settings/SwitchSettingsView.smali b/smali/smali_classes3/com/vk/im/ui/views/settings/SwitchSettingsView.smali index 69ba151465..abedb29f80 100644 --- a/smali/smali_classes3/com/vk/im/ui/views/settings/SwitchSettingsView.smali +++ b/smali/smali_classes3/com/vk/im/ui/views/settings/SwitchSettingsView.smali @@ -906,7 +906,7 @@ if-eqz v0, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v2 diff --git a/smali/smali_classes3/com/vk/imageloader/ImageLoaderUtils.smali b/smali/smali_classes3/com/vk/imageloader/ImageLoaderUtils.smali index 3ee4628b98..b8d1412cd4 100644 --- a/smali/smali_classes3/com/vk/imageloader/ImageLoaderUtils.smali +++ b/smali/smali_classes3/com/vk/imageloader/ImageLoaderUtils.smali @@ -147,7 +147,7 @@ div-float/2addr p0, v3 .line 26 - invoke-static {v2, p0, p0, p0, v5}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V + invoke-static {v2, p0, p0, p0, v5}, Lru/vtosters/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V return-object v1 @@ -212,7 +212,7 @@ div-float/2addr v0, v3 .line 36 - invoke-static {v2, v0, v0, v0, v5}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V + invoke-static {v2, v0, v0, v0, v5}, Lru/vtosters/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V .line 37 invoke-virtual {v1}, Landroid/graphics/Bitmap;->recycle()V diff --git a/smali/smali_classes3/com/vk/libvideo/autoplay/delegate/AutoPlayDelegate.smali b/smali/smali_classes3/com/vk/libvideo/autoplay/delegate/AutoPlayDelegate.smali index e1725fc141..067cfba2fc 100644 --- a/smali/smali_classes3/com/vk/libvideo/autoplay/delegate/AutoPlayDelegate.smali +++ b/smali/smali_classes3/com/vk/libvideo/autoplay/delegate/AutoPlayDelegate.smali @@ -4385,7 +4385,7 @@ if-eqz p2, :cond_5 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->videofeed()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->videofeed()Z move-result v0 diff --git a/smali/smali_classes3/com/vk/libvideo/autoplay/delegate/NoAutoPlayDelegate.smali b/smali/smali_classes3/com/vk/libvideo/autoplay/delegate/NoAutoPlayDelegate.smali index 71beeb84df..0dce42c94f 100644 --- a/smali/smali_classes3/com/vk/libvideo/autoplay/delegate/NoAutoPlayDelegate.smali +++ b/smali/smali_classes3/com/vk/libvideo/autoplay/delegate/NoAutoPlayDelegate.smali @@ -261,7 +261,7 @@ :cond_0 if-eqz p2, :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->videofeed()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->videofeed()Z move-result v0 diff --git a/smali/smali_classes3/com/vk/libvideo/dialogs/BaseAnimationDialog.smali b/smali/smali_classes3/com/vk/libvideo/dialogs/BaseAnimationDialog.smali index f4f4081f19..427ed91dc8 100644 --- a/smali/smali_classes3/com/vk/libvideo/dialogs/BaseAnimationDialog.smali +++ b/smali/smali_classes3/com/vk/libvideo/dialogs/BaseAnimationDialog.smali @@ -357,7 +357,7 @@ invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v0, v1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, v1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V :cond_2 return-void diff --git a/smali/smali_classes3/com/vk/libvideo/live/views/chat/g/CommentRoundedDrawable.smali b/smali/smali_classes3/com/vk/libvideo/live/views/chat/g/CommentRoundedDrawable.smali index ece8b03fd5..b1c1d2bf74 100644 --- a/smali/smali_classes3/com/vk/libvideo/live/views/chat/g/CommentRoundedDrawable.smali +++ b/smali/smali_classes3/com/vk/libvideo/live/views/chat/g/CommentRoundedDrawable.smali @@ -21,7 +21,7 @@ invoke-direct {p0}, Landroid/graphics/drawable/Drawable;->()V .line 2 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes3/com/vk/libvideo/live/views/gifts/GiftsView.smali b/smali/smali_classes3/com/vk/libvideo/live/views/gifts/GiftsView.smali index 18a747a8b8..3aeb7d2de8 100644 --- a/smali/smali_classes3/com/vk/libvideo/live/views/gifts/GiftsView.smali +++ b/smali/smali_classes3/com/vk/libvideo/live/views/gifts/GiftsView.smali @@ -991,7 +991,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes3/com/vk/libvideo/ui/VideoBottomPanelView.smali b/smali/smali_classes3/com/vk/libvideo/ui/VideoBottomPanelView.smali index 1cf2336eb8..5327944d18 100644 --- a/smali/smali_classes3/com/vk/libvideo/ui/VideoBottomPanelView.smali +++ b/smali/smali_classes3/com/vk/libvideo/ui/VideoBottomPanelView.smali @@ -106,7 +106,7 @@ invoke-virtual {p2, p3, p0, v0}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View; - invoke-static/range {p0 .. p0}, Lru/vtosters/lite/hooks/PostViewHook;->injectVideoView(Landroid/widget/RelativeLayout;)V + invoke-static/range {p0 .. p0}, Lru/vtosters/hooks/PostViewHook;->injectVideoView(Landroid/widget/RelativeLayout;)V .line 5 sget p2, Lcom/vk/libvideo/g;->subtitle:I diff --git a/smali/smali_classes3/com/vk/libvideo/ui/VideoView.smali b/smali/smali_classes3/com/vk/libvideo/ui/VideoView.smali index 2980e92009..dc6d4fb3ed 100644 --- a/smali/smali_classes3/com/vk/libvideo/ui/VideoView.smali +++ b/smali/smali_classes3/com/vk/libvideo/ui/VideoView.smali @@ -7279,7 +7279,7 @@ # move-result v0 - invoke-static {}, Lru/vtosters/lite/hooks/NewsfeedHook;->isPowerSaveMode()Z + invoke-static {}, Lru/vtosters/hooks/NewsfeedHook;->isPowerSaveMode()Z move-result v0 diff --git a/smali/smali_classes3/com/vk/mentions/w/DefaultMentionSpanProvider.smali b/smali/smali_classes3/com/vk/mentions/w/DefaultMentionSpanProvider.smali index 2b94edf247..08587fe504 100644 --- a/smali/smali_classes3/com/vk/mentions/w/DefaultMentionSpanProvider.smali +++ b/smali/smali_classes3/com/vk/mentions/w/DefaultMentionSpanProvider.smali @@ -27,7 +27,7 @@ .line 2 sget v0, Lcom/vk/mentions/p;->light_blue:I - invoke-static {v0}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {v0}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result p1 diff --git a/smali/smali_classes3/com/vk/menu/MenuFragment.smali b/smali/smali_classes3/com/vk/menu/MenuFragment.smali index 09367dd7d7..435110e4c0 100644 --- a/smali/smali_classes3/com/vk/menu/MenuFragment.smali +++ b/smali/smali_classes3/com/vk/menu/MenuFragment.smali @@ -302,7 +302,7 @@ invoke-virtual {v3, v5, v1}, Landroid/view/MenuInflater;->inflate(ILandroid/view/Menu;)V -# invoke-static {v1}, Lru/vtosters/lite/hooks/DockBarInjector;->injectMenuFragment(Landroid/view/Menu;)V +# invoke-static {v1}, Lru/vtosters/hooks/DockBarInjector;->injectMenuFragment(Landroid/view/Menu;)V .line 5 invoke-direct {p0, v1}, Lcom/vk/menu/MenuFragment;->a(Landroidx/appcompat/view/menu/MenuBuilder;)Ljava/util/List; @@ -318,7 +318,7 @@ if-eqz v5, :cond_f - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->showmenu()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->showmenu()Z move-result v7 diff --git a/smali/smali_classes3/com/vk/menu/MenuUtils.smali b/smali/smali_classes3/com/vk/menu/MenuUtils.smali index b26221f4a1..d000a81408 100644 --- a/smali/smali_classes3/com/vk/menu/MenuUtils.smali +++ b/smali/smali_classes3/com/vk/menu/MenuUtils.smali @@ -45,7 +45,7 @@ .method public static final a(Ljava/lang/String;)I .locals 3 - invoke-static {p0}, Lru/vtosters/lite/hooks/DockBarInjector;->injectId(Ljava/lang/String;)I + invoke-static {p0}, Lru/vtosters/hooks/DockBarInjector;->injectId(Ljava/lang/String;)I move-result v0 @@ -1021,7 +1021,7 @@ const-class v5, Lcom/vtosters/lite/fragments/SettingsListFragment; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->useNewSettings()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->useNewSettings()Ljava/lang/Class; move-result-object v5 diff --git a/smali/smali_classes3/com/vk/menu/SearchMenuPresenter.smali b/smali/smali_classes3/com/vk/menu/SearchMenuPresenter.smali index 2588790481..9b1196248c 100644 --- a/smali/smali_classes3/com/vk/menu/SearchMenuPresenter.smali +++ b/smali/smali_classes3/com/vk/menu/SearchMenuPresenter.smali @@ -1319,7 +1319,7 @@ invoke-interface {v0, v2, v1}, Lcom/vk/menu/SearchMenuContract1;->d(ILjava/util/List;)V - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkpay()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->vkpay()Z move-result v0 @@ -1328,7 +1328,7 @@ invoke-direct {p0}, Lcom/vk/menu/SearchMenuPresenter;->g()V :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->miniapps()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->miniapps()Z move-result v0 diff --git a/smali/smali_classes3/com/vk/ml/model/BrandsNNModel.smali b/smali/smali_classes3/com/vk/ml/model/BrandsNNModel.smali index d768f8061e..3d7551d9f7 100644 --- a/smali/smali_classes3/com/vk/ml/model/BrandsNNModel.smali +++ b/smali/smali_classes3/com/vk/ml/model/BrandsNNModel.smali @@ -591,7 +591,7 @@ const/16 p3, 0x64 - invoke-static {p3}, Lru/vtosters/lite/utils/Preferences;->compress(I)I + invoke-static {p3}, Lru/vtosters/hooks/other/Preferences;->compress(I)I move-result p3 diff --git a/smali/smali_classes3/com/vk/music/AudioPlayerActivity.smali b/smali/smali_classes3/com/vk/music/AudioPlayerActivity.smali index c8c8fc9c7b..349732eb6e 100644 --- a/smali/smali_classes3/com/vk/music/AudioPlayerActivity.smali +++ b/smali/smali_classes3/com/vk/music/AudioPlayerActivity.smali @@ -164,9 +164,9 @@ invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v0, v1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, v1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V - invoke-static {v0}, Lru/vtosters/lite/utils/ThemesUtils;->setStatusBarColor(Landroid/view/Window;)V + invoke-static {v0}, Lru/vtosters/hooks/other/ThemesUtils;->setStatusBarColor(Landroid/view/Window;)V .line 9 :cond_2 diff --git a/smali/smali_classes3/com/vk/music/playlist/modern/holders/buttons/MusicPlaylistButtonsHolder.smali b/smali/smali_classes3/com/vk/music/playlist/modern/holders/buttons/MusicPlaylistButtonsHolder.smali index 2689dec49a..98e58650aa 100644 --- a/smali/smali_classes3/com/vk/music/playlist/modern/holders/buttons/MusicPlaylistButtonsHolder.smali +++ b/smali/smali_classes3/com/vk/music/playlist/modern/holders/buttons/MusicPlaylistButtonsHolder.smali @@ -178,7 +178,7 @@ invoke-virtual {p1, p4}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->setImageViewColored(Landroid/widget/ImageView;)V + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->setImageViewColored(Landroid/widget/ImageView;)V .line 16 iget-object p4, p0, Lcom/vk/music/playlist/modern/holders/buttons/MusicPlaylistButtonsHolder;->d:Lcom/vk/music/view/MusicActionButton; @@ -289,7 +289,7 @@ .line 26 invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->setImageViewColored(Landroid/widget/ImageView;)V + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->setImageViewColored(Landroid/widget/ImageView;)V .line 27 iget-object p3, p0, Lcom/vk/music/playlist/modern/holders/buttons/MusicPlaylistButtonsHolder;->f:Landroid/widget/ImageView; @@ -307,7 +307,7 @@ .line 28 iput-object p1, p0, Lcom/vk/music/playlist/modern/holders/buttons/MusicPlaylistButtonsHolder;->D:Landroid/widget/ImageView; - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->setImageViewColored(Landroid/widget/ImageView;)V + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->setImageViewColored(Landroid/widget/ImageView;)V .line 29 iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View; diff --git a/smali/smali_classes3/com/vk/music/view/MusicActionButton.smali b/smali/smali_classes3/com/vk/music/view/MusicActionButton.smali index 3240d4a75b..ac14856914 100644 --- a/smali/smali_classes3/com/vk/music/view/MusicActionButton.smali +++ b/smali/smali_classes3/com/vk/music/view/MusicActionButton.smali @@ -345,7 +345,7 @@ .method public final setIcon(Landroid/graphics/drawable/Drawable;)V .locals 2 - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object p1 diff --git a/smali/smali_classes3/com/vk/music/view/SmallPlayerView$a.smali b/smali/smali_classes3/com/vk/music/view/SmallPlayerView$a.smali index 4ed58061f9..f550ea3032 100644 --- a/smali/smali_classes3/com/vk/music/view/SmallPlayerView$a.smali +++ b/smali/smali_classes3/com/vk/music/view/SmallPlayerView$a.smali @@ -245,7 +245,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes3/com/vk/navigation/NavigationDelegateActivity.smali b/smali/smali_classes3/com/vk/navigation/NavigationDelegateActivity.smali index 9f9b52da92..658d90761c 100644 --- a/smali/smali_classes3/com/vk/navigation/NavigationDelegateActivity.smali +++ b/smali/smali_classes3/com/vk/navigation/NavigationDelegateActivity.smali @@ -371,7 +371,7 @@ invoke-virtual {v0, p1}, Lcom/vk/navigation/NavigationDelegate;->a(Landroid/content/res/Configuration;)V - invoke-static {p1}, Lru/vtosters/lite/hooks/ui/SystemThemeChangerHook;->onThemeChanged(Landroid/content/res/Configuration;)V + invoke-static {p1}, Lru/vtosters/hooks/ui/SystemThemeChangerHook;->onThemeChanged(Landroid/content/res/Configuration;)V return-void .end method diff --git a/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom$k.smali b/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom$k.smali index 6161be61a3..9160a3cf95 100644 --- a/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom$k.smali +++ b/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom$k.smali @@ -43,7 +43,7 @@ .method public a()I .locals 3 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->swipe()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->swipe()Z move-result v2 diff --git a/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali b/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali index 8eba23186d..8681e1cc99 100644 --- a/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali +++ b/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali @@ -295,7 +295,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/hooks/DockBarInjector;->injectMap()Ljava/util/Map; + invoke-static {}, Lru/vtosters/hooks/DockBarInjector;->injectMap()Ljava/util/Map; move-result-object v0 @@ -411,7 +411,7 @@ const v0, 0x7f070067 - invoke-static {v0}, Lru/vtosters/lite/utils/ThemesUtils;->getNavigationHeight(I)I + invoke-static {v0}, Lru/vtosters/hooks/other/ThemesUtils;->getNavigationHeight(I)I move-result v0 @@ -1719,7 +1719,7 @@ :cond_0 iget-object v5, p0, Lcom/vk/navigation/NavigationDelegateBottom;->U:Lcom/vk/navigation/right/RightMenu; - invoke-static {p1, v5}, Lru/vtosters/lite/hooks/DockBarInjector;->interceptClick(ILcom/vk/navigation/right/RightMenu;)Ljava/lang/Class; + invoke-static {p1, v5}, Lru/vtosters/hooks/DockBarInjector;->interceptClick(ILcom/vk/navigation/right/RightMenu;)Ljava/lang/Class; move-result-object p1 @@ -2083,7 +2083,7 @@ iput-object v3, p0, Lcom/vk/navigation/NavigationDelegateBottom;->H:Lcom/vtosters/lite/ui/bottomnavigation/BottomNavigationView; - invoke-static {v3}, Lru/vtosters/lite/hooks/DockBarInjector;->inject(Lcom/vtosters/lite/ui/bottomnavigation/BottomNavigationView;)V + invoke-static {v3}, Lru/vtosters/hooks/DockBarInjector;->inject(Lcom/vtosters/lite/ui/bottomnavigation/BottomNavigationView;)V .line 11 invoke-virtual {p0}, Lcom/vk/navigation/NavigationDelegate;->c()Landroid/app/Activity; @@ -2495,7 +2495,7 @@ :goto_2 invoke-virtual {v1, v3}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v1, v3}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v1, v3}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V .line 46 instance-of v1, p1, Lcom/vk/navigation/b0/FragmentWithCustomNavigationBar; @@ -2827,7 +2827,7 @@ .method private final f(Lcom/vk/core/fragments/FragmentImpl;)Z .locals 1 - invoke-static {p1}, Lru/vtosters/lite/hooks/DockBarInjector;->isDockOpenAllowed(Lcom/vk/core/fragments/FragmentImpl;)Z + invoke-static {p1}, Lru/vtosters/hooks/DockBarInjector;->isDockOpenAllowed(Lcom/vk/core/fragments/FragmentImpl;)Z move-result v0 @@ -5422,7 +5422,7 @@ if-eqz v2, :cond_0 - invoke-static {v1, v2}, Lru/vtosters/lite/hooks/DockBarInjector;->setCounter(ILcom/vtosters/lite/ui/bottomnavigation/BottomNavigationView;)V + invoke-static {v1, v2}, Lru/vtosters/hooks/DockBarInjector;->setCounter(ILcom/vtosters/lite/ui/bottomnavigation/BottomNavigationView;)V goto :goto_0 diff --git a/smali/smali_classes3/com/vk/navigation/SpecialEventsNavigationDelegate.smali b/smali/smali_classes3/com/vk/navigation/SpecialEventsNavigationDelegate.smali index f2dae6f352..f21c303709 100644 --- a/smali/smali_classes3/com/vk/navigation/SpecialEventsNavigationDelegate.smali +++ b/smali/smali_classes3/com/vk/navigation/SpecialEventsNavigationDelegate.smali @@ -254,7 +254,7 @@ const v3, 0x7f070067 - invoke-static {v3}, Lru/vtosters/lite/utils/ThemesUtils;->getNavigationHeight(I)I + invoke-static {v3}, Lru/vtosters/hooks/other/ThemesUtils;->getNavigationHeight(I)I move-result v3 @@ -398,7 +398,7 @@ const v2, 0x7f070067 - invoke-static {v2}, Lru/vtosters/lite/utils/ThemesUtils;->getNavigationHeight(I)I + invoke-static {v2}, Lru/vtosters/hooks/other/ThemesUtils;->getNavigationHeight(I)I move-result v2 @@ -666,7 +666,7 @@ const v2, 0x7f070067 - invoke-static {v2}, Lru/vtosters/lite/utils/ThemesUtils;->getNavigationHeight(I)I + invoke-static {v2}, Lru/vtosters/hooks/other/ThemesUtils;->getNavigationHeight(I)I move-result v2 diff --git a/smali/smali_classes3/com/vk/newsfeed/holders/BaseFooterHolder.smali b/smali/smali_classes3/com/vk/newsfeed/holders/BaseFooterHolder.smali index 60be23bd10..f0fffc508e 100644 --- a/smali/smali_classes3/com/vk/newsfeed/holders/BaseFooterHolder.smali +++ b/smali/smali_classes3/com/vk/newsfeed/holders/BaseFooterHolder.smali @@ -62,7 +62,7 @@ .line 1 invoke-direct {p0, p1, p2}, Lcom/vk/newsfeed/holders/BaseNewsEntryHolder;->(ILandroid/view/ViewGroup;)V - invoke-static/range {p0 .. p0}, Lru/vtosters/lite/hooks/PostViewHook;->injectBaseFooterHolder(Lcom/vk/newsfeed/holders/BaseFooterHolder;)V + invoke-static/range {p0 .. p0}, Lru/vtosters/hooks/PostViewHook;->injectBaseFooterHolder(Lcom/vk/newsfeed/holders/BaseFooterHolder;)V .line 2 iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View; diff --git a/smali/smali_classes3/com/vk/newsfeed/holders/attachments/comments/VideoThumbnailHolder.smali b/smali/smali_classes3/com/vk/newsfeed/holders/attachments/comments/VideoThumbnailHolder.smali index fd848f7bcf..f2ac65be6d 100644 --- a/smali/smali_classes3/com/vk/newsfeed/holders/attachments/comments/VideoThumbnailHolder.smali +++ b/smali/smali_classes3/com/vk/newsfeed/holders/attachments/comments/VideoThumbnailHolder.smali @@ -377,7 +377,7 @@ move-result-object v1 - invoke-static {v1, v0}, Lru/vtosters/lite/utils/ExternalLinkParser;->parseVideoFile(Lcom/vk/dto/common/VideoFile;Landroid/app/Activity;)Z + invoke-static {v1, v0}, Lru/vtosters/hooks/VideoPlayerHook;->parseVideoFile(Lcom/vk/dto/common/VideoFile;Landroid/app/Activity;)Z move-result v4 diff --git a/smali/smali_classes3/com/vk/newsfeed/k0/b/b/PostingItemPresenter.smali b/smali/smali_classes3/com/vk/newsfeed/k0/b/b/PostingItemPresenter.smali index e1983eb094..4a78dbc30d 100644 --- a/smali/smali_classes3/com/vk/newsfeed/k0/b/b/PostingItemPresenter.smali +++ b/smali/smali_classes3/com/vk/newsfeed/k0/b/b/PostingItemPresenter.smali @@ -544,7 +544,7 @@ :cond_2 :goto_0 - invoke-static {v0}, Lru/vtosters/lite/hooks/NewsfeedHook;->hideElement(Ljava/util/ArrayList;)Ljava/util/List; + invoke-static {v0}, Lru/vtosters/hooks/NewsfeedHook;->hideElement(Ljava/util/ArrayList;)Ljava/util/List; move-result-object v0 diff --git a/smali/smali_classes3/com/vk/newsfeed/posting/attachments/PostingAttachActivity.smali b/smali/smali_classes3/com/vk/newsfeed/posting/attachments/PostingAttachActivity.smali index 96ede65c12..f0b46a5026 100644 --- a/smali/smali_classes3/com/vk/newsfeed/posting/attachments/PostingAttachActivity.smali +++ b/smali/smali_classes3/com/vk/newsfeed/posting/attachments/PostingAttachActivity.smali @@ -561,7 +561,7 @@ invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {p1, v0}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p1, v0}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V .line 14 invoke-virtual {p0}, Landroid/app/Activity;->getWindow()Landroid/view/Window; diff --git a/smali/smali_classes3/com/vk/newsfeed/posting/viewpresenter/bottom/PosterPreviewAdapter$e$a.smali b/smali/smali_classes3/com/vk/newsfeed/posting/viewpresenter/bottom/PosterPreviewAdapter$e$a.smali index f47efb65c5..f0bc9b3e6f 100644 --- a/smali/smali_classes3/com/vk/newsfeed/posting/viewpresenter/bottom/PosterPreviewAdapter$e$a.smali +++ b/smali/smali_classes3/com/vk/newsfeed/posting/viewpresenter/bottom/PosterPreviewAdapter$e$a.smali @@ -118,7 +118,7 @@ div-float/2addr v7, v5 - invoke-static {v1, v4, v6, v7, v2}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V + invoke-static {v1, v4, v6, v7, v2}, Lru/vtosters/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V .line 11 new-instance v4, Landroid/graphics/PorterDuffXfermode; diff --git a/smali/smali_classes3/com/vk/newsfeed/presenters/NewsfeedPresenter.smali b/smali/smali_classes3/com/vk/newsfeed/presenters/NewsfeedPresenter.smali index d6bdb419c1..005cd9193c 100644 --- a/smali/smali_classes3/com/vk/newsfeed/presenters/NewsfeedPresenter.smali +++ b/smali/smali_classes3/com/vk/newsfeed/presenters/NewsfeedPresenter.smali @@ -1176,7 +1176,7 @@ .method private final b(Lcom/vk/dto/stories/model/GetStoriesResponse;)V .locals 4 - invoke-static {}, Lru/vtosters/lite/hooks/StoriesHook;->showstories()Z + invoke-static {}, Lru/vtosters/hooks/StoriesHook;->showstories()Z move-result v0 diff --git a/smali/smali_classes4/com/vk/notifications/NotificationView.smali b/smali/smali_classes4/com/vk/notifications/NotificationView.smali index 5cc89e8c85..03539d2c79 100644 --- a/smali/smali_classes4/com/vk/notifications/NotificationView.smali +++ b/smali/smali_classes4/com/vk/notifications/NotificationView.smali @@ -1970,7 +1970,7 @@ .line 36 invoke-virtual {p1, p2}, Landroid/widget/TextView;->setBackgroundResource(I)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p2 diff --git a/smali/smali_classes4/com/vk/poll/adapters/PollBackgroundSmallViewHolders2.smali b/smali/smali_classes4/com/vk/poll/adapters/PollBackgroundSmallViewHolders2.smali index edf2f44697..b87143e6d4 100644 --- a/smali/smali_classes4/com/vk/poll/adapters/PollBackgroundSmallViewHolders2.smali +++ b/smali/smali_classes4/com/vk/poll/adapters/PollBackgroundSmallViewHolders2.smali @@ -67,7 +67,7 @@ invoke-static {p1, p2}, Lcom/vk/extensions/ViewExtKt;->b(Landroid/view/View;Z)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p1 diff --git a/smali/smali_classes4/com/vk/poll/adapters/PollResultAnswerHolder.smali b/smali/smali_classes4/com/vk/poll/adapters/PollResultAnswerHolder.smali index cc29fcef91..071ccbed37 100644 --- a/smali/smali_classes4/com/vk/poll/adapters/PollResultAnswerHolder.smali +++ b/smali/smali_classes4/com/vk/poll/adapters/PollResultAnswerHolder.smali @@ -289,7 +289,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes4/com/vk/poll/views/PollFilterBottomView.smali b/smali/smali_classes4/com/vk/poll/views/PollFilterBottomView.smali index 6244f56782..920781bdb1 100644 --- a/smali/smali_classes4/com/vk/poll/views/PollFilterBottomView.smali +++ b/smali/smali_classes4/com/vk/poll/views/PollFilterBottomView.smali @@ -500,7 +500,7 @@ sget-object v1, Lcom/vk/core/util/AppContextHolder;->a:Landroid/content/Context; - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes4/com/vk/poll/views/PollResultRateDrawable.smali b/smali/smali_classes4/com/vk/poll/views/PollResultRateDrawable.smali index 21d19338fb..3324272027 100644 --- a/smali/smali_classes4/com/vk/poll/views/PollResultRateDrawable.smali +++ b/smali/smali_classes4/com/vk/poll/views/PollResultRateDrawable.smali @@ -47,7 +47,7 @@ .line 2 sget-object v0, Lcom/vk/core/util/AppContextHolder;->a:Landroid/content/Context; - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes4/com/vk/polls/ui/views/AbstractPollView$e.smali b/smali/smali_classes4/com/vk/polls/ui/views/AbstractPollView$e.smali index e1caf7cf76..477c809835 100644 --- a/smali/smali_classes4/com/vk/polls/ui/views/AbstractPollView$e.smali +++ b/smali/smali_classes4/com/vk/polls/ui/views/AbstractPollView$e.smali @@ -181,7 +181,7 @@ .method private final b()I .locals 1 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView$a.smali b/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView$a.smali index 7d89972974..8871e47635 100644 --- a/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView$a.smali +++ b/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView$a.smali @@ -37,7 +37,7 @@ .locals 1 .line 4 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 @@ -143,7 +143,7 @@ .locals 1 .line 3 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView.smali b/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView.smali index 873e0aa0f3..d0bf3d238c 100644 --- a/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView.smali +++ b/smali/smali_classes4/com/vk/polls/ui/views/PollOptionView.smali @@ -270,7 +270,7 @@ aput v0, p1, v4 .line 7 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 @@ -754,7 +754,7 @@ :goto_5 invoke-virtual {v0, v2}, Landroid/widget/TextView;->setVisibility(I)V - invoke-static {p0}, Lru/vtosters/lite/hooks/PollHook;->show(Lcom/vk/polls/ui/views/PollOptionView;)V + invoke-static {p0}, Lru/vtosters/hooks/PollHook;->show(Lcom/vk/polls/ui/views/PollOptionView;)V .line 18 iget-object v0, p0, Lcom/vk/polls/ui/views/PollOptionView;->c:Landroid/widget/TextView; diff --git a/smali/smali_classes4/com/vk/profile/adapter/items/b0/StubCountersItem$c.smali b/smali/smali_classes4/com/vk/profile/adapter/items/b0/StubCountersItem$c.smali index 01a31ed83a..9998c28671 100644 --- a/smali/smali_classes4/com/vk/profile/adapter/items/b0/StubCountersItem$c.smali +++ b/smali/smali_classes4/com/vk/profile/adapter/items/b0/StubCountersItem$c.smali @@ -140,7 +140,7 @@ if-le v1, v3, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortinfo()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->shortinfo()Z move-result v5 diff --git a/smali/smali_classes4/com/vk/profile/adapter/items/c0/StubMessageItem$c.smali b/smali/smali_classes4/com/vk/profile/adapter/items/c0/StubMessageItem$c.smali index 4f3f4525e3..3667738625 100644 --- a/smali/smali_classes4/com/vk/profile/adapter/items/c0/StubMessageItem$c.smali +++ b/smali/smali_classes4/com/vk/profile/adapter/items/c0/StubMessageItem$c.smali @@ -18,7 +18,7 @@ .method public constructor (Landroid/content/Context;Lcom/vtosters/lite/api/ExtendedUserProfile;Z)V .locals 2 - invoke-static {p2}, Lru/vtosters/lite/ssfs/ProfileHider;->getInfo(Lcom/vtosters/lite/api/ExtendedUserProfile;)Ljava/lang/String; + invoke-static {p2}, Lru/vtosters/hooks/ssfs/ProfileHook;->getInfo(Lcom/vtosters/lite/api/ExtendedUserProfile;)Ljava/lang/String; move-result-object p1 diff --git a/smali/smali_classes4/com/vk/profile/adapter/items/community/CommunityOnlineStatusItem$a.smali b/smali/smali_classes4/com/vk/profile/adapter/items/community/CommunityOnlineStatusItem$a.smali index bec4ffc563..8d76a1cacd 100644 --- a/smali/smali_classes4/com/vk/profile/adapter/items/community/CommunityOnlineStatusItem$a.smali +++ b/smali/smali_classes4/com/vk/profile/adapter/items/community/CommunityOnlineStatusItem$a.smali @@ -257,7 +257,7 @@ invoke-static {v7, v3}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v7 diff --git a/smali/smali_classes4/com/vk/profile/presenter/UserPresenter$a.smali b/smali/smali_classes4/com/vk/profile/presenter/UserPresenter$a.smali index 802e04ebf4..9049a0a535 100644 --- a/smali/smali_classes4/com/vk/profile/presenter/UserPresenter$a.smali +++ b/smali/smali_classes4/com/vk/profile/presenter/UserPresenter$a.smali @@ -105,7 +105,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/ssfs/ProfileHider;->isService(Ljava/lang/Integer;)Z + invoke-static {p1}, Lru/vtosters/hooks/ssfs/ProfileHook;->isService(Ljava/lang/Integer;)Z move-result p1 diff --git a/smali/smali_classes4/com/vk/profile/presenter/UserPresenter.smali b/smali/smali_classes4/com/vk/profile/presenter/UserPresenter.smali index fe3d7b5e10..dbd45d2871 100644 --- a/smali/smali_classes4/com/vk/profile/presenter/UserPresenter.smali +++ b/smali/smali_classes4/com/vk/profile/presenter/UserPresenter.smali @@ -956,7 +956,7 @@ #invoke-static {p0}, Lcom/vk/core/util/ToastUtils;->a(Ljava/lang/CharSequence;)V - invoke-static {p1, p2}, Lru/vtosters/lite/hooks/CallsHook;->forwardToVkOffApps(Landroid/view/View;Lcom/vtosters/lite/api/ExtendedUserProfile;)V + invoke-static {p1, p2}, Lru/vtosters/hooks/CallsHook;->forwardToVkOffApps(Landroid/view/View;Lcom/vtosters/lite/api/ExtendedUserProfile;)V # .line 18 # new-instance v7, Lcom/vk/core/dialogs/actionspopup/ActionsPopup$b; @@ -1128,7 +1128,7 @@ move-result-object v1 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali b/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali index 39a7c4b94c..08a6d21893 100644 --- a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali +++ b/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment$c.smali @@ -56,7 +56,7 @@ const-string v4, "static.vk.com" - invoke-static {v4}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali b/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali index 471cde4687..751accbc29 100644 --- a/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali +++ b/smali/smali_classes4/com/vk/profile/ui/community/CommunityChatsFragment.smali @@ -84,7 +84,7 @@ const-string v4, "static.vk.com" - invoke-static {v4}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes4/com/vk/profile/ui/community/CommunityFragment.smali b/smali/smali_classes4/com/vk/profile/ui/community/CommunityFragment.smali index 27daff7c04..e48a1d5107 100644 --- a/smali/smali_classes4/com/vk/profile/ui/community/CommunityFragment.smali +++ b/smali/smali_classes4/com/vk/profile/ui/community/CommunityFragment.smali @@ -2657,7 +2657,7 @@ invoke-virtual {p0, p1}, Lcom/vk/newsfeed/EntriesListFragment;->a(Lio/reactivex/disposables/Disposable;)V :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-void .end method diff --git a/smali/smali_classes4/com/vk/profile/ui/user/AdministratorProfileFragment.smali b/smali/smali_classes4/com/vk/profile/ui/user/AdministratorProfileFragment.smali index eda39d07a7..e48d20b394 100644 --- a/smali/smali_classes4/com/vk/profile/ui/user/AdministratorProfileFragment.smali +++ b/smali/smali_classes4/com/vk/profile/ui/user/AdministratorProfileFragment.smali @@ -377,7 +377,7 @@ if-eqz v3, :cond_3 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v4 @@ -450,7 +450,7 @@ if-eqz v1, :cond_8 - invoke-static {v1}, Lru/vtosters/lite/ssfs/ProfileHider;->getInfo(Lcom/vtosters/lite/api/ExtendedUserProfile;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/ssfs/ProfileHook;->getInfo(Lcom/vtosters/lite/api/ExtendedUserProfile;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes4/com/vk/pushes/notifications/im/BusinessNotifyGroupNotification.smali b/smali/smali_classes4/com/vk/pushes/notifications/im/BusinessNotifyGroupNotification.smali index bf35a4f9d8..89ee5f657d 100644 --- a/smali/smali_classes4/com/vk/pushes/notifications/im/BusinessNotifyGroupNotification.smali +++ b/smali/smali_classes4/com/vk/pushes/notifications/im/BusinessNotifyGroupNotification.smali @@ -113,7 +113,7 @@ .line 6 iget-object v1, p0, Lcom/vk/pushes/notifications/im/BusinessNotifyGroupNotification;->d:Landroid/content/Context; - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes4/com/vk/pushes/notifications/im/MessageGroupNotification.smali b/smali/smali_classes4/com/vk/pushes/notifications/im/MessageGroupNotification.smali index 7a78e986c7..9963906e82 100644 --- a/smali/smali_classes4/com/vk/pushes/notifications/im/MessageGroupNotification.smali +++ b/smali/smali_classes4/com/vk/pushes/notifications/im/MessageGroupNotification.smali @@ -164,7 +164,7 @@ .line 6 iget-object v1, p0, Lcom/vk/pushes/notifications/im/MessageGroupNotification;->d:Landroid/content/Context; - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes4/com/vk/qrcode/QRUtils.smali b/smali/smali_classes4/com/vk/qrcode/QRUtils.smali index dcba6459f6..a17fb1ade1 100644 --- a/smali/smali_classes4/com/vk/qrcode/QRUtils.smali +++ b/smali/smali_classes4/com/vk/qrcode/QRUtils.smali @@ -316,7 +316,7 @@ const/16 v2, 0x64 - invoke-static {v2}, Lru/vtosters/lite/utils/Preferences;->compress(I)I + invoke-static {v2}, Lru/vtosters/hooks/other/Preferences;->compress(I)I move-result v2 diff --git a/smali/smali_classes4/com/vk/qrcode/QRViewUtils.smali b/smali/smali_classes4/com/vk/qrcode/QRViewUtils.smali index a870c4211b..ce6e0f4c3a 100644 --- a/smali/smali_classes4/com/vk/qrcode/QRViewUtils.smali +++ b/smali/smali_classes4/com/vk/qrcode/QRViewUtils.smali @@ -6659,7 +6659,7 @@ const/16 v2, 0x64 - invoke-static {v2}, Lru/vtosters/lite/utils/Preferences;->compress(I)I + invoke-static {v2}, Lru/vtosters/hooks/other/Preferences;->compress(I)I move-result v2 diff --git a/smali/smali_classes4/com/vk/sharing/attachment/AttachmentTypes2.smali b/smali/smali_classes4/com/vk/sharing/attachment/AttachmentTypes2.smali index e1a3c32f4d..9d1003bff4 100644 --- a/smali/smali_classes4/com/vk/sharing/attachment/AttachmentTypes2.smali +++ b/smali/smali_classes4/com/vk/sharing/attachment/AttachmentTypes2.smali @@ -216,7 +216,7 @@ move-result-object v4 - invoke-static {v4}, Lru/vtosters/lite/utils/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + invoke-static {v4}, Lru/vtosters/hooks/other/ThemesUtils;->recolorDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object v4 diff --git a/smali/smali_classes4/com/vk/sharing/view/SharingView.smali b/smali/smali_classes4/com/vk/sharing/view/SharingView.smali index ac8a3aff90..5b41bd9e71 100644 --- a/smali/smali_classes4/com/vk/sharing/view/SharingView.smali +++ b/smali/smali_classes4/com/vk/sharing/view/SharingView.smali @@ -1271,7 +1271,7 @@ sget v1, Lb/h/z/b;->button_primary_background:I - invoke-static {v1}, Lru/vtosters/lite/utils/ThemesUtils;->getColorFromAttr(I)I + invoke-static {v1}, Lru/vtosters/hooks/other/ThemesUtils;->getColorFromAttr(I)I move-result v1 @@ -1376,7 +1376,7 @@ sget v1, Lb/h/z/b;->button_primary_background:I - invoke-static {v1}, Lru/vtosters/lite/utils/ThemesUtils;->getColorFromAttr(I)I + invoke-static {v1}, Lru/vtosters/hooks/other/ThemesUtils;->getColorFromAttr(I)I move-result v1 diff --git a/smali/smali_classes4/com/vk/socialgraph/init/BaseSocialGraphInitFragment.smali b/smali/smali_classes4/com/vk/socialgraph/init/BaseSocialGraphInitFragment.smali index f73ffb7465..51b8b836fe 100644 --- a/smali/smali_classes4/com/vk/socialgraph/init/BaseSocialGraphInitFragment.smali +++ b/smali/smali_classes4/com/vk/socialgraph/init/BaseSocialGraphInitFragment.smali @@ -144,7 +144,7 @@ .line 5 invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v0, v1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, v1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V const/4 v0, 0x0 diff --git a/smali/smali_classes4/com/vk/socialgraph/init/SocialGraphLoginFragment.smali b/smali/smali_classes4/com/vk/socialgraph/init/SocialGraphLoginFragment.smali index c98906f839..5cec918dfb 100644 --- a/smali/smali_classes4/com/vk/socialgraph/init/SocialGraphLoginFragment.smali +++ b/smali/smali_classes4/com/vk/socialgraph/init/SocialGraphLoginFragment.smali @@ -203,7 +203,7 @@ const-string v0, "com.google" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -389,7 +389,7 @@ const-string v1, "com.google" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes4/com/vk/socialgraph/list/SocialGraphFriendsFragment.smali b/smali/smali_classes4/com/vk/socialgraph/list/SocialGraphFriendsFragment.smali index 8e6d709ce2..e26b029072 100644 --- a/smali/smali_classes4/com/vk/socialgraph/list/SocialGraphFriendsFragment.smali +++ b/smali/smali_classes4/com/vk/socialgraph/list/SocialGraphFriendsFragment.smali @@ -183,7 +183,7 @@ .line 6 invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v0, v1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, v1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V const/4 v0, 0x0 diff --git a/smali/smali_classes4/com/vk/stickers/StickerEmojiPage.smali b/smali/smali_classes4/com/vk/stickers/StickerEmojiPage.smali index 169fad3966..131f419cf1 100644 --- a/smali/smali_classes4/com/vk/stickers/StickerEmojiPage.smali +++ b/smali/smali_classes4/com/vk/stickers/StickerEmojiPage.smali @@ -98,7 +98,7 @@ invoke-virtual {v0, p1}, Lcom/vk/emoji/EmojiKeyboardView;->setFastScrollBarColor(I)V .line 9 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p1 diff --git a/smali/smali_classes4/com/vk/stickers/StickerLongtapWindow.smali b/smali/smali_classes4/com/vk/stickers/StickerLongtapWindow.smali index fb0d79fb88..09076a1618 100644 --- a/smali/smali_classes4/com/vk/stickers/StickerLongtapWindow.smali +++ b/smali/smali_classes4/com/vk/stickers/StickerLongtapWindow.smali @@ -304,7 +304,7 @@ invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v0, v1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, v1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V :cond_0 const/4 v0, 0x0 @@ -375,7 +375,7 @@ :goto_0 invoke-virtual {v0, v2}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v0, v2}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, v2}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V const/4 v0, 0x1 diff --git a/smali/smali_classes4/com/vk/stickers/Stickers.smali b/smali/smali_classes4/com/vk/stickers/Stickers.smali index 4701683f69..1fab0d0143 100644 --- a/smali/smali_classes4/com/vk/stickers/Stickers.smali +++ b/smali/smali_classes4/com/vk/stickers/Stickers.smali @@ -2362,7 +2362,7 @@ .method public final a(I)Lcom/vk/dto/stickers/StickerStockItem; .locals 1 - invoke-static {p1}, Lru/vtosters/lite/tgs/TGRoot;->getPackBySticker(I)Lcom/vk/dto/stickers/StickerStockItem; + invoke-static {p1}, Lru/vtosters/hooks/TelegramStickersHook;->getPackBySticker(I)Lcom/vk/dto/stickers/StickerStockItem; move-result-object v0 @@ -2678,7 +2678,7 @@ .method public final b(I)Lcom/vk/dto/stickers/StickerStockItem; .locals 1 - invoke-static {p1}, Lru/vtosters/lite/tgs/TGRoot;->getPackBySticker(I)Lcom/vk/dto/stickers/StickerStockItem; + invoke-static {p1}, Lru/vtosters/hooks/TelegramStickersHook;->getPackBySticker(I)Lcom/vk/dto/stickers/StickerStockItem; move-result-object v0 diff --git a/smali/smali_classes4/com/vk/stickers/StickersKeyboardNavigationAdapter$StickersNavigationHolder.smali b/smali/smali_classes4/com/vk/stickers/StickersKeyboardNavigationAdapter$StickersNavigationHolder.smali index 64d409d597..807e950a73 100644 --- a/smali/smali_classes4/com/vk/stickers/StickersKeyboardNavigationAdapter$StickersNavigationHolder.smali +++ b/smali/smali_classes4/com/vk/stickers/StickersKeyboardNavigationAdapter$StickersNavigationHolder.smali @@ -151,7 +151,7 @@ new-array v1, v1, [I .line 2 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v4 @@ -221,7 +221,7 @@ new-array v1, v1, [I .line 2 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v4 diff --git a/smali/smali_classes4/com/vk/stickers/StickersKeyboardView.smali b/smali/smali_classes4/com/vk/stickers/StickersKeyboardView.smali index b7507d9e0e..0ba64ef142 100644 --- a/smali/smali_classes4/com/vk/stickers/StickersKeyboardView.smali +++ b/smali/smali_classes4/com/vk/stickers/StickersKeyboardView.smali @@ -237,7 +237,7 @@ if-eqz p1, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes4/com/vk/stickers/StickersView.smali b/smali/smali_classes4/com/vk/stickers/StickersView.smali index 934bac7ab5..c52c661091 100644 --- a/smali/smali_classes4/com/vk/stickers/StickersView.smali +++ b/smali/smali_classes4/com/vk/stickers/StickersView.smali @@ -719,7 +719,7 @@ new-array v1, v1, [I - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v4 @@ -914,7 +914,7 @@ invoke-direct {v2, v3}, Ljava/util/ArrayList;->(Ljava/util/Collection;)V - invoke-static {v2}, Lru/vtosters/lite/tgs/TGRoot;->injectStickers(Ljava/util/List;)V + invoke-static {v2}, Lru/vtosters/hooks/TelegramStickersHook;->injectStickers(Ljava/util/List;)V .line 9 sget-object v3, Lcom/vk/stickers/Stickers;->l:Lcom/vk/stickers/Stickers; diff --git a/smali/smali_classes4/com/vk/stickers/f0/KeyboardPopup.smali b/smali/smali_classes4/com/vk/stickers/f0/KeyboardPopup.smali index 2bb7c2a336..cccd5d83dc 100644 --- a/smali/smali_classes4/com/vk/stickers/f0/KeyboardPopup.smali +++ b/smali/smali_classes4/com/vk/stickers/f0/KeyboardPopup.smali @@ -162,7 +162,7 @@ move-result v4 - invoke-static {v4}, Lru/vtosters/lite/utils/Preferences;->alteremoji(Z)Z + invoke-static {v4}, Lru/vtosters/hooks/other/Preferences;->alteremoji(Z)Z move-result v4 @@ -205,7 +205,7 @@ move-result v5 - invoke-static {v5}, Lru/vtosters/lite/utils/Preferences;->alteremoji(Z)Z + invoke-static {v5}, Lru/vtosters/hooks/other/Preferences;->alteremoji(Z)Z move-result v5 @@ -419,7 +419,7 @@ move-result v4 - invoke-static {v4}, Lru/vtosters/lite/utils/Preferences;->alteremoji(Z)Z + invoke-static {v4}, Lru/vtosters/hooks/other/Preferences;->alteremoji(Z)Z move-result v4 diff --git a/smali/smali_classes4/com/vk/stories/StoriesController.smali b/smali/smali_classes4/com/vk/stories/StoriesController.smali index 17f63a1529..4927f83bce 100644 --- a/smali/smali_classes4/com/vk/stories/StoriesController.smali +++ b/smali/smali_classes4/com/vk/stories/StoriesController.smali @@ -1941,7 +1941,7 @@ .line 43 :cond_0 - invoke-static {}, Lru/vtosters/lite/dialogs/DNRPrefs;->getStoriesRead()Z + invoke-static {}, Lru/vtosters/hooks/StoriesHook;->getStoriesRead()Z move-result v2 @@ -1999,7 +1999,7 @@ .method public static a(Lcom/vk/dto/stories/model/StoriesContainer;Lcom/vk/dto/stories/model/StoryEntry;Lcom/vk/stories/StoriesController$SourceType;I)V .locals 15 - invoke-static {}, Lru/vtosters/lite/dialogs/DNRPrefs;->getStoriesRead()Z + invoke-static {}, Lru/vtosters/hooks/StoriesHook;->getStoriesRead()Z move-result v2 diff --git a/smali/smali_classes4/com/vk/stories/clickable/dialogs/music/SelectRangeWaveFormView.smali b/smali/smali_classes4/com/vk/stories/clickable/dialogs/music/SelectRangeWaveFormView.smali index f220d8801c..dd0e3f9707 100644 --- a/smali/smali_classes4/com/vk/stories/clickable/dialogs/music/SelectRangeWaveFormView.smali +++ b/smali/smali_classes4/com/vk/stories/clickable/dialogs/music/SelectRangeWaveFormView.smali @@ -324,7 +324,7 @@ invoke-static {v1, v2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 @@ -657,7 +657,7 @@ invoke-static {v0, v1}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 @@ -990,7 +990,7 @@ invoke-static {p3, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p3 diff --git a/smali/smali_classes4/com/vk/stories/clickable/dialogs/question/StoryCreateQuestionDataProvider.smali b/smali/smali_classes4/com/vk/stories/clickable/dialogs/question/StoryCreateQuestionDataProvider.smali index d866190818..717f354821 100644 --- a/smali/smali_classes4/com/vk/stories/clickable/dialogs/question/StoryCreateQuestionDataProvider.smali +++ b/smali/smali_classes4/com/vk/stories/clickable/dialogs/question/StoryCreateQuestionDataProvider.smali @@ -126,7 +126,7 @@ aput-object v1, v0, v6 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes4/com/vk/stories/clickable/models/StoryQuestionInfo.smali b/smali/smali_classes4/com/vk/stories/clickable/models/StoryQuestionInfo.smali index 34bb3aefbc..4335218a40 100644 --- a/smali/smali_classes4/com/vk/stories/clickable/models/StoryQuestionInfo.smali +++ b/smali/smali_classes4/com/vk/stories/clickable/models/StoryQuestionInfo.smali @@ -56,7 +56,7 @@ sput-object v0, Lcom/vk/stories/clickable/models/StoryQuestionInfo;->g:Lcom/vk/stories/clickable/models/StoryQuestionInfo$b; - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes4/com/vk/stories/clickable/stickers/StoryPollSticker.smali b/smali/smali_classes4/com/vk/stories/clickable/stickers/StoryPollSticker.smali index 6867d95ba4..18bb71ee22 100644 --- a/smali/smali_classes4/com/vk/stories/clickable/stickers/StoryPollSticker.smali +++ b/smali/smali_classes4/com/vk/stories/clickable/stickers/StoryPollSticker.smali @@ -1453,7 +1453,7 @@ if-eqz v16, :cond_12 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes4/com/vk/stories/util/StoriesUtil.smali b/smali/smali_classes4/com/vk/stories/util/StoriesUtil.smali index c49f2be2c0..a534a635c1 100644 --- a/smali/smali_classes4/com/vk/stories/util/StoriesUtil.smali +++ b/smali/smali_classes4/com/vk/stories/util/StoriesUtil.smali @@ -403,7 +403,7 @@ .method public final a(I)Ljava/lang/String; .locals 10 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortinfo()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->shortinfo()Z move-result v1 diff --git a/smali/smali_classes4/com/vk/stories/view/VolumeControlView.smali b/smali/smali_classes4/com/vk/stories/view/VolumeControlView.smali index 8088bb25ee..32a17fcd5f 100644 --- a/smali/smali_classes4/com/vk/stories/view/VolumeControlView.smali +++ b/smali/smali_classes4/com/vk/stories/view/VolumeControlView.smali @@ -128,7 +128,7 @@ .method private a()V .locals 2 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getBackgroundContent()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getBackgroundContent()I move-result v0 @@ -172,7 +172,7 @@ .line 6 iget-object v0, p0, Lcom/vk/stories/view/VolumeControlView;->c:Landroid/graphics/Paint; - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes4/com/vk/stories/view/question/StoryViewAskQuestionView.smali b/smali/smali_classes4/com/vk/stories/view/question/StoryViewAskQuestionView.smali index 43e84675d0..e9b36af0fa 100644 --- a/smali/smali_classes4/com/vk/stories/view/question/StoryViewAskQuestionView.smali +++ b/smali/smali_classes4/com/vk/stories/view/question/StoryViewAskQuestionView.smali @@ -1139,7 +1139,7 @@ invoke-static {p2, v2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p2 diff --git a/smali/smali_classes4/com/vk/toggle/FeatureManager.smali b/smali/smali_classes4/com/vk/toggle/FeatureManager.smali index 7bbb679ebd..5b25559192 100644 --- a/smali/smali_classes4/com/vk/toggle/FeatureManager.smali +++ b/smali/smali_classes4/com/vk/toggle/FeatureManager.smali @@ -558,13 +558,13 @@ .method public static final declared-synchronized b(Lcom/vk/toggle/Features$Type;)Z .locals 2 - invoke-static {p0}, Lru/vtosters/lite/hooks/TogglesHook;->shouldPatch(Lcom/vk/toggle/Features$Type;)Z + invoke-static {p0}, Lru/vtosters/hooks/TogglesHook;->shouldPatch(Lcom/vk/toggle/Features$Type;)Z move-result v0 if-eqz v0, :cond_b - invoke-static {p0}, Lru/vtosters/lite/hooks/TogglesHook;->redirect(Lcom/vk/toggle/Features$Type;)Z + invoke-static {p0}, Lru/vtosters/hooks/TogglesHook;->redirect(Lcom/vk/toggle/Features$Type;)Z move-result p0 diff --git a/smali/smali_classes4/com/vk/ui/photoviewer/BottomPanelController.smali b/smali/smali_classes4/com/vk/ui/photoviewer/BottomPanelController.smali index 9eb751b480..481682a7b7 100644 --- a/smali/smali_classes4/com/vk/ui/photoviewer/BottomPanelController.smali +++ b/smali/smali_classes4/com/vk/ui/photoviewer/BottomPanelController.smali @@ -102,7 +102,7 @@ move-result-object v0 - invoke-static/range {v0 .. v0}, Lru/vtosters/lite/hooks/PostViewHook;->injectPhotoViewer(Landroid/view/View;)V + invoke-static/range {v0 .. v0}, Lru/vtosters/hooks/PostViewHook;->injectPhotoViewer(Landroid/view/View;)V const-string v1, "LayoutInflater.from(cont\u2026hoto_viewer_bottom, null)" diff --git a/smali/smali_classes4/com/vk/ui/photoviewer/MenuController.smali b/smali/smali_classes4/com/vk/ui/photoviewer/MenuController.smali index a0daa99c66..3126fffe7a 100644 --- a/smali/smali_classes4/com/vk/ui/photoviewer/MenuController.smali +++ b/smali/smali_classes4/com/vk/ui/photoviewer/MenuController.smali @@ -721,7 +721,7 @@ move/from16 v3, p4 - invoke-static/range {v0 .. v3}, Lru/vtosters/lite/hooks/PhotoViewer;->addMenuItems(Lcom/vk/dto/common/AttachmentWithMedia;Lcom/vk/core/dialogs/actionspopup/ActionsPopup$b;IZ)V + invoke-static/range {v0 .. v3}, Lru/vtosters/hooks/PhotoViewer;->addMenuItems(Lcom/vk/dto/common/AttachmentWithMedia;Lcom/vk/core/dialogs/actionspopup/ActionsPopup$b;IZ)V invoke-virtual/range {p2 .. p2}, Lcom/vk/core/dialogs/actionspopup/ActionsPopup$b;->c()Lcom/vk/core/dialogs/actionspopup/ActionsPopup; @@ -2748,7 +2748,7 @@ .method public final a(Lcom/vk/dto/common/AttachmentWithMedia;Landroid/view/MenuItem;Landroid/view/View;)Z .locals 2 - invoke-static {p1, p2, p3}, Lru/vtosters/lite/hooks/PhotoViewer;->interceptClick(Lcom/vk/dto/common/AttachmentWithMedia;Landroid/view/MenuItem;Landroid/view/View;)Z + invoke-static {p1, p2, p3}, Lru/vtosters/hooks/PhotoViewer;->interceptClick(Lcom/vk/dto/common/AttachmentWithMedia;Landroid/view/MenuItem;Landroid/view/View;)Z move-result v0 diff --git a/smali/smali_classes4/com/vk/wall/replybar/ReplyBarPresenter.smali b/smali/smali_classes4/com/vk/wall/replybar/ReplyBarPresenter.smali index ae3deae33e..7548d13a50 100644 --- a/smali/smali_classes4/com/vk/wall/replybar/ReplyBarPresenter.smali +++ b/smali/smali_classes4/com/vk/wall/replybar/ReplyBarPresenter.smali @@ -995,7 +995,7 @@ .method public a(ILcom/vk/dto/stickers/StickerItem;Ljava/lang/String;)V .locals 2 - invoke-static {p2}, Lru/vtosters/lite/tgs/TGRoot;->processSticker(Lcom/vk/dto/stickers/StickerItem;)Lcom/vk/dto/common/Attachment; + invoke-static {p2}, Lru/vtosters/hooks/TelegramStickersHook;->processSticker(Lcom/vk/dto/stickers/StickerItem;)Lcom/vk/dto/common/Attachment; move-result-object v0 diff --git a/smali/smali_classes4/com/vk/wall/thread/CommentThreadFragment.smali b/smali/smali_classes4/com/vk/wall/thread/CommentThreadFragment.smali index 172faf4ef5..177d76a20f 100644 --- a/smali/smali_classes4/com/vk/wall/thread/CommentThreadFragment.smali +++ b/smali/smali_classes4/com/vk/wall/thread/CommentThreadFragment.smali @@ -1165,7 +1165,7 @@ invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v0, v1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, v1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V .line 4 :cond_0 diff --git a/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali b/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali index 30a60d009a..d771dcc9c7 100644 --- a/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali +++ b/smali/smali_classes4/com/vk/webapp/VkUiFragment$b.smali @@ -132,7 +132,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali b/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali index 71925231cb..330adb313f 100644 --- a/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali +++ b/smali/smali_classes4/com/vk/webapp/VkUiFragment.smali @@ -1217,7 +1217,7 @@ const-string v3, "static.vk.com" - invoke-static {v3}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 @@ -1968,7 +1968,7 @@ move-result-object v1 - invoke-static {v1}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali b/smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali index 37667bd002..6b9620ecb5 100644 --- a/smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali +++ b/smali/smali_classes4/com/vk/webapp/bridges/AndroidBridge.smali @@ -548,7 +548,7 @@ const-string v3, "https://oauth.vk.com/blank.html" - invoke-static {v3}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 @@ -1091,14 +1091,10 @@ .line 2 :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/WebAppUtils;->getWebAppConfig()Lorg/json/JSONObject; + invoke-static {}, Lru/vtosters/hooks/WebAppHook;->getWebAppConfig()Lorg/json/JSONObject; move-result-object p1 - .line 3 - - .line 4 - .line 5 sget-object v0, Lcom/vk/webapp/internal/data/JsApiMethodType;->GET_CONFIG:Lcom/vk/webapp/internal/data/JsApiMethodType; @@ -1547,7 +1543,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/proxy/api/ApiProxy;->staticFix(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p1}, Lru/vtosters/hooks/ProxyHook;->staticFix(Ljava/lang/String;)Ljava/lang/String; move-result-object p1 @@ -1641,7 +1637,7 @@ const-string p3, "https://oauth.vk.com/authorize" - invoke-static {p3}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p3}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object p3 @@ -2197,7 +2193,7 @@ const-string v3, "https://oauth.vk.com/blank.html" - invoke-static {v3}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali b/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali index 22cfda7006..f3a636f366 100644 --- a/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali +++ b/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$a.smali @@ -132,7 +132,7 @@ aput-object p1, v0, v1 - invoke-static {p3}, Lru/vtosters/lite/proxy/api/ApiProxy;->staticFix(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p3}, Lru/vtosters/hooks/ProxyHook;->staticFix(Ljava/lang/String;)Ljava/lang/String; move-result-object p3 @@ -244,7 +244,7 @@ move-result-object p3 - invoke-static {p3}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p3}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object p3 diff --git a/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$u.smali b/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$u.smali index 16a3130e30..bd0348934b 100644 --- a/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$u.smali +++ b/smali/smali_classes4/com/vk/webapp/bridges/VkUiConnectBridge$u.smali @@ -87,7 +87,7 @@ move-result-object v4 - invoke-static {v4}, Lru/vtosters/lite/proxy/api/ApiProxy;->staticFix(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/ProxyHook;->staticFix(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali b/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali index 0cb4744842..989c0b68a7 100644 --- a/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali +++ b/smali/smali_classes4/com/vk/webapp/helpers/WebAppApiHelper.smali @@ -182,7 +182,7 @@ .line 16 :goto_0 - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/com/vk/webapp/helpers/WebClients.smali b/smali/smali_classes4/com/vk/webapp/helpers/WebClients.smali index e2a57e47e5..742943b06d 100644 --- a/smali/smali_classes4/com/vk/webapp/helpers/WebClients.smali +++ b/smali/smali_classes4/com/vk/webapp/helpers/WebClients.smali @@ -300,7 +300,7 @@ .method public onPageFinished(Landroid/webkit/WebView;Ljava/lang/String;)V .locals 3 - invoke-static/range {p1 .. p1}, Lru/vtosters/lite/hooks/VKUIHook;->inject(Landroid/webkit/WebView;)V + invoke-static/range {p1 .. p1}, Lru/vtosters/hooks/VKUIHook;->inject(Landroid/webkit/WebView;)V const/4 v0, 0x2 diff --git a/smali/smali_classes4/com/vk/webapp/p/a/StatusNavBarUtils.smali b/smali/smali_classes4/com/vk/webapp/p/a/StatusNavBarUtils.smali index efbeb1738f..3030407c4e 100644 --- a/smali/smali_classes4/com/vk/webapp/p/a/StatusNavBarUtils.smali +++ b/smali/smali_classes4/com/vk/webapp/p/a/StatusNavBarUtils.smali @@ -196,7 +196,7 @@ :cond_0 invoke-virtual {p1, p2}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {p1, p2}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p1, p2}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V :cond_1 return-void @@ -263,7 +263,7 @@ :goto_0 invoke-virtual {p1, p2}, Landroid/view/Window;->setNavigationBarColor(I)V - invoke-static {p1, p2}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p1, p2}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V :cond_1 return-void diff --git a/smali/smali_classes4/com/vtosters/lite/BirthdayBroadcastReceiver.smali b/smali/smali_classes4/com/vtosters/lite/BirthdayBroadcastReceiver.smali index a29c0b1582..7bcd4b98bc 100644 --- a/smali/smali_classes4/com/vtosters/lite/BirthdayBroadcastReceiver.smali +++ b/smali/smali_classes4/com/vtosters/lite/BirthdayBroadcastReceiver.smali @@ -196,7 +196,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes4/com/vtosters/lite/MainActivity.smali b/smali/smali_classes4/com/vtosters/lite/MainActivity.smali index 496c8c9270..bbdf532f81 100644 --- a/smali/smali_classes4/com/vtosters/lite/MainActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/MainActivity.smali @@ -111,7 +111,7 @@ move-result-object p1 - invoke-static {}, Lru/vtosters/lite/hooks/StartFragmentHook;->getStartFragment()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/hooks/StartFragmentHook;->getStartFragment()Ljava/lang/Class; move-result-object p2 @@ -400,7 +400,7 @@ .line 7 :cond_0 - invoke-static {p0}, Lru/vtosters/lite/hooks/MainActivityInjector;->inject(Landroid/app/Activity;)V + invoke-static {p0}, Lru/vtosters/hooks/MainActivityInjector;->inject(Landroid/app/Activity;)V invoke-virtual {p0}, Landroid/app/Activity;->getWindow()Landroid/view/Window; @@ -619,7 +619,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/hooks/StartFragmentHook;->getStartFragment()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/hooks/StartFragmentHook;->getStartFragment()Ljava/lang/Class; move-result-object v1 diff --git a/smali/smali_classes4/com/vtosters/lite/NotificationUtils.smali b/smali/smali_classes4/com/vtosters/lite/NotificationUtils.smali index b185b9efe4..f59ca9a8ca 100644 --- a/smali/smali_classes4/com/vtosters/lite/NotificationUtils.smali +++ b/smali/smali_classes4/com/vtosters/lite/NotificationUtils.smali @@ -51,7 +51,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p0 diff --git a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali index a5b889827b..1d8bef9a8a 100644 --- a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali +++ b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity$d.smali @@ -97,7 +97,7 @@ const-string v4, "oauth.vk.com" - invoke-static {v4}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali index 3c47b06d89..bedaf8ac1f 100644 --- a/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/SDKAuthActivity.smali @@ -207,7 +207,7 @@ const-string v4, "https://oauth.vk.com/blank.html" - invoke-static {v4}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 @@ -296,7 +296,7 @@ const-string v1, "oauth.vk.com" - invoke-static {v1}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes4/com/vtosters/lite/TabletDialogActivity.smali b/smali/smali_classes4/com/vtosters/lite/TabletDialogActivity.smali index 3c2bbff77a..466aa9015c 100644 --- a/smali/smali_classes4/com/vtosters/lite/TabletDialogActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/TabletDialogActivity.smali @@ -791,7 +791,7 @@ invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v0, v1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, v1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V .line 3 :cond_0 @@ -841,7 +841,7 @@ invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {p1, v0}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p1, v0}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V :cond_0 return-void diff --git a/smali/smali_classes4/com/vtosters/lite/VKActivity.smali b/smali/smali_classes4/com/vtosters/lite/VKActivity.smali index f102143d98..dc3392d7bc 100644 --- a/smali/smali_classes4/com/vtosters/lite/VKActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/VKActivity.smali @@ -309,7 +309,7 @@ invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {p1, v0}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p1, v0}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V :cond_0 return-void @@ -350,7 +350,7 @@ invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {p1, v0}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p1, v0}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V :cond_0 return-void diff --git a/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali b/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali index bc24c3d635..6d62af0251 100644 --- a/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali +++ b/smali/smali_classes4/com/vtosters/lite/VKApplication$initNetwork$1.smali @@ -82,7 +82,7 @@ .line 3 :goto_0 - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/com/vtosters/lite/VKApplication.smali b/smali/smali_classes4/com/vtosters/lite/VKApplication.smali index 59aa6da4ed..300ebeeb7a 100644 --- a/smali/smali_classes4/com/vtosters/lite/VKApplication.smali +++ b/smali/smali_classes4/com/vtosters/lite/VKApplication.smali @@ -2512,7 +2512,7 @@ .method public onCreate()V .locals 11 - invoke-static {p0}, Lru/vtosters/lite/utils/Preferences;->init(Landroid/app/Application;)V + invoke-static {p0}, Lru/vtosters/hooks/other/Preferences;->init(Landroid/app/Application;)V .line 1 invoke-static {p0}, Lcom/squareup/leakcanary/LeakCanary;->isInAnalyzerProcess(Landroid/content/Context;)Z diff --git a/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali b/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali index fa3b5c7441..48fc6a9d48 100644 --- a/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali +++ b/smali/smali_classes4/com/vtosters/lite/ValidationActivity$a.smali @@ -326,7 +326,7 @@ const-string v3, "oauth.vk.com" - invoke-static {v3}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes4/com/vtosters/lite/ViewUtils.smali b/smali/smali_classes4/com/vtosters/lite/ViewUtils.smali index 1f08edb5d1..308a42c044 100644 --- a/smali/smali_classes4/com/vtosters/lite/ViewUtils.smali +++ b/smali/smali_classes4/com/vtosters/lite/ViewUtils.smali @@ -747,7 +747,7 @@ .line 66 invoke-virtual {p0, p1}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {p0, p1}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p0, p1}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 diff --git a/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali b/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali index 65086030b9..0e52da0863 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/AppVKApiCallback.smali @@ -208,7 +208,7 @@ const-string v0, "api.vk.com" - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -305,7 +305,7 @@ const-string v3, "api.vk.com" - invoke-static {v3}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v3}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullCommunity.smali b/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullCommunity.smali index acd42e317a..b69f9cf533 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullCommunity.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullCommunity.smali @@ -178,7 +178,7 @@ } .end annotation - invoke-static/range {p2 .. p2}, Lru/vtosters/lite/utils/RenameTool;->injectIntoJsonGroup(Lorg/json/JSONObject;)V + invoke-static/range {p2 .. p2}, Lru/vtosters/hooks/RenameHook;->injectIntoJsonGroup(Lorg/json/JSONObject;)V move-object/from16 v0, p1 diff --git a/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullProfile.smali b/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullProfile.smali index 3942471198..b05afc7455 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullProfile.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullProfile.smali @@ -1513,7 +1513,7 @@ iput-object v0, v15, Lcom/vtosters/lite/api/ExtendedUserProfile;->l1:Ljava/util/ArrayList; :cond_22 - invoke-static {v14}, Lru/vtosters/lite/ssfs/ProfileButtons;->profileButton(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {v14}, Lru/vtosters/hooks/ssfs/ProfileHook;->getProfileButton(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object v14 diff --git a/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullUserProfile.smali b/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullUserProfile.smali index 1c89813745..32f768d2e6 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullUserProfile.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/execute/GetFullUserProfile.smali @@ -127,13 +127,13 @@ } .end annotation - invoke-static/range {p2 .. p2}, Lru/vtosters/lite/utils/RenameTool;->injectIntoJson(Lorg/json/JSONObject;)V + invoke-static/range {p2 .. p2}, Lru/vtosters/hooks/RenameHook;->injectIntoJson(Lorg/json/JSONObject;)V move-object/from16 v0, p1 move-object/from16 v1, p2 - invoke-static {v1}, Lru/vtosters/lite/hooks/OnlineFormatterHook;->onlineHook(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {v1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHook(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object v1 @@ -152,7 +152,7 @@ iput v4, v2, Lcom/vk/dto/user/UserProfile;->b:I - invoke-static {v0, v1}, Lru/vtosters/lite/ssfs/ProfileHider;->fetchInfo(Lcom/vtosters/lite/api/ExtendedUserProfile;Lorg/json/JSONObject;)V + invoke-static {v0, v1}, Lru/vtosters/hooks/ssfs/ProfileHook;->fetchInfo(Lcom/vtosters/lite/api/ExtendedUserProfile;Lorg/json/JSONObject;)V .line 3 iget-object v2, v0, Lcom/vtosters/lite/api/ExtendedUserProfile;->a:Lcom/vk/dto/user/UserProfile; diff --git a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet$a.smali b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet$a.smali index 1a67b757a0..d07aa5b995 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet$a.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet$a.smali @@ -188,7 +188,7 @@ .line 13 :cond_2 - invoke-static {p2}, Lru/vtosters/lite/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; + invoke-static {p2}, Lru/vtosters/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; move-result-object p2 diff --git a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet.smali b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet.smali index 8879fed8cd..93c54b517b 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet.smali @@ -147,7 +147,7 @@ invoke-virtual {p0, p2, p1}, Lcom/vk/api/base/ApiRequest;->c(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/base/ApiRequest; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-void .end method diff --git a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali index 7dce91e189..0acebb5de6 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali @@ -46,7 +46,7 @@ .method static constructor ()V .locals 7 - invoke-static {}, Lru/vtosters/lite/hooks/NewsfeedHook;->feedParams()[Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/NewsfeedHook;->feedParams()[Ljava/lang/String; move-result-object v0 @@ -548,7 +548,7 @@ move-result-object v1 - invoke-static {v1}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -566,7 +566,7 @@ invoke-virtual {p0, v2, v1}, Lcom/vk/api/base/ApiRequest;->a(Ljava/lang/String;Z)Lcom/vk/api/base/ApiRequest; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-void .end method @@ -734,7 +734,7 @@ .line 37 :cond_2 :goto_2 - invoke-static {v1}, Lru/vtosters/lite/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; + invoke-static {v1}, Lru/vtosters/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; move-result-object v1 @@ -805,7 +805,7 @@ .method public static c(Z)J .locals 3 - invoke-static {p0}, Lru/vtosters/lite/hooks/NewsfeedHook;->getUpdateNewsfeed(Z)J + invoke-static {p0}, Lru/vtosters/hooks/NewsfeedHook;->getUpdateNewsfeed(Z)J move-result-wide v0 @@ -1506,7 +1506,7 @@ move-result-object p2 - invoke-static {p2}, Lru/vtosters/lite/hooks/JsonInjectors;->newsfeedlist(Lorg/json/JSONArray;)Lorg/json/JSONArray; + invoke-static {p2}, Lru/vtosters/hooks/JsonInjectors;->newsfeedlist(Lorg/json/JSONArray;)Lorg/json/JSONArray; move-result-object p2 diff --git a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGetRecommendedLiveVideos.smali b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGetRecommendedLiveVideos.smali index d6e548c719..5d636f7ce0 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGetRecommendedLiveVideos.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGetRecommendedLiveVideos.smali @@ -139,7 +139,7 @@ move-result-object v1 - invoke-static {v1}, Lru/vtosters/lite/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; + invoke-static {v1}, Lru/vtosters/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; move-result-object v1 diff --git a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedSearch.smali b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedSearch.smali index 5e4c9e56cd..588ee04680 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedSearch.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedSearch.smali @@ -365,7 +365,7 @@ .line 14 :goto_2 - invoke-static {v4}, Lru/vtosters/lite/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; + invoke-static {v4}, Lru/vtosters/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; move-result-object v4 @@ -400,7 +400,7 @@ .line 17 :goto_3 - invoke-static {v2}, Lru/vtosters/lite/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; + invoke-static {v2}, Lru/vtosters/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; move-result-object v2 diff --git a/smali/smali_classes4/com/vtosters/lite/api/wall/WallGet.smali b/smali/smali_classes4/com/vtosters/lite/api/wall/WallGet.smali index bda6d05398..be5468cbb0 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/wall/WallGet.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/wall/WallGet.smali @@ -524,7 +524,7 @@ .line 19 :goto_2 - invoke-static {p1}, Lru/vtosters/lite/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; + invoke-static {p1}, Lru/vtosters/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; move-result-object p1 diff --git a/smali/smali_classes4/com/vtosters/lite/api/wall/WallGetById.smali b/smali/smali_classes4/com/vtosters/lite/api/wall/WallGetById.smali index 3d0c85e885..3ff91a3333 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/wall/WallGetById.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/wall/WallGetById.smali @@ -75,7 +75,7 @@ } .end annotation - invoke-static {p2}, Lru/vtosters/lite/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; + invoke-static {p2}, Lru/vtosters/hooks/AdBlockHook;->feedInject(Lorg/json/JSONArray;)Lorg/json/JSONArray; move-result-object p2 diff --git a/smali/smali_classes4/com/vtosters/lite/attachments/AttachmentUtils.smali b/smali/smali_classes4/com/vtosters/lite/attachments/AttachmentUtils.smali index f40a02f47f..7d514d3b84 100644 --- a/smali/smali_classes4/com/vtosters/lite/attachments/AttachmentUtils.smali +++ b/smali/smali_classes4/com/vtosters/lite/attachments/AttachmentUtils.smali @@ -983,7 +983,7 @@ :pswitch_8 const-string v0, "images" - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getBackgroundStickers()Ljava/lang/String; + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getBackgroundStickers()Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/com/vtosters/lite/data/Users$a.smali b/smali/smali_classes4/com/vtosters/lite/data/Users$a.smali index 9d83b34680..f4825b533b 100644 --- a/smali/smali_classes4/com/vtosters/lite/data/Users$a.smali +++ b/smali/smali_classes4/com/vtosters/lite/data/Users$a.smali @@ -51,13 +51,13 @@ .method public a(Lcom/vk/api/sdk/exceptions/VKApiExecutionException;)V .locals 5 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->offline()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->offline()Z move-result v2 if-eqz v2, :cond_a - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-void diff --git a/smali/smali_classes4/com/vtosters/lite/data/Users.smali b/smali/smali_classes4/com/vtosters/lite/data/Users.smali index 3e1758991d..9338eb2a86 100644 --- a/smali/smali_classes4/com/vtosters/lite/data/Users.smali +++ b/smali/smali_classes4/com/vtosters/lite/data/Users.smali @@ -109,13 +109,13 @@ .line 2 :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->offline()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->offline()Z move-result v2 if-eqz v2, :cond_a - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->forceOffline()V return-void diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc$i.smali b/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc$i.smali index 0afeb9d229..8c35556d13 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc$i.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc$i.smali @@ -75,7 +75,7 @@ invoke-virtual {v0, p1, p2, p3}, Lcom/vtosters/lite/im/AppAttachToImAttachConverter;->a(ILcom/vk/dto/stickers/StickerItem;Ljava/lang/String;)Lcom/vk/im/engine/models/attaches/AttachSticker; - invoke-static {p1, p2, p3}, Lru/vtosters/lite/tgs/TGRoot;->modifyStickerIM(ILcom/vk/dto/stickers/StickerItem;Ljava/lang/String;)Lcom/vk/im/engine/models/attaches/Attach; + invoke-static {p1, p2, p3}, Lru/vtosters/hooks/TelegramStickersHook;->modifyStickerIM(ILcom/vk/dto/stickers/StickerItem;Ljava/lang/String;)Lcom/vk/im/engine/models/attaches/Attach; move-result-object p1 diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc.smali b/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc.smali index 58dba5b263..8a2c4b28dd 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc.smali @@ -2724,7 +2724,7 @@ const/4 v4, 0x0 - invoke-static {v0, v4}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Lcom/vk/im/engine/models/messages/MsgFromUser;Z)Ljava/lang/String; + invoke-static {v0, v4}, Lru/vtosters/hooks/EncryptionMessagesHook;->decryptMessage(Lcom/vk/im/engine/models/messages/MsgFromUser;Z)Ljava/lang/String; move-result-object v1 @@ -5666,7 +5666,7 @@ iput-object p1, p0, Lcom/vtosters/lite/fragments/messages/chat/vc/MsgSendVc;->D:Lcom/vk/im/ui/views/WriteBarDisabled; - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->colorWriteBar(Landroid/view/View;)V + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->colorWriteBar(Landroid/view/View;)V .line 15 iget-object p1, p0, Lcom/vtosters/lite/fragments/messages/chat/vc/MsgSendVc;->C:Landroid/view/View; @@ -5687,7 +5687,7 @@ iput-object p1, p0, Lcom/vtosters/lite/fragments/messages/chat/vc/MsgSendVc;->B:Lcom/vtosters/lite/ui/WriteBar; - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->colorWriteBar(Landroid/view/View;)V + invoke-static {p1}, Lru/vtosters/hooks/other/ThemesUtils;->colorWriteBar(Landroid/view/View;)V .line 16 iget-object p1, p0, Lcom/vtosters/lite/fragments/messages/chat/vc/MsgSendVc;->B:Lcom/vtosters/lite/ui/WriteBar; @@ -6348,7 +6348,7 @@ const/4 v8, 0x0 - invoke-static {v2, v5, v8}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Ljava/lang/CharSequence;Lcom/vk/im/engine/models/messages/MsgFromUser;Z)Ljava/lang/CharSequence; + invoke-static {v2, v5, v8}, Lru/vtosters/hooks/EncryptionMessagesHook;->decryptMessage(Ljava/lang/CharSequence;Lcom/vk/im/engine/models/messages/MsgFromUser;Z)Ljava/lang/CharSequence; move-result-object v2 diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat_invite/accept/ChatInviteActivity.smali b/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat_invite/accept/ChatInviteActivity.smali index 0340a75d8a..651425afe7 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat_invite/accept/ChatInviteActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat_invite/accept/ChatInviteActivity.smali @@ -84,7 +84,7 @@ invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {p1, v0}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {p1, v0}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V return-void .end method diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyInfoBottomSheetDialog.smali b/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyInfoBottomSheetDialog.smali index 66995420b8..d3f5d79923 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyInfoBottomSheetDialog.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyInfoBottomSheetDialog.smali @@ -2088,7 +2088,7 @@ return p1 :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p1 diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali b/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali index ac46576dd0..90e3f8a0e8 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/money/MoneyWebViewFragment$a.smali @@ -68,7 +68,7 @@ const-string v1, "oauth.vk.com" - invoke-static {v1}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali b/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali index fac1a3cc08..803e92f7f9 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/n2/DebugDomainsFilter.smali @@ -305,7 +305,7 @@ :goto_5 const-string p2, "api.vk.com" - invoke-static {p2}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p2}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object p2 diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali b/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali index 111bb503b4..afa128055f 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/n2/SettingsDebugFragment.smali @@ -1969,7 +1969,7 @@ const-string v1, "static.vk.com" - invoke-static {v1}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -1987,7 +1987,7 @@ const-string v2, "previous_oauth" - invoke-static {v1}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -2001,7 +2001,7 @@ const-string v1, "api.vk.com" - invoke-static {v1}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes4/com/vtosters/lite/general/fragments/PhotosFragment.smali b/smali/smali_classes4/com/vtosters/lite/general/fragments/PhotosFragment.smali index a0205a6580..45edf6f364 100644 --- a/smali/smali_classes4/com/vtosters/lite/general/fragments/PhotosFragment.smali +++ b/smali/smali_classes4/com/vtosters/lite/general/fragments/PhotosFragment.smali @@ -829,7 +829,7 @@ move-result p2 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes4/com/vtosters/lite/general/fragments/SuggestionsFragment.smali b/smali/smali_classes4/com/vtosters/lite/general/fragments/SuggestionsFragment.smali index b15174de7c..bf2f387a1c 100644 --- a/smali/smali_classes4/com/vtosters/lite/general/fragments/SuggestionsFragment.smali +++ b/smali/smali_classes4/com/vtosters/lite/general/fragments/SuggestionsFragment.smali @@ -410,7 +410,7 @@ move-result-object p3 - invoke-static {v2}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {v2}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result p3 diff --git a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali b/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali index 58206f0cba..8bc428806b 100644 --- a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali +++ b/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment$a.smali @@ -40,7 +40,7 @@ const-string v1, "oauth.vk.com" - invoke-static {v1}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 @@ -182,7 +182,7 @@ const-string v0, "https://oauth.vk.com/blank.html#state=webview_refresh_access_token" - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali b/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali index 9476e7fd28..75810f643b 100644 --- a/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali +++ b/smali/smali_classes4/com/vtosters/lite/general/fragments/WebViewFragment.smali @@ -1012,7 +1012,7 @@ const-string v2, "https://oauth.vk.com/webview_token" - invoke-static {v2}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v2}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v2 @@ -1202,7 +1202,7 @@ const-string v0, "https://oauth.vk.com/webview_token" - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes5/com/vtosters/lite/fragments/photos/PhotoListFragment.smali b/smali/smali_classes5/com/vtosters/lite/fragments/photos/PhotoListFragment.smali index c6c1d9a173..5b5a6988bb 100644 --- a/smali/smali_classes5/com/vtosters/lite/fragments/photos/PhotoListFragment.smali +++ b/smali/smali_classes5/com/vtosters/lite/fragments/photos/PhotoListFragment.smali @@ -2161,7 +2161,7 @@ const v0, 0x7f0600f7 - invoke-static {v0}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {v0}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result p2 diff --git a/smali/smali_classes5/com/vtosters/lite/fragments/y2/VideosFragment.smali b/smali/smali_classes5/com/vtosters/lite/fragments/y2/VideosFragment.smali index 970a69e370..027fc0ed29 100644 --- a/smali/smali_classes5/com/vtosters/lite/fragments/y2/VideosFragment.smali +++ b/smali/smali_classes5/com/vtosters/lite/fragments/y2/VideosFragment.smali @@ -1135,7 +1135,7 @@ move-result-object v1 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v1 diff --git a/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali b/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali index bbd7a59958..01682ab6fe 100644 --- a/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali +++ b/smali/smali_classes5/com/vtosters/lite/im/ImEngineProvider$getApiManager$apiConfig$1.smali @@ -70,7 +70,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/proxy/api/ApiProxy;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/ProxyHook;->linkReplacer(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes5/com/vtosters/lite/live/LiveUserHolder.smali b/smali/smali_classes5/com/vtosters/lite/live/LiveUserHolder.smali index c2d22f6189..7f0734f666 100644 --- a/smali/smali_classes5/com/vtosters/lite/live/LiveUserHolder.smali +++ b/smali/smali_classes5/com/vtosters/lite/live/LiveUserHolder.smali @@ -194,7 +194,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/CircleColorDrawable.smali b/smali/smali_classes5/com/vtosters/lite/ui/CircleColorDrawable.smali index e7893c6e65..3e0e187b43 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/CircleColorDrawable.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/CircleColorDrawable.smali @@ -204,7 +204,7 @@ iget-object v3, p0, Lcom/vtosters/lite/ui/CircleColorDrawable;->c:Landroid/graphics/Paint; - invoke-static {p1, v0, v0, v2, v3}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V + invoke-static {p1, v0, v0, v2, v3}, Lru/vtosters/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V .line 6 iget-boolean v2, p0, Lcom/vtosters/lite/ui/CircleColorDrawable;->e:Z @@ -226,7 +226,7 @@ iget-object v1, p0, Lcom/vtosters/lite/ui/CircleColorDrawable;->b:Landroid/graphics/Paint; - invoke-static {p1, v0, v0, v2, v1}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V + invoke-static {p1, v0, v0, v2, v1}, Lru/vtosters/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V .line 8 :cond_0 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali b/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali index 631a95be52..43139b61dd 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/WriteBar.smali @@ -1314,7 +1314,7 @@ move-result-object p1 - invoke-static {}, Lru/vtosters/lite/hooks/WritebarHook;->getWriteBar()I + invoke-static {}, Lru/vtosters/hooks/WritebarHook;->getWriteBar()I move-result v0 @@ -1328,7 +1328,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/utils/ThemesUtils;->colorWriteBar(Landroid/view/View;)V + invoke-static {v0}, Lru/vtosters/hooks/other/ThemesUtils;->colorWriteBar(Landroid/view/View;)V check-cast v0, Landroid/view/ViewGroup; @@ -1701,7 +1701,7 @@ invoke-static {v0, v2}, Lcom/vk/extensions/ViewExtKt;->b(Landroid/view/View;Landroid/view/View$OnClickListener;)V - invoke-static {v0}, Lru/vtosters/lite/hooks/MessagesHook;->onLongClick(Landroid/view/View;)V + invoke-static {v0}, Lru/vtosters/hooks/MessagesHook;->onLongClick(Landroid/view/View;)V .line 62 iget-object v0, p0, Lcom/vtosters/lite/ui/WriteBar;->a0:Landroid/view/View; @@ -2135,7 +2135,7 @@ if-eqz v0, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->voice()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->voice()Z move-result v0 @@ -2162,7 +2162,7 @@ if-eqz v4, :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->voice()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->voice()Z move-result v4 @@ -3491,7 +3491,7 @@ .end annotation .end param - invoke-static {p3}, Lru/vtosters/lite/hooks/WritebarHook;->getIconsColors(I)I + invoke-static {p3}, Lru/vtosters/hooks/WritebarHook;->getIconsColors(I)I move-result p3 @@ -4512,7 +4512,7 @@ move-result v1 - invoke-static {v0, p1, p2, v1}, Lru/vtosters/lite/hooks/ReplyMsgHook;->injectWithDecrypt(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/MsgFromUser;Lcom/vk/im/engine/models/ProfilesSimpleInfo;Z)V + invoke-static {v0, p1, p2, v1}, Lru/vtosters/hooks/ReplyMsgHook;->injectWithDecrypt(Lcom/vk/im/ui/views/ReplyView;Lcom/vk/im/engine/models/messages/MsgFromUser;Lcom/vk/im/engine/models/ProfilesSimpleInfo;Z)V .line 177 iput-object p1, p0, Lcom/vtosters/lite/ui/WriteBar;->m0:Lcom/vk/im/engine/models/messages/MsgFromUser; @@ -5826,7 +5826,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result v0 @@ -5963,7 +5963,7 @@ return-void :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->voice()Z + invoke-static {}, Lru/vtosters/hooks/other/Preferences;->voice()Z move-result v0 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali b/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali index 5737a434ea..c23fc09e40 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali @@ -59,7 +59,7 @@ .line 1 new-instance v0, Landroidx/core/util/Pools$SynchronizedPool; - invoke-static {}, Lru/vtosters/lite/hooks/DockBarInjector;->getItemCount()I + invoke-static {}, Lru/vtosters/hooks/DockBarInjector;->getItemCount()I move-result v1 @@ -125,7 +125,7 @@ const p2, 0x7f070060 - invoke-static {p2}, Lru/vtosters/lite/utils/ThemesUtils;->getNavigationWidth(I)I + invoke-static {p2}, Lru/vtosters/hooks/other/ThemesUtils;->getNavigationWidth(I)I move-result p2 @@ -138,7 +138,7 @@ const p2, 0x7f070061 - invoke-static {p2}, Lru/vtosters/lite/utils/ThemesUtils;->getNavigationWidth(I)I + invoke-static {p2}, Lru/vtosters/hooks/other/ThemesUtils;->getNavigationWidth(I)I move-result p2 @@ -147,7 +147,7 @@ const p2, 0x7f070067 - invoke-static {p2}, Lru/vtosters/lite/utils/ThemesUtils;->getNavigationHeight(I)I + invoke-static {p2}, Lru/vtosters/hooks/other/ThemesUtils;->getNavigationHeight(I)I move-result p2 @@ -176,7 +176,7 @@ iput-object p1, p0, Lcom/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView;->e:Landroid/view/View$OnClickListener; - invoke-static {}, Lru/vtosters/lite/hooks/DockBarInjector;->getItemCount()I + invoke-static {}, Lru/vtosters/hooks/DockBarInjector;->getItemCount()I move-result p1 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationView.smali b/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationView.smali index 8fdef97a02..8946a50040 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationView.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationView.smali @@ -686,7 +686,7 @@ .method public getMaxItemCount()I .locals 1 - invoke-static {}, Lru/vtosters/lite/hooks/DockBarInjector;->getItemCount()I + invoke-static {}, Lru/vtosters/hooks/DockBarInjector;->getItemCount()I move-result v0 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/g0/CardItemDecoration.smali b/smali/smali_classes5/com/vtosters/lite/ui/g0/CardItemDecoration.smali index aaa75d431c..b378f1a6b3 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/g0/CardItemDecoration.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/g0/CardItemDecoration.smali @@ -88,7 +88,7 @@ const/high16 v4, 0x40000000 # 2.0f - invoke-static {v4}, Lru/vtosters/lite/utils/ThemesUtils;->fixSeparator(F)I + invoke-static {v4}, Lru/vtosters/hooks/other/ThemesUtils;->fixSeparator(F)I move-result v4 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/holder/video/VideoSimpleHolder.smali b/smali/smali_classes5/com/vtosters/lite/ui/holder/video/VideoSimpleHolder.smali index da1e3715d6..10d5b06913 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/holder/video/VideoSimpleHolder.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/holder/video/VideoSimpleHolder.smali @@ -1326,7 +1326,7 @@ check-cast v0, Landroid/app/Activity; - invoke-static {v2, v0}, Lru/vtosters/lite/utils/ExternalLinkParser;->parseVideoFile(Lcom/vk/dto/common/VideoFile;Landroid/app/Activity;)Z + invoke-static {v2, v0}, Lru/vtosters/hooks/VideoPlayerHook;->parseVideoFile(Lcom/vk/dto/common/VideoFile;Landroid/app/Activity;)Z move-result v3 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/layout/ExpandableBarLayout.smali b/smali/smali_classes5/com/vtosters/lite/ui/layout/ExpandableBarLayout.smali index b4cedfb03f..b00df3306f 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/layout/ExpandableBarLayout.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/layout/ExpandableBarLayout.smali @@ -87,7 +87,7 @@ const v0, 0x7f070067 - invoke-static {v0}, Lru/vtosters/lite/utils/ThemesUtils;->getNavigationHeight(I)I + invoke-static {v0}, Lru/vtosters/hooks/other/ThemesUtils;->getNavigationHeight(I)I move-result v0 @@ -161,7 +161,7 @@ const p2, 0x7f070067 - invoke-static {p2}, Lru/vtosters/lite/utils/ThemesUtils;->getNavigationHeight(I)I + invoke-static {p2}, Lru/vtosters/hooks/other/ThemesUtils;->getNavigationHeight(I)I move-result p2 @@ -235,7 +235,7 @@ const p2, 0x7f070067 - invoke-static {p2}, Lru/vtosters/lite/utils/ThemesUtils;->getNavigationHeight(I)I + invoke-static {p2}, Lru/vtosters/hooks/other/ThemesUtils;->getNavigationHeight(I)I move-result p2 @@ -312,7 +312,7 @@ const p2, 0x7f070067 - invoke-static {p2}, Lru/vtosters/lite/utils/ThemesUtils;->getNavigationHeight(I)I + invoke-static {p2}, Lru/vtosters/hooks/other/ThemesUtils;->getNavigationHeight(I)I move-result p2 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/refreshlayout/CircleImageView$a.smali b/smali/smali_classes5/com/vtosters/lite/ui/refreshlayout/CircleImageView$a.smali index e017b3177e..0a7f806dd3 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/refreshlayout/CircleImageView$a.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/refreshlayout/CircleImageView$a.smali @@ -143,7 +143,7 @@ iget-object v3, p0, Lcom/vtosters/lite/ui/refreshlayout/CircleImageView$a;->b:Landroid/graphics/Paint; - invoke-static {p1, v0, v1, v2, v3}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V + invoke-static {p1, v0, v1, v2, v3}, Lru/vtosters/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V .line 4 iget v2, p0, Lcom/vtosters/lite/ui/refreshlayout/CircleImageView$a;->c:I @@ -152,7 +152,7 @@ int-to-float v2, v2 - invoke-static {p1, v0, v1, v2, p2}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V + invoke-static {p1, v0, v1, v2, p2}, Lru/vtosters/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V return-void .end method diff --git a/smali/smali_classes5/com/vtosters/lite/ui/widget/VoiceRecordControlPopupWindow.smali b/smali/smali_classes5/com/vtosters/lite/ui/widget/VoiceRecordControlPopupWindow.smali index 9a2779672c..4b5d1dc324 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/widget/VoiceRecordControlPopupWindow.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/widget/VoiceRecordControlPopupWindow.smali @@ -135,7 +135,7 @@ move-result-object p2 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p2 diff --git a/smali/smali_classes5/com/vtosters/lite/ui/widget/WaveRecordCircleView.smali b/smali/smali_classes5/com/vtosters/lite/ui/widget/WaveRecordCircleView.smali index dcb1c5df18..250df5c77e 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/widget/WaveRecordCircleView.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/widget/WaveRecordCircleView.smali @@ -82,7 +82,7 @@ const v0, 0x7f0600f7 - invoke-static {v0}, Lru/vtosters/lite/utils/ThemesUtils;->getColor(I)I + invoke-static {v0}, Lru/vtosters/hooks/other/ThemesUtils;->getColor(I)I move-result p3 diff --git a/smali/smali_classes5/com/vtosters/lite/upload/UploadNotification.smali b/smali/smali_classes5/com/vtosters/lite/upload/UploadNotification.smali index ba655c957b..616e8f2d97 100644 --- a/smali/smali_classes5/com/vtosters/lite/upload/UploadNotification.smali +++ b/smali/smali_classes5/com/vtosters/lite/upload/UploadNotification.smali @@ -100,7 +100,7 @@ move-result-object p2 - invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I + invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getAccentColor()I move-result p2 diff --git a/smali/smali_classes5/com/vtosters/lite/utils/Utils.smali b/smali/smali_classes5/com/vtosters/lite/utils/Utils.smali index a77d702542..c8fc2f4a93 100644 --- a/smali/smali_classes5/com/vtosters/lite/utils/Utils.smali +++ b/smali/smali_classes5/com/vtosters/lite/utils/Utils.smali @@ -228,7 +228,7 @@ move-result-object v0 - invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 @@ -738,7 +738,7 @@ invoke-direct {v0, p0}, Ljava/util/HashSet;->(Ljava/util/Collection;)V - invoke-static {v0}, Lru/vtosters/lite/hooks/NewsfeedHook;->adsParams(Ljava/util/HashSet;)V + invoke-static {v0}, Lru/vtosters/hooks/NewsfeedHook;->adsParams(Ljava/util/HashSet;)V .line 20 invoke-virtual {v0}, Ljava/util/HashSet;->size()I diff --git a/smali/smali_classes5/org/chromium/base/BuildInfo.smali b/smali/smali_classes5/org/chromium/base/BuildInfo.smali index d71c5c8ea7..0a27cda232 100644 --- a/smali/smali_classes5/org/chromium/base/BuildInfo.smali +++ b/smali/smali_classes5/org/chromium/base/BuildInfo.smali @@ -165,7 +165,7 @@ :try_start_1 const-string v1, "com.google.android.gms" - invoke-static {v1}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v1}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes5/ru/mail/libverify/accounts/c.smali b/smali/smali_classes5/ru/mail/libverify/accounts/c.smali index fb43889ef3..eb7c10865e 100644 --- a/smali/smali_classes5/ru/mail/libverify/accounts/c.smali +++ b/smali/smali_classes5/ru/mail/libverify/accounts/c.smali @@ -536,7 +536,7 @@ const-string v4, "com.google" - invoke-static {v4}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v4}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v4 @@ -1012,7 +1012,7 @@ const-string v5, "com.google" - invoke-static {v5}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v5}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v5 diff --git a/smali/smali_classes5/ru/mail/libverify/notifications/h.smali b/smali/smali_classes5/ru/mail/libverify/notifications/h.smali index 4f4b57cd46..34dcd9342b 100644 --- a/smali/smali_classes5/ru/mail/libverify/notifications/h.smali +++ b/smali/smali_classes5/ru/mail/libverify/notifications/h.smali @@ -434,7 +434,7 @@ invoke-virtual {v0, p3}, Landroid/view/Window;->setStatusBarColor(I)V - invoke-static {v0, p3}, Lru/vtosters/lite/utils/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V + invoke-static {v0, p3}, Lru/vtosters/hooks/other/ThemesUtils;->setNavbarColor(Landroid/view/Window;I)V goto :goto_0 diff --git a/smali/smali_classes5/ru/mail/libverify/utils/n.smali b/smali/smali_classes5/ru/mail/libverify/utils/n.smali index b064600b1e..994aa4d57b 100644 --- a/smali/smali_classes5/ru/mail/libverify/utils/n.smali +++ b/smali/smali_classes5/ru/mail/libverify/utils/n.smali @@ -729,7 +729,7 @@ :cond_1 const-string v0, "com.google.android.gms" - invoke-static {v0}, Lru/vtosters/lite/utils/GmsUtils;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/hooks/GmsHook;->replaceGMSPackage(Ljava/lang/String;)Ljava/lang/String; move-result-object v0 From 7d9cc8a1b744de88035d9c82028c34450f4bf4d6 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 22 May 2023 00:55:20 +0300 Subject: [PATCH 02/11] Update proguard-rules.pro --- app/proguard-rules.pro | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 1b2141860b..95ea4d844f 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -32,15 +32,10 @@ -repackageclasses -allowaccessmodification -optimizations +-optimizationpasses 5 -keepattributes SourceFile, LineNumberTable --keep,allowoptimization class ru.vtosters.hooks.** { - public ; - public ; - public (...); -} - --keep,allowoptimization class ru.vtosters.lite.utils.AndroidUtils, ru.vtosters.lite.utils.NetworkUtils, ru.vtosters.lite.ui.**, ru.vtosters.lite.themes.**, ru.vtosters.lite.feature.**, ru.vtosters.lite.music.**, ru.vtosters.lite.downloaders.** { +-keep,allowoptimization class ru.vtosters.hooks.**, ru.vtosters.lite.utils.AndroidUtils, ru.vtosters.lite.utils.NetworkUtils, ru.vtosters.lite.ui.**, ru.vtosters.lite.themes.**, ru.vtosters.lite.feature.**, ru.vtosters.lite.music.**, ru.vtosters.lite.downloaders.** { public ; public ; public (...); From 8486f3be7fd23d850f43fc6a008d3601e23880d1 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 22 May 2023 14:24:37 +0300 Subject: [PATCH 03/11] many fixes fixed crashreporter added more obf files --- app/proguard-rules.pro | 2 +- .../java/ru/vtosters/hooks/CatalogsHook.java | 27 +++++++++++++ .../discover => hooks}/DiscoverTemplates.java | 2 +- .../ru/vtosters/hooks/DownloadersHook.java | 40 +++++++++++++++++++ .../GroupsCatalogInjector.java | 2 +- .../java/ru/vtosters/hooks/LastFMHook.java | 10 +++++ .../vtosters/hooks/MusicCacheFilesHook.java | 16 ++++++++ .../ru/vtosters/hooks/ProfileMenuHook.java | 16 ++++++++ .../ThemeChangeDrawerHook.java} | 4 +- .../ru/vtosters/hooks/WallpapersHooks.java | 19 +++++++++ .../lite/downloaders/AudioDownloader.java | 4 +- .../lite/downloaders/StoryDownloader.java | 3 -- .../lite/downloaders/VideoDownloader.java | 24 ++--------- .../music/cache/FileCacheImplementation.java | 11 +---- .../catalog/inject/CatalogJsonInjector.java | 12 ++---- .../lite/ui/wallpapers/WallpapersHooks.java | 8 ---- .../components => utils}/CrashReporter.java | 3 +- .../api/discover/DiscoverCategoriesGet.smali | 4 +- .../com/vk/api/discover/DiscoverGet$a.smali | 2 +- .../catalog2/core/api/CatalogGetSection.smali | 2 +- .../core/api/h/CatalogGetGroups.smali | 2 +- .../core/api/music/CatalogGetAudio.smali | 2 +- .../api/music/CatalogGetAudioArtist.smali | 2 +- .../com/vk/dto/common/data/JsonParser$a.smali | 2 +- .../com/vk/im/ui/ImUiPrefs.smali | 33 --------------- .../com/vk/im/ui/fragments/ChatFragment.smali | 2 +- .../bottomsheet/VideoBottomSheet.smali | 4 +- .../track/MusicTrackBottomSheetModel.smali | 2 +- .../music/model/v/MusicTrackModelImpl.smali | 2 +- .../navigation/right/RightMenuPresenter.smali | 2 +- .../CommunityFragmentActionsMenuBuilder.smali | 2 +- .../ProfileFragmentActionsMenuBuilder.smali | 2 +- .../com/vk/stories/view/StoryView.smali | 2 +- .../com/vtosters/lite/MainActivity.smali | 2 +- .../lite/audio/player/CacheUtils.smali | 4 +- .../lite/audio/player/ExoPlayerHelper.smali | 2 +- 36 files changed, 165 insertions(+), 113 deletions(-) create mode 100644 app/src/main/java/ru/vtosters/hooks/CatalogsHook.java rename app/src/main/java/ru/vtosters/{lite/feature/discover => hooks}/DiscoverTemplates.java (91%) create mode 100644 app/src/main/java/ru/vtosters/hooks/DownloadersHook.java rename app/src/main/java/ru/vtosters/{lite/feature/groupslist => hooks}/GroupsCatalogInjector.java (98%) create mode 100644 app/src/main/java/ru/vtosters/hooks/LastFMHook.java create mode 100644 app/src/main/java/ru/vtosters/hooks/MusicCacheFilesHook.java create mode 100644 app/src/main/java/ru/vtosters/hooks/ProfileMenuHook.java rename app/src/main/java/ru/vtosters/{lite/ui/dialogs/ThemeChanging.java => hooks/ThemeChangeDrawerHook.java} (94%) create mode 100644 app/src/main/java/ru/vtosters/hooks/WallpapersHooks.java rename app/src/main/java/ru/vtosters/lite/{ui/components => utils}/CrashReporter.java (97%) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 95ea4d844f..340c29b7c2 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -35,7 +35,7 @@ -optimizationpasses 5 -keepattributes SourceFile, LineNumberTable --keep,allowoptimization class ru.vtosters.hooks.**, ru.vtosters.lite.utils.AndroidUtils, ru.vtosters.lite.utils.NetworkUtils, ru.vtosters.lite.ui.**, ru.vtosters.lite.themes.**, ru.vtosters.lite.feature.**, ru.vtosters.lite.music.**, ru.vtosters.lite.downloaders.** { +-keep,allowoptimization class ru.vtosters.hooks.**, ru.vtosters.lite.utils.AndroidUtils, ru.vtosters.lite.utils.NetworkUtils, ru.vtosters.lite.utils.CrashReporter, ru.vtosters.lite.ui.activities.**, ru.vtosters.lite.services.**, ru.vtosters.lite.ui.fragments.**, ru.vtosters.lite.themes.**, ru.vtosters.lite.music.hook.**, ru.vtosters.lite.music.cache.injectors.**, ru.vtosters.lite.ui.wallpapers.NativeEffects { public ; public ; public (...); diff --git a/app/src/main/java/ru/vtosters/hooks/CatalogsHook.java b/app/src/main/java/ru/vtosters/hooks/CatalogsHook.java new file mode 100644 index 0000000000..8368e27e4a --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/CatalogsHook.java @@ -0,0 +1,27 @@ +package ru.vtosters.hooks; + +import org.json.JSONException; +import org.json.JSONObject; +import ru.vtosters.lite.music.catalog.inject.CatalogJsonInjector; + +public class CatalogsHook { + public static JSONObject injectCatalogGetAudio(JSONObject json) { + try { + return CatalogJsonInjector.music(json); + } catch (JSONException e) { + return json; + } + } + + public static JSONObject injectCatalogGetAudioArtist(JSONObject json) { + try { + return CatalogJsonInjector.fixArtists(json); + } catch (JSONException e) { + return json; + } + } + + public static JSONObject injectCatalogGetSection(JSONObject json) { + return CatalogJsonInjector.injectIntoCatalogs(json); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/feature/discover/DiscoverTemplates.java b/app/src/main/java/ru/vtosters/hooks/DiscoverTemplates.java similarity index 91% rename from app/src/main/java/ru/vtosters/lite/feature/discover/DiscoverTemplates.java rename to app/src/main/java/ru/vtosters/hooks/DiscoverTemplates.java index c0c81970f7..3542545901 100644 --- a/app/src/main/java/ru/vtosters/lite/feature/discover/DiscoverTemplates.java +++ b/app/src/main/java/ru/vtosters/hooks/DiscoverTemplates.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.feature.discover; +package ru.vtosters.hooks; import com.vk.dto.discover.DiscoverItem; diff --git a/app/src/main/java/ru/vtosters/hooks/DownloadersHook.java b/app/src/main/java/ru/vtosters/hooks/DownloadersHook.java new file mode 100644 index 0000000000..aeafbe815a --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/DownloadersHook.java @@ -0,0 +1,40 @@ +package ru.vtosters.hooks; + +import android.content.Context; +import com.vk.core.dialogs.bottomsheet.MenuBottomSheetAction; +import com.vk.dto.common.VideoFile; +import com.vk.dto.music.MusicTrack; +import com.vk.dto.stories.model.StoryEntry; +import ru.vtosters.lite.downloaders.AudioDownloader; +import ru.vtosters.lite.downloaders.StoryDownloader; +import ru.vtosters.lite.downloaders.VideoDownloader; +import ru.vtosters.lite.utils.ExternalLinkParser; + +import java.util.ArrayList; + +public class DownloadersHook { + public static boolean onClickVideo(int id, VideoFile video, Context ctx) { + if (id == VideoDownloader.DOWNLOAD_ID) { + VideoDownloader.downloadVideo(video, ctx); + return true; + } else if (id == VideoDownloader.OPEN_EXTERNAL_LINK_ID) { + ExternalLinkParser.parseVideoFile(video, ctx, true); + } + return false; + } + + public static void injectActionVideo(ArrayList list, VideoFile video) { + if (!video.U && !video.I1()) { + VideoDownloader.addAction(list, VideoDownloader.DOWNLOAD_ID, com.vtosters.lite.R.drawable.ic_download_outline_24, com.vtosters.lite.R.string.download, 9); + VideoDownloader.addAction(list, VideoDownloader.OPEN_EXTERNAL_LINK_ID, com.vtosters.lite.R.drawable.ic_link_outline_28, com.vtosters.lite.R.string.interfacevideoext_short, 9); + } + } + + public static Runnable injectActionStory(StoryEntry story) { + return () -> StoryDownloader.downloadStory(story); + } + + public static void injectCacheAudio(MusicTrack mt) { + AudioDownloader.cacheTrack(mt); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/feature/groupslist/GroupsCatalogInjector.java b/app/src/main/java/ru/vtosters/hooks/GroupsCatalogInjector.java similarity index 98% rename from app/src/main/java/ru/vtosters/lite/feature/groupslist/GroupsCatalogInjector.java rename to app/src/main/java/ru/vtosters/hooks/GroupsCatalogInjector.java index 9bbbe1685e..702e2f4c43 100644 --- a/app/src/main/java/ru/vtosters/lite/feature/groupslist/GroupsCatalogInjector.java +++ b/app/src/main/java/ru/vtosters/hooks/GroupsCatalogInjector.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.feature.groupslist; +package ru.vtosters.hooks; import android.util.Log; import org.json.JSONArray; diff --git a/app/src/main/java/ru/vtosters/hooks/LastFMHook.java b/app/src/main/java/ru/vtosters/hooks/LastFMHook.java new file mode 100644 index 0000000000..3bb245e319 --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/LastFMHook.java @@ -0,0 +1,10 @@ +package ru.vtosters.hooks; + +import com.vk.dto.music.MusicTrack; +import ru.vtosters.lite.music.LastFMScrobbler; + +public class LastFMHook { + public static void grabMusicTrack(MusicTrack musictrack) { + LastFMScrobbler.grabMusicTrack(musictrack); + } +} diff --git a/app/src/main/java/ru/vtosters/hooks/MusicCacheFilesHook.java b/app/src/main/java/ru/vtosters/hooks/MusicCacheFilesHook.java new file mode 100644 index 0000000000..f2e97b8d4f --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/MusicCacheFilesHook.java @@ -0,0 +1,16 @@ +package ru.vtosters.hooks; + +import ru.vtosters.lite.music.cache.CacheDatabaseDelegate; +import ru.vtosters.lite.music.cache.FileCacheImplementation; + +import java.io.File; + +public class MusicCacheFilesHook { + public static File getTrackFile(String trackId) { + return new File(FileCacheImplementation.getTrackFolder(trackId), "track.mp3"); + } + + public static boolean isTrackExist(String trackId) { + return CacheDatabaseDelegate.isCached(trackId); + } +} diff --git a/app/src/main/java/ru/vtosters/hooks/ProfileMenuHook.java b/app/src/main/java/ru/vtosters/hooks/ProfileMenuHook.java new file mode 100644 index 0000000000..ab4a309c11 --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/ProfileMenuHook.java @@ -0,0 +1,16 @@ +package ru.vtosters.hooks; + +import com.vk.core.dialogs.actionspopup.ActionsPopup; +import com.vk.profile.ui.components.CommunityFragmentActionsMenuBuilder; +import com.vk.profile.ui.components.ProfileFragmentActionsMenuBuilder; +import ru.vtosters.lite.ui.vkui.MenuBuilder; + +public class ProfileMenuHook { + public static void inject(final CommunityFragmentActionsMenuBuilder mb, final ActionsPopup.b builder) { + MenuBuilder.injectAP(mb, builder); + } + + public static void inject(final ProfileFragmentActionsMenuBuilder mb, final ActionsPopup.b builder) { + MenuBuilder.injectAP(mb, builder); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java b/app/src/main/java/ru/vtosters/hooks/ThemeChangeDrawerHook.java similarity index 94% rename from app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java rename to app/src/main/java/ru/vtosters/hooks/ThemeChangeDrawerHook.java index 262191c17c..d6142e78d2 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java +++ b/app/src/main/java/ru/vtosters/hooks/ThemeChangeDrawerHook.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.ui.dialogs; +package ru.vtosters.hooks; import android.app.Activity; import com.vk.core.dialogs.alert.VkAlertDialog; @@ -6,7 +6,7 @@ import ru.vtosters.hooks.other.Preferences; import ru.vtosters.hooks.other.ThemesUtils; -public class ThemeChanging { +public class ThemeChangeDrawerHook { public static void changeTheme(Activity activity, float[] f) { if (Preferences.systemtheme()) { new VkAlertDialog.Builder(activity) diff --git a/app/src/main/java/ru/vtosters/hooks/WallpapersHooks.java b/app/src/main/java/ru/vtosters/hooks/WallpapersHooks.java new file mode 100644 index 0000000000..e82e0fa10c --- /dev/null +++ b/app/src/main/java/ru/vtosters/hooks/WallpapersHooks.java @@ -0,0 +1,19 @@ +package ru.vtosters.hooks; + +import android.view.View; +import android.widget.ImageView; +import com.vk.im.engine.h; +import ru.vtosters.hooks.other.ThemesUtils; + +import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getWallpaper; +import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.hasWallpapers; + +public class WallpapersHooks { + public static void setBg(View view) { + if (hasWallpapers()) { + ((ImageView) view).setImageDrawable(getWallpaper()); // set picture to background + } else { + view.setBackgroundColor(ThemesUtils.getColorFromAttr(h.im_bg_chat)); // set default bg color + } + } +} diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java index 2f07c5186b..3892d7fc77 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java @@ -6,8 +6,8 @@ import com.vk.dto.music.MusicTrack; import com.vk.dto.music.Playlist; import com.vtosters.lite.R; +import ru.vtosters.hooks.MusicCacheFilesHook; import ru.vtosters.lite.music.cache.CacheDatabaseDelegate; -import ru.vtosters.lite.music.cache.FileCacheImplementation; import ru.vtosters.lite.music.callback.MusicCallbackBuilder; import ru.vtosters.lite.music.converter.playlist.PlaylistConverter; import ru.vtosters.lite.music.downloader.AudioGet; @@ -66,7 +66,7 @@ public static void cacheTrack(MusicTrack track) { return; } - var trackFile = FileCacheImplementation.getTrackFile(trackId); + var trackFile = MusicCacheFilesHook.getTrackFile(trackId); if (!trackFile.exists()) trackFile.getParentFile().mkdirs(); executor.submit(() -> downloadM3U8(track, true)); diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java index c427abf8cc..a02d6ef4b4 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java @@ -13,9 +13,6 @@ import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; public class StoryDownloader { - public static Runnable injectButton(StoryEntry story) { - return () -> downloadStory(story); - } public static void downloadStory(StoryEntry story) { if (story.T1()) { diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java index eecf825149..f11c8b0395 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java @@ -20,7 +20,6 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import ru.vtosters.lite.utils.ExternalLinkParser; import ru.vtosters.lite.utils.LifecycleUtils; import java.util.ArrayList; @@ -32,27 +31,10 @@ import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken; public class VideoDownloader { - private static final int DOWNLOAD_ID = 0; - private static final int OPEN_EXTERNAL_LINK_ID = 1; - - public static boolean onClick(int id, VideoFile video, Context ctx) { - if (id == DOWNLOAD_ID) { - downloadVideo(video, ctx); - return true; - } else if (id == OPEN_EXTERNAL_LINK_ID) { - ExternalLinkParser.parseVideoFile(video, ctx, true); - } - return false; - } - - public static void injectAction(ArrayList list, VideoFile video) { - if (!video.U && !video.I1()) { - addAction(list, DOWNLOAD_ID, R.drawable.ic_download_outline_24, R.string.download, 9); - addAction(list, OPEN_EXTERNAL_LINK_ID, R.drawable.ic_link_outline_28, R.string.interfacevideoext_short, 9); - } - } + public static final int DOWNLOAD_ID = 0; + public static final int OPEN_EXTERNAL_LINK_ID = 1; - private static void addAction(List actions, int... ints) { + public static void addAction(List actions, int... ints) { actions.add(new MenuBottomSheetAction(ints[0], ints[1], ints[2], ints[3])); } diff --git a/app/src/main/java/ru/vtosters/lite/music/cache/FileCacheImplementation.java b/app/src/main/java/ru/vtosters/lite/music/cache/FileCacheImplementation.java index 0c996d8ddf..266d142895 100644 --- a/app/src/main/java/ru/vtosters/lite/music/cache/FileCacheImplementation.java +++ b/app/src/main/java/ru/vtosters/lite/music/cache/FileCacheImplementation.java @@ -2,6 +2,7 @@ import android.net.Uri; import com.vk.dto.music.MusicTrack; +import ru.vtosters.hooks.MusicCacheFilesHook; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.IOUtils; @@ -30,16 +31,8 @@ public static File getThumbnailsFolder(String trackId) { return dir; } - public static File getTrackFile(String trackId) { - return new File(getTrackFolder(trackId), "track.mp3"); - } - - public static boolean isTrackExist(String trackId) { - return CacheDatabaseDelegate.isCached(trackId); - } - public static File getTrackFile(MusicTrack track) { - return getTrackFile(track.y1()); + return MusicCacheFilesHook.getTrackFile(track.y1()); } public static File getTrackThumbnail(String trackId, int factor) { diff --git a/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java b/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java index c25f99795e..9f78a5bdd6 100644 --- a/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java +++ b/app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java @@ -20,7 +20,7 @@ import static ru.vtosters.hooks.DateHook.getLocale; import static ru.vtosters.hooks.other.Preferences.getBoolValue; -import static ru.vtosters.lite.feature.groupslist.GroupsCatalogInjector.injectIntoCatalog; +import static ru.vtosters.hooks.GroupsCatalogInjector.injectIntoCatalog; import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.*; import static ru.vtosters.lite.proxy.ProxyUtils.getApi; import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId; @@ -237,14 +237,8 @@ public static void musicLinkFix(JSONObject json) { } } - public static JSONObject fixArtists(JSONObject json) { - - try { - fixHeaders(json.getJSONObject("catalog").getJSONArray("sections").getJSONObject(0)); - } catch (Exception e) { - e.printStackTrace(); - } - + public static JSONObject fixArtists(JSONObject json) throws JSONException { + fixHeaders(json.getJSONObject("catalog").getJSONArray("sections").getJSONObject(0)); return json; } diff --git a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java index 5e71962415..7e939d1933 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java +++ b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java @@ -30,14 +30,6 @@ public class WallpapersHooks { private static Drawable mWallpaper; private static boolean mUpdateWallpaperRequested = true; - public static void setBg(View view) { - if (hasWallpapers()) { - ((ImageView) view).setImageDrawable(getWallpaper()); // set picture to background - } else { - view.setBackgroundColor(ThemesUtils.getColorFromAttr(h.im_bg_chat)); // set default bg color - } - } - public static Drawable getWallpaper() { File oldwp = new File(AndroidUtils.getGlobalContext().getFilesDir(), "wallpaper.jpeg"); File oldwpcompressed = new File(AndroidUtils.getGlobalContext().getFilesDir(), "compressedwp.jpeg"); diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/CrashReporter.java b/app/src/main/java/ru/vtosters/lite/utils/CrashReporter.java similarity index 97% rename from app/src/main/java/ru/vtosters/lite/ui/components/CrashReporter.java rename to app/src/main/java/ru/vtosters/lite/utils/CrashReporter.java index d7c7e95337..bbfeb6f29e 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/CrashReporter.java +++ b/app/src/main/java/ru/vtosters/lite/utils/CrashReporter.java @@ -1,4 +1,4 @@ -package ru.vtosters.lite.ui.components; +package ru.vtosters.lite.utils; import android.annotation.SuppressLint; import android.app.*; @@ -10,7 +10,6 @@ import com.vtosters.lite.R; import ru.vtosters.lite.deviceinfo.DeviceInfoCollector; import ru.vtosters.lite.services.LogWriterService; -import ru.vtosters.lite.utils.AndroidUtils; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/smali/smali_classes2/com/vk/api/discover/DiscoverCategoriesGet.smali b/smali/smali_classes2/com/vk/api/discover/DiscoverCategoriesGet.smali index 1c9b842578..97e6babdc6 100644 --- a/smali/smali_classes2/com/vk/api/discover/DiscoverCategoriesGet.smali +++ b/smali/smali_classes2/com/vk/api/discover/DiscoverCategoriesGet.smali @@ -66,9 +66,9 @@ # :cond_0 .line 2 - # ru.vtosters.lite.feature.discover.DiscoverTemplates. ArrayList getTemplates() + # ru.vtosters.hooks.DiscoverTemplates. ArrayList getTemplates() - invoke-static {}, Lru/vtosters/lite/feature/discover/DiscoverTemplates;->getTemplates()Ljava/util/ArrayList; + invoke-static {}, Lru/vtosters/hooks/DiscoverTemplates;->getTemplates()Ljava/util/ArrayList; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali b/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali index 9a24b94eef..33196910ee 100644 --- a/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali +++ b/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali @@ -815,7 +815,7 @@ :cond_0 - invoke-static {}, Lru/vtosters/lite/feature/discover/DiscoverTemplates;->getTemplates()Ljava/util/ArrayList; + invoke-static {}, Lru/vtosters/hooks/DiscoverTemplates;->getTemplates()Ljava/util/ArrayList; move-result-object v1 diff --git a/smali/smali_classes2/com/vk/catalog2/core/api/CatalogGetSection.smali b/smali/smali_classes2/com/vk/catalog2/core/api/CatalogGetSection.smali index 9ea5188cec..e23b64ba62 100644 --- a/smali/smali_classes2/com/vk/catalog2/core/api/CatalogGetSection.smali +++ b/smali/smali_classes2/com/vk/catalog2/core/api/CatalogGetSection.smali @@ -136,7 +136,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/music/catalog/inject/CatalogJsonInjector;->injectIntoCatalogs(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/CatalogsHook;->injectCatalogGetSection(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/catalog2/core/api/h/CatalogGetGroups.smali b/smali/smali_classes2/com/vk/catalog2/core/api/h/CatalogGetGroups.smali index 363c53493e..dfa2b0a03a 100644 --- a/smali/smali_classes2/com/vk/catalog2/core/api/h/CatalogGetGroups.smali +++ b/smali/smali_classes2/com/vk/catalog2/core/api/h/CatalogGetGroups.smali @@ -75,7 +75,7 @@ const-string v1, "r.getJSONObject(ServerKeys.RESPONSE)" - invoke-static { p1 }, Lru/vtosters/lite/feature/groupslist/GroupsCatalogInjector;->injectIntoGetGroups(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static { p1 }, Lru/vtosters/hooks/GroupsCatalogInjector;->injectIntoGetGroups(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/catalog2/core/api/music/CatalogGetAudio.smali b/smali/smali_classes2/com/vk/catalog2/core/api/music/CatalogGetAudio.smali index 59dc034e82..ee55f91a26 100644 --- a/smali/smali_classes2/com/vk/catalog2/core/api/music/CatalogGetAudio.smali +++ b/smali/smali_classes2/com/vk/catalog2/core/api/music/CatalogGetAudio.smali @@ -81,7 +81,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/music/catalog/inject/CatalogJsonInjector;->music(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/CatalogsHook;->injectCatalogGetAudio(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/catalog2/core/api/music/CatalogGetAudioArtist.smali b/smali/smali_classes2/com/vk/catalog2/core/api/music/CatalogGetAudioArtist.smali index beb09165e6..8819702fd7 100644 --- a/smali/smali_classes2/com/vk/catalog2/core/api/music/CatalogGetAudioArtist.smali +++ b/smali/smali_classes2/com/vk/catalog2/core/api/music/CatalogGetAudioArtist.smali @@ -82,7 +82,7 @@ move-result-object p1 - invoke-static {p1}, Lru/vtosters/lite/music/catalog/inject/CatalogJsonInjector;->fixArtists(Lorg/json/JSONObject;)Lorg/json/JSONObject; + invoke-static {p1}, Lru/vtosters/hooks/CatalogsHook;->injectCatalogGetAudioArtist(Lorg/json/JSONObject;)Lorg/json/JSONObject; move-result-object p1 diff --git a/smali/smali_classes2/com/vk/dto/common/data/JsonParser$a.smali b/smali/smali_classes2/com/vk/dto/common/data/JsonParser$a.smali index 8e3bb0e30b..fa53d9c4fb 100644 --- a/smali/smali_classes2/com/vk/dto/common/data/JsonParser$a.smali +++ b/smali/smali_classes2/com/vk/dto/common/data/JsonParser$a.smali @@ -165,7 +165,7 @@ ">;" } .end annotation - invoke-static { p1, p2 }, Lru/vtosters/lite/feature/groupslist/GroupsCatalogInjector;->injectIntoJsonParser(Lorg/json/JSONObject;Ljava/lang/String;)Ljava/util/ArrayList; + invoke-static { p1, p2 }, Lru/vtosters/hooks/GroupsCatalogInjector;->injectIntoJsonParser(Lorg/json/JSONObject;Ljava/lang/String;)Ljava/util/ArrayList; move-result-object v0 diff --git a/smali/smali_classes3/com/vk/im/ui/ImUiPrefs.smali b/smali/smali_classes3/com/vk/im/ui/ImUiPrefs.smali index 1815e92fdc..c077cbaff4 100644 --- a/smali/smali_classes3/com/vk/im/ui/ImUiPrefs.smali +++ b/smali/smali_classes3/com/vk/im/ui/ImUiPrefs.smali @@ -424,39 +424,6 @@ return v0 .end method -# .method public final c()Ljava/lang/String; -# .locals 3 - -# invoke-static {}, Lru/vtosters/lite/ui/wallpapers/WallpapersHooks;->getWallpaperUrl()Ljava/lang/String; - -# move-result-object v0 - -# return-object v0 - -# .line 1 -# invoke-direct {p0}, Lcom/vk/im/ui/ImUiPrefs;->k()Landroid/content/SharedPreferences; - -# move-result-object v0 - -# const-string v1, "pref_dialog_background_uri" - -# const-string v2, "default" - -# invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; - -# move-result-object v0 - -# if-eqz v0, :cond_0 - -# goto :goto_0 - -# :cond_0 -# const-string v0, "" - -# :goto_0 -# return-object v0 -# .end method - .method public final d()J .locals 4 diff --git a/smali/smali_classes3/com/vk/im/ui/fragments/ChatFragment.smali b/smali/smali_classes3/com/vk/im/ui/fragments/ChatFragment.smali index f23f59b038..450fbba679 100644 --- a/smali/smali_classes3/com/vk/im/ui/fragments/ChatFragment.smali +++ b/smali/smali_classes3/com/vk/im/ui/fragments/ChatFragment.smali @@ -5161,7 +5161,7 @@ move-result-object v1 - invoke-static {v1}, Lru/vtosters/lite/ui/wallpapers/WallpapersHooks;->setBg(Landroid/view/View;)V + invoke-static {v1}, Lru/vtosters/hooks/WallpapersHooks;->setBg(Landroid/view/View;)V .line 69 sget v1, Lcom/vk/im/ui/h;->sticker_bar_container_stub:I diff --git a/smali/smali_classes3/com/vk/libvideo/bottomsheet/VideoBottomSheet.smali b/smali/smali_classes3/com/vk/libvideo/bottomsheet/VideoBottomSheet.smali index 9d6c857265..9a58793f30 100644 --- a/smali/smali_classes3/com/vk/libvideo/bottomsheet/VideoBottomSheet.smali +++ b/smali/smali_classes3/com/vk/libvideo/bottomsheet/VideoBottomSheet.smali @@ -279,7 +279,7 @@ move-result v0 - invoke-static {v0, v2, p1}, Lru/vtosters/lite/downloaders/VideoDownloader;->onClick(ILcom/vk/dto/common/VideoFile;Landroid/content/Context;)Z + invoke-static {v0, v2, p1}, Lru/vtosters/hooks/DownloadersHook;->onClickVideo(ILcom/vk/dto/common/VideoFile;Landroid/content/Context;)Z .line 35 sget v1, Lcom/vk/libvideo/g;->attach_link:I @@ -961,7 +961,7 @@ invoke-direct {v1}, Ljava/util/ArrayList;->()V - invoke-static {v1, p1}, Lru/vtosters/lite/downloaders/VideoDownloader;->injectAction(Ljava/util/ArrayList;Lcom/vk/dto/common/VideoFile;)V + invoke-static {v1, p1}, Lru/vtosters/hooks/DownloadersHook;->injectActionVideo(Ljava/util/ArrayList;Lcom/vk/dto/common/VideoFile;)V .line 86 iget-boolean v2, p1, Lcom/vk/dto/common/VideoFile;->e0:Z diff --git a/smali/smali_classes3/com/vk/music/bottomsheets/track/MusicTrackBottomSheetModel.smali b/smali/smali_classes3/com/vk/music/bottomsheets/track/MusicTrackBottomSheetModel.smali index bbf6a8478b..2f0b0dfe5f 100644 --- a/smali/smali_classes3/com/vk/music/bottomsheets/track/MusicTrackBottomSheetModel.smali +++ b/smali/smali_classes3/com/vk/music/bottomsheets/track/MusicTrackBottomSheetModel.smali @@ -569,7 +569,7 @@ .method public a(Landroid/content/Context;Lcom/vk/dto/music/MusicTrack;Lcom/vk/music/common/BoomModel$From;Lcom/vk/music/common/MusicPlaybackLaunchContext;)V .locals 1 - invoke-static {p2}, Lru/vtosters/lite/downloaders/AudioDownloader;->cacheTrack(Lcom/vk/dto/music/MusicTrack;)V + invoke-static {p2}, Lru/vtosters/hooks/DownloadersHook;->injectCacheAudio(Lcom/vk/dto/music/MusicTrack;)V return-void diff --git a/smali/smali_classes3/com/vk/music/model/v/MusicTrackModelImpl.smali b/smali/smali_classes3/com/vk/music/model/v/MusicTrackModelImpl.smali index c97bacc35f..5bc8f6f80b 100644 --- a/smali/smali_classes3/com/vk/music/model/v/MusicTrackModelImpl.smali +++ b/smali/smali_classes3/com/vk/music/model/v/MusicTrackModelImpl.smali @@ -211,7 +211,7 @@ if-eqz v1, :cond_0 .line 12 - invoke-static {p1}, Lru/vtosters/lite/downloaders/AudioDownloader;->cacheTrack(Lcom/vk/dto/music/MusicTrack;)V + invoke-static {p1}, Lru/vtosters/hooks/DownloadersHook;->injectCacheAudio(Lcom/vk/dto/music/MusicTrack;)V return-void diff --git a/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali b/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali index 1e5fbb1d41..26d816f044 100644 --- a/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali +++ b/smali/smali_classes3/com/vk/navigation/right/RightMenuPresenter.smali @@ -242,7 +242,7 @@ if-eqz v0, :cond_0 .line 6 - invoke-static {v0, p1}, Lru/vtosters/lite/ui/dialogs/ThemeChanging;->changeTheme(Landroid/app/Activity;[F)V + invoke-static {v0, p1}, Lru/vtosters/hooks/ThemeChangeDrawerHook;->changeTheme(Landroid/app/Activity;[F)V :cond_0 return-void diff --git a/smali/smali_classes4/com/vk/profile/ui/components/CommunityFragmentActionsMenuBuilder.smali b/smali/smali_classes4/com/vk/profile/ui/components/CommunityFragmentActionsMenuBuilder.smali index 0361061014..5f009625b8 100644 --- a/smali/smali_classes4/com/vk/profile/ui/components/CommunityFragmentActionsMenuBuilder.smali +++ b/smali/smali_classes4/com/vk/profile/ui/components/CommunityFragmentActionsMenuBuilder.smali @@ -38,7 +38,7 @@ move-result-object v7 - invoke-static {p0, v7}, Lru/vtosters/lite/ui/vkui/MenuBuilder;->injectAP(Lcom/vk/profile/ui/components/CommunityFragmentActionsMenuBuilder;Lcom/vk/core/dialogs/actionspopup/ActionsPopup$b;)V + invoke-static {p0, v7}, Lru/vtosters/hooks/ProfileMenuHook;->inject(Lcom/vk/profile/ui/components/CommunityFragmentActionsMenuBuilder;Lcom/vk/core/dialogs/actionspopup/ActionsPopup$b;)V .line 2 iget-object v0, p0, Lcom/vk/profile/ui/components/CommunityFragmentActionsMenuBuilder;->b:Lcom/vtosters/lite/api/ExtendedCommunityProfile; diff --git a/smali/smali_classes4/com/vk/profile/ui/components/ProfileFragmentActionsMenuBuilder.smali b/smali/smali_classes4/com/vk/profile/ui/components/ProfileFragmentActionsMenuBuilder.smali index 3e9180faa4..5990d6990f 100644 --- a/smali/smali_classes4/com/vk/profile/ui/components/ProfileFragmentActionsMenuBuilder.smali +++ b/smali/smali_classes4/com/vk/profile/ui/components/ProfileFragmentActionsMenuBuilder.smali @@ -51,7 +51,7 @@ move-result-object v7 - invoke-static {p0, v7}, Lru/vtosters/lite/ui/vkui/MenuBuilder;->injectAP(Lcom/vk/profile/ui/components/ProfileFragmentActionsMenuBuilder;Lcom/vk/core/dialogs/actionspopup/ActionsPopup$b;)V + invoke-static {p0, v7}, Lru/vtosters/hooks/ProfileMenuHook;->inject(Lcom/vk/profile/ui/components/ProfileFragmentActionsMenuBuilder;Lcom/vk/core/dialogs/actionspopup/ActionsPopup$b;)V .line 2 invoke-direct {p0}, Lcom/vk/profile/ui/components/ProfileFragmentActionsMenuBuilder;->q()Z diff --git a/smali/smali_classes4/com/vk/stories/view/StoryView.smali b/smali/smali_classes4/com/vk/stories/view/StoryView.smali index c6c1c71e27..8a06337608 100644 --- a/smali/smali_classes4/com/vk/stories/view/StoryView.smali +++ b/smali/smali_classes4/com/vk/stories/view/StoryView.smali @@ -5849,7 +5849,7 @@ const v4, 0x7f12032e .line 8 - invoke-static {v0}, Lru/vtosters/lite/downloaders/StoryDownloader;->injectButton(Lcom/vk/dto/stories/model/StoryEntry;)Ljava/lang/Runnable; + invoke-static {v0}, Lru/vtosters/hooks/DownloadersHook;->injectActionStory(Lcom/vk/dto/stories/model/StoryEntry;)Ljava/lang/Runnable; move-result-object v5 diff --git a/smali/smali_classes4/com/vtosters/lite/MainActivity.smali b/smali/smali_classes4/com/vtosters/lite/MainActivity.smali index bbdf532f81..0e65b9e6ea 100644 --- a/smali/smali_classes4/com/vtosters/lite/MainActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/MainActivity.smali @@ -343,7 +343,7 @@ .line 1 invoke-super {p0, p1}, Lcom/vk/navigation/NavigationDelegateActivity;->onCreate(Landroid/os/Bundle;)V - invoke-static {p0}, Lru/vtosters/lite/ui/components/CrashReporter;->init(Landroid/app/Activity;)V + invoke-static {p0}, Lru/vtosters/lite/utils/CrashReporter;->init(Landroid/app/Activity;)V .line 2 invoke-virtual {p0}, Landroid/app/Activity;->isTaskRoot()Z diff --git a/smali/smali_classes4/com/vtosters/lite/audio/player/CacheUtils.smali b/smali/smali_classes4/com/vtosters/lite/audio/player/CacheUtils.smali index d76705eacd..49e233fa5f 100644 --- a/smali/smali_classes4/com/vtosters/lite/audio/player/CacheUtils.smali +++ b/smali/smali_classes4/com/vtosters/lite/audio/player/CacheUtils.smali @@ -112,14 +112,14 @@ .method static a(Ljava/lang/String;)Ljava/io/File; .locals 6 - invoke-static {p0}, Lru/vtosters/lite/music/cache/FileCacheImplementation;->isTrackExist(Ljava/lang/String;)Z + invoke-static {p0}, Lru/vtosters/hooks/MusicCacheFilesHook;->isTrackExist(Ljava/lang/String;)Z move-result v5 if-eqz v5, :cond_228 .line 5 - invoke-static {p0}, Lru/vtosters/lite/music/cache/FileCacheImplementation;->getTrackFile(Ljava/lang/String;)Ljava/io/File; + invoke-static {p0}, Lru/vtosters/hooks/MusicCacheFilesHook;->getTrackFile(Ljava/lang/String;)Ljava/io/File; move-result-object v0 diff --git a/smali/smali_classes4/com/vtosters/lite/audio/player/ExoPlayerHelper.smali b/smali/smali_classes4/com/vtosters/lite/audio/player/ExoPlayerHelper.smali index c5605a9dd1..35bf94f6b4 100644 --- a/smali/smali_classes4/com/vtosters/lite/audio/player/ExoPlayerHelper.smali +++ b/smali/smali_classes4/com/vtosters/lite/audio/player/ExoPlayerHelper.smali @@ -703,7 +703,7 @@ .line 17 :cond_0 - invoke-static {p1}, Lru/vtosters/lite/music/LastFMScrobbler;->grabMusicTrack(Lcom/vk/dto/music/MusicTrack;)V + invoke-static {p1}, Lru/vtosters/hooks/LastFMHook;->grabMusicTrack(Lcom/vk/dto/music/MusicTrack;)V invoke-virtual {p1}, Lcom/vk/dto/music/MusicTrack;->y1()Ljava/lang/String; From e005f9a9078644e5d3c3e4fece10477d759b56cc Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 22 May 2023 14:36:05 +0300 Subject: [PATCH 04/11] fixed telegram stickers issue --- app/proguard-rules.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 340c29b7c2..7e882ce4fb 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -35,7 +35,7 @@ -optimizationpasses 5 -keepattributes SourceFile, LineNumberTable --keep,allowoptimization class ru.vtosters.hooks.**, ru.vtosters.lite.utils.AndroidUtils, ru.vtosters.lite.utils.NetworkUtils, ru.vtosters.lite.utils.CrashReporter, ru.vtosters.lite.ui.activities.**, ru.vtosters.lite.services.**, ru.vtosters.lite.ui.fragments.**, ru.vtosters.lite.themes.**, ru.vtosters.lite.music.hook.**, ru.vtosters.lite.music.cache.injectors.**, ru.vtosters.lite.ui.wallpapers.NativeEffects { +-keep,allowoptimization class ru.vtosters.hooks.**, ru.vtosters.lite.utils.AndroidUtils, ru.vtosters.lite.utils.NetworkUtils, ru.vtosters.lite.utils.CrashReporter, ru.vtosters.lite.ui.activities.**, ru.vtosters.lite.services.**, ru.vtosters.lite.ui.fragments.**, ru.vtosters.lite.themes.**, ru.vtosters.lite.music.hook.**, ru.vtosters.lite.music.cache.injectors.**, ru.vtosters.lite.ui.wallpapers.NativeEffects, com.aefyr.tsg.g2.TelegramStickersService { public ; public ; public (...); From c6e9a2fea0fdbce370ddaf40e315db4caa60758a Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 22 May 2023 15:22:47 +0300 Subject: [PATCH 05/11] speedup webview coloring --- .../main/java/ru/vtosters/hooks/VKUIHook.java | 79 ++----------------- .../ru/vtosters/hooks/other/ThemesUtils.java | 4 +- .../lite/utils/WebViewColoringUtils.java | 55 +++++++++++++ 3 files changed, 63 insertions(+), 75 deletions(-) create mode 100644 app/src/main/java/ru/vtosters/lite/utils/WebViewColoringUtils.java diff --git a/app/src/main/java/ru/vtosters/hooks/VKUIHook.java b/app/src/main/java/ru/vtosters/hooks/VKUIHook.java index 80f109ede8..9a5d7ec0ec 100644 --- a/app/src/main/java/ru/vtosters/hooks/VKUIHook.java +++ b/app/src/main/java/ru/vtosters/hooks/VKUIHook.java @@ -1,75 +1,15 @@ package ru.vtosters.hooks; import android.webkit.WebView; -import com.vk.articles.preload.WebCachePreloader; -import com.vtosters.lite.R; -import com.vtosters.lite.data.ThemeTracker; import ru.vtosters.hooks.other.Preferences; import ru.vtosters.hooks.other.ThemesUtils; import ru.vtosters.lite.themes.ThemesCore; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; +import ru.vtosters.lite.utils.WebViewColoringUtils; import static android.util.Base64.encodeToString; import static ru.vtosters.hooks.other.Preferences.getBoolValue; -import static ru.vtosters.hooks.other.ThemesUtils.*; -import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; public class VKUIHook { - public static boolean isLoaded = false; - private static String loadedCSS = ""; - private static String loadedCSSAmoled = ""; - - private static String load(String str) { - try { - InputStream open = getGlobalContext().getAssets().open(str); - StringBuilder sb = new StringBuilder(); - - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(open, StandardCharsets.UTF_8)); - - while (true) { - String readLine = bufferedReader.readLine(); - if (readLine != null) { - sb.append(readLine); - } else { - bufferedReader.close(); - return sb.toString(); - } - } - - } catch (IOException e) { - - e.printStackTrace(); - return ""; - } - } - - public static void load() { - loadedCSS = load("vt_ui_accent.css") - .replace("%header_background%", hex(getHeaderBackground())) - .replace("%background_content%", hex(getBackgroundContent())) - .replace("%header_text%", hex(getHeaderText())) - .replace("%accent%", hex(getAccentColor())) - .replace("%background_page%", hex(getBackgroundPage())) - .replace("%content_tint_background%", hex(getColorFromAttr(R.attr.content_tint_background))) - .replace("%button_primary_background%", hex(getColorFromAttr(R.attr.button_primary_background))) - .replace("%button_outline_foreground%", hex(getColorFromAttr(R.attr.button_outline_foreground))) - .replace("%button_outline_border%", hex(getColorFromAttr(R.attr.button_outline_border))) - .replace("%text_primary%", hex(getTextAttr())); - - - loadedCSSAmoled = load("vt_ui_oled.css"); - isLoaded = true; - } - - private static void inject(WebView webView, String str) { - webView.loadUrl("javascript:(function() {let parent = document.head || document.documentElement; parent.appendChild(document.createElement('style')).innerText = window.atob('" + str + "');})()"); - } - public static void inject(WebView webView) { if (Preferences.getBoolValue("__dbg_webview", false)) { WebView.setWebContentsDebuggingEnabled(true); @@ -77,30 +17,23 @@ public static void inject(WebView webView) { } if (getBoolValue("VKUI_INJ", true)) { - if (!isLoaded) { - load(); + if (!WebViewColoringUtils.isLoaded) { + WebViewColoringUtils.load(); } StringBuilder sb = new StringBuilder(); if (ThemesCore.isCachedAccents()) { sb.append("\n\n"); - sb.append(loadedCSS); + sb.append(WebViewColoringUtils.loadedCSS); } if (ThemesUtils.isAmoledTheme()) { sb.append("\n\n"); - sb.append(loadedCSSAmoled); + sb.append(WebViewColoringUtils.loadedCSSAmoled); } - inject(webView, encodeToString(sb.toString().getBytes(), 2)); + WebViewColoringUtils.inject(webView, encodeToString(sb.toString().getBytes(), 2)); } } - - public static void clearWebCache() { - ThemeTracker.a(); - isLoaded = false; - new WebView(getGlobalContext()).clearCache(true); - WebCachePreloader.e(); - } } diff --git a/app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java b/app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java index 3011282822..d75d5d9526 100644 --- a/app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java +++ b/app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java @@ -27,11 +27,11 @@ import com.vk.core.ui.themes.VKThemeHelper; import com.vtosters.lite.R; import com.vtosters.lite.data.ThemeTracker; -import ru.vtosters.hooks.VKUIHook; import ru.vtosters.lite.deviceinfo.OEMDetector; import ru.vtosters.lite.themes.ThemesHacks; import ru.vtosters.lite.ui.wallpapers.WallpapersHooks; import ru.vtosters.lite.utils.LifecycleUtils; +import ru.vtosters.lite.utils.WebViewColoringUtils; import java.lang.reflect.Field; @@ -74,7 +74,7 @@ public static void setThemeFL(VKTheme theme, Activity activity, float[] fl, Bool VKThemeHelper.theme(theme, activity, fl); if (restartActivity) activity.recreate(); ThemeTracker.a(); - VKUIHook.isLoaded = false; + WebViewColoringUtils.isLoaded = false; new WebView(activity).clearCache(true); WebCachePreloader.e(); } diff --git a/app/src/main/java/ru/vtosters/lite/utils/WebViewColoringUtils.java b/app/src/main/java/ru/vtosters/lite/utils/WebViewColoringUtils.java new file mode 100644 index 0000000000..6261ff6a2f --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/utils/WebViewColoringUtils.java @@ -0,0 +1,55 @@ +package ru.vtosters.lite.utils; + +import android.webkit.WebView; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringWriter; +import java.nio.charset.StandardCharsets; + +import static ru.vtosters.hooks.other.ThemesUtils.*; +import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; + +public class WebViewColoringUtils { + public static boolean isLoaded = false; + public static String loadedCSS = ""; + public static String loadedCSSAmoled = ""; + + private static String load(String str) { + try (Reader reader = new InputStreamReader(getGlobalContext().getAssets().open(str), StandardCharsets.UTF_8)) { + StringWriter writer = new StringWriter(); + char[] buffer = new char[1024]; + int len; + while ((len = reader.read(buffer)) != -1) { + writer.write(buffer, 0, len); + } + return writer.toString(); + } catch (IOException e) { + e.printStackTrace(); + return ""; + } + } + + public static void load() { + loadedCSS = load("vt_ui_accent.css") + .replace("%header_background%", hex(getHeaderBackground())) + .replace("%background_content%", hex(getBackgroundContent())) + .replace("%header_text%", hex(getHeaderText())) + .replace("%accent%", hex(getAccentColor())) + .replace("%background_page%", hex(getBackgroundPage())) + .replace("%content_tint_background%", hex(getColorFromAttr(com.vtosters.lite.R.attr.content_tint_background))) + .replace("%button_primary_background%", hex(getColorFromAttr(com.vtosters.lite.R.attr.button_primary_background))) + .replace("%button_outline_foreground%", hex(getColorFromAttr(com.vtosters.lite.R.attr.button_outline_foreground))) + .replace("%button_outline_border%", hex(getColorFromAttr(com.vtosters.lite.R.attr.button_outline_border))) + .replace("%text_primary%", hex(getTextAttr())); + + + loadedCSSAmoled = load("vt_ui_oled.css"); + isLoaded = true; + } + + public static void inject(WebView webView, String str) { + webView.loadUrl("javascript:(function() {let parent = document.head || document.documentElement; parent.appendChild(document.createElement('style')).innerText = window.atob('" + str + "');})()"); + } +} From a37e2fc09b67fe82745e85a756db5ebf15abb9d8 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 22 May 2023 15:23:14 +0300 Subject: [PATCH 06/11] some code cleanup --- .../java/ru/vtosters/hooks/NewsfeedHook.java | 71 ---------------- .../vtosters/hooks/OnlineFormatterHook.java | 7 +- .../ru/vtosters/lite/ui/vkui/MenuBuilder.java | 84 +++++++++++++++++-- 3 files changed, 82 insertions(+), 80 deletions(-) diff --git a/app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java b/app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java index 0dc220d5aa..d9488808fa 100644 --- a/app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java +++ b/app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java @@ -5,9 +5,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.vk.core.preference.Preference; import com.vk.discover.DiscoverItemDecorator; -import com.vtosters.lite.api.ExtendedCommunityProfile; -import ru.vtosters.hooks.other.Preferences; -import ru.vtosters.lite.utils.AccountManagerUtils; import java.util.*; @@ -75,74 +72,6 @@ public static String[] feedParams() { return params.toArray(new String[0]); } - public static boolean isWhitelistedFilter(ExtendedCommunityProfile eup) { - return Preferences.getPreferences().getStringSet( - "whitelisted_filters_groups", Collections.emptySet() - ).contains(String.valueOf(AccountManagerUtils.getUserID(eup))); - } - - public static boolean isWhitelistedAd(ExtendedCommunityProfile eup) { - return Preferences.getPreferences().getStringSet( - "whitelisted_ad_groups", - Collections.emptySet() - ).contains(String.valueOf(AccountManagerUtils.getUserID(eup))); - } - - public static boolean isWhitelistedAdStories(ExtendedCommunityProfile eup) { - return Preferences.getPreferences().getStringSet( - "whitelisted_stories_ad", - Collections.emptySet() - ).contains(String.valueOf(AccountManagerUtils.getUserID(eup))); - } - - public static void setWhitelistedFilter(ExtendedCommunityProfile eup, boolean needWhitelist) { - var id = String.valueOf(AccountManagerUtils.getUserID(eup)); - - var mutableAdsSet = new LinkedHashSet<>(Preferences.getPreferences().getStringSet( - "whitelisted_filters_groups", - Collections.emptySet()) - ); - if (needWhitelist) { - mutableAdsSet.add(id); - } else { - mutableAdsSet.remove(id); - } - - Preferences.getPreferences().edit().putStringSet("whitelisted_filters_groups", mutableAdsSet).apply(); - } - - public static void setWhitelistedAd(ExtendedCommunityProfile eup, boolean needWhitelist) { - var id = String.valueOf(AccountManagerUtils.getUserID(eup)); - - var mutableAdsSet = new LinkedHashSet<>(Preferences.getPreferences().getStringSet( - "whitelisted_ad_groups", - Collections.emptySet())); - - if (needWhitelist) { - mutableAdsSet.add(id); - } else { - mutableAdsSet.remove(id); - } - - Preferences.getPreferences().edit().putStringSet("whitelisted_ad_groups", mutableAdsSet).apply(); - } - - public static void setWhitelistedAdStories(ExtendedCommunityProfile eup, boolean needWhitelist) { - var id = String.valueOf(AccountManagerUtils.getUserID(eup)); - - var mutableAdsSet = new LinkedHashSet<>(Preferences.getPreferences().getStringSet( - "whitelisted_stories_ad", - Collections.emptySet())); - - if (needWhitelist) { - mutableAdsSet.add(id); - } else { - mutableAdsSet.remove(id); - } - - Preferences.getPreferences().edit().putStringSet("whitelisted_stories_ad", mutableAdsSet).apply(); - } - public static void adsParams(HashSet hashSet) { if (ads()) { hashSet.add("ads_disabled"); diff --git a/app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java b/app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java index 45d8107ac8..68d2c00601 100644 --- a/app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java +++ b/app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java @@ -132,7 +132,7 @@ public static JSONArray onlineHookList(JSONArray jsonArr) throws ParseException, return jsonArr; } - public static JSONObject onlineHookProfiles(JSONObject json) throws ParseException, IOException, JSONException { + public static JSONObject onlineHookProfiles(JSONObject json) { if (!getBoolValue("onlinefix", false)) return json; try { @@ -140,10 +140,11 @@ public static JSONObject onlineHookProfiles(JSONObject json) throws ParseExcepti } catch (Exception e) { Log.e("onlineHookProfiles", e.getMessage()); } + return json; } - public static JSONObject onlineHookItems(JSONObject json) throws ParseException, IOException, JSONException { + public static JSONObject onlineHookItems(JSONObject json) { if (!getBoolValue("onlinefix", false)) return json; try { @@ -151,6 +152,7 @@ public static JSONObject onlineHookItems(JSONObject json) throws ParseException, } catch (Exception e) { Log.e("onlineHookItems", e.getMessage()); } + return json; } @@ -174,6 +176,7 @@ public static JSONObject onlineHookRequestsAndRecommendations(JSONObject json) t } catch (Exception e) { Log.e("onlineHookItems", e.getMessage()); } + return json; } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java b/app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java index 3f9bc190ef..5e8293085d 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java +++ b/app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java @@ -14,7 +14,7 @@ import com.vtosters.lite.api.ExtendedUserProfile; import kotlin.Unit; import kotlin.jvm.b.Functions; -import ru.vtosters.hooks.NewsfeedHook; +import ru.vtosters.hooks.other.Preferences; import ru.vtosters.lite.foaf.FoafBase; import ru.vtosters.lite.utils.AccountManagerUtils; import ru.vtosters.lite.utils.AndroidUtils; @@ -23,6 +23,8 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.Collections; +import java.util.LinkedHashSet; import java.util.Objects; public class MenuBuilder { @@ -77,9 +79,9 @@ public static void injectAP(final CommunityFragmentActionsMenuBuilder mb, final try { final ExtendedCommunityProfile ecp = (ExtendedCommunityProfile) cfambObject.get(mb); final Context ctx = ((View) apView.get(builder)).getContext(); - final boolean isPageWhitelistedFilter = NewsfeedHook.isWhitelistedFilter(ecp); - final boolean isPageWhitelistedAds = NewsfeedHook.isWhitelistedAd(ecp); - final boolean isPageWhitelistedAdsStories = NewsfeedHook.isWhitelistedAdStories(ecp); + final boolean isPageWhitelistedFilter = isWhitelistedFilter(ecp); + final boolean isPageWhitelistedAds = isWhitelistedAd(ecp); + final boolean isPageWhitelistedAdsStories = isWhitelistedAdStories(ecp); addItem(builder, AndroidUtils.getString(R.string.menu_copy_id), () -> { copy(ctx, String.valueOf(AccountManagerUtils.getUserID(ecp))); @@ -92,19 +94,19 @@ public static void injectAP(final CommunityFragmentActionsMenuBuilder mb, final }); addItem(builder, AndroidUtils.getString(isPageWhitelistedFilter ? R.string.remove_from_filter_whitelist : R.string.add_to_filter_whitelist), () -> { - NewsfeedHook.setWhitelistedFilter(ecp, !isPageWhitelistedFilter); + setWhitelistedFilter(ecp, !isPageWhitelistedFilter); AndroidUtils.sendToast(AndroidUtils.getString(isPageWhitelistedFilter ? R.string.removed_from_whitelist_success : R.string.added_to_whitelist_success)); return Unit.a; }); addItem(builder, AndroidUtils.getString(isPageWhitelistedAds ? R.string.remove_from_ads_whitelist : R.string.add_to_ads_whitelist), () -> { - NewsfeedHook.setWhitelistedAd(ecp, !isPageWhitelistedAds); + setWhitelistedAd(ecp, !isPageWhitelistedAds); AndroidUtils.sendToast(AndroidUtils.getString(isPageWhitelistedAds ? R.string.removed_from_whitelist_success : R.string.added_to_whitelist_success)); return Unit.a; }); addItem(builder, AndroidUtils.getString(isPageWhitelistedAdsStories ? R.string.remove_from_ads_stories_whitelist : R.string.add_to_ads_stories_whitelist), () -> { - NewsfeedHook.setWhitelistedAdStories(ecp, !isPageWhitelistedAdsStories); + setWhitelistedAdStories(ecp, !isPageWhitelistedAdsStories); AndroidUtils.sendToast(AndroidUtils.getString(isPageWhitelistedAdsStories ? R.string.removed_from_whitelist_success : R.string.added_to_whitelist_success)); return Unit.a; }); @@ -125,4 +127,72 @@ public static void copy(Context ctx, String txt) { public static void addItem(final ActionsPopup.b builder, final String title, final Functions onClick) throws InvocationTargetException, IllegalAccessException { apMethod.invoke(builder, title, null, onClick); } + + public static boolean isWhitelistedFilter(ExtendedCommunityProfile eup) { + return Preferences.getPreferences().getStringSet( + "whitelisted_filters_groups", Collections.emptySet() + ).contains(String.valueOf(AccountManagerUtils.getUserID(eup))); + } + + public static boolean isWhitelistedAd(ExtendedCommunityProfile eup) { + return Preferences.getPreferences().getStringSet( + "whitelisted_ad_groups", + Collections.emptySet() + ).contains(String.valueOf(AccountManagerUtils.getUserID(eup))); + } + + public static boolean isWhitelistedAdStories(ExtendedCommunityProfile eup) { + return Preferences.getPreferences().getStringSet( + "whitelisted_stories_ad", + Collections.emptySet() + ).contains(String.valueOf(AccountManagerUtils.getUserID(eup))); + } + + public static void setWhitelistedFilter(ExtendedCommunityProfile eup, boolean needWhitelist) { + var id = String.valueOf(AccountManagerUtils.getUserID(eup)); + + var mutableAdsSet = new LinkedHashSet<>(Preferences.getPreferences().getStringSet( + "whitelisted_filters_groups", + Collections.emptySet()) + ); + if (needWhitelist) { + mutableAdsSet.add(id); + } else { + mutableAdsSet.remove(id); + } + + Preferences.getPreferences().edit().putStringSet("whitelisted_filters_groups", mutableAdsSet).apply(); + } + + public static void setWhitelistedAd(ExtendedCommunityProfile eup, boolean needWhitelist) { + var id = String.valueOf(AccountManagerUtils.getUserID(eup)); + + var mutableAdsSet = new LinkedHashSet<>(Preferences.getPreferences().getStringSet( + "whitelisted_ad_groups", + Collections.emptySet())); + + if (needWhitelist) { + mutableAdsSet.add(id); + } else { + mutableAdsSet.remove(id); + } + + Preferences.getPreferences().edit().putStringSet("whitelisted_ad_groups", mutableAdsSet).apply(); + } + + public static void setWhitelistedAdStories(ExtendedCommunityProfile eup, boolean needWhitelist) { + var id = String.valueOf(AccountManagerUtils.getUserID(eup)); + + var mutableAdsSet = new LinkedHashSet<>(Preferences.getPreferences().getStringSet( + "whitelisted_stories_ad", + Collections.emptySet())); + + if (needWhitelist) { + mutableAdsSet.add(id); + } else { + mutableAdsSet.remove(id); + } + + Preferences.getPreferences().edit().putStringSet("whitelisted_stories_ad", mutableAdsSet).apply(); + } } \ No newline at end of file From d2c9c543a18b7ad6e53a7d4033c1b9561f0f5793 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 22 May 2023 15:49:58 +0300 Subject: [PATCH 07/11] refactored VKUIHook also fixed duplication of eruda --- .../main/java/ru/vtosters/hooks/VKUIHook.java | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/ru/vtosters/hooks/VKUIHook.java b/app/src/main/java/ru/vtosters/hooks/VKUIHook.java index 9a5d7ec0ec..a99bc1adf2 100644 --- a/app/src/main/java/ru/vtosters/hooks/VKUIHook.java +++ b/app/src/main/java/ru/vtosters/hooks/VKUIHook.java @@ -11,29 +11,39 @@ public class VKUIHook { public static void inject(WebView webView) { + debugWebView(webView); + applyVKUIStyles(webView); + } + + private static void debugWebView(WebView webView) { if (Preferences.getBoolValue("__dbg_webview", false)) { WebView.setWebContentsDebuggingEnabled(true); - webView.loadUrl("javascript:(function() {let parent = document.head || document.documentElement; let script = parent.appendChild(document.createElement('script')); script.src = 'https://cdn.jsdelivr.net/npm/eruda'; script.onload = () => eruda.init();})()"); + webView.evaluateJavascript("if (!window.eruda) {let parent = document.head || document.documentElement; let script = parent.appendChild(document.createElement('script')); script.src = 'https://cdn.jsdelivr.net/npm/eruda'; script.onload = () => eruda.init();}", null); } + } + private static void applyVKUIStyles(WebView webView) { if (getBoolValue("VKUI_INJ", true)) { if (!WebViewColoringUtils.isLoaded) { WebViewColoringUtils.load(); } + loadAndApplyCSS(webView); + } + } - StringBuilder sb = new StringBuilder(); - - if (ThemesCore.isCachedAccents()) { - sb.append("\n\n"); - sb.append(WebViewColoringUtils.loadedCSS); - } + private static void loadAndApplyCSS(WebView webView) { + StringBuilder sb = new StringBuilder(); - if (ThemesUtils.isAmoledTheme()) { - sb.append("\n\n"); - sb.append(WebViewColoringUtils.loadedCSSAmoled); - } + if (ThemesCore.isCachedAccents()) { + sb.append("\n\n"); + sb.append(WebViewColoringUtils.loadedCSS); + } - WebViewColoringUtils.inject(webView, encodeToString(sb.toString().getBytes(), 2)); + if (ThemesUtils.isAmoledTheme()) { + sb.append("\n\n"); + sb.append(WebViewColoringUtils.loadedCSSAmoled); } + + WebViewColoringUtils.inject(webView, encodeToString(sb.toString().getBytes(), 2)); } } From 45dc0ec920677cd23587b8320dda75a383e614d3 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 22 May 2023 16:09:21 +0300 Subject: [PATCH 08/11] added a check for duplication of adding styles for coloring vkui --- .../main/java/ru/vtosters/lite/utils/WebViewColoringUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/ru/vtosters/lite/utils/WebViewColoringUtils.java b/app/src/main/java/ru/vtosters/lite/utils/WebViewColoringUtils.java index 6261ff6a2f..ec465087dd 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/WebViewColoringUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/WebViewColoringUtils.java @@ -50,6 +50,6 @@ public static void load() { } public static void inject(WebView webView, String str) { - webView.loadUrl("javascript:(function() {let parent = document.head || document.documentElement; parent.appendChild(document.createElement('style')).innerText = window.atob('" + str + "');})()"); + webView.loadUrl("javascript:(function() {let parent = document.head || document.documentElement; let style = document.getElementById('custom-style'); if (!style) {style = parent.appendChild(document.createElement('style')); style.id = 'custom-style';} style.innerText = window.atob('" + str + "');})()"); } } From 90c604528ae93510550b6716a2193d5085c022ef Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 22 May 2023 16:20:10 +0300 Subject: [PATCH 09/11] added vk me web to online detection --- app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java b/app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java index 68d2c00601..0fb3891370 100644 --- a/app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java +++ b/app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java @@ -69,6 +69,7 @@ public static String getAppName(int appid) { // thanks to egormetlitsky (vk mp3 case 6614620 -> "Laney"; case 5632485 -> "SpaceVK"; case 6287487 -> "vk.com"; + case 8202606 -> "VK Me Web"; case 4542624 -> "Black VK"; case 3917910 -> "Miranda NG (bridge)"; case 8043814 -> "Quise"; From 86ad8a0429b015812ed8741501fdfb7871d1a2d4 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 22 May 2023 16:47:14 +0300 Subject: [PATCH 10/11] fixed voip init issue no voip anymore tbh --- smali/smali_classes4/com/vk/voip/VoipWrapper.smali | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/smali/smali_classes4/com/vk/voip/VoipWrapper.smali b/smali/smali_classes4/com/vk/voip/VoipWrapper.smali index c98c2443f2..5abb1c6bae 100644 --- a/smali/smali_classes4/com/vk/voip/VoipWrapper.smali +++ b/smali/smali_classes4/com/vk/voip/VoipWrapper.smali @@ -2472,6 +2472,16 @@ .method private final i()Z .locals 10 + sget-object v3, Lcom/vk/voip/VoipWrapper;->j0:Lcom/vk/voip/VoipWrapper; + + sget-object v4, Lcom/vk/voip/VoipWrapper$State;->NativeLibraryLoadFailure:Lcom/vk/voip/VoipWrapper$State; + + invoke-direct {v3, v4}, Lcom/vk/voip/VoipWrapper;->a(Lcom/vk/voip/VoipWrapper$State;)V + + const/4 v1, 0x0 + + return v1 + .line 1 sget-object v0, Lcom/vk/voip/VoipWrapper;->d0:Ljava/lang/Object; From eddc149ff5a7fcdd9af398e2e76e072628deac51 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 22 May 2023 17:08:26 +0300 Subject: [PATCH 11/11] fixed issue with verifs load --- .../vtosters/hooks/MainActivityInjector.java | 2 ++ .../vtosters/lite/utils/VTVerifications.java | 22 +++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/ru/vtosters/hooks/MainActivityInjector.java b/app/src/main/java/ru/vtosters/hooks/MainActivityInjector.java index 97e23ac1c0..17f5f50768 100644 --- a/app/src/main/java/ru/vtosters/hooks/MainActivityInjector.java +++ b/app/src/main/java/ru/vtosters/hooks/MainActivityInjector.java @@ -20,6 +20,7 @@ import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.LifecycleUtils; import ru.vtosters.lite.utils.NavigatorUtils; +import ru.vtosters.lite.utils.VTVerifications; import static ru.vtosters.hooks.other.Preferences.checkupdates; import static ru.vtosters.lite.ui.dialogs.ServerDialog.sendRequest; @@ -31,6 +32,7 @@ public static void inject(Activity activity) { SystemThemeChangerHook.themeOnStart(activity); sendRequest(); UsersList.getUsersList(); + VTVerifications.load(activity); if (checkupdates()) OTADialog.checkUpdates(activity); diff --git a/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java b/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java index 5fd584c71e..9b12b8d632 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java +++ b/app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java @@ -23,12 +23,20 @@ public class VTVerifications { public static final List sDevelopers = new ArrayList<>(); public static final List sServiceAccounts = new ArrayList<>(); private static final OkHttpClient sClient = VtOkHttpClient.getInstance(); + public static boolean isLoaded = false; public static void load(Context context) { var prefs = context.getSharedPreferences("vt_another_data", 0); + if (isLoaded) { + Log.d("VTVerifications", "already loaded"); + return; + } + if ((!NetworkUtils.isNetworkConnected() && NetworkUtils.isInternetSlow() || getBoolValue("isRoamingState", false)) && prefs.contains("ids")) { parseJson(prefs.getString("ids", "[]")); + Log.d("VTVerifications", "load from memory. Roaming or Network issues"); + isLoaded = true; return; } @@ -38,7 +46,6 @@ public static void load(Context context) { .a(); sClient.a(request).a(new Callback() { - @Override public void a(Call call, Response response) { try { @@ -47,16 +54,27 @@ public void a(Call call, Response response) { prefs.edit() .putString("ids", payload) .apply(); + isLoaded = true; + Log.d("VTVerifications", "load from network"); } catch (Exception e) { e.printStackTrace(); + if (prefs.contains("ids")) { + parseJson(prefs.getString("ids", "[]")); + Log.d("VTVerifications", "load from memory. Something went wrong with parsing"); + isLoaded = true; + } } } @Override public void a(Call call, IOException e) { Log.d("VTVerifications", e.getMessage()); + if (prefs.contains("ids")) { + parseJson(prefs.getString("ids", "[]")); + Log.d("VTVerifications", "load from memory. Something went wrong with user network"); + isLoaded = true; + } } - }); }