From cc445e4aea0997996bdf0a813e35285466870042 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 2 May 2022 09:44:30 +0300 Subject: [PATCH] Oh sh*t I am sorry (for refactoring) --- .../libvkx/client/LibVKXClient.java | 6 +- .../libvkx/client/LibVKXClientImpl.java | 2 +- .../aefyr/tsg/g2/TelegramStickersService.java | 2 +- .../main/java/ru/f0x1d/net/F0x1dRequest.java | 2 +- .../ru/vtosters/lite/dnr/DNRInjector.java | 2 +- .../java/ru/vtosters/lite/dnr/DNRModule.java | 2 +- .../java/ru/vtosters/lite/dnr/DNRPrefs.java | 16 +- .../lite/dnr/helpers/DoNotReadDBHelper.java | 2 +- .../lite/dnr/helpers/DoNotTypeDBHelper.java | 2 +- .../ru/vtosters/lite/f0x1d/Crashreporter.java | 7 +- .../vtosters/lite/f0x1d/LogWriterService.java | 2 +- .../vtosters/lite/f0x1d/VTVerifications.java | 9 +- .../java/ru/vtosters/lite/foaf/FoafBase.java | 7 +- .../java/ru/vtosters/lite/tgs/TGPref.java | 2 +- .../java/ru/vtosters/lite/tgs/TGRoot.java | 4 +- .../ru/vtosters/lite/ui/PreferencesUtil.java | 4 +- .../lite/ui/dialogs/DisableBattery.java | 8 +- .../vtosters/lite/ui/dialogs/InstallGMS.java | 10 +- .../ru/vtosters/lite/ui/dialogs/Start.java | 6 +- .../lite/ui/fragments/InterfaceFragment.java | 2 +- .../lite/ui/fragments/OtherFragment.java | 8 +- .../lite/ui/fragments/ThemesFragment.java | 2 +- .../ui/fragments/dockbar/DockBarAdapter.java | 4 +- .../ui/fragments/dockbar/DockBarFragment.java | 4 +- .../ui/fragments/dockbar/DockBarInjector.java | 2 +- .../ui/fragments/dockbar/DockBarManager.java | 20 +- .../multiaccount/MultiAccountAdapter.java | 8 +- .../multiaccount/MultiAccountFragment.java | 2 +- .../multiaccount/MultiAccountManager.java | 4 +- .../tgstickers/StickersFragment.java | 14 +- .../StickersPreferencesFragment.java | 4 +- .../java/ru/vtosters/lite/utils/About.java | 66 ++ .../lite/utils/ExternalLinkHandler.java | 7 +- .../lite/utils/{Helper.java => Globals.java} | 49 +- .../ru/vtosters/lite/utils/IconHelper.java | 4 +- .../java/ru/vtosters/lite/utils/Newsfeed.java | 238 ++++++ .../ru/vtosters/lite/utils/Preferences.java | 330 ++++++++ .../java/ru/vtosters/lite/utils/Prefs.java | 782 ------------------ .../java/ru/vtosters/lite/utils/Proxy.java | 9 +- .../java/ru/vtosters/lite/utils/SSFS.java | 43 + .../ru/vtosters/lite/utils/SettBackup.java | 2 +- .../java/ru/vtosters/lite/utils/Themes.java | 28 +- .../ru/vtosters/lite/utils/VKUIInjector.java | 6 +- .../com/vk/about/AboutAppFragment$d.smali | 4 +- .../smali/com/vk/about/AboutAppFragment.smali | 2 +- .../com/vk/common/links/LinkProcessor1.smali | 28 +- smali/smali/com/vk/core/b/BuildInfo.smali | 4 +- .../com/vk/core/ui/themes/VKThemeHelper.smali | 2 +- .../messages/MessagesSendApiCmd.smali | 4 +- .../dialogs_list/vc_impl/VhDialog.smali | 6 +- .../info/DialogHeaderInfoVc.smali | 2 +- .../dialog_header/info/IconFormatter.smali | 4 +- .../adapter/msgparts/MsgPartPollHolder.smali | 2 +- .../im/ui/views/dialogs/DialogItemView.smali | 2 +- .../com/vk/stickers/c/KeyboardPopup.smali | 6 +- smali/smali/com/vk/webapp/AndroidBridge.smali | 4 +- smali/smali/com/vk/webapp/SSFS.smali | 2 +- .../com/vtosters/lite/VKApplication.smali | 10 +- .../vtosters/lite/VKFragmentActivity.smali | 2 +- .../lite/api/execute/GetFullUserProfile.smali | 2 +- .../com/vtosters/lite/data/Users$1.smali | 4 +- .../smali/com/vtosters/lite/ui/WriteBar.smali | 6 +- .../notifications/SettingsActivity.smali | 2 +- .../com/vk/api/sdk/ui/VKCaptchaActivity.smali | 2 +- .../vk/api/sdk/ui/VKWebViewAuthActivity.smali | 2 +- .../avatarpicker/AvatarPickerActivity.smali | 2 +- .../network/security/NetworkKeyStore.smali | 2 +- smali/smali_classes2/com/vk/emoji/Emoji.smali | 2 +- .../messages/MessagesDeleteApiCmd.smali | 2 +- .../MessagesGetConversationsByIdApiCmd.smali | 2 +- .../api_parsers/AttachApiParser.smali | 2 +- .../formatters/MsgBodiesFormatter.smali | 2 +- .../im/ui/formatters/ComposingFormatter.smali | 2 +- .../views/msg/bubble/MsgBubbleDrawable.smali | 2 +- .../com/vk/newsfeed/Feed2049$type$2.smali | 2 +- .../com/vtosters/lite/CaptchaActivity.smali | 2 +- .../lite/ChangePasswordActivity.smali | 2 +- .../com/vtosters/lite/VKActivity.smali | 2 +- .../vtosters/lite/data/BenchmarkTracker.smali | 2 +- .../fragments/SettingsListFragment$b.smali | 4 +- .../support/v4/app/SupportActivity.smali | 2 +- .../android/youtube/player/internal/y.smali | 4 +- .../security/NetworkTrustManager.smali | 8 +- .../newsfeed/entries/NewsEntryFactory.smali | 8 +- .../system/MediaStoreController.smali | 12 +- .../mediastore/system/MediaStoreEntry.smali | 2 +- .../com/vk/pushes/PushOpenActivity.smali | 2 +- smali/smali_classes3/com/vk/t/Vigo.smali | 2 +- .../com/vtosters/lite/MainActivity.smali | 8 +- .../vtosters/lite/ReportContentActivity.smali | 2 +- .../com/vtosters/lite/WelcomeActivity.smali | 2 +- .../lite/api/newsfeed/NewsfeedCustomGet.smali | 2 +- .../lite/api/newsfeed/NewsfeedGet.smali | 6 +- .../com/vtosters/lite/auth/VKAuthState.smali | 2 +- .../appkit/LiteAppCompatActivity.smali | 2 +- .../AppSettingsDialogHolderActivity.smali | 2 +- .../SmsCodeNotificationActivity.smali | 2 +- .../ru/mail/libverify/storage/h.smali | 2 +- .../com/vk/about/holders1.smali | 2 +- .../TokenConfirmationHandlerChainCall.smali | 2 +- .../api/sdk/ui/VKConfirmationActivity.smali | 2 +- .../com/vk/common/links/BrowserUtils$a.smali | 2 +- ...ationsFragment$dirtyHackActivity$2$1.smali | 2 +- .../commands/chats/ChatsLoadPreviewCmd.smali | 2 +- .../messages/MessagesExistsApiCmd.smali | 2 +- ...MessagesGetConversationMembersApiCmd.smali | 2 +- .../jobs/msg/MsgSendMultipleJob.smali | 2 +- .../jobs/msg/MsgSendUncheckedJob.smali | 2 +- .../msg_list/adapter/VhBindArgs.smali | 2 +- .../msg_list/adapter/vh/VhMsg.smali | 6 +- .../com/vk/im/ui/fragments/ChatFragment.smali | 2 +- .../vk/im/ui/views/avatars/AvatarView.smali | 2 +- .../com/vk/menu/MenuFragment$c.smali | 2 +- .../com/vk/menu/MenuFragment.smali | 2 +- .../navigation/NavigationDelegateBottom.smali | 4 +- .../controllers/NewsfeedController.smali | 2 +- .../presenters/NewsfeedPresenter.smali | 2 +- .../com/vk/stories/StoriesController.smali | 4 +- .../com/vtosters/lite/AuthActivity.smali | 4 +- .../vtosters/lite/ImagePickerActivity.smali | 2 +- .../com/vtosters/lite/LinkParser.smali | 2 +- .../com/vtosters/lite/LinkRedirActivity.smali | 2 +- .../com/vtosters/lite/VideoUploadDialog.smali | 2 +- .../com/vtosters/lite/data/Users.smali | 4 +- .../ru/mail/libverify/storage/m.smali | 2 +- .../ru/mail/libverify/utils/n.smali | 2 +- .../ru/mail/voip2/VoipImpl2.smali | 2 +- .../com/vk/api/discover/DiscoverGet.smali | 2 +- .../com/vk/api/wall/WallGetComments.smali | 2 +- .../com/vk/auth/api/VKAccount.smali | 16 +- .../network/security/NetworkKeyStore$a.smali | 2 +- .../com/vk/core/util/AppLangProvider.smali | 2 +- .../com/vk/core/util/LangUtils.smali | 2 +- .../com/vk/core/util/StringUtils.smali | 4 +- .../com/vk/dto/stickers/StickerItem$b.smali | 2 +- .../stories/model/GetStoriesResponse.smali | 2 +- .../messages/MessagesGetByIdApiCmd.smali | 2 +- .../MessagesGetConversationsApiCmd.smali | 4 +- .../messages/MessagesGetHistoryApiCmd.smali | 6 +- .../messages/MessagesMarkAsReadApiCmd.smali | 2 +- .../internal/api_parsers/UserApiParser.smali | 2 +- .../impl/vk/VkDialogsHeaderVc.smali | 4 +- .../viewcontrollers/msg_list/MsgListVc.smali | 2 +- .../vk/profile/ui/BaseProfileFragment.smali | 6 +- .../vtosters/lite/NotificationActivity.smali | 2 +- .../com/vtosters/lite/PostPhotoActivity.smali | 2 +- .../com/vtosters/lite/RepostActivity.smali | 2 +- .../com/vtosters/lite/api/wall/WallGet.smali | 2 +- .../ru/mail/libverify/notifications/f.smali | 2 +- 149 files changed, 1006 insertions(+), 1073 deletions(-) create mode 100644 app/src/main/java/ru/vtosters/lite/utils/About.java rename app/src/main/java/ru/vtosters/lite/utils/{Helper.java => Globals.java} (77%) create mode 100644 app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java create mode 100644 app/src/main/java/ru/vtosters/lite/utils/Preferences.java delete mode 100644 app/src/main/java/ru/vtosters/lite/utils/Prefs.java create mode 100644 app/src/main/java/ru/vtosters/lite/utils/SSFS.java 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 3ccfa6c68..9c4126065 100644 --- a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java +++ b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java @@ -1,6 +1,7 @@ package bruhcollective.itaysonlab.libvkx.client; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Preferences.BooleanFalse; import android.content.Context; import android.os.RemoteException; @@ -14,7 +15,6 @@ import java.util.Iterator; import java.util.List; import bruhcollective.itaysonlab.libvkx.ILibVkxService; -import ru.vtosters.lite.utils.Prefs; public class LibVKXClient { private static LibVKXClientImpl impl; @@ -36,7 +36,7 @@ public class LibVKXClient { } public static boolean isIntegrationEnabled() { - return Prefs.BooleanFalse("libvkx_integration") && isVkxInstalled(); + return BooleanFalse("libvkx_integration") && isVkxInstalled(); } public static boolean play(MusicTrack musicTrack, List list, PlayerRefer playerRefer) { diff --git a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClientImpl.java b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClientImpl.java index 216412981..29d957912 100644 --- a/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClientImpl.java +++ b/app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClientImpl.java @@ -1,6 +1,6 @@ package bruhcollective.itaysonlab.libvkx.client; -import static ru.vtosters.lite.utils.Helper.getUserId; +import static ru.vtosters.lite.utils.Globals.getUserId; import android.content.ComponentName; import android.content.Context; diff --git a/app/src/main/java/com/aefyr/tsg/g2/TelegramStickersService.java b/app/src/main/java/com/aefyr/tsg/g2/TelegramStickersService.java index 1cd9c6364..cb0220e22 100755 --- a/app/src/main/java/com/aefyr/tsg/g2/TelegramStickersService.java +++ b/app/src/main/java/com/aefyr/tsg/g2/TelegramStickersService.java @@ -1,6 +1,6 @@ package com.aefyr.tsg.g2; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.getContext; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/ru/f0x1d/net/F0x1dRequest.java b/app/src/main/java/ru/f0x1d/net/F0x1dRequest.java index fed5bcae6..4e5315a21 100644 --- a/app/src/main/java/ru/f0x1d/net/F0x1dRequest.java +++ b/app/src/main/java/ru/f0x1d/net/F0x1dRequest.java @@ -1,6 +1,6 @@ package ru.f0x1d.net; -import static ru.vtosters.lite.utils.Helper.getUserToken; +import static ru.vtosters.lite.utils.Globals.getUserToken; import android.os.AsyncTask; diff --git a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java index 9f356b935..80c86be88 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java +++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java @@ -4,7 +4,7 @@ import static ru.vtosters.lite.dnr.DNRModule.hookDNR; import static ru.vtosters.lite.dnr.DNRModule.hookDNT; import static ru.vtosters.lite.dnr.DNRModule.isDnrEnabledFor; import static ru.vtosters.lite.dnr.DNRModule.isDntEnabledFor; -import static ru.vtosters.lite.utils.Helper.getIdentifier; +import static ru.vtosters.lite.utils.Globals.getIdentifier; import com.vk.im.engine.models.dialogs.Dialog; import com.vk.im.ui.components.common.DialogAction; diff --git a/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java b/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java index 2355635f3..6953570d7 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java +++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.dnr; import static ru.f0x1d.net.F0x1dRequest.makeRequest; -import static ru.vtosters.lite.utils.Helper.getUserToken; +import static ru.vtosters.lite.utils.Globals.getUserToken; import static ru.vtosters.lite.utils.Proxy.getApiCom; import com.vk.core.util.ToastUtils; diff --git a/app/src/main/java/ru/vtosters/lite/dnr/DNRPrefs.java b/app/src/main/java/ru/vtosters/lite/dnr/DNRPrefs.java index 66b312042..ace0ae08b 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/DNRPrefs.java +++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRPrefs.java @@ -1,10 +1,10 @@ package ru.vtosters.lite.dnr; -import ru.vtosters.lite.utils.Prefs; +import static ru.vtosters.lite.utils.Preferences.BooleanFalse; public class DNRPrefs { public static boolean getStoriesRead() { - return Prefs.BooleanFalse("read_s"); + return BooleanFalse("read_s"); } public static boolean getMarkAsReadWithoutExceptions(int peerId) { @@ -28,27 +28,27 @@ public class DNRPrefs { } public static boolean readPM(int peer) { - return (peer > 0 && peer < 2000000000) && Prefs.BooleanFalse("read_pm"); + return (peer > 0 && peer < 2000000000) && BooleanFalse("read_pm"); } public static boolean readConversations(int peer) { - return (peer > 2000000000) && Prefs.BooleanFalse("read_conversations"); + return (peer > 2000000000) && BooleanFalse("read_conversations"); } public static boolean readBots(int peer) { - return (peer < 0) && Prefs.BooleanFalse("read_bot"); + return (peer < 0) && BooleanFalse("read_bot"); } public static boolean writePM(int peer) { - return (peer > 0 && peer < 2000000000) && Prefs.BooleanFalse("write_pm"); + return (peer > 0 && peer < 2000000000) && BooleanFalse("write_pm"); } public static boolean writeConversations(int peer) { - return (peer > 2000000000) && Prefs.BooleanFalse("write_conversations"); + return (peer > 2000000000) && BooleanFalse("write_conversations"); } public static boolean writeBots(int peer) { - return (peer < 0) && Prefs.BooleanFalse("write_bot"); + return (peer < 0) && BooleanFalse("write_bot"); } public static boolean getActivityWithoutExceptions(int peerId) { diff --git a/app/src/main/java/ru/vtosters/lite/dnr/helpers/DoNotReadDBHelper.java b/app/src/main/java/ru/vtosters/lite/dnr/helpers/DoNotReadDBHelper.java index 84200f5a3..3017d0dae 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/helpers/DoNotReadDBHelper.java +++ b/app/src/main/java/ru/vtosters/lite/dnr/helpers/DoNotReadDBHelper.java @@ -1,6 +1,6 @@ package ru.vtosters.lite.dnr.helpers; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.getContext; import android.content.ContentValues; import android.database.Cursor; diff --git a/app/src/main/java/ru/vtosters/lite/dnr/helpers/DoNotTypeDBHelper.java b/app/src/main/java/ru/vtosters/lite/dnr/helpers/DoNotTypeDBHelper.java index 614a639f3..efaa023c5 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/helpers/DoNotTypeDBHelper.java +++ b/app/src/main/java/ru/vtosters/lite/dnr/helpers/DoNotTypeDBHelper.java @@ -1,6 +1,6 @@ package ru.vtosters.lite.dnr.helpers; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.getContext; import android.content.ContentValues; import android.database.Cursor; diff --git a/app/src/main/java/ru/vtosters/lite/f0x1d/Crashreporter.java b/app/src/main/java/ru/vtosters/lite/f0x1d/Crashreporter.java index 9392e9bb1..4c84b1753 100644 --- a/app/src/main/java/ru/vtosters/lite/f0x1d/Crashreporter.java +++ b/app/src/main/java/ru/vtosters/lite/f0x1d/Crashreporter.java @@ -1,6 +1,8 @@ package ru.vtosters.lite.f0x1d; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.About.*; +import static ru.vtosters.lite.utils.Globals.*; +import static ru.vtosters.lite.utils.Preferences.*; import android.app.Activity; import android.app.Notification; @@ -19,7 +21,6 @@ import java.io.PrintWriter; import java.io.StringWriter; import ru.vtosters.lite.badmanners.DeviceInfoCollector; -import ru.vtosters.lite.utils.Prefs; public class Crashreporter { protected static String logString; @@ -36,7 +37,7 @@ public class Crashreporter { } static void start(Thread.UncaughtExceptionHandler uncaughtExceptionHandler, Thread thread, Throwable th, Activity activity) { - logString = getStackTrace(th) + "\n\n" + new DeviceInfoCollector().collect(getContext()).toDeviceName() + "\n VTL Version: " + Prefs.VERSIONNAME + ", build: " + Prefs.getBuildNumber(); + logString = getStackTrace(th) + "\n\n" + new DeviceInfoCollector().collect(getContext()).toDeviceName() + "\n VTL Version: " + VERSIONNAME + ", build: " + getBuildNumber(); if (Build.VERSION.SDK_INT >= 26) { var notificationChannel = new NotificationChannel("crashes", "crash", NotificationManager.IMPORTANCE_DEFAULT); notificationChannel.enableVibration(true); diff --git a/app/src/main/java/ru/vtosters/lite/f0x1d/LogWriterService.java b/app/src/main/java/ru/vtosters/lite/f0x1d/LogWriterService.java index 3cf230ae4..ed90dc2b9 100644 --- a/app/src/main/java/ru/vtosters/lite/f0x1d/LogWriterService.java +++ b/app/src/main/java/ru/vtosters/lite/f0x1d/LogWriterService.java @@ -2,7 +2,7 @@ package ru.vtosters.lite.f0x1d; import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.makeText; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.getContext; import android.app.NotificationManager; import android.app.Service; diff --git a/app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java b/app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java index 8c94764ee..a172945e6 100644 --- a/app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java +++ b/app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java @@ -1,5 +1,7 @@ package ru.vtosters.lite.f0x1d; +import static ru.vtosters.lite.utils.Preferences.BooleanTrue; + import android.content.Context; import android.content.SharedPreferences; import android.util.Base64; @@ -24,7 +26,6 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; -import ru.vtosters.lite.utils.Prefs; public class VTVerifications { public static final HashMap sServiceAccountsMap = new HashMap<>(); @@ -135,7 +136,7 @@ public class VTVerifications { if (jSONObject.optInt("verified", 0) == 1) { return true; } - if (!Prefs.BooleanTrue("VT_Verification")) { + if (!BooleanTrue("VT_Verification")) { return false; } return isVerified((jSONObject.optString(NavigatorKeys.j) == null || (!jSONObject.optString(NavigatorKeys.j).equals("group") && !jSONObject.optString(NavigatorKeys.j).equals("page"))) ? jSONObject.optInt("id", 0) : -jSONObject.optInt("id", 0)); @@ -145,14 +146,14 @@ public class VTVerifications { if (jSONObject.optInt("trending", 0) == 1) { return true; } - if (!Prefs.BooleanTrue("VT_Fire")) { + if (!BooleanTrue("VT_Fire")) { return false; } return hasPrometheus((jSONObject.optString(NavigatorKeys.j) == null || (!jSONObject.optString(NavigatorKeys.j).equals("group") && !jSONObject.optString(NavigatorKeys.j).equals("page"))) ? jSONObject.optInt("id", 0) : -jSONObject.optInt("id", 0)); } public static boolean hasDeveloper(JSONObject jSONObject) { - if (!Prefs.BooleanTrue("VT_Dev")) { + if (!BooleanTrue("VT_Dev")) { return false; } return isDeveloper((jSONObject.optString(NavigatorKeys.j) == null || (!jSONObject.optString(NavigatorKeys.j).equals("group") && !jSONObject.optString(NavigatorKeys.j).equals("page"))) ? jSONObject.optInt("id", 0) : -jSONObject.optInt("id", 0)); diff --git a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java index 58fa68805..ee9453b6c 100644 --- a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java +++ b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java @@ -2,8 +2,9 @@ package ru.vtosters.lite.foaf; import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.makeText; -import static ru.vtosters.lite.utils.Helper.getString; +import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Proxy.getApiCom; +import static ru.vtosters.lite.utils.Proxy.proxy; import android.app.ProgressDialog; import android.content.Context; @@ -26,7 +27,7 @@ import java.util.regex.Pattern; import okhttp3.OkHttpClient; import okhttp3.Request; import ru.f0x1d.net.F0x1dRequest; -import ru.vtosters.lite.utils.Prefs; +import ru.vtosters.lite.utils.Preferences; public class FoafBase { private static final Pattern FOAF_REGEX = Pattern.compile(""); @@ -49,7 +50,7 @@ public class FoafBase { private static String getLink(int i) { String str; StringBuilder sb; - if (Prefs.proxy()) { + if (proxy()) { sb = new StringBuilder(); str = "https://" + getApiCom() + "/_/vk.com/foaf.php?id="; } else { diff --git a/app/src/main/java/ru/vtosters/lite/tgs/TGPref.java b/app/src/main/java/ru/vtosters/lite/tgs/TGPref.java index 230ea8149..391cd1a43 100644 --- a/app/src/main/java/ru/vtosters/lite/tgs/TGPref.java +++ b/app/src/main/java/ru/vtosters/lite/tgs/TGPref.java @@ -1,6 +1,6 @@ package ru.vtosters.lite.tgs; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.getContext; import android.content.SharedPreferences; import android.preference.PreferenceManager; 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 ec0d1f93c..7a93213bb 100644 --- a/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java +++ b/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.tgs; -import static ru.vtosters.lite.utils.Helper.getContext; -import static ru.vtosters.lite.utils.Helper.getString; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Globals.getString; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java b/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java index 1729cec20..130ae14c9 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java +++ b/app/src/main/java/ru/vtosters/lite/ui/PreferencesUtil.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.ui; -import static ru.vtosters.lite.utils.Helper.convertDpToPixel; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.convertDpToPixel; +import static ru.vtosters.lite.utils.Globals.getContext; import android.app.AlertDialog; import android.content.Context; 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 1343acc36..e9ce4cda9 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 @@ -1,7 +1,8 @@ package ru.vtosters.lite.ui.dialogs; -import static ru.vtosters.lite.utils.Helper.edit; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.edit; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Preferences.BooleanTrue; import android.app.Activity; import android.app.AlertDialog; @@ -13,11 +14,10 @@ import android.os.Build; import android.os.PowerManager; import ru.vtosters.lite.utils.OEMDetector; -import ru.vtosters.lite.utils.Prefs; public class DisableBattery { public static void alert(Activity activity) { - if (OEMDetector.isOEM() && Build.VERSION.SDK_INT >= 23 && Prefs.BooleanTrue("showDoze")) { + if (OEMDetector.isOEM() && Build.VERSION.SDK_INT >= 23 && BooleanTrue("showDoze")) { final Context context = getContext(); if (!((PowerManager) context.getSystemService(Context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName())) { AlertDialog.Builder builder = new AlertDialog.Builder(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 4ab0c40f7..c8e87609a 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 @@ -1,8 +1,9 @@ package ru.vtosters.lite.ui.dialogs; -import static ru.vtosters.lite.utils.Helper.edit; -import static ru.vtosters.lite.utils.Helper.getContext; -import static ru.vtosters.lite.utils.Helper.isGmsInstalled; +import static ru.vtosters.lite.utils.Globals.edit; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Globals.isGmsInstalled; +import static ru.vtosters.lite.utils.Preferences.BooleanTrue; import android.app.Activity; import android.app.AlertDialog; @@ -13,7 +14,6 @@ import android.content.Intent; import com.vk.navigation.Navigator; import ru.vtosters.lite.ui.fragments.InstallGMSFragment; -import ru.vtosters.lite.utils.Prefs; public class InstallGMS { public static void alert(final Activity activity) { @@ -39,7 +39,7 @@ public class InstallGMS { context.startActivity(a2); } }); - if (Prefs.BooleanTrue("showAlertGms")) { + if (BooleanTrue("showAlertGms")) { builder.show(); } } 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 920093b37..51e5e0a03 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 @@ -1,6 +1,7 @@ package ru.vtosters.lite.ui.dialogs; -import static ru.vtosters.lite.utils.Helper.edit; +import static ru.vtosters.lite.utils.Globals.edit; +import static ru.vtosters.lite.utils.Preferences.BooleanTrue; import android.app.Activity; import android.app.AlertDialog; @@ -10,7 +11,6 @@ import android.net.Uri; import android.os.Build; import ru.vtosters.lite.utils.OEMDetector; -import ru.vtosters.lite.utils.Prefs; public class Start { public static void alert(final Activity activity) { @@ -36,7 +36,7 @@ public class Start { activity.startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://t.me/vtosters"))); } }); - if (Prefs.BooleanTrue("showAlert")) { + if (BooleanTrue("showAlert")) { builder.show(); } } 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 92970633a..9769ea220 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 @@ -1,6 +1,6 @@ package ru.vtosters.lite.ui.fragments; -import static ru.vtosters.lite.utils.Helper.getString; +import static ru.vtosters.lite.utils.Globals.getString; import android.os.Bundle; import android.support.v7.preference.Preference; 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 91b983ab6..aa6a9bf26 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 @@ -2,10 +2,10 @@ package ru.vtosters.lite.ui.fragments; import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.makeText; -import static ru.vtosters.lite.utils.Helper.getContext; -import static ru.vtosters.lite.utils.Helper.getString; -import static ru.vtosters.lite.utils.Helper.getUserToken; -import static ru.vtosters.lite.utils.Helper.restartApplication; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Globals.getString; +import static ru.vtosters.lite.utils.Globals.getUserToken; +import static ru.vtosters.lite.utils.Globals.restartApplication; import static ru.vtosters.lite.utils.SettBackup.backupSettings; import static ru.vtosters.lite.utils.SettBackup.deletePrefs; import static ru.vtosters.lite.utils.SettBackup.restoreBackup; 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 b35f2967d..e434117a8 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 @@ -1,6 +1,6 @@ package ru.vtosters.lite.ui.fragments; -import static ru.vtosters.lite.utils.Helper.getString; +import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.IconHelper.switchToDefault; import static ru.vtosters.lite.utils.IconHelper.switchToVK; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java index 7c1643332..574c8f005 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarAdapter.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.ui.fragments.dockbar; -import static ru.vtosters.lite.utils.Helper.convertDpToPixel; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.convertDpToPixel; +import static ru.vtosters.lite.utils.Globals.getContext; import android.content.res.ColorStateList; import android.graphics.Typeface; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java index 8008224b6..89576fda4 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarFragment.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.ui.fragments.dockbar; -import static ru.vtosters.lite.utils.Helper.convertDpToPixel; -import static ru.vtosters.lite.utils.Helper.restartApplication; +import static ru.vtosters.lite.utils.Globals.convertDpToPixel; +import static ru.vtosters.lite.utils.Globals.restartApplication; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java index 2c11a0fa6..7a882646b 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarInjector.java @@ -1,6 +1,6 @@ package ru.vtosters.lite.ui.fragments.dockbar; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.getContext; import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java index 42064644b..e1f88bf3b 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java @@ -1,6 +1,8 @@ package ru.vtosters.lite.ui.fragments.dockbar; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Preferences.newfeed; +import static ru.vtosters.lite.utils.Preferences.olddock; import com.vk.apps.AppsFragment; import com.vk.discover.DiscoverFeedFragment; @@ -42,8 +44,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import ru.vtosters.lite.utils.Prefs; - public class DockBarManager { public static final int MIN_SELECTED_TABS_LIMIT = 3; public static final int MAX_SELECTED_TABS_LIMIT = 9; @@ -79,11 +79,11 @@ public class DockBarManager { File dockbar = new File(getContext().getFilesDir(), "dockbar.json"); if (!dockbar.exists()) { - mSelectedTabs.add(new DockBarTab("tab_news", Prefs.olddock() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, Prefs.isUseAlternativeFragments() ? Feed2049.b.c() : NewsfeedFragment.class)); - mSelectedTabs.add(new DockBarTab("tab_discover", Prefs.olddock() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, Prefs.isUseAlternativeFragments() ? DiscoverFragment.class : DiscoverFeedFragment.class)); - mSelectedTabs.add(new DockBarTab("tab_messages", Prefs.olddock() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class)); - mSelectedTabs.add(new DockBarTab("tab_feedback", Prefs.olddock() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class)); - mSelectedTabs.add(new DockBarTab("tab_menu", Prefs.olddock() ? R.drawable.ic_menu_more_28 : R.drawable.ic_menu_more_outline_28, R.string.menu, R.id.tab_menu, MenuFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_news", olddock() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, newfeed() ? Feed2049.b.c() : NewsfeedFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_discover", olddock() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, newfeed() ? DiscoverFragment.class : DiscoverFeedFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_messages", olddock() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_feedback", olddock() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_menu", olddock() ? R.drawable.ic_menu_more_28 : R.drawable.ic_menu_more_outline_28, R.string.menu, R.id.tab_menu, MenuFragment.class)); mDisabledTabs.add(new DockBarTab("tab_friends", R.drawable.ic_user_24, R.string.friends, R.id.menu_friends, FriendsFragment.class)); mDisabledTabs.add(new DockBarTab("tab_groups", R.drawable.ic_users_24, R.string.groups, R.id.menu_groups, GroupsFragment.class)); @@ -115,7 +115,7 @@ public class DockBarManager { item.getInt("id"), Class.forName(item.getString("fragmentClass")) ); - if (Prefs.isUseAlternativeFragments()) { + if (newfeed()) { if (tab.fragmentClass == NewsfeedFragment.class) { tab.fragmentClass = Feed2049.b.c(); } else if (tab.fragmentClass == DiscoverFeedFragment.class) { @@ -141,7 +141,7 @@ public class DockBarManager { item.getInt("id"), Class.forName(item.getString("fragmentClass")) ); - if (Prefs.isUseAlternativeFragments()) { + if (newfeed()) { if (tab.fragmentClass == NewsfeedFragment.class) { tab.fragmentClass = Feed2049.b.c(); } else if (tab.fragmentClass == DiscoverFeedFragment.class) { diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java index 8f3b5e51a..82ec816bf 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountAdapter.java @@ -1,9 +1,9 @@ package ru.vtosters.lite.ui.fragments.multiaccount; -import static ru.vtosters.lite.utils.Helper.convertDpToPixel; -import static ru.vtosters.lite.utils.Helper.getResources; -import static ru.vtosters.lite.utils.Helper.isNetworkConnected; -import static ru.vtosters.lite.utils.Helper.restartApplication; +import static ru.vtosters.lite.utils.Globals.convertDpToPixel; +import static ru.vtosters.lite.utils.Globals.getResources; +import static ru.vtosters.lite.utils.Globals.isNetworkConnected; +import static ru.vtosters.lite.utils.Globals.restartApplication; import static ru.vtosters.lite.utils.Themes.getTextAttr; import static ru.vtosters.lite.utils.Themes.recolorDrawable; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountFragment.java index 7e26fb510..b0a979269 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountFragment.java @@ -1,6 +1,6 @@ package ru.vtosters.lite.ui.fragments.multiaccount; -import static ru.vtosters.lite.utils.Helper.getString; +import static ru.vtosters.lite.utils.Globals.getString; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java index 3f42a09a8..f3d8908ad 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.ui.fragments.multiaccount; -import static ru.vtosters.lite.utils.Helper.getContext; -import static ru.vtosters.lite.utils.Helper.getPreferences; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Globals.getPreferences; import android.content.Context; import android.content.SharedPreferences; 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 eff2eb603..5bbbdbedf 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 @@ -2,12 +2,13 @@ package ru.vtosters.lite.ui.fragments.tgstickers; import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.makeText; -import static ru.vtosters.lite.utils.Helper.convertDpToPixel; -import static ru.vtosters.lite.utils.Helper.getContext; -import static ru.vtosters.lite.utils.Helper.getIdentifier; -import static ru.vtosters.lite.utils.Helper.getResources; -import static ru.vtosters.lite.utils.Helper.getString; +import static ru.vtosters.lite.utils.Globals.convertDpToPixel; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Globals.getIdentifier; +import static ru.vtosters.lite.utils.Globals.getResources; +import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Themes.getAccentColor; +import static ru.vtosters.lite.utils.Themes.getNavbarColor; import static ru.vtosters.lite.utils.Themes.getSTextAttr; import static ru.vtosters.lite.utils.Themes.getTextAttr; import static ru.vtosters.lite.utils.Themes.recolorDrawable; @@ -54,7 +55,6 @@ import java.io.File; import me.grishka.appkit.fragments.ToolbarFragment; import ru.vtosters.lite.tgs.TGPref; import ru.vtosters.lite.ui.PreferencesUtil; -import ru.vtosters.lite.utils.Prefs; public class StickersFragment extends ToolbarFragment { @@ -372,7 +372,7 @@ public class StickersFragment extends ToolbarFragment { holder.switchCompat.setOnCheckedChangeListener((buttonView, isChecked) -> stickersService.setPackEnabled(pack, isChecked, false)); holder.count.setText(pack.stickersCount + " " + getString("stickerscount")); - holder.layout.setBackgroundColor(Prefs.getNavbarColor()); + holder.layout.setBackgroundColor(getNavbarColor()); // Color костыль int color = getTextAttr(); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java index dcffe5620..0a9615a35 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.ui.fragments.tgstickers; -import static ru.vtosters.lite.utils.Helper.getContext; -import static ru.vtosters.lite.utils.Helper.getString; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Globals.getString; import android.os.Bundle; diff --git a/app/src/main/java/ru/vtosters/lite/utils/About.java b/app/src/main/java/ru/vtosters/lite/utils/About.java new file mode 100644 index 000000000..266736174 --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/utils/About.java @@ -0,0 +1,66 @@ +package ru.vtosters.lite.utils; + +import static ru.vtosters.lite.utils.Globals.*; +import static ru.vtosters.lite.utils.Preferences.*; + +import android.content.Context; + +import com.vk.about.Items; +import com.vk.about.Items1; +import com.vk.about.Items2; + +import java.io.IOException; +import java.util.List; +import java.util.Scanner; + +public class About { + public static void injectAbout(List list) { + list.clear(); + list.add(new Items1()); + if (!oldabout()) { + list.add(new Items(21, com.vtosters.lite.R.string.opencommit)); + list.add(new Items(8, com.vtosters.lite.R.string.tgchannel)); + list.add(new Items(9, com.vtosters.lite.R.string.tgchat)); + list.add(new Items(16, com.vtosters.lite.R.string.vtfaq)); + list.add(new Items(19, com.vtosters.lite.R.string.vtsite)); + list.add(new Items(20, com.vtosters.lite.R.string.donate)); + list.add(new Items(17, com.vtosters.lite.R.string.vkgroup)); + list.add(new Items(18, com.vtosters.lite.R.string.sett_debug)); + return; + } + list.add(new Items(0, com.vtosters.lite.R.string.about_app_feedback)); + list.add(new Items(1, com.vtosters.lite.R.string.about_app_estimate)); + list.add(new Items(2, com.vtosters.lite.R.string.about_app_privacy)); + list.add(new Items(5, com.vtosters.lite.R.string.about_app_cookie)); + list.add(new Items(3, com.vtosters.lite.R.string.about_app_terms_to_use)); + list.add(new Items(4, com.vtosters.lite.R.string.about_app_license)); + list.add(new Items(6, com.vtosters.lite.R.string.about_app_data_protect)); + list.add(new Items(8, com.vtosters.lite.R.string.sett_debug)); + } + public static String getBuildNumber() { + return getBuild(getContext(), "version.properties"); + } + + public static String getCommitLink() { + return "https://github.com/vtosters/lite/commit/" + getBuild(getContext(), "version.properties"); + } + + public static String getBuild(Context context, String name) { + try { + Scanner scanner = new Scanner(context.getAssets().open(name)); + while (scanner.hasNextLine()) { + String line = scanner.findInLine("VERSION_BUILD=.+"); + if (line != null) + return line.replace("VERSION_BUILD=", ""); + return "0000000"; + } + } catch (IOException e) { + e.printStackTrace(); + } + return "0000000"; + } + + public static String getAppVersion() throws IOException { + return "VTLite | " + VERSIONNAME + " | " + getBuildNumber(); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkHandler.java b/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkHandler.java index ba6e8c9fe..6aa519ccb 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkHandler.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ExternalLinkHandler.java @@ -1,7 +1,8 @@ package ru.vtosters.lite.utils; -import static ru.vtosters.lite.utils.Helper.getContext; -import static ru.vtosters.lite.utils.Helper.isEmpty; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Globals.isEmpty; +import static ru.vtosters.lite.utils.Preferences.*; import android.app.AlertDialog; import android.content.Context; @@ -40,7 +41,7 @@ public class ExternalLinkHandler { } } - if (!Prefs.isEnableExternalOpening()) return false; + if (!isEnableExternalOpening()) return false; if (checkVkVideo(file)) { if (qualities.size() == 1) { diff --git a/app/src/main/java/ru/vtosters/lite/utils/Helper.java b/app/src/main/java/ru/vtosters/lite/utils/Globals.java similarity index 77% rename from app/src/main/java/ru/vtosters/lite/utils/Helper.java rename to app/src/main/java/ru/vtosters/lite/utils/Globals.java index fbf6678cd..2d142b319 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Helper.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Globals.java @@ -1,7 +1,9 @@ package ru.vtosters.lite.utils; -import static ru.vtosters.lite.utils.Prefs.getLocale; +import static ru.vtosters.lite.utils.Preferences.getLocale; +import android.app.Activity; +import android.app.Application; import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; @@ -12,20 +14,26 @@ import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Build; +import android.os.Bundle; import android.preference.PreferenceManager; import androidx.annotation.NonNull; import com.vk.core.util.ToastUtils; import com.vtosters.lite.UserProfile; +import com.vtosters.lite.VKActivity; import com.vtosters.lite.api.ExtendedUserProfile; import com.vtosters.lite.auth.VKAccountManager; import com.vtosters.lite.im.ImEngineProvider; import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; import java.util.Locale; -public class Helper { +public class Globals { + private static final List activities = new ArrayList<>(); + // Current UserId public static int getUserId() { return VKAccountManager.b().a(); @@ -162,6 +170,43 @@ public class Helper { } } + + public static void registerActivities(Application application) { + application.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() { + @Override // android.app.Application.ActivityLifecycleCallbacks + public void onActivityPaused(Activity activity) { + } + + @Override // android.app.Application.ActivityLifecycleCallbacks + public void onActivityResumed(Activity activity) { + } + + @Override // android.app.Application.ActivityLifecycleCallbacks + public void onActivitySaveInstanceState(Activity activity, Bundle bundle) { + } + + @Override // android.app.Application.ActivityLifecycleCallbacks + public void onActivityStarted(Activity activity) { + } + + @Override // android.app.Application.ActivityLifecycleCallbacks + public void onActivityStopped(Activity activity) { + } + + @Override // android.app.Application.ActivityLifecycleCallbacks + public void onActivityCreated(Activity activity, Bundle bundle) { + if (activity instanceof VKActivity) { + activities.add(activity); + } + } + + @Override // android.app.Application.ActivityLifecycleCallbacks + public void onActivityDestroyed(Activity activity) { + activities.remove(activity); + } + }); + } + // Language changer and BaseContext inject public static Context BaseContextLocale(Context context) { Locale locale = new Locale(getLocale()); diff --git a/app/src/main/java/ru/vtosters/lite/utils/IconHelper.java b/app/src/main/java/ru/vtosters/lite/utils/IconHelper.java index aa8b92318..527121079 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/IconHelper.java +++ b/app/src/main/java/ru/vtosters/lite/utils/IconHelper.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.utils; -import static ru.vtosters.lite.utils.Helper.getContext; -import static ru.vtosters.lite.utils.Helper.getPackageName; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Globals.getPackageName; import android.content.ComponentName; import android.content.pm.PackageManager; diff --git a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java new file mode 100644 index 000000000..51d6ff0a8 --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -0,0 +1,238 @@ +package ru.vtosters.lite.utils; + +import static ru.vtosters.lite.ui.fragments.dockbar.DockBarManager.*; +import static ru.vtosters.lite.utils.Globals.*; +import static ru.vtosters.lite.utils.Preferences.*; + +import com.vk.apps.AppsFragment; +import com.vk.fave.fragments.FaveTabFragment; +import com.vk.menu.MenuFragment; +import com.vk.music.fragment.MusicFragment; +import com.vk.navigation.NavigatorKeys; +import com.vk.newsfeed.Feed2049; +import com.vk.notifications.NotificationsContainerFragment; +import com.vtosters.lite.fragments.GamesFragment; +import com.vtosters.lite.fragments.PhotosFragment; +import com.vtosters.lite.fragments.ProfileFragment; +import com.vtosters.lite.fragments.SettingsListFragment; +import com.vtosters.lite.fragments.d.DocumentsViewFragment; +import com.vtosters.lite.fragments.f.FriendsFragment; +import com.vtosters.lite.fragments.g.BirthdaysFragment; +import com.vtosters.lite.fragments.h.GroupsFragment; +import com.vtosters.lite.fragments.lives.LivesTabsFragment; +import com.vtosters.lite.fragments.m.VideosFragment; +import com.vtosters.lite.fragments.messages.dialogs.DialogsFragment; +import com.vtosters.lite.fragments.money.MoneyTransfersFragment; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class Newsfeed { + public static List mFilters; + + public static boolean isBlockedByFilter(String str) { + for (String str2 : mFilters) { + if (str.toLowerCase().contains(str2.toLowerCase())) { + return true; + } + } + return false; + } + + public static void setupFilters() { + mFilters = new ArrayList(); + + getFilter("refsfilter", "Referals.txt"); + getFilter("shortlinkfilter", "LinkShorter.txt"); + getFilter("default_ad_list", "StandartFilter.txt"); + getFilter("shitposting", "IDontWantToReadIt.txt"); + + String string = getPreferences().getString("spamfilters", ""); + + if (!string.isEmpty()) { + mFilters.addAll(Arrays.asList(string.split(", "))); + } + + } + + public static void getFilter(String boolname, String filename) { + if (BooleanTrue(boolname)) { + try { + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(getContext().getAssets().open(filename))); + while (true) { + String readLine = bufferedReader.readLine(); + if (readLine != null) { + mFilters.add(readLine); + } else { + bufferedReader.close(); + return; + } + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + public static boolean injectFilters(JSONObject jSONObject) { + String optString = jSONObject.optString(NavigatorKeys.j, ""); + if (!ads(optString) && !authors_rec(optString) && !recomm(optString) && !friendrecomm(optString)) { + String optString2 = jSONObject.optString("post_type", ""); + if (!ads(optString2) && !authors_rec(optString2) && !recomm(optString2) && !friendrecomm(optString2)) { + String optString3 = jSONObject.optString("filters", ""); + if (ads(optString3) || authors_rec(optString3) || recomm(optString3) || friendrecomm(optString3) || isBlockedByFilter(jSONObject.optString(NavigatorKeys.x, "")) || checkCopyright(jSONObject) || captions(jSONObject)) { + return false; + } + return !AD(jSONObject); + } + } + return false; + } + + public static boolean authors_rec(String str) { + return str.equals("authors_rec") && !authorsrecomm(); + } + + public static boolean captions(JSONObject jSONObject) { + try { + JSONObject jSONObject2 = jSONObject.getJSONObject("caption"); + if (!Preferences.captions()) { + return true; + } + boolean postsrecomm = postsrecomm(); + return (jSONObject2.getString(NavigatorKeys.j).equals("explorebait") && !postsrecomm) || ((jSONObject2.getString(NavigatorKeys.j).equals("shared") && postsrecomm) || ((jSONObject.getString(NavigatorKeys.j).equals("digest") && postsrecomm) || ((jSONObject2.getString(NavigatorKeys.j).equals("commented") && postsrecomm) || (jSONObject2.getString(NavigatorKeys.j).equals("voted") && postsrecomm)))); + } catch (JSONException unused) { + return false; + } + } + + public static boolean ads(String str) { + if ((str.equals("ads_easy_promote") || str.equals("promo_button") || str.equals("app_widget") || str.equals("ads")) && Preferences.ads()) { + return true; + } + return false; + } + + public static boolean recomm(String str) { + return (str.equals("user_rec") || str.equals("live_recommended") || str.equals("inline_user_rec")) && !postsrecomm(); + } + + public static boolean friendrecomm(String str) { + return str.equals("friends_recommendations") && !friendsrecomm(); + } + + public static boolean AD(JSONObject jSONObject) { + return jSONObject.optInt("marked_as_ads", 0) == 1 && adsgroup(); + } + + public static boolean checkCopyright(JSONObject jSONObject) { + return jSONObject.optInt("copyright", 0) == 1 && copyright_post(); + } + + public static String friendsads() { + return postsrecomm() ? "user_rec" : "null"; + } + + public static String getFriendRecomm() { + return friendsrecomm() ? "friends_recommendations" : "null"; + } + + public static String authorsads() { + return authorsrecomm() ? "authors_rec" : "null"; + } + + public static String widgetads() { + return Preferences.ads() ? "null" : "app_widget"; + } + + public static String promoads() { + return Preferences.ads() ? "null" : "promo_button"; + } + + public static String storyads() { + return adsstories() ? "null" : "ads"; + } + + public static String getCommentsSort(String def) { + String string = getPreferences().getString("commentssort", ""); + if (string.isEmpty()) { + return def; + } + if (string.equals("new")) { + return "desc"; + } + if (string.equals("old")) { + return "asc"; + } + return def; + } + + public static Class getStartFragment() { + String string = getPreferences().getString("start_values", ""); + if (string.equals("default")) { + return getInstance().getSelectedTabs().get(0).fragmentClass; + } + if (string.equals("newsfeed")) { + return Feed2049.b.c(); + } + if (string.equals("messenger")) { + return DialogsFragment.class; + } + if (string.equals("groups")) { + return GroupsFragment.class; + } + if (string.equals("music")) { + return MusicFragment.class; + } + if (string.equals("friends")) { + return FriendsFragment.class; + } + if (string.equals("photos")) { + return PhotosFragment.class; + } + if (string.equals("videos")) { + return VideosFragment.class; + } + if (string.equals("settings")) { + return SettingsListFragment.class; + } + if (string.equals("apps")) { + return AppsFragment.class; + } + if (string.equals("discover")) { + return Feed2049.b.e(); + } + if (string.equals("notifications")) { + return NotificationsContainerFragment.class; + } + if (string.equals("money")) { + return MoneyTransfersFragment.class; + } + if (string.equals("games")) { + return GamesFragment.class; + } + if (string.equals("liked")) { + return FaveTabFragment.class; + } + if (string.equals("menu")) { + return MenuFragment.class; + } + if (string.equals("profile")) { + return ProfileFragment.class; + } + if (string.equals("lives")) { + return LivesTabsFragment.class; + } + if (string.equals("docs")) { + return DocumentsViewFragment.class; + } + return string.equals("brtd") ? BirthdaysFragment.class : getInstance().getSelectedTabs().get(0).fragmentClass; + } +} diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java new file mode 100644 index 000000000..f0e49e8da --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -0,0 +1,330 @@ +package ru.vtosters.lite.utils; + +import static ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountManager.*; +import static ru.vtosters.lite.utils.Globals.*; +import static ru.vtosters.lite.utils.Newsfeed.*; +import static ru.vtosters.lite.utils.Proxy.*; + +import android.app.Application; +import android.content.Context; +import android.content.SharedPreferences; +import android.os.Build; +import android.preference.PreferenceManager; + +import com.vk.core.util.Screen; +import com.vtosters.lite.data.Users; + +import java.util.Locale; + +public class Preferences { + public static String VERSIONNAME = "2.0 Beta"; + + public static boolean BooleanFalse(String key) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + return prefs.getBoolean(key, false); + } + + public static boolean BooleanTrue(String key) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); + return prefs.getBoolean(key, true); + } + + public static String getBackgroundStickers() { + if (isBGStickersEnabled()) { + return "images_with_background"; + } + return "images"; + } + + public static boolean authorsrecomm() { + return BooleanTrue("authorsrecomm"); + } + + public static boolean captions() { + return BooleanTrue("captions"); + } + + public static boolean copyright_post() { + return BooleanFalse("copyright_post"); + } + + public static boolean default_ad_list() { + return BooleanFalse("default_ad_list"); + } + + public static boolean shitposting() { + return BooleanFalse("shitposting"); + } + + public static boolean friendsrecomm() { + return BooleanTrue("friendsrecomm"); + } + + public static boolean isBGStickersEnabled() { + return BooleanTrue("isBGStickersEnabled"); + } + + public static boolean ads() { + return BooleanFalse("__dbg_no_ads"); + } + + public static boolean adsgroup() { + return BooleanFalse("adsgroup"); + } + + public static boolean olddock() { + return BooleanFalse("olddock"); + } + + public static boolean adsslider() { + return BooleanFalse("__dbg_no_slider_ads"); + } + + public static boolean adsstories() { + return BooleanFalse("adsstories"); + } + + public static boolean alteremoji(Context context) { + return alteremojipref() ? alteremojipref() : Screen.a(context); + } + + public static boolean alteremojipref() { + return BooleanFalse("alteremoji"); + } + + public static boolean awayphp() { + return BooleanTrue("awayphp"); + } + + public static boolean VKUI_INJ() { + return BooleanTrue("VKUI_INJ"); + } + + public static boolean benchmark() { + return BooleanFalse("benchmark"); + } + + public static boolean calls() { + return BooleanTrue("calls"); + } + + public static boolean convUsersOnline() { + return BooleanFalse("convUsersOnline"); + } + + public static boolean darkmode() { + return BooleanTrue("darkmode"); + } + + public static boolean dev() { + return BooleanFalse("dev"); + } + + public static boolean devmenu() { + return BooleanFalse("devmenu"); + } + + public static boolean dnr() { + return BooleanTrue("dnr"); + } + + public static boolean dns() { + return BooleanTrue("dns"); + } + + public static boolean libverify() { + return BooleanFalse("libverify"); + } + + public static boolean dnt() { + return BooleanTrue("dnt"); + } + + public static boolean dockcounter() { + return BooleanTrue("dockcounter"); + } + + public static boolean feedautoupdate() { + return BooleanTrue("feedautoupdate"); + } + + public static boolean feedcache() { + return BooleanTrue("feedcache"); + } + + public static void forceOffline() { + if (setoffline()) { + Users.b(); + } + setupFilters(); + } + + public static boolean fulltime() { + return BooleanTrue("fulltime"); + } + + public static boolean gcmfix() { + return BooleanTrue("gcmfix"); + } + + public static boolean hasMusicSubscription() { + return BooleanTrue("hasMusicSubscription"); + } + + public static boolean isEnableExternalOpening() { + return BooleanFalse("isEnableExternalOpening"); + } + + public static boolean iconvk() { + return BooleanFalse("iconvk"); + } + + public static boolean iconvkru() { + return BooleanFalse("iconvkru"); + } + + public static boolean isMusicRestricted() { + return BooleanTrue("isMusicRestricted"); + } + + public static boolean msgflat() { + return BooleanFalse("msgflat"); + } + + public static boolean msgtails() { + return BooleanTrue("msgtails"); + } + + public static boolean navbar() { + return BooleanTrue("navbar"); + } + + public static boolean newfeed() { + return BooleanTrue("newfeed"); + } + + public static boolean offline() { + return BooleanTrue("offline"); + } + + public static boolean oldabout() { + return BooleanFalse("oldabout"); + } + + public static boolean postsrecomm() { + return BooleanTrue("postsrecomm"); + } + + public static String readstatus() { + return dnr() ? "messages.markAsRead" : "null"; + } + + public static boolean refsfilter() { + return BooleanFalse("refsfilter"); + } + + public static boolean setoffline() { + return BooleanFalse("setoffline"); + } + + public static boolean shortinfo() { + return BooleanTrue("shortinfo"); + } + + public static boolean shortlinkfilter() { + return BooleanFalse("shortlinkfilter"); + } + + public static boolean shortpost() { + return BooleanTrue("shortpost"); + } + + public static boolean showmenu() { + return BooleanFalse("showmenu"); + } + + public static boolean ssl() { + return BooleanTrue("ssl"); + } + + public static boolean stories() { + return BooleanTrue("stories"); + } + + public static boolean swipe() { + return BooleanTrue("swipe"); + } + + public static boolean systememoji() { + return BooleanFalse("systememoji"); + } + + public static boolean unlockstats() { + return BooleanFalse("unlockstats"); + } + + public static boolean usevkui() { + return BooleanTrue("usevkui"); + } + + public static boolean vksans() { + return BooleanFalse("vksans"); + } + + public static boolean voice() { + return BooleanTrue("voice"); + } + + public static boolean newvideo() { + return false; + } + + public static int getMsgCount() { + String customvalue = getPreferences().getString("msgcount", ""); + return customvalue.isEmpty() ? 30 : Integer.parseInt(customvalue); + } + + public static String MediacontentFix() { + return Build.VERSION.SDK_INT >= 29 ? "date_modified DESC" : "datetaken DESC"; + } + + public static String MediacontentFix2() { + return Build.VERSION.SDK_INT >= 29 ? "date_modified" : "datetaken"; + } + + public static String MediacontentFix3() { + return Build.VERSION.SDK_INT >= 29 ? ", date_modified=" : ", dateTaken="; + } + + public static boolean color_grishka() { + return BooleanTrue("color_grishka"); + } + + public static boolean vkme_msg() { + return BooleanFalse("vkme_msg"); + } + + public static String VKVersion() { + String string = getPreferences().getString("vkversion", ""); + if (!string.isEmpty()) { + return string; + } + return "5.29"; + } + + public static String getLocale() { + String string = getPreferences().getString("lang_value", ""); + if (string.equals("system")) { + return Locale.getDefault().getLanguage(); + } + return string.isEmpty() ? Locale.getDefault().getLanguage() : string; + } + + public static void init(Application application) { + setupFilters(); + fixGapps(); + setProxy(); + migrate(); + registerActivities(application); + } +} diff --git a/app/src/main/java/ru/vtosters/lite/utils/Prefs.java b/app/src/main/java/ru/vtosters/lite/utils/Prefs.java deleted file mode 100644 index c31a23dcc..000000000 --- a/app/src/main/java/ru/vtosters/lite/utils/Prefs.java +++ /dev/null @@ -1,782 +0,0 @@ -package ru.vtosters.lite.utils; - -import static ru.vtosters.lite.ui.fragments.dockbar.DockBarManager.getInstance; -import static ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountManager.migrate; -import static ru.vtosters.lite.utils.Helper.fixGapps; -import static ru.vtosters.lite.utils.Helper.getContext; -import static ru.vtosters.lite.utils.Helper.getPreferences; -import static ru.vtosters.lite.utils.Helper.getUserSecret; -import static ru.vtosters.lite.utils.Helper.getUserToken; -import static ru.vtosters.lite.utils.Proxy.setProxy; - -import android.app.Activity; -import android.app.Application; -import android.content.Context; -import android.content.SharedPreferences; -import android.os.Build; -import android.os.Bundle; -import android.preference.PreferenceManager; - -import com.vk.about.Items; -import com.vk.about.Items1; -import com.vk.about.Items2; -import com.vk.apps.AppsFragment; -import com.vk.core.ui.themes.VKThemeHelper; -import com.vk.core.util.Screen; -import com.vk.fave.fragments.FaveTabFragment; -import com.vk.menu.MenuFragment; -import com.vk.music.fragment.MusicFragment; -import com.vk.navigation.NavigatorKeys; -import com.vk.newsfeed.Feed2049; -import com.vk.notifications.NotificationsContainerFragment; -import com.vtosters.lite.R; -import com.vtosters.lite.VKActivity; -import com.vtosters.lite.data.Users; -import com.vtosters.lite.fragments.GamesFragment; -import com.vtosters.lite.fragments.PhotosFragment; -import com.vtosters.lite.fragments.ProfileFragment; -import com.vtosters.lite.fragments.SettingsListFragment; -import com.vtosters.lite.fragments.d.DocumentsViewFragment; -import com.vtosters.lite.fragments.f.FriendsFragment; -import com.vtosters.lite.fragments.g.BirthdaysFragment; -import com.vtosters.lite.fragments.h.GroupsFragment; -import com.vtosters.lite.fragments.lives.LivesTabsFragment; -import com.vtosters.lite.fragments.m.VideosFragment; -import com.vtosters.lite.fragments.messages.dialogs.DialogsFragment; -import com.vtosters.lite.fragments.money.MoneyTransfersFragment; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; -import java.util.Scanner; - -public class Prefs { - private static final List activities = new ArrayList<>(); - public static String VERSIONNAME = "2.0 Beta"; - private static List mFilters; - - public static boolean BooleanFalse(String key) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); - return prefs.getBoolean(key, false); - } - - public static boolean BooleanTrue(String key) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); - return prefs.getBoolean(key, true); - } - - public static String getBackgroundStickers() { - if (isBGStickersEnabled()) { - return "images_with_background"; - } - return "images"; - } - - public static boolean isBGStickersEnabled() { - return BooleanTrue("isBGStickersEnabled"); - } - - public static String getFriendRecomm() { - return friendsrecomm() ? "friends_recommendations" : "null"; - } - - public static boolean ads() { - return BooleanFalse("__dbg_no_ads"); - } - - public static boolean adsgroup() { - return BooleanFalse("adsgroup"); - } - - public static boolean olddock() { - return BooleanFalse("olddock"); - } - - public static boolean adsslider() { - return BooleanFalse("__dbg_no_slider_ads"); - } - - public static boolean adsstories() { - return BooleanFalse("adsstories"); - } - - public static boolean alteremoji(Context context) { - return alteremojipref() ? alteremojipref() : Screen.a(context); - } - - public static boolean alteremojipref() { - return BooleanFalse("alteremoji"); - } - - public static String authorsads() { - return authorsrecomm() ? "authors_rec" : "null"; - } - - public static boolean authorsrecomm() { - return BooleanTrue("authorsrecomm"); - } - - public static boolean awayphp() { - return BooleanTrue("awayphp"); - } - - public static boolean VKUI_INJ() { - return BooleanTrue("VKUI_INJ"); - } - - public static boolean benchmark() { - return BooleanFalse("benchmark"); - } - - public static boolean calls() { - return BooleanTrue("calls"); - } - - public static boolean captions() { - return BooleanTrue("captions"); - } - - public static boolean convUsersOnline() { - return BooleanFalse("convUsersOnline"); - } - - public static boolean copyright_post() { - return BooleanFalse("copyright_post"); - } - - public static boolean darkmode() { - return BooleanTrue("darkmode"); - } - - public static boolean default_ad_list() { - return BooleanFalse("default_ad_list"); - } - - public static boolean shitposting() { - return BooleanFalse("shitposting"); - } - - public static boolean dev() { - return BooleanFalse("dev"); - } - - public static boolean devmenu() { - return BooleanFalse("devmenu"); - } - - public static boolean dnr() { - return BooleanTrue("dnr"); - } - - public static boolean dns() { - return BooleanTrue("dns"); - } - - public static boolean libverify() { - return BooleanFalse("libverify"); - } - - public static boolean dnt() { - return BooleanTrue("dnt"); - } - - public static boolean dockcounter() { - return BooleanTrue("dockcounter"); - } - - public static boolean feedautoupdate() { - return BooleanTrue("feedautoupdate"); - } - - public static boolean feedcache() { - return BooleanTrue("feedcache"); - } - - public static void forceOffline() { - if (setoffline()) { - Users.b(); - } - setupFilters(); - } - - public static boolean forcenogms() { - return BooleanTrue("forcenogms"); - } - - public static String friendsads() { - return postsrecomm() ? "user_rec" : "null"; - } - - public static boolean friendsrecomm() { - return BooleanTrue("friendsrecomm"); - } - - public static boolean fulltime() { - return BooleanTrue("fulltime"); - } - - public static boolean gcmfix() { - return BooleanTrue("gcmfix"); - } - - public static String getAppVersion() throws IOException { - return "VTLite | " + VERSIONNAME + " | " + getBuildNumber(); - } - - public static String getBuildNumber() { - return Prefs.getBuild(getContext(), "version.properties"); - } - - public static String getCommitLink() { - return "https://github.com/vtosters/lite/commit/" + Prefs.getBuild(getContext(), "version.properties"); - } - - public static String getBuild(Context context, String name) { - try { - Scanner scanner = new Scanner(context.getAssets().open(name)); - while (scanner.hasNextLine()) { - String line = scanner.findInLine("VERSION_BUILD=.+"); - if (line != null) - return line.replace("VERSION_BUILD=", ""); - return "0000000"; - } - } catch (IOException e) { - e.printStackTrace(); - } - - return "0000000"; - } - - public static String getDarkVKUI() { - return !VKThemeHelper.d() ? "1" : "0"; - } - - public static String getAmoledVKUI() { - String string = getPreferences().getString("darktheme", ""); - return string.equals("amoled") ? "1" : "0"; - } - - public static String getCommentsSort(String def) { - String string = getPreferences().getString("commentssort", ""); - if (string.isEmpty()) { - return def; - } - if (string.equals("new")) { - return "desc"; - } - if (string.equals("old")) { - return "asc"; - } - return def; - } - - public static String getMeToken() { - return getPreferences().getString("me_token", ""); - } - - public static void setMeToken(String str) { - getPreferences().edit().putString("me_token", str).apply(); - } - - public static int getNavbarColor() { - return VKThemeHelper.a(R.attr.tabbar_background); - } - - public static String getSSFSLink() { - return SSFSDomain() + "?token=" + getUserToken() + "&vt_dark=" + getDarkVKUI() + "&vt_amoled=" + getAmoledVKUI() + "&secret=" + getUserSecret() + "&proxy=" + getUserProxy() + "&lang=" + getLocale() + "&vt=1&vtl=1&vksans=" + isVKSansEnabled() + "&vt_version=" + getBuildNumber() + "&vt_debug=" + isDEVModEnabled(); - } - - public static String getString(String key, String defValue) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); - return prefs.getString(key, defValue); - } - - public static String getUserProxy() { - return proxy() ? "1" : "0"; - } - - public static boolean hasMusicSubscription() { - return BooleanTrue("hasMusicSubscription"); - } - - public static boolean isEnableExternalOpening() { - return BooleanFalse("isEnableExternalOpening"); - } - - public static boolean iconvk() { - return BooleanFalse("iconvk"); - } - - public static boolean iconvkru() { - return BooleanFalse("iconvkru"); - } - - public static String isDEVModEnabled() { - return dev() ? "1" : "0"; - } - - public static boolean isOtaEnabled() { - return BooleanTrue("ota_enabled"); - } - - public static boolean isMusicRestricted() { - return BooleanTrue("isMusicRestricted"); - } - - public static String isVKSansEnabled() { - return vksans() ? "1" : "0"; - } - - public static boolean msgflat() { - return BooleanFalse("msgflat"); - } - - public static boolean msgtails() { - return BooleanTrue("msgtails"); - } - - public static boolean navbar() { - return BooleanTrue("navbar"); - } - - public static boolean newfeed() { - return BooleanTrue("newfeed"); - } - - public static boolean offline() { - return BooleanTrue("offline"); - } - - public static boolean oldabout() { - return BooleanFalse("oldabout"); - } - - public static boolean postsrecomm() { - return BooleanTrue("postsrecomm"); - } - - public static String promoads() { - return ads() ? "null" : "promo_button"; - } - - public static String readstatus() { - return dnr() ? "messages.markAsRead" : "null"; - } - - public static boolean refsfilter() { - return BooleanFalse("refsfilter"); - } - - public static boolean rightLikes() { - return BooleanFalse("rightLikes"); - } - - public static boolean setoffline() { - return BooleanFalse("setoffline"); - } - - public static boolean shortinfo() { - return BooleanTrue("shortinfo"); - } - - public static boolean shortlinkfilter() { - return BooleanFalse("shortlinkfilter"); - } - - public static boolean shortpost() { - return BooleanTrue("shortpost"); - } - - public static boolean showmenu() { - return BooleanFalse("showmenu"); - } - - public static boolean ssl() { - return BooleanTrue("ssl"); - } - - public static boolean stories() { - return BooleanTrue("stories"); - } - - public static String storyads() { - return adsstories() ? "null" : "ads"; - } - - public static boolean swipe() { - return BooleanTrue("swipe"); - } - - public static boolean systememoji() { - return BooleanFalse("systememoji"); - } - - public static boolean unlockstats() { - return BooleanFalse("unlockstats"); - } - - public static boolean usevkui() { - return BooleanTrue("usevkui"); - } - - public static boolean vksans() { - return BooleanFalse("vksans"); - } - - public static boolean voice() { - return BooleanTrue("voice"); - } - - public static boolean newvideo() { - return false; - } - - public static String widgetads() { - return ads() ? "null" : "app_widget"; - } - - public static int getMsgCount() { - String customvalue = getPreferences().getString("msgcount", ""); - return customvalue.isEmpty() ? 30 : Integer.parseInt(customvalue); - } - - public static String MediacontentFix() { - return Build.VERSION.SDK_INT >= 29 ? "date_modified DESC" : "datetaken DESC"; - } - - public static String MediacontentFix2() { - return Build.VERSION.SDK_INT >= 29 ? "date_modified" : "datetaken"; - } - - public static String MediacontentFix3() { - return Build.VERSION.SDK_INT >= 29 ? ", date_modified=" : ", dateTaken="; - } - - public static boolean inject(JSONObject jSONObject) { - String optString = jSONObject.optString(NavigatorKeys.j, ""); - if (!ads(optString) && !authors_rec(optString) && !recomm(optString) && !friendrecomm(optString)) { - String optString2 = jSONObject.optString("post_type", ""); - if (!ads(optString2) && !authors_rec(optString2) && !recomm(optString2) && !friendrecomm(optString2)) { - String optString3 = jSONObject.optString("filters", ""); - if (ads(optString3) || authors_rec(optString3) || recomm(optString3) || friendrecomm(optString3) || isBlockedByFilter(jSONObject.optString(NavigatorKeys.x, "")) || checkCopyright(jSONObject) || captions(jSONObject)) { - return false; - } - return !AD(jSONObject); - } - } - return false; - } - - public static void setupFilters() { - mFilters = new ArrayList(); - ReferalsPut(); - StandardFilterPut(); - ShortLinkPut(); - IDontWantToReadIt(); - String string = getPreferences().getString("spamfilters", ""); - if (!string.isEmpty()) { - mFilters.addAll(Arrays.asList(string.split(", "))); - } - } - - public static void ReferalsPut() { - if (BooleanTrue("refsfilter")) { - try { - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(getContext().getAssets().open("Referals.txt"))); - while (true) { - String readLine = bufferedReader.readLine(); - if (readLine != null) { - mFilters.add(readLine); - } else { - bufferedReader.close(); - return; - } - } - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - public static void ShortLinkPut() { - if (BooleanTrue("shortlinkfilter")) { - try { - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(getContext().getAssets().open("LinkShorter.txt"))); - while (true) { - String readLine = bufferedReader.readLine(); - if (readLine != null) { - mFilters.add(readLine); - } else { - bufferedReader.close(); - return; - } - } - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - public static void StandardFilterPut() { - if (BooleanTrue("default_ad_list")) { - try { - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(getContext().getAssets().open("StandartFilter.txt"))); - while (true) { - String readLine = bufferedReader.readLine(); - if (readLine != null) { - mFilters.add(readLine); - } else { - bufferedReader.close(); - return; - } - } - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - public static void IDontWantToReadIt() { - if (BooleanTrue("shitposting")) { - try { - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(getContext().getAssets().open("IDontWantToReadIt.txt"))); - while (true) { - String readLine = bufferedReader.readLine(); - if (readLine != null) { - mFilters.add(readLine); - } else { - bufferedReader.close(); - return; - } - } - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - public static String SSFSDomain() { - String string = getPreferences().getString("ssfscustom", ""); - if (!string.isEmpty()) { - return string; - } - return "https://vtsf.vknext.net"; - } - - public static String VKVersion() { - String string = getPreferences().getString("vkversion", ""); - if (!string.isEmpty()) { - return string; - } - return "5.29"; - } - - public static boolean isBlockedByFilter(String str) { - for (String str2 : mFilters) { - if (str.toLowerCase().contains(str2.toLowerCase())) { - return true; - } - } - return false; - } - - public static void injectAbout(List list) { - list.clear(); - list.add(new Items1()); - if (!oldabout()) { - list.add(new Items(21, R.string.opencommit)); - list.add(new Items(8, R.string.tgchannel)); - list.add(new Items(9, R.string.tgchat)); - list.add(new Items(16, R.string.vtfaq)); - list.add(new Items(19, R.string.vtsite)); - list.add(new Items(20, R.string.donate)); - list.add(new Items(17, R.string.vkgroup)); - list.add(new Items(18, R.string.sett_debug)); - return; - } - list.add(new Items(0, R.string.about_app_feedback)); - list.add(new Items(1, R.string.about_app_estimate)); - list.add(new Items(2, R.string.about_app_privacy)); - list.add(new Items(5, R.string.about_app_cookie)); - list.add(new Items(3, R.string.about_app_terms_to_use)); - list.add(new Items(4, R.string.about_app_license)); - list.add(new Items(6, R.string.about_app_data_protect)); - list.add(new Items(8, R.string.sett_debug)); - } - - public static boolean ads(String str) { - if ((str.equals("ads_easy_promote") || str.equals("promo_button") || str.equals("app_widget") || str.equals("ads")) && ads()) { - return false; - } - return false; - } - - public static String getLocale() { - String string = getPreferences().getString("lang_value", ""); - if (string.equals("system")) { - return Locale.getDefault().getLanguage(); - } - return string.isEmpty() ? Locale.getDefault().getLanguage() : string; - } - - public static boolean proxy() { - return getPreferences().getString("proxy", "").equals("apiproxy"); - } - - public static boolean authors_rec(String str) { - return str.equals("authors_rec") && !authorsrecomm(); - } - - public static boolean captions(JSONObject jSONObject) { - try { - JSONObject jSONObject2 = jSONObject.getJSONObject("caption"); - if (!captions()) { - return true; - } - boolean postsrecomm = postsrecomm(); - return (jSONObject2.getString(NavigatorKeys.j).equals("explorebait") && !postsrecomm) || ((jSONObject2.getString(NavigatorKeys.j).equals("shared") && postsrecomm) || ((jSONObject.getString(NavigatorKeys.j).equals("digest") && postsrecomm) || ((jSONObject2.getString(NavigatorKeys.j).equals("commented") && postsrecomm) || (jSONObject2.getString(NavigatorKeys.j).equals("voted") && postsrecomm)))); - } catch (JSONException unused) { - return false; - } - } - - public static boolean recomm(String str) { - return (str.equals("user_rec") || str.equals("live_recommended") || str.equals("inline_user_rec")) && !postsrecomm(); - } - - public static boolean friendrecomm(String str) { - return str.equals("friends_recommendations") && !friendsrecomm(); - } - - public static boolean AD(JSONObject jSONObject) { - return jSONObject.optInt("marked_as_ads", 0) == 1 && adsgroup(); - } - - public static boolean checkCopyright(JSONObject jSONObject) { - return jSONObject.optInt("copyright", 0) == 1 && copyright_post(); - } - - public static Activity getCurrentActivity() { - if (activities.size() == 0) { - return null; - } - return activities.get(0); - } - - public static void init(Application application) { - setupFilters(); - fixGapps(); - setProxy(); - migrate(); - registerActivities(application); - } - - private static void registerActivities(Application application) { - application.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() { - @Override // android.app.Application.ActivityLifecycleCallbacks - public void onActivityPaused(Activity activity) { - } - - @Override // android.app.Application.ActivityLifecycleCallbacks - public void onActivityResumed(Activity activity) { - } - - @Override // android.app.Application.ActivityLifecycleCallbacks - public void onActivitySaveInstanceState(Activity activity, Bundle bundle) { - } - - @Override // android.app.Application.ActivityLifecycleCallbacks - public void onActivityStarted(Activity activity) { - } - - @Override // android.app.Application.ActivityLifecycleCallbacks - public void onActivityStopped(Activity activity) { - } - - @Override // android.app.Application.ActivityLifecycleCallbacks - public void onActivityCreated(Activity activity, Bundle bundle) { - if (activity instanceof VKActivity) { - Prefs.activities.add(activity); - } - } - - @Override // android.app.Application.ActivityLifecycleCallbacks - public void onActivityDestroyed(Activity activity) { - Prefs.activities.remove(activity); - } - }); - } - - public static boolean isUseAlternativeFragments() { - return true; - } - - public static Class getStartFragment() { - String string = getPreferences().getString("start_values", ""); - if (string.equals("default")) { - return getInstance().getSelectedTabs().get(0).fragmentClass; - } - if (string.equals("newsfeed")) { - return Feed2049.b.c(); - } - if (string.equals("messenger")) { - return DialogsFragment.class; - } - if (string.equals("groups")) { - return GroupsFragment.class; - } - if (string.equals("music")) { - return MusicFragment.class; - } - if (string.equals("friends")) { - return FriendsFragment.class; - } - if (string.equals("photos")) { - return PhotosFragment.class; - } - if (string.equals("videos")) { - return VideosFragment.class; - } - if (string.equals("settings")) { - return SettingsListFragment.class; - } - if (string.equals("apps")) { - return AppsFragment.class; - } - if (string.equals("discover")) { - return Feed2049.b.e(); - } - if (string.equals("notifications")) { - return NotificationsContainerFragment.class; - } - if (string.equals("money")) { - return MoneyTransfersFragment.class; - } - if (string.equals("games")) { - return GamesFragment.class; - } - if (string.equals("liked")) { - return FaveTabFragment.class; - } - if (string.equals("menu")) { - return MenuFragment.class; - } - if (string.equals("profile")) { - return ProfileFragment.class; - } - if (string.equals("lives")) { - return LivesTabsFragment.class; - } - if (string.equals("docs")) { - return DocumentsViewFragment.class; - } - return string.equals("brtd") ? BirthdaysFragment.class : getInstance().getSelectedTabs().get(0).fragmentClass; - } -} diff --git a/app/src/main/java/ru/vtosters/lite/utils/Proxy.java b/app/src/main/java/ru/vtosters/lite/utils/Proxy.java index 9a7be2ba4..ae0bfa600 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Proxy.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Proxy.java @@ -1,8 +1,7 @@ package ru.vtosters.lite.utils; -import static ru.vtosters.lite.utils.Helper.getPreferences; -import static ru.vtosters.lite.utils.Prefs.BooleanFalse; -import static ru.vtosters.lite.utils.Prefs.proxy; +import static ru.vtosters.lite.utils.Globals.*; +import static ru.vtosters.lite.utils.Preferences.*; import java.util.Properties; @@ -160,6 +159,10 @@ public class Proxy { return string.isEmpty() ? "8888" : string; } + public static boolean proxy() { + return getPreferences().getString("proxy", "").equals("apiproxy"); + } + // Official vk proxy enforcer public static boolean proxyvk() { return BooleanFalse("proxyvk"); diff --git a/app/src/main/java/ru/vtosters/lite/utils/SSFS.java b/app/src/main/java/ru/vtosters/lite/utils/SSFS.java new file mode 100644 index 000000000..3ba705880 --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/utils/SSFS.java @@ -0,0 +1,43 @@ +package ru.vtosters.lite.utils; + +import static ru.vtosters.lite.utils.About.*; +import static ru.vtosters.lite.utils.Globals.*; +import static ru.vtosters.lite.utils.Preferences.*; +import static ru.vtosters.lite.utils.Proxy.*; + +import com.vk.core.ui.themes.VKThemeHelper; + +public class SSFS { + public static String getSSFSLink() { + return SSFSDomain() + "?token=" + getUserToken() + "&vt_dark=" + getDarkVKUI() + "&vt_amoled=" + getAmoledVKUI() + "&secret=" + getUserSecret() + "&proxy=" + getUserProxy() + "&lang=" + getLocale() + "&vt=1&vtl=1&vksans=" + isVKSansEnabled() + "&vt_version=" + getBuildNumber() + "&vt_debug=" + isDEVModEnabled(); + } + + public static String SSFSDomain() { + String string = getPreferences().getString("ssfscustom", ""); + if (!string.isEmpty()) { + return string; + } + return "https://vtsf.vknext.net"; + } + + public static String getDarkVKUI() { + return !VKThemeHelper.d() ? "1" : "0"; + } + + public static String getAmoledVKUI() { + String string = getPreferences().getString("darktheme", ""); + return string.equals("amoled") ? "1" : "0"; + } + + public static String getUserProxy() { + return proxy() ? "1" : "0"; + } + + public static String isVKSansEnabled() { + return vksans() ? "1" : "0"; + } + + public static String isDEVModEnabled() { + return dev() ? "1" : "0"; + } +} diff --git a/app/src/main/java/ru/vtosters/lite/utils/SettBackup.java b/app/src/main/java/ru/vtosters/lite/utils/SettBackup.java index 289cf7234..4e00ebfd6 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/SettBackup.java +++ b/app/src/main/java/ru/vtosters/lite/utils/SettBackup.java @@ -5,7 +5,7 @@ import static android.os.Environment.getExternalStoragePublicDirectory; import static android.widget.Toast.LENGTH_LONG; import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.makeText; -import static ru.vtosters.lite.utils.Helper.getContext; +import static ru.vtosters.lite.utils.Globals.getContext; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java index a8ed350c4..0eb0495c8 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -1,10 +1,7 @@ package ru.vtosters.lite.utils; -import static ru.vtosters.lite.utils.Helper.getContext; -import static ru.vtosters.lite.utils.Helper.getPreferences; -import static ru.vtosters.lite.utils.Prefs.getNavbarColor; -import static ru.vtosters.lite.utils.Prefs.navbar; -import static ru.vtosters.lite.utils.Prefs.vksans; +import static ru.vtosters.lite.utils.Globals.*; +import static ru.vtosters.lite.utils.Preferences.*; import android.content.Context; import android.content.res.ColorStateList; @@ -107,10 +104,6 @@ public class Themes { } } - public static boolean color_grishka() { - return ru.vtosters.lite.utils.Prefs.BooleanTrue("color_grishka"); - } - public static boolean isColorRefAccented(int i) { return i == R.color.cornflower_blue || i == R.color.cornflower_blue_two || i == R.color.dot_unread || i == R.color.fave_promo_btn_pressed || i == R.color.im_back_to_vk_gradient_start || i == R.color.live_emoji_butt_hide || i == R.color.picker_tab_bg_selected || i == R.color.sky_300 || i == R.color.text_blue || i == R.color.tw__blue_default || i == R.color.tw__blue_pressed || i == R.color.white_blue32 || i == R.color.name || i == R.color.picker_blue || i == R.color.picker_blue_pressed || i == R.color.picker_tab_text_selected || i == R.color.sharing_blue_btn_pressed || i == R.color.sharing_blue_btn_normal || i == R.color.tip_background || i == R.color.vkim_msg_sending_ic || i == R.color.vkim_playing_drawable_rect || i == R.color.accent_blue || i == R.color.light_blue_gray || i == R.color.light_blue || i == R.color.blue_200 || i == R.color.header_blue || i == R.color.blue_200_muted || i == R.color.im_old_accent || i == R.color.im_old_accent_muted || i == R.color.im_dark_accent || i == R.color.im_dark_accent_muted || i == R.color.azure_A400 || i == R.color.blue || i == R.color.blue_400 || i == R.color.blue_300 || i == R.color.cool_blue; } @@ -122,18 +115,6 @@ public class Themes { } } - public static boolean vkim_msg() { - return ru.vtosters.lite.utils.Prefs.BooleanFalse("vkim_msg"); - } - - public static boolean amoled() { - return ru.vtosters.lite.utils.Prefs.BooleanFalse("amoled"); - } - - public static boolean vkme_msg() { - return ru.vtosters.lite.utils.Prefs.BooleanFalse("vkme_msg"); - } - public static Drawable recolorDrawable(Drawable drawable) { if (drawable == null) { return null; @@ -208,4 +189,9 @@ public class Themes { public static int vk_sans_text_regular() { return vksans() ? R.font.vk_sans_text_regular : R.font.roboto_regular; } + + public static int getNavbarColor() { + return VKThemeHelper.a(R.attr.tabbar_background); + } + } diff --git a/app/src/main/java/ru/vtosters/lite/utils/VKUIInjector.java b/app/src/main/java/ru/vtosters/lite/utils/VKUIInjector.java index c52e897e5..62b0ffe6f 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/VKUIInjector.java +++ b/app/src/main/java/ru/vtosters/lite/utils/VKUIInjector.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.utils; -import static ru.vtosters.lite.utils.Helper.getContext; -import static ru.vtosters.lite.utils.Helper.getPreferences; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Globals.getPreferences; import static ru.vtosters.lite.utils.Themes.getColorFromAttr; import static ru.vtosters.lite.utils.Themes.hex; @@ -67,7 +67,7 @@ public class VKUIInjector { public static void inject(WebView webView) { String string = getPreferences().getString("darktheme", ""); - if (Prefs.BooleanTrue("VKUI_INJ")) { + if (Preferences.BooleanTrue("VKUI_INJ")) { if (!isLoaded) { load(); } diff --git a/smali/smali/com/vk/about/AboutAppFragment$d.smali b/smali/smali/com/vk/about/AboutAppFragment$d.smali index cbd660f1e..f35d08524 100644 --- a/smali/smali/com/vk/about/AboutAppFragment$d.smali +++ b/smali/smali/com/vk/about/AboutAppFragment$d.smali @@ -273,7 +273,7 @@ check-cast v2, Landroid/content/Context; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getCommitLink()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/About;->getCommitLink()Ljava/lang/String; move-result-object v3 @@ -304,7 +304,7 @@ if-eqz v0, :cond_8 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object p1 diff --git a/smali/smali/com/vk/about/AboutAppFragment.smali b/smali/smali/com/vk/about/AboutAppFragment.smali index e88386400..97050e700 100644 --- a/smali/smali/com/vk/about/AboutAppFragment.smali +++ b/smali/smali/com/vk/about/AboutAppFragment.smali @@ -632,7 +632,7 @@ invoke-interface {p1, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z - invoke-static {p1}, Lru/vtosters/lite/utils/Prefs;->injectAbout(Ljava/util/List;)V + invoke-static {p1}, Lru/vtosters/lite/utils/About;->injectAbout(Ljava/util/List;)V return-void .end method diff --git a/smali/smali/com/vk/common/links/LinkProcessor1.smali b/smali/smali/com/vk/common/links/LinkProcessor1.smali index e63c56cb7..682829104 100644 --- a/smali/smali/com/vk/common/links/LinkProcessor1.smali +++ b/smali/smali/com/vk/common/links/LinkProcessor1.smali @@ -4040,7 +4040,7 @@ if-eqz v2, :cond_51 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4091,7 +4091,7 @@ if-eqz v2, :cond_52 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4144,7 +4144,7 @@ if-eqz v2, :cond_130 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4197,7 +4197,7 @@ if-eqz v2, :cond_131 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4250,7 +4250,7 @@ if-eqz v2, :cond_132 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4304,7 +4304,7 @@ if-eqz v2, :cond_53 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4355,7 +4355,7 @@ if-eqz v2, :cond_54 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4406,7 +4406,7 @@ if-eqz v2, :cond_55 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4457,7 +4457,7 @@ if-eqz v2, :cond_56 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4508,7 +4508,7 @@ if-eqz v2, :cond_57 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4559,7 +4559,7 @@ if-eqz v2, :cond_58 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4610,7 +4610,7 @@ if-eqz v2, :cond_59 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -4661,7 +4661,7 @@ if-eqz v2, :cond_5a - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v1 @@ -5758,7 +5758,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->newvideo()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->newvideo()Z move-result v0 diff --git a/smali/smali/com/vk/core/b/BuildInfo.smali b/smali/smali/com/vk/core/b/BuildInfo.smali index c9a1c1e14..e90849271 100644 --- a/smali/smali/com/vk/core/b/BuildInfo.smali +++ b/smali/smali/com/vk/core/b/BuildInfo.smali @@ -109,7 +109,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->dev()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dev()Z move-result v0 @@ -151,7 +151,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->dev()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dev()Z move-result v0 diff --git a/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali b/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali index 0871dac9a..3fa7b8615 100644 --- a/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali +++ b/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali @@ -1062,7 +1062,7 @@ if-eqz v0, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->darkmode()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->darkmode()Z move-result v0 diff --git a/smali/smali/com/vk/im/engine/internal/api_commands/messages/MessagesSendApiCmd.smali b/smali/smali/com/vk/im/engine/internal/api_commands/messages/MessagesSendApiCmd.smali index b3f940fe4..986d99b8b 100644 --- a/smali/smali/com/vk/im/engine/internal/api_commands/messages/MessagesSendApiCmd.smali +++ b/smali/smali/com/vk/im/engine/internal/api_commands/messages/MessagesSendApiCmd.smali @@ -566,7 +566,7 @@ invoke-interface {v2, p0, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; :cond_f - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object v2 .end method @@ -775,7 +775,7 @@ check-cast p1, Ljava/lang/Integer; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali/com/vk/im/ui/components/dialogs_list/vc_impl/VhDialog.smali b/smali/smali/com/vk/im/ui/components/dialogs_list/vc_impl/VhDialog.smali index b3bd7e1b7..e217e46e0 100644 --- a/smali/smali/com/vk/im/ui/components/dialogs_list/vc_impl/VhDialog.smali +++ b/smali/smali/com/vk/im/ui/components/dialogs_list/vc_impl/VhDialog.smali @@ -124,7 +124,7 @@ move-result v1 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result v1 @@ -1327,7 +1327,7 @@ const-string p2, "VT_Verification" .line 181 - invoke-static {p2}, Lru/vtosters/lite/utils/Prefs;->BooleanTrue(Ljava/lang/String;)Z + invoke-static {p2}, Lru/vtosters/lite/utils/Preferences;->BooleanTrue(Ljava/lang/String;)Z move-result p2 @@ -1357,7 +1357,7 @@ const-string p2, "VT_Verification" .line 181 - invoke-static {p2}, Lru/vtosters/lite/utils/Prefs;->BooleanTrue(Ljava/lang/String;)Z + invoke-static {p2}, Lru/vtosters/lite/utils/Preferences;->BooleanTrue(Ljava/lang/String;)Z move-result p2 diff --git a/smali/smali/com/vk/im/ui/components/viewcontrollers/dialog_header/info/DialogHeaderInfoVc.smali b/smali/smali/com/vk/im/ui/components/viewcontrollers/dialog_header/info/DialogHeaderInfoVc.smali index c9ae0aa89..de669d0ee 100644 --- a/smali/smali/com/vk/im/ui/components/viewcontrollers/dialog_header/info/DialogHeaderInfoVc.smali +++ b/smali/smali/com/vk/im/ui/components/viewcontrollers/dialog_header/info/DialogHeaderInfoVc.smali @@ -112,7 +112,7 @@ move-result p1 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result p1 diff --git a/smali/smali/com/vk/im/ui/components/viewcontrollers/dialog_header/info/IconFormatter.smali b/smali/smali/com/vk/im/ui/components/viewcontrollers/dialog_header/info/IconFormatter.smali index 2f55b745e..094a681ba 100644 --- a/smali/smali/com/vk/im/ui/components/viewcontrollers/dialog_header/info/IconFormatter.smali +++ b/smali/smali/com/vk/im/ui/components/viewcontrollers/dialog_header/info/IconFormatter.smali @@ -76,7 +76,7 @@ const-string p2, "VT_Verification" .line 181 - invoke-static {p2}, Lru/vtosters/lite/utils/Prefs;->BooleanTrue(Ljava/lang/String;)Z + invoke-static {p2}, Lru/vtosters/lite/utils/Preferences;->BooleanTrue(Ljava/lang/String;)Z move-result p2 @@ -107,7 +107,7 @@ const-string p2, "VT_Verification" .line 181 - invoke-static {p2}, Lru/vtosters/lite/utils/Prefs;->BooleanTrue(Ljava/lang/String;)Z + invoke-static {p2}, Lru/vtosters/lite/utils/Preferences;->BooleanTrue(Ljava/lang/String;)Z move-result p2 diff --git a/smali/smali/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartPollHolder.smali b/smali/smali/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartPollHolder.smali index ac2b72c4a..565226f5c 100644 --- a/smali/smali/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartPollHolder.smali +++ b/smali/smali/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/MsgPartPollHolder.smali @@ -231,7 +231,7 @@ move-result v1 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result v1 diff --git a/smali/smali/com/vk/im/ui/views/dialogs/DialogItemView.smali b/smali/smali/com/vk/im/ui/views/dialogs/DialogItemView.smali index 69d13f751..94d2b4f0c 100644 --- a/smali/smali/com/vk/im/ui/views/dialogs/DialogItemView.smali +++ b/smali/smali/com/vk/im/ui/views/dialogs/DialogItemView.smali @@ -343,7 +343,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result v0 diff --git a/smali/smali/com/vk/stickers/c/KeyboardPopup.smali b/smali/smali/com/vk/stickers/c/KeyboardPopup.smali index fc778f65c..2c31a2c03 100644 --- a/smali/smali/com/vk/stickers/c/KeyboardPopup.smali +++ b/smali/smali/com/vk/stickers/c/KeyboardPopup.smali @@ -138,7 +138,7 @@ .locals 6 .line 165 - invoke-static {p1}, Lru/vtosters/lite/utils/Prefs;->alteremoji(Landroid/content/Context;)Z + invoke-static {p1}, Lru/vtosters/lite/utils/Preferences;->alteremoji(Landroid/content/Context;)Z move-result v4 @@ -161,7 +161,7 @@ .locals 7 .line 154 - invoke-static {p1}, Lru/vtosters/lite/utils/Prefs;->alteremoji(Landroid/content/Context;)Z + invoke-static {p1}, Lru/vtosters/lite/utils/Preferences;->alteremoji(Landroid/content/Context;)Z move-result v5 @@ -339,7 +339,7 @@ .locals 7 .line 172 - invoke-static {p1}, Lru/vtosters/lite/utils/Prefs;->alteremoji(Landroid/content/Context;)Z + invoke-static {p1}, Lru/vtosters/lite/utils/Preferences;->alteremoji(Landroid/content/Context;)Z move-result v4 diff --git a/smali/smali/com/vk/webapp/AndroidBridge.smali b/smali/smali/com/vk/webapp/AndroidBridge.smali index 463a26425..fd0750229 100644 --- a/smali/smali/com/vk/webapp/AndroidBridge.smali +++ b/smali/smali/com/vk/webapp/AndroidBridge.smali @@ -520,13 +520,13 @@ invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->dev()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dev()Z move-result v1 if-eqz v1, :cond_3 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v3 diff --git a/smali/smali/com/vk/webapp/SSFS.smali b/smali/smali/com/vk/webapp/SSFS.smali index 743b50c6c..fa1c710d5 100644 --- a/smali/smali/com/vk/webapp/SSFS.smali +++ b/smali/smali/com/vk/webapp/SSFS.smali @@ -29,7 +29,7 @@ .line 18 invoke-super {p0, p1}, Lcom/vk/webapp/VkUiFragment;->b(Landroid/os/Bundle;)V - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getSSFSLink()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/SSFS;->getSSFSLink()Ljava/lang/String; move-result-object v0 diff --git a/smali/smali/com/vtosters/lite/VKApplication.smali b/smali/smali/com/vtosters/lite/VKApplication.smali index 226b9e4c1..ee86a4199 100644 --- a/smali/smali/com/vtosters/lite/VKApplication.smali +++ b/smali/smali/com/vtosters/lite/VKApplication.smali @@ -59,7 +59,7 @@ const-string v1, "arm" - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->VKVersion()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersion()Ljava/lang/String; move-result-object v2 @@ -727,7 +727,7 @@ .param p0, "s" # I .line 17 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->fulltime()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->fulltime()Z move-result v0 @@ -1071,7 +1071,7 @@ .method private setLang()V .locals 6 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v0 @@ -1089,7 +1089,7 @@ new-instance v3, Ljava/util/Locale; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getLocale()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getLocale()Ljava/lang/String; move-result-object v4 @@ -1321,7 +1321,7 @@ .method public onCreate()V .locals 4 - invoke-static {p0}, Lru/vtosters/lite/utils/Prefs;->init(Landroid/app/Application;)V + invoke-static {p0}, Lru/vtosters/lite/utils/Preferences;->init(Landroid/app/Application;)V invoke-direct {p0}, Lcom/vtosters/lite/VKApplication;->setLang()V diff --git a/smali/smali/com/vtosters/lite/VKFragmentActivity.smali b/smali/smali/com/vtosters/lite/VKFragmentActivity.smali index d5f0b7a07..edc0e0124 100644 --- a/smali/smali/com/vtosters/lite/VKFragmentActivity.smali +++ b/smali/smali/com/vtosters/lite/VKFragmentActivity.smali @@ -114,7 +114,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali/com/vtosters/lite/api/execute/GetFullUserProfile.smali b/smali/smali/com/vtosters/lite/api/execute/GetFullUserProfile.smali index 98ef67f50..3be152e34 100644 --- a/smali/smali/com/vtosters/lite/api/execute/GetFullUserProfile.smali +++ b/smali/smali/com/vtosters/lite/api/execute/GetFullUserProfile.smali @@ -2582,7 +2582,7 @@ iput-boolean v2, v0, Lcom/vtosters/lite/api/ExtendedUserProfile;->bp:Z - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getFriendRecomm()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->getFriendRecomm()Ljava/lang/String; move-result-object v2 diff --git a/smali/smali/com/vtosters/lite/data/Users$1.smali b/smali/smali/com/vtosters/lite/data/Users$1.smali index 7b86716b5..2e8c67e5c 100644 --- a/smali/smali/com/vtosters/lite/data/Users$1.smali +++ b/smali/smali/com/vtosters/lite/data/Users$1.smali @@ -51,13 +51,13 @@ .method public a(Lcom/vk/api/sdk/exceptions/VKApiExecutionException;)V .locals 5 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->offline()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->offline()Z move-result v2 if-nez v2, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-void diff --git a/smali/smali/com/vtosters/lite/ui/WriteBar.smali b/smali/smali/com/vtosters/lite/ui/WriteBar.smali index 13e5322d5..f645d0945 100644 --- a/smali/smali/com/vtosters/lite/ui/WriteBar.smali +++ b/smali/smali/com/vtosters/lite/ui/WriteBar.smali @@ -1031,7 +1031,7 @@ if-eqz v0, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->voice()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->voice()Z move-result v0 @@ -1080,7 +1080,7 @@ if-eqz v0, :cond_2 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->voice()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->voice()Z move-result v6 @@ -4835,7 +4835,7 @@ return-void :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->voice()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->voice()Z move-result v2 diff --git a/smali/smali/ru/mail/libverify/notifications/SettingsActivity.smali b/smali/smali/ru/mail/libverify/notifications/SettingsActivity.smali index e7657b37f..7a50592b5 100644 --- a/smali/smali/ru/mail/libverify/notifications/SettingsActivity.smali +++ b/smali/smali/ru/mail/libverify/notifications/SettingsActivity.smali @@ -27,7 +27,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/api/sdk/ui/VKCaptchaActivity.smali b/smali/smali_classes2/com/vk/api/sdk/ui/VKCaptchaActivity.smali index c18f6e8c1..4e9c096b2 100644 --- a/smali/smali_classes2/com/vk/api/sdk/ui/VKCaptchaActivity.smali +++ b/smali/smali_classes2/com/vk/api/sdk/ui/VKCaptchaActivity.smali @@ -234,7 +234,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 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 0645bac8b..112f25a8e 100644 --- a/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali +++ b/smali/smali_classes2/com/vk/api/sdk/ui/VKWebViewAuthActivity.smali @@ -359,7 +359,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes2/com/vk/avatarpicker/AvatarPickerActivity.smali b/smali/smali_classes2/com/vk/avatarpicker/AvatarPickerActivity.smali index 6eb0d4704..d16a77e83 100644 --- a/smali/smali_classes2/com/vk/avatarpicker/AvatarPickerActivity.smali +++ b/smali/smali_classes2/com/vk/avatarpicker/AvatarPickerActivity.smali @@ -549,7 +549,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object 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 8ae530692..ab12f4a01 100644 --- a/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali +++ b/smali/smali_classes2/com/vk/core/network/security/NetworkKeyStore.smali @@ -42,7 +42,7 @@ .method private a(Landroid/content/Context;Z)V .locals 5 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->ssl()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/emoji/Emoji.smali b/smali/smali_classes2/com/vk/emoji/Emoji.smali index f09653886..403c239f9 100644 --- a/smali/smali_classes2/com/vk/emoji/Emoji.smali +++ b/smali/smali_classes2/com/vk/emoji/Emoji.smali @@ -746,7 +746,7 @@ .method public a(Ljava/lang/CharSequence;II)Ljava/lang/CharSequence; .locals 8 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->systememoji()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->systememoji()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/im/engine/internal/api_commands/messages/MessagesDeleteApiCmd.smali b/smali/smali_classes2/com/vk/im/engine/internal/api_commands/messages/MessagesDeleteApiCmd.smali index 0080f3522..520f58dc9 100644 --- a/smali/smali_classes2/com/vk/im/engine/internal/api_commands/messages/MessagesDeleteApiCmd.smali +++ b/smali/smali_classes2/com/vk/im/engine/internal/api_commands/messages/MessagesDeleteApiCmd.smali @@ -182,7 +182,7 @@ move-result-object p1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes2/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd.smali b/smali/smali_classes2/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd.smali index 8e954c862..f3585b458 100644 --- a/smali/smali_classes2/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd.smali +++ b/smali/smali_classes2/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd.smali @@ -151,7 +151,7 @@ check-cast p1, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd$b; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes2/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali b/smali/smali_classes2/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali index 551f3cacd..7c9e39771 100644 --- a/smali/smali_classes2/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali +++ b/smali/smali_classes2/com/vk/im/engine/internal/api_parsers/AttachApiParser.smali @@ -2213,7 +2213,7 @@ .line 183 sget-object v3, Lcom/vk/im/engine/internal/api_parsers/ImageSizesParser;->a:Lcom/vk/im/engine/internal/api_parsers/ImageSizesParser; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getBackgroundStickers()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getBackgroundStickers()Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes2/com/vk/im/ui/components/dialogs_list/formatters/MsgBodiesFormatter.smali b/smali/smali_classes2/com/vk/im/ui/components/dialogs_list/formatters/MsgBodiesFormatter.smali index 07706fa12..19d147739 100644 --- a/smali/smali_classes2/com/vk/im/ui/components/dialogs_list/formatters/MsgBodiesFormatter.smali +++ b/smali/smali_classes2/com/vk/im/ui/components/dialogs_list/formatters/MsgBodiesFormatter.smali @@ -370,7 +370,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/im/ui/formatters/ComposingFormatter.smali b/smali/smali_classes2/com/vk/im/ui/formatters/ComposingFormatter.smali index d12256f89..d26b1e275 100644 --- a/smali/smali_classes2/com/vk/im/ui/formatters/ComposingFormatter.smali +++ b/smali/smali_classes2/com/vk/im/ui/formatters/ComposingFormatter.smali @@ -87,7 +87,7 @@ move-result p1 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result p1 diff --git a/smali/smali_classes2/com/vk/im/ui/views/msg/bubble/MsgBubbleDrawable.smali b/smali/smali_classes2/com/vk/im/ui/views/msg/bubble/MsgBubbleDrawable.smali index dd0b23d42..9bf530dc0 100644 --- a/smali/smali_classes2/com/vk/im/ui/views/msg/bubble/MsgBubbleDrawable.smali +++ b/smali/smali_classes2/com/vk/im/ui/views/msg/bubble/MsgBubbleDrawable.smali @@ -861,7 +861,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result v0 diff --git a/smali/smali_classes2/com/vk/newsfeed/Feed2049$type$2.smali b/smali/smali_classes2/com/vk/newsfeed/Feed2049$type$2.smali index bf9722122..00708601f 100644 --- a/smali/smali_classes2/com/vk/newsfeed/Feed2049$type$2.smali +++ b/smali/smali_classes2/com/vk/newsfeed/Feed2049$type$2.smali @@ -69,7 +69,7 @@ .method public final b()Lcom/vk/newsfeed/Feed2049$ExperimentType; .locals 3 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->newfeed()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->newfeed()Z move-result v0 diff --git a/smali/smali_classes2/com/vtosters/lite/CaptchaActivity.smali b/smali/smali_classes2/com/vtosters/lite/CaptchaActivity.smali index a1e1e376a..a8cb358c4 100644 --- a/smali/smali_classes2/com/vtosters/lite/CaptchaActivity.smali +++ b/smali/smali_classes2/com/vtosters/lite/CaptchaActivity.smali @@ -186,7 +186,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes2/com/vtosters/lite/ChangePasswordActivity.smali b/smali/smali_classes2/com/vtosters/lite/ChangePasswordActivity.smali index 34b49e3ad..7bae2b9e3 100644 --- a/smali/smali_classes2/com/vtosters/lite/ChangePasswordActivity.smali +++ b/smali/smali_classes2/com/vtosters/lite/ChangePasswordActivity.smali @@ -96,7 +96,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes2/com/vtosters/lite/VKActivity.smali b/smali/smali_classes2/com/vtosters/lite/VKActivity.smali index 519281b3e..6357a4abd 100644 --- a/smali/smali_classes2/com/vtosters/lite/VKActivity.smali +++ b/smali/smali_classes2/com/vtosters/lite/VKActivity.smali @@ -119,7 +119,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes2/com/vtosters/lite/data/BenchmarkTracker.smali b/smali/smali_classes2/com/vtosters/lite/data/BenchmarkTracker.smali index 81a3cc348..b2f09d6ce 100644 --- a/smali/smali_classes2/com/vtosters/lite/data/BenchmarkTracker.smali +++ b/smali/smali_classes2/com/vtosters/lite/data/BenchmarkTracker.smali @@ -232,7 +232,7 @@ .method private a(Ljava/lang/String;)Ljava/lang/String; .locals 4 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->benchmark()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->benchmark()Z move-result v0 diff --git a/smali/smali_classes2/com/vtosters/lite/fragments/SettingsListFragment$b.smali b/smali/smali_classes2/com/vtosters/lite/fragments/SettingsListFragment$b.smali index 9fabcc8f7..0efb331a8 100644 --- a/smali/smali_classes2/com/vtosters/lite/fragments/SettingsListFragment$b.smali +++ b/smali/smali_classes2/com/vtosters/lite/fragments/SettingsListFragment$b.smali @@ -116,7 +116,7 @@ const/4 v4, 0x1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->devmenu()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->devmenu()Z move-result v5 @@ -512,7 +512,7 @@ invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - invoke-static {}, Lru/vtosters/lite/utils/Helper;->isGmsInstalled()Z + invoke-static {}, Lru/vtosters/lite/utils/Globals;->isGmsInstalled()Z move-result v6 diff --git a/smali/smali_classes3/android/support/v4/app/SupportActivity.smali b/smali/smali_classes3/android/support/v4/app/SupportActivity.smali index deabd7c61..1699527fe 100644 --- a/smali/smali_classes3/android/support/v4/app/SupportActivity.smali +++ b/smali/smali_classes3/android/support/v4/app/SupportActivity.smali @@ -64,7 +64,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes3/com/google/android/youtube/player/internal/y.smali b/smali/smali_classes3/com/google/android/youtube/player/internal/y.smali index 26ab9d937..0e1f1415d 100644 --- a/smali/smali_classes3/com/google/android/youtube/player/internal/y.smali +++ b/smali/smali_classes3/com/google/android/youtube/player/internal/y.smali @@ -85,7 +85,7 @@ move-result-object v1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getLocale()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getLocale()Ljava/lang/String; move-result-object v1 @@ -95,7 +95,7 @@ move-result-object v1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getLocale()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getLocale()Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes3/com/vk/core/network/security/NetworkTrustManager.smali b/smali/smali_classes3/com/vk/core/network/security/NetworkTrustManager.smali index 84ad78926..86e2a0cce 100644 --- a/smali/smali_classes3/com/vk/core/network/security/NetworkTrustManager.smali +++ b/smali/smali_classes3/com/vk/core/network/security/NetworkTrustManager.smali @@ -153,7 +153,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->ssl()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z move-result v1 @@ -325,7 +325,7 @@ } .end annotation - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->ssl()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z move-result v0 @@ -353,7 +353,7 @@ } .end annotation - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->ssl()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z move-result v0 @@ -376,7 +376,7 @@ .method public getAcceptedIssuers()[Ljava/security/cert/X509Certificate; .locals 1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->ssl()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z move-result v0 diff --git a/smali/smali_classes3/com/vk/dto/newsfeed/entries/NewsEntryFactory.smali b/smali/smali_classes3/com/vk/dto/newsfeed/entries/NewsEntryFactory.smali index 257c29f73..99197773f 100644 --- a/smali/smali_classes3/com/vk/dto/newsfeed/entries/NewsEntryFactory.smali +++ b/smali/smali_classes3/com/vk/dto/newsfeed/entries/NewsEntryFactory.smali @@ -66,7 +66,7 @@ goto/16 :goto_6 :sswitch_0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->widgetads()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->widgetads()Ljava/lang/String; move-result-object p2 @@ -100,7 +100,7 @@ goto/16 :goto_6 :sswitch_1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->authorsads()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->authorsads()Ljava/lang/String; move-result-object p2 @@ -136,7 +136,7 @@ goto/16 :goto_6 :sswitch_3 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->promoads()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->promoads()Ljava/lang/String; move-result-object p2 @@ -408,7 +408,7 @@ goto/16 :goto_6 :sswitch_10 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->friendsads()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->friendsads()Ljava/lang/String; move-result-object p2 diff --git a/smali/smali_classes3/com/vk/mediastore/system/MediaStoreController.smali b/smali/smali_classes3/com/vk/mediastore/system/MediaStoreController.smali index 99ee63c15..47451c1e9 100644 --- a/smali/smali_classes3/com/vk/mediastore/system/MediaStoreController.smali +++ b/smali/smali_classes3/com/vk/mediastore/system/MediaStoreController.smali @@ -132,7 +132,7 @@ const-string v4, "_data" - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->MediacontentFix2()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->MediacontentFix2()Ljava/lang/String; move-result-object v5 @@ -155,7 +155,7 @@ const-string v1, "_id" - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->MediacontentFix2()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->MediacontentFix2()Ljava/lang/String; move-result-object v2 @@ -371,7 +371,7 @@ move-result v6 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->MediacontentFix2()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->MediacontentFix2()Ljava/lang/String; move-result-object v7 @@ -833,7 +833,7 @@ const/4 v9, 0x0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->MediacontentFix()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->MediacontentFix()Ljava/lang/String; move-result-object v10 @@ -866,7 +866,7 @@ const/4 v8, 0x0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->MediacontentFix()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->MediacontentFix()Ljava/lang/String; move-result-object v9 @@ -1045,7 +1045,7 @@ move-result v6 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->MediacontentFix2()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->MediacontentFix2()Ljava/lang/String; move-result-object v7 diff --git a/smali/smali_classes3/com/vk/mediastore/system/MediaStoreEntry.smali b/smali/smali_classes3/com/vk/mediastore/system/MediaStoreEntry.smali index 734b631b9..e71ae15de 100644 --- a/smali/smali_classes3/com/vk/mediastore/system/MediaStoreEntry.smali +++ b/smali/smali_classes3/com/vk/mediastore/system/MediaStoreEntry.smali @@ -514,7 +514,7 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->MediacontentFix3()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->MediacontentFix3()Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes3/com/vk/pushes/PushOpenActivity.smali b/smali/smali_classes3/com/vk/pushes/PushOpenActivity.smali index 6082b9de4..feef93072 100644 --- a/smali/smali_classes3/com/vk/pushes/PushOpenActivity.smali +++ b/smali/smali_classes3/com/vk/pushes/PushOpenActivity.smali @@ -472,7 +472,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes3/com/vk/t/Vigo.smali b/smali/smali_classes3/com/vk/t/Vigo.smali index 07664b203..910d10e9c 100644 --- a/smali/smali_classes3/com/vk/t/Vigo.smali +++ b/smali/smali_classes3/com/vk/t/Vigo.smali @@ -3659,7 +3659,7 @@ .line 1302 iget-object v2, v1, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->VKVersion()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersion()Ljava/lang/String; move-result-object v2 diff --git a/smali/smali_classes3/com/vtosters/lite/MainActivity.smali b/smali/smali_classes3/com/vtosters/lite/MainActivity.smali index 46ded7c2d..1916f7027 100644 --- a/smali/smali_classes3/com/vtosters/lite/MainActivity.smali +++ b/smali/smali_classes3/com/vtosters/lite/MainActivity.smali @@ -104,7 +104,7 @@ const-class v1, Lcom/vtosters/lite/fragments/messages/dialogs/DialogsFragment; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getStartFragment()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->getStartFragment()Ljava/lang/Class; move-result-object v1 @@ -129,7 +129,7 @@ move-result-object v1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getStartFragment()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->getStartFragment()Ljava/lang/Class; move-result-object v1 @@ -661,7 +661,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getStartFragment()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->getStartFragment()Ljava/lang/Class; move-result-object v1 @@ -755,7 +755,7 @@ move-result-object v1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getStartFragment()Ljava/lang/Class; + invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->getStartFragment()Ljava/lang/Class; move-result-object v1 diff --git a/smali/smali_classes3/com/vtosters/lite/ReportContentActivity.smali b/smali/smali_classes3/com/vtosters/lite/ReportContentActivity.smali index b9ceb8b07..b81386054 100644 --- a/smali/smali_classes3/com/vtosters/lite/ReportContentActivity.smali +++ b/smali/smali_classes3/com/vtosters/lite/ReportContentActivity.smali @@ -229,7 +229,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes3/com/vtosters/lite/WelcomeActivity.smali b/smali/smali_classes3/com/vtosters/lite/WelcomeActivity.smali index fb87eb99b..3ea8d2a88 100644 --- a/smali/smali_classes3/com/vtosters/lite/WelcomeActivity.smali +++ b/smali/smali_classes3/com/vtosters/lite/WelcomeActivity.smali @@ -414,7 +414,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet.smali b/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet.smali index c7cbe9281..d808c1605 100644 --- a/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet.smali +++ b/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedCustomGet.smali @@ -128,7 +128,7 @@ invoke-virtual {p0, p1, p2}, Lcom/vtosters/lite/api/newsfeed/NewsfeedCustomGet;->a(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/base/ApiRequest; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-void .end method diff --git a/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali b/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali index eebec52ee..c91872ce7 100644 --- a/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali +++ b/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali @@ -503,7 +503,7 @@ invoke-virtual {v0, v2, v1}, Lcom/vtosters/lite/api/newsfeed/NewsfeedGet;->a(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/base/ApiRequest; :cond_d - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-void @@ -531,7 +531,7 @@ .method public static c(Z)J .locals 3 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->feedautoupdate()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->feedautoupdate()Z move-result v0 @@ -730,7 +730,7 @@ move-result-object v2 - invoke-static {v2}, Lru/vtosters/lite/utils/Prefs;->inject(Lorg/json/JSONObject;)Z + invoke-static {v2}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z move-result v10 diff --git a/smali/smali_classes3/com/vtosters/lite/auth/VKAuthState.smali b/smali/smali_classes3/com/vtosters/lite/auth/VKAuthState.smali index 48f5b09c6..469406c9f 100644 --- a/smali/smali_classes3/com/vtosters/lite/auth/VKAuthState.smali +++ b/smali/smali_classes3/com/vtosters/lite/auth/VKAuthState.smali @@ -380,7 +380,7 @@ const-string v1, "libverify_support" - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->libverify()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->libverify()Z move-result v2 diff --git a/smali/smali_classes3/me/grishka/appkit/LiteAppCompatActivity.smali b/smali/smali_classes3/me/grishka/appkit/LiteAppCompatActivity.smali index dc8a6c786..728739326 100644 --- a/smali/smali_classes3/me/grishka/appkit/LiteAppCompatActivity.smali +++ b/smali/smali_classes3/me/grishka/appkit/LiteAppCompatActivity.smali @@ -25,7 +25,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes3/pub/devrel/easypermissions/AppSettingsDialogHolderActivity.smali b/smali/smali_classes3/pub/devrel/easypermissions/AppSettingsDialogHolderActivity.smali index b229488b2..9108a6ed7 100644 --- a/smali/smali_classes3/pub/devrel/easypermissions/AppSettingsDialogHolderActivity.smali +++ b/smali/smali_classes3/pub/devrel/easypermissions/AppSettingsDialogHolderActivity.smali @@ -48,7 +48,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes3/ru/mail/libverify/notifications/SmsCodeNotificationActivity.smali b/smali/smali_classes3/ru/mail/libverify/notifications/SmsCodeNotificationActivity.smali index 9f5ccd4cc..e508e3703 100644 --- a/smali/smali_classes3/ru/mail/libverify/notifications/SmsCodeNotificationActivity.smali +++ b/smali/smali_classes3/ru/mail/libverify/notifications/SmsCodeNotificationActivity.smali @@ -323,7 +323,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes3/ru/mail/libverify/storage/h.smali b/smali/smali_classes3/ru/mail/libverify/storage/h.smali index c5bfdaf91..05d44792c 100644 --- a/smali/smali_classes3/ru/mail/libverify/storage/h.smali +++ b/smali/smali_classes3/ru/mail/libverify/storage/h.smali @@ -303,7 +303,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getLocale()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getLocale()Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/com/vk/about/holders1.smali b/smali/smali_classes4/com/vk/about/holders1.smali index 42766c35d..a9dce8f20 100644 --- a/smali/smali_classes4/com/vk/about/holders1.smali +++ b/smali/smali_classes4/com/vk/about/holders1.smali @@ -65,7 +65,7 @@ move-result-object p1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getAppVersion()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/About;->getAppVersion()Ljava/lang/String; move-result-object p1 diff --git a/smali/smali_classes4/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali b/smali/smali_classes4/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali index 18c17fd2b..28a1bfdb2 100644 --- a/smali/smali_classes4/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali +++ b/smali/smali_classes4/com/vk/api/internal/chain/TokenConfirmationHandlerChainCall.smali @@ -165,7 +165,7 @@ move-result-object v3 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->gcmfix()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->gcmfix()Z move-result v5 diff --git a/smali/smali_classes4/com/vk/api/sdk/ui/VKConfirmationActivity.smali b/smali/smali_classes4/com/vk/api/sdk/ui/VKConfirmationActivity.smali index ac76f52ce..25aebacdd 100644 --- a/smali/smali_classes4/com/vk/api/sdk/ui/VKConfirmationActivity.smali +++ b/smali/smali_classes4/com/vk/api/sdk/ui/VKConfirmationActivity.smali @@ -67,7 +67,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes4/com/vk/common/links/BrowserUtils$a.smali b/smali/smali_classes4/com/vk/common/links/BrowserUtils$a.smali index e4f7b097f..56ae41f12 100644 --- a/smali/smali_classes4/com/vk/common/links/BrowserUtils$a.smali +++ b/smali/smali_classes4/com/vk/common/links/BrowserUtils$a.smali @@ -508,7 +508,7 @@ .line 153 :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->awayphp()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->awayphp()Z move-result v0 diff --git a/smali/smali_classes4/com/vk/friends/recommendations/FriendsRecommendationsFragment$dirtyHackActivity$2$1.smali b/smali/smali_classes4/com/vk/friends/recommendations/FriendsRecommendationsFragment$dirtyHackActivity$2$1.smali index 28f21cd39..8b0f98a02 100644 --- a/smali/smali_classes4/com/vk/friends/recommendations/FriendsRecommendationsFragment$dirtyHackActivity$2$1.smali +++ b/smali/smali_classes4/com/vk/friends/recommendations/FriendsRecommendationsFragment$dirtyHackActivity$2$1.smali @@ -43,7 +43,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes4/com/vk/im/engine/commands/chats/ChatsLoadPreviewCmd.smali b/smali/smali_classes4/com/vk/im/engine/commands/chats/ChatsLoadPreviewCmd.smali index f924abe17..d53a46137 100644 --- a/smali/smali_classes4/com/vk/im/engine/commands/chats/ChatsLoadPreviewCmd.smali +++ b/smali/smali_classes4/com/vk/im/engine/commands/chats/ChatsLoadPreviewCmd.smali @@ -135,7 +135,7 @@ check-cast p1, Lcom/vk/im/engine/models/chats/ChatPreview; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes4/com/vk/im/engine/internal/api_commands/messages/MessagesExistsApiCmd.smali b/smali/smali_classes4/com/vk/im/engine/internal/api_commands/messages/MessagesExistsApiCmd.smali index b8e7addae..47d0a6711 100644 --- a/smali/smali_classes4/com/vk/im/engine/internal/api_commands/messages/MessagesExistsApiCmd.smali +++ b/smali/smali_classes4/com/vk/im/engine/internal/api_commands/messages/MessagesExistsApiCmd.smali @@ -190,7 +190,7 @@ goto :goto_0 :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object v0 .end method diff --git a/smali/smali_classes4/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationMembersApiCmd.smali b/smali/smali_classes4/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationMembersApiCmd.smali index 94442a685..f27ab92ba 100644 --- a/smali/smali_classes4/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationMembersApiCmd.smali +++ b/smali/smali_classes4/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationMembersApiCmd.smali @@ -132,7 +132,7 @@ check-cast p1, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationMembersApiCmd$b; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object p1 .end method diff --git a/smali/smali_classes4/com/vk/im/engine/internal/jobs/msg/MsgSendMultipleJob.smali b/smali/smali_classes4/com/vk/im/engine/internal/jobs/msg/MsgSendMultipleJob.smali index 552c0f222..5ec5db77e 100644 --- a/smali/smali_classes4/com/vk/im/engine/internal/jobs/msg/MsgSendMultipleJob.smali +++ b/smali/smali_classes4/com/vk/im/engine/internal/jobs/msg/MsgSendMultipleJob.smali @@ -360,7 +360,7 @@ invoke-virtual {p1, p2}, Lcom/vk/api/internal/ApiManager;->a(Lcom/vk/api/sdk/VKMethodCall;)V - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-void .end method diff --git a/smali/smali_classes4/com/vk/im/engine/internal/jobs/msg/MsgSendUncheckedJob.smali b/smali/smali_classes4/com/vk/im/engine/internal/jobs/msg/MsgSendUncheckedJob.smali index effac717d..48c2fa3ec 100644 --- a/smali/smali_classes4/com/vk/im/engine/internal/jobs/msg/MsgSendUncheckedJob.smali +++ b/smali/smali_classes4/com/vk/im/engine/internal/jobs/msg/MsgSendUncheckedJob.smali @@ -172,7 +172,7 @@ invoke-virtual {p1, p2}, Lcom/vk/api/internal/ApiManager;->a(Lcom/vk/api/sdk/VKMethodCall;)V - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-void .end method diff --git a/smali/smali_classes4/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/VhBindArgs.smali b/smali/smali_classes4/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/VhBindArgs.smali index 57899d993..21020ee45 100644 --- a/smali/smali_classes4/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/VhBindArgs.smali +++ b/smali/smali_classes4/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/VhBindArgs.smali @@ -167,7 +167,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->msgflat()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->msgflat()Z move-result v1 diff --git a/smali/smali_classes4/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/vh/VhMsg.smali b/smali/smali_classes4/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/vh/VhMsg.smali index dce721bdc..e699ddd8c 100644 --- a/smali/smali_classes4/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/vh/VhMsg.smali +++ b/smali/smali_classes4/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/vh/VhMsg.smali @@ -673,7 +673,7 @@ move-result p1 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result p1 @@ -1127,7 +1127,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result v0 @@ -1940,7 +1940,7 @@ goto :goto_1 :cond_4 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->msgtails()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->msgtails()Z move-result p0 diff --git a/smali/smali_classes4/com/vk/im/ui/fragments/ChatFragment.smali b/smali/smali_classes4/com/vk/im/ui/fragments/ChatFragment.smali index 50256efd5..1b8fd6f78 100644 --- a/smali/smali_classes4/com/vk/im/ui/fragments/ChatFragment.smali +++ b/smali/smali_classes4/com/vk/im/ui/fragments/ChatFragment.smali @@ -2617,7 +2617,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result v0 diff --git a/smali/smali_classes4/com/vk/im/ui/views/avatars/AvatarView.smali b/smali/smali_classes4/com/vk/im/ui/views/avatars/AvatarView.smali index f2a114f70..fe4d4b6ee 100644 --- a/smali/smali_classes4/com/vk/im/ui/views/avatars/AvatarView.smali +++ b/smali/smali_classes4/com/vk/im/ui/views/avatars/AvatarView.smali @@ -342,7 +342,7 @@ move-result p2 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result p2 diff --git a/smali/smali_classes4/com/vk/menu/MenuFragment$c.smali b/smali/smali_classes4/com/vk/menu/MenuFragment$c.smali index e9ee63949..ced0162b5 100644 --- a/smali/smali_classes4/com/vk/menu/MenuFragment$c.smali +++ b/smali/smali_classes4/com/vk/menu/MenuFragment$c.smali @@ -153,7 +153,7 @@ move-result p2 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->newvideo()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->newvideo()Z move-result p2 diff --git a/smali/smali_classes4/com/vk/menu/MenuFragment.smali b/smali/smali_classes4/com/vk/menu/MenuFragment.smali index c9aa05edd..8b625664a 100644 --- a/smali/smali_classes4/com/vk/menu/MenuFragment.smali +++ b/smali/smali_classes4/com/vk/menu/MenuFragment.smali @@ -1301,7 +1301,7 @@ if-eqz v5, :cond_12 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->showmenu()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->showmenu()Z move-result v5 diff --git a/smali/smali_classes4/com/vk/navigation/NavigationDelegateBottom.smali b/smali/smali_classes4/com/vk/navigation/NavigationDelegateBottom.smali index 212881293..36b20955b 100644 --- a/smali/smali_classes4/com/vk/navigation/NavigationDelegateBottom.smali +++ b/smali/smali_classes4/com/vk/navigation/NavigationDelegateBottom.smali @@ -1403,7 +1403,7 @@ const/4 p1, 0x0 :goto_1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->dockcounter()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dockcounter()Z move-result v1 @@ -3863,7 +3863,7 @@ .method public final p()Z .locals 7 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->swipe()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->swipe()Z move-result v6 diff --git a/smali/smali_classes4/com/vk/newsfeed/controllers/NewsfeedController.smali b/smali/smali_classes4/com/vk/newsfeed/controllers/NewsfeedController.smali index 85a3d2b72..5a61adb9e 100644 --- a/smali/smali_classes4/com/vk/newsfeed/controllers/NewsfeedController.smali +++ b/smali/smali_classes4/com/vk/newsfeed/controllers/NewsfeedController.smali @@ -135,7 +135,7 @@ .method private final a(IZ)Ljava/lang/String; .locals 2 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->feedcache()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->feedcache()Z move-result v0 diff --git a/smali/smali_classes4/com/vk/newsfeed/presenters/NewsfeedPresenter.smali b/smali/smali_classes4/com/vk/newsfeed/presenters/NewsfeedPresenter.smali index da489e308..472b16b7f 100644 --- a/smali/smali_classes4/com/vk/newsfeed/presenters/NewsfeedPresenter.smali +++ b/smali/smali_classes4/com/vk/newsfeed/presenters/NewsfeedPresenter.smali @@ -1826,7 +1826,7 @@ .method private final b(Lcom/vk/dto/stories/model/GetStoriesResponse;)V .locals 4 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->stories()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->stories()Z move-result v0 diff --git a/smali/smali_classes4/com/vk/stories/StoriesController.smali b/smali/smali_classes4/com/vk/stories/StoriesController.smali index 13d8bef55..33fb12752 100644 --- a/smali/smali_classes4/com/vk/stories/StoriesController.smali +++ b/smali/smali_classes4/com/vk/stories/StoriesController.smali @@ -1420,7 +1420,7 @@ .line 230 :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->dns()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dns()Z move-result v2 @@ -1597,7 +1597,7 @@ .method public static a(Lcom/vk/dto/stories/model/StoryEntry;Lcom/vk/stories/StoriesController$SourceType;)V .locals 10 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->dns()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dns()Z move-result v2 diff --git a/smali/smali_classes4/com/vtosters/lite/AuthActivity.smali b/smali/smali_classes4/com/vtosters/lite/AuthActivity.smali index 438a993cd..2b2fc72ab 100644 --- a/smali/smali_classes4/com/vtosters/lite/AuthActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/AuthActivity.smali @@ -448,7 +448,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 @@ -618,7 +618,7 @@ .line 187 :sswitch_3 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object p0 diff --git a/smali/smali_classes4/com/vtosters/lite/ImagePickerActivity.smali b/smali/smali_classes4/com/vtosters/lite/ImagePickerActivity.smali index dda605b03..20821d9f4 100644 --- a/smali/smali_classes4/com/vtosters/lite/ImagePickerActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/ImagePickerActivity.smali @@ -263,7 +263,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes4/com/vtosters/lite/LinkParser.smali b/smali/smali_classes4/com/vtosters/lite/LinkParser.smali index 6d2102241..c7383be5b 100644 --- a/smali/smali_classes4/com/vtosters/lite/LinkParser.smali +++ b/smali/smali_classes4/com/vtosters/lite/LinkParser.smali @@ -1505,7 +1505,7 @@ .method public static a(Ljava/lang/CharSequence;ZF)Ljava/lang/CharSequence; .locals 9 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->shortpost()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortpost()Z move-result v0 diff --git a/smali/smali_classes4/com/vtosters/lite/LinkRedirActivity.smali b/smali/smali_classes4/com/vtosters/lite/LinkRedirActivity.smali index fdcf32e77..430adf2f6 100644 --- a/smali/smali_classes4/com/vtosters/lite/LinkRedirActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/LinkRedirActivity.smali @@ -93,7 +93,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes4/com/vtosters/lite/VideoUploadDialog.smali b/smali/smali_classes4/com/vtosters/lite/VideoUploadDialog.smali index 86621d8f8..7b8fbdf19 100644 --- a/smali/smali_classes4/com/vtosters/lite/VideoUploadDialog.smali +++ b/smali/smali_classes4/com/vtosters/lite/VideoUploadDialog.smali @@ -220,7 +220,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes4/com/vtosters/lite/data/Users.smali b/smali/smali_classes4/com/vtosters/lite/data/Users.smali index cdd211db3..ecdef8f6f 100644 --- a/smali/smali_classes4/com/vtosters/lite/data/Users.smali +++ b/smali/smali_classes4/com/vtosters/lite/data/Users.smali @@ -13,13 +13,13 @@ } .end annotation - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->offline()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->offline()Z move-result v2 if-nez v2, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-void diff --git a/smali/smali_classes4/ru/mail/libverify/storage/m.smali b/smali/smali_classes4/ru/mail/libverify/storage/m.smali index e4609f639..f1858f52f 100644 --- a/smali/smali_classes4/ru/mail/libverify/storage/m.smali +++ b/smali/smali_classes4/ru/mail/libverify/storage/m.smali @@ -2693,7 +2693,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getLocale()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getLocale()Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/ru/mail/libverify/utils/n.smali b/smali/smali_classes4/ru/mail/libverify/utils/n.smali index 2405f28b1..dffb8d916 100644 --- a/smali/smali_classes4/ru/mail/libverify/utils/n.smali +++ b/smali/smali_classes4/ru/mail/libverify/utils/n.smali @@ -295,7 +295,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getLocale()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getLocale()Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes4/ru/mail/voip2/VoipImpl2.smali b/smali/smali_classes4/ru/mail/voip2/VoipImpl2.smali index b66dff4b6..18b4f776d 100644 --- a/smali/smali_classes4/ru/mail/voip2/VoipImpl2.smali +++ b/smali/smali_classes4/ru/mail/voip2/VoipImpl2.smali @@ -507,7 +507,7 @@ iget-object v3, p1, Landroid/content/pm/PackageInfo;->versionName:Ljava/lang/String; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->VKVersion()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->VKVersion()Ljava/lang/String; move-result-object v3 diff --git a/smali/smali_classes5/com/vk/api/discover/DiscoverGet.smali b/smali/smali_classes5/com/vk/api/discover/DiscoverGet.smali index 5624f4fa1..afe34ece9 100644 --- a/smali/smali_classes5/com/vk/api/discover/DiscoverGet.smali +++ b/smali/smali_classes5/com/vk/api/discover/DiscoverGet.smali @@ -217,7 +217,7 @@ invoke-virtual {p0, p1, p2}, Lcom/vk/api/discover/DiscoverGet;->a(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/base/ApiRequest; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-void .end method diff --git a/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali b/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali index 05eed4e57..233b2dba5 100644 --- a/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali +++ b/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali @@ -138,7 +138,7 @@ .line 64 :goto_1 - invoke-static {p2}, Lru/vtosters/lite/utils/Prefs;->getCommentsSort(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p2}, Lru/vtosters/lite/utils/Newsfeed;->getCommentsSort(Ljava/lang/String;)Ljava/lang/String; move-result-object p2 diff --git a/smali/smali_classes5/com/vk/auth/api/VKAccount.smali b/smali/smali_classes5/com/vk/auth/api/VKAccount.smali index e68ede1e4..a8c4a6660 100644 --- a/smali/smali_classes5/com/vk/auth/api/VKAccount.smali +++ b/smali/smali_classes5/com/vk/auth/api/VKAccount.smali @@ -1290,7 +1290,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->calls()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->calls()Z move-result v0 @@ -1995,7 +1995,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->dev()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dev()Z move-result v0 @@ -2335,7 +2335,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->usevkui()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->usevkui()Z move-result v0 @@ -2354,7 +2354,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->usevkui()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->usevkui()Z move-result v0 @@ -2664,7 +2664,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->dev()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dev()Z move-result v0 @@ -2689,7 +2689,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->dev()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->dev()Z move-result v0 @@ -3635,7 +3635,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->hasMusicSubscription()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->hasMusicSubscription()Z move-result v0 @@ -3669,7 +3669,7 @@ move-result v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->isMusicRestricted()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->isMusicRestricted()Z move-result v0 diff --git a/smali/smali_classes5/com/vk/core/network/security/NetworkKeyStore$a.smali b/smali/smali_classes5/com/vk/core/network/security/NetworkKeyStore$a.smali index b9d228ef0..de0493fcd 100644 --- a/smali/smali_classes5/com/vk/core/network/security/NetworkKeyStore$a.smali +++ b/smali/smali_classes5/com/vk/core/network/security/NetworkKeyStore$a.smali @@ -474,7 +474,7 @@ if-eqz v0, :cond_0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->ssl()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->ssl()Z move-result v0 diff --git a/smali/smali_classes5/com/vk/core/util/AppLangProvider.smali b/smali/smali_classes5/com/vk/core/util/AppLangProvider.smali index d78338162..5b64910d0 100644 --- a/smali/smali_classes5/com/vk/core/util/AppLangProvider.smali +++ b/smali/smali_classes5/com/vk/core/util/AppLangProvider.smali @@ -48,7 +48,7 @@ move-result-object v0 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getLocale()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getLocale()Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes5/com/vk/core/util/LangUtils.smali b/smali/smali_classes5/com/vk/core/util/LangUtils.smali index d00e9d778..411387e90 100644 --- a/smali/smali_classes5/com/vk/core/util/LangUtils.smali +++ b/smali/smali_classes5/com/vk/core/util/LangUtils.smali @@ -70,7 +70,7 @@ move-result-object v1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getLocale()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getLocale()Ljava/lang/String; move-result-object v1 diff --git a/smali/smali_classes5/com/vk/core/util/StringUtils.smali b/smali/smali_classes5/com/vk/core/util/StringUtils.smali index 5dfecd827..d95e59d5c 100644 --- a/smali/smali_classes5/com/vk/core/util/StringUtils.smali +++ b/smali/smali_classes5/com/vk/core/util/StringUtils.smali @@ -132,7 +132,7 @@ .method public static final a(I)Ljava/lang/String; .locals 4 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->shortinfo()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortinfo()Z move-result v1 @@ -258,7 +258,7 @@ .method public static final a(III)Ljava/lang/String; .locals 6 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->shortinfo()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->shortinfo()Z move-result v1 diff --git a/smali/smali_classes5/com/vk/dto/stickers/StickerItem$b.smali b/smali/smali_classes5/com/vk/dto/stickers/StickerItem$b.smali index 6dbe6f46d..d793a9f82 100644 --- a/smali/smali_classes5/com/vk/dto/stickers/StickerItem$b.smali +++ b/smali/smali_classes5/com/vk/dto/stickers/StickerItem$b.smali @@ -49,7 +49,7 @@ move-result v2 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getBackgroundStickers()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getBackgroundStickers()Ljava/lang/String; move-result-object v0 diff --git a/smali/smali_classes5/com/vk/dto/stories/model/GetStoriesResponse.smali b/smali/smali_classes5/com/vk/dto/stories/model/GetStoriesResponse.smali index 360c4a37f..81be290e5 100644 --- a/smali/smali_classes5/com/vk/dto/stories/model/GetStoriesResponse.smali +++ b/smali/smali_classes5/com/vk/dto/stories/model/GetStoriesResponse.smali @@ -205,7 +205,7 @@ invoke-static {v4, v5, v1, 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/utils/Prefs;->storyads()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Newsfeed;->storyads()Ljava/lang/String; move-result-object v4 diff --git a/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetByIdApiCmd.smali b/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetByIdApiCmd.smali index 30dfe9e8e..ea638e11e 100644 --- a/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetByIdApiCmd.smali +++ b/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetByIdApiCmd.smali @@ -208,7 +208,7 @@ goto :goto_0 :cond_1 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object v0 .end method diff --git a/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd.smali b/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd.smali index e0c52873a..6032ad94b 100644 --- a/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd.smali +++ b/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd.smali @@ -51,7 +51,7 @@ iput-object p2, p0, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd;->b:Lcom/vk/im/engine/models/dialogs/DialogsFilter; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getMsgCount()I + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getMsgCount()I move-result p3 @@ -331,7 +331,7 @@ check-cast p1, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd$b; - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object p1 diff --git a/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd.smali b/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd.smali index 26e616f27..79bd49193 100644 --- a/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd.smali +++ b/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd.smali @@ -350,7 +350,7 @@ .line 132 invoke-direct/range {v4 .. v9}, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd$d;->(Lcom/vk/im/engine/models/dialogs/DialogApiModel;Ljava/util/List;ZZLcom/vk/im/engine/models/ProfilesSimpleInfo;)V - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object v0 .end method @@ -552,7 +552,7 @@ .line 154 invoke-direct/range {v4 .. v9}, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd$d;->(Lcom/vk/im/engine/models/dialogs/DialogApiModel;Ljava/util/List;ZZLcom/vk/im/engine/models/ProfilesSimpleInfo;)V - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object v0 .end method @@ -720,7 +720,7 @@ .line 176 invoke-direct/range {v0 .. v5}, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetHistoryApiCmd$d;->(Lcom/vk/im/engine/models/dialogs/DialogApiModel;Ljava/util/List;ZZLcom/vk/im/engine/models/ProfilesSimpleInfo;)V - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->forceOffline()V + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->forceOffline()V return-object v6 .end method diff --git a/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali b/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali index 95550a07d..b6b80f9a5 100644 --- a/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali +++ b/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali @@ -62,7 +62,7 @@ invoke-direct {v0}, Lcom/vk/api/internal/MethodCall$a;->()V - # invoke-static {}, Lru/vtosters/lite/utils/Prefs;->readstatus()Ljava/lang/String; + # invoke-static {}, Lru/vtosters/lite/utils/Preferences;->readstatus()Ljava/lang/String; const-string v1, "messages.markAsRead" diff --git a/smali/smali_classes5/com/vk/im/engine/internal/api_parsers/UserApiParser.smali b/smali/smali_classes5/com/vk/im/engine/internal/api_parsers/UserApiParser.smali index 08acd39af..735446458 100644 --- a/smali/smali_classes5/com/vk/im/engine/internal/api_parsers/UserApiParser.smali +++ b/smali/smali_classes5/com/vk/im/engine/internal/api_parsers/UserApiParser.smali @@ -521,7 +521,7 @@ invoke-static {v3, v4}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V .line 26 - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->convUsersOnline()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->convUsersOnline()Z move-result v5 diff --git a/smali/smali_classes5/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc.smali b/smali/smali_classes5/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc.smali index d1b0998d4..f1a7d5319 100644 --- a/smali/smali_classes5/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc.smali +++ b/smali/smali_classes5/com/vk/im/ui/components/dialogs_header/impl/vk/VkDialogsHeaderVc.smali @@ -494,11 +494,11 @@ .method private final savedmsg()V .locals 8 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getContext()Landroid/content/Context; + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getContext()Landroid/content/Context; move-result-object v3 - invoke-static {}, Lru/vtosters/lite/utils/Helper;->getUserId()I + invoke-static {}, Lru/vtosters/lite/utils/Globals;->getUserId()I move-result v0 diff --git a/smali/smali_classes5/com/vk/im/ui/components/viewcontrollers/msg_list/MsgListVc.smali b/smali/smali_classes5/com/vk/im/ui/components/viewcontrollers/msg_list/MsgListVc.smali index e5a41d246..81454388b 100644 --- a/smali/smali_classes5/com/vk/im/ui/components/viewcontrollers/msg_list/MsgListVc.smali +++ b/smali/smali_classes5/com/vk/im/ui/components/viewcontrollers/msg_list/MsgListVc.smali @@ -346,7 +346,7 @@ move-result p1 - invoke-static {}, Lru/vtosters/lite/utils/Themes;->vkme_msg()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->vkme_msg()Z move-result p1 diff --git a/smali/smali_classes5/com/vk/profile/ui/BaseProfileFragment.smali b/smali/smali_classes5/com/vk/profile/ui/BaseProfileFragment.smali index a4a066d39..fb9599e56 100644 --- a/smali/smali_classes5/com/vk/profile/ui/BaseProfileFragment.smali +++ b/smali/smali_classes5/com/vk/profile/ui/BaseProfileFragment.smali @@ -2116,7 +2116,7 @@ if-ge p2, v0, :cond_c - invoke-static {}, Lru/vtosters/lite/utils/Prefs;->unlockstats()Z + invoke-static {}, Lru/vtosters/lite/utils/Preferences;->unlockstats()Z move-result p2 @@ -4248,7 +4248,7 @@ iget-object v3, p0, Lcom/vk/profile/ui/BaseProfileFragment;->ai:Lcom/vtosters/lite/api/ExtendedUserProfile; - invoke-static {v3}, Lru/vtosters/lite/utils/Helper;->getUserID(Lcom/vtosters/lite/api/ExtendedUserProfile;)I + invoke-static {v3}, Lru/vtosters/lite/utils/Globals;->getUserID(Lcom/vtosters/lite/api/ExtendedUserProfile;)I move-result v1 @@ -4359,7 +4359,7 @@ iget-object v3, p0, Lcom/vk/profile/ui/BaseProfileFragment;->ai:Lcom/vtosters/lite/api/ExtendedUserProfile; - invoke-static {v3}, Lru/vtosters/lite/utils/Helper;->getUserID(Lcom/vtosters/lite/api/ExtendedUserProfile;)I + invoke-static {v3}, Lru/vtosters/lite/utils/Globals;->getUserID(Lcom/vtosters/lite/api/ExtendedUserProfile;)I move-result v1 diff --git a/smali/smali_classes5/com/vtosters/lite/NotificationActivity.smali b/smali/smali_classes5/com/vtosters/lite/NotificationActivity.smali index a4491d075..e02df2ba8 100644 --- a/smali/smali_classes5/com/vtosters/lite/NotificationActivity.smali +++ b/smali/smali_classes5/com/vtosters/lite/NotificationActivity.smali @@ -63,7 +63,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes5/com/vtosters/lite/PostPhotoActivity.smali b/smali/smali_classes5/com/vtosters/lite/PostPhotoActivity.smali index 8b16a8be0..c8187c56f 100644 --- a/smali/smali_classes5/com/vtosters/lite/PostPhotoActivity.smali +++ b/smali/smali_classes5/com/vtosters/lite/PostPhotoActivity.smali @@ -227,7 +227,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes5/com/vtosters/lite/RepostActivity.smali b/smali/smali_classes5/com/vtosters/lite/RepostActivity.smali index e6de44281..a0b19addd 100644 --- a/smali/smali_classes5/com/vtosters/lite/RepostActivity.smali +++ b/smali/smali_classes5/com/vtosters/lite/RepostActivity.smali @@ -43,7 +43,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0 diff --git a/smali/smali_classes5/com/vtosters/lite/api/wall/WallGet.smali b/smali/smali_classes5/com/vtosters/lite/api/wall/WallGet.smali index a1986ff1f..571fa25d8 100644 --- a/smali/smali_classes5/com/vtosters/lite/api/wall/WallGet.smali +++ b/smali/smali_classes5/com/vtosters/lite/api/wall/WallGet.smali @@ -566,7 +566,7 @@ move-result-object v7 - invoke-static {v7}, Lru/vtosters/lite/utils/Prefs;->inject(Lorg/json/JSONObject;)Z + invoke-static {v7}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z move-result v10 diff --git a/smali/smali_classes5/ru/mail/libverify/notifications/f.smali b/smali/smali_classes5/ru/mail/libverify/notifications/f.smali index 146fa03f9..50103e408 100644 --- a/smali/smali_classes5/ru/mail/libverify/notifications/f.smali +++ b/smali/smali_classes5/ru/mail/libverify/notifications/f.smali @@ -91,7 +91,7 @@ .prologue .line 41 - invoke-static {p1}, Lru/vtosters/lite/utils/Helper;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; + invoke-static {p1}, Lru/vtosters/lite/utils/Globals;->BaseContextLocale(Landroid/content/Context;)Landroid/content/Context; move-result-object v0