From b756bfa62238a81895caba54971f3e7c239d88ec Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 26 Aug 2022 21:33:29 +0300 Subject: [PATCH] proxy fixes --- .../java/com/vk/core/util/DownloadUtils.java | 4 --- .../com/vk/sharing/view/TargetImageView.java | 3 -- .../vk/stories/view/StoryCircleImageView.java | 5 --- .../BottomNavigationItemView.java | 3 +- .../ru/vtosters/lite/dnr/DNRInjector.java | 4 --- .../java/ru/vtosters/lite/dnr/DNRModule.java | 2 +- .../lite/downloaders/AudioDownloader.java | 1 - .../lite/downloaders/StoryDownloader.java | 2 -- .../lite/downloaders/VideoDownloader.java | 2 -- .../java/ru/vtosters/lite/foaf/FoafBase.java | 7 ++--- .../vtosters/lite/hooks/DeviceInfoHook.java | 3 -- .../vtosters/lite/hooks/DockBarInjector.java | 1 - .../ru/vtosters/lite/hooks/JsonInjectors.java | 2 +- .../ru/vtosters/lite/hooks/MessagesHook.java | 7 ++--- .../ru/vtosters/lite/hooks/NewsfeedHook.java | 4 +-- .../lite/hooks/OnlineFormatterHook.java | 2 +- .../ru/vtosters/lite/hooks/PhotoViewer.java | 2 +- .../ru/vtosters/lite/hooks/ProxyHook.java | 4 +-- .../ru/vtosters/lite/music/MP3Downloader.java | 1 - .../ru/vtosters/lite/proxy/ProxyUtils.java | 31 +++++++++++++++---- .../ru/vtosters/lite/proxy/RandomProxy.java | 1 - .../ru/vtosters/lite/proxy/api/ApiProxy.java | 16 +++++++--- .../ui/components/SuperAppEditorManager.java | 1 - .../ui/dialogs/RoundingSeekbarDialog.java | 1 - .../lite/ui/dialogs/VKIDProtection.java | 4 +-- .../ui/fragments/DockBarEditorFragment.java | 2 -- .../lite/ui/fragments/FeedFragment.java | 3 -- .../lite/ui/fragments/MessagesFragment.java | 7 ++--- .../lite/ui/fragments/OtherFragment.java | 1 - .../ui/fragments/ProxySettingsFragment.java | 2 -- .../tgstickers/StickersFragment.java | 1 - .../ui/wallpapers/WallpaperMenuFragment.java | 1 - .../lite/ui/wallpapers/WallpapersHooks.java | 2 -- .../ru/vtosters/lite/utils/CacheUtils.java | 2 -- .../ru/vtosters/lite/utils/ImageUtils.java | 1 - .../ru/vtosters/lite/utils/Preferences.java | 4 +-- .../ru/vtosters/lite/utils/SSFSUtils.java | 4 +-- 37 files changed, 58 insertions(+), 85 deletions(-) diff --git a/app/src/main/java/com/vk/core/util/DownloadUtils.java b/app/src/main/java/com/vk/core/util/DownloadUtils.java index da49f43b2..c4a04af04 100644 --- a/app/src/main/java/com/vk/core/util/DownloadUtils.java +++ b/app/src/main/java/com/vk/core/util/DownloadUtils.java @@ -1,6 +1,5 @@ package com.vk.core.util; -import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; import static ru.vtosters.lite.utils.Preferences.getDownloadsDir; import static ru.vtosters.lite.utils.Preferences.getMusicDir; import static ru.vtosters.lite.utils.Preferences.getPhotosDir; @@ -13,10 +12,8 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.database.sqlite.SQLiteException; -import android.media.MediaScannerConnection; import android.net.Uri; import android.text.TextUtils; -import android.util.Log; import com.facebook.common.i.MediaUtils; import com.facebook.x.g.EncodedImage; @@ -24,7 +21,6 @@ import com.vk.core.concurrent.VkExecutors; import com.vk.imageloader.VKImageLoader; import com.vk.log.L; import com.vk.metrics.eventtracking.VkTracker; -import com.vtosters.lite.MainActivity; import com.vtosters.lite.R; import java.io.File; diff --git a/app/src/main/java/com/vk/sharing/view/TargetImageView.java b/app/src/main/java/com/vk/sharing/view/TargetImageView.java index 69b4cb999..9daf7139f 100644 --- a/app/src/main/java/com/vk/sharing/view/TargetImageView.java +++ b/app/src/main/java/com/vk/sharing/view/TargetImageView.java @@ -11,7 +11,6 @@ import android.graphics.BitmapShader; import android.graphics.Canvas; import android.graphics.LinearGradient; import android.graphics.Paint; -import android.graphics.Path; import android.graphics.PorterDuff; import android.graphics.RectF; import android.graphics.Shader; @@ -36,8 +35,6 @@ import com.vtosters.lite.a0; import java.util.Arrays; -import ru.vtosters.lite.utils.AndroidUtils; - @UiThread public class TargetImageView extends VKMultiImageView { private static final int I = Screen.a(2); diff --git a/app/src/main/java/com/vk/stories/view/StoryCircleImageView.java b/app/src/main/java/com/vk/stories/view/StoryCircleImageView.java index 8cd135949..ede58dcb6 100644 --- a/app/src/main/java/com/vk/stories/view/StoryCircleImageView.java +++ b/app/src/main/java/com/vk/stories/view/StoryCircleImageView.java @@ -1,7 +1,5 @@ package com.vk.stories.view; -import static ru.vtosters.lite.utils.ThemesUtils.getColor2; - import android.animation.ValueAnimator; import android.annotation.SuppressLint; import android.content.Context; @@ -29,7 +27,6 @@ import com.facebook.imagepipeline.request.ImageRequest; import com.facebook.imagepipeline.request.ImageRequestBuilder; import com.facebook.u.b.a.PipelineDraweeControllerBuilder; import com.facebook.x.g.CloseableImage; -import com.vk.core.drawable.BorderDrawable; import com.vk.core.ui.themes.Themable; import com.vk.core.ui.themes.VKThemeHelper; import com.vk.core.util.DrawableUtils; @@ -50,8 +47,6 @@ import java.util.HashSet; import java.util.List; import java.util.Objects; -import ru.vtosters.lite.utils.AndroidUtils; - public class StoryCircleImageView extends BorderedCircleImageView implements Themable{ private static final HashSet B0 = new HashSet<>(); private final PipelineDraweeControllerBuilder f0; diff --git a/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java b/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java index d661873f5..4cbde195e 100644 --- a/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java +++ b/app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java @@ -1,6 +1,6 @@ package com.vtosters.lite.ui.bottomnavigation; -import static ru.vtosters.lite.utils.Preferences.*; +import static ru.vtosters.lite.utils.Preferences.vkme; import static ru.vtosters.lite.utils.ThemesUtils.getCSTDock; import android.annotation.SuppressLint; @@ -31,7 +31,6 @@ import com.vk.core.ui.themes.VKThemeHelper; import com.vtosters.lite.R; import me.grishka.appkit.utils.V; -import ru.vtosters.lite.utils.Preferences; public class BottomNavigationItemView extends FrameLayout implements MenuView.ItemView { private final TextView mSmallLabel; 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 db551a1e8..d4f6a02c7 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java +++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java @@ -5,8 +5,6 @@ import static com.vk.im.engine.h.im_ic_edit_msg; import static com.vk.im.engine.h.im_ic_more_vertical; import static com.vk.im.engine.h.im_ic_pinned_msg_hide; import static com.vk.im.engine.h.im_ic_pinned_msg_show; -import static com.vk.im.engine.h.im_ic_write_msg; -import static com.vk.im.ui.c.im_ic_chat_settings; import static com.vk.im.ui.c.im_ic_keyboard; import static ru.vtosters.lite.dnr.DNRModule.hookDNR; import static ru.vtosters.lite.dnr.DNRModule.hookDNT; @@ -29,7 +27,6 @@ import com.vk.core.network.Network; import com.vk.im.engine.ImEngine1; import com.vk.im.engine.events.OnDialogUpdateEvent; import com.vk.im.engine.models.EntityIntMap; -import com.vk.im.engine.models.ProfilesSimpleInfo; import com.vk.im.engine.models.dialogs.Dialog; import com.vk.im.engine.models.messages.Msg; import com.vk.im.engine.models.messages.MsgFromUser; @@ -52,7 +49,6 @@ import ru.vtosters.lite.encryption.EncryptProvider; import ru.vtosters.lite.encryption.base.IMProcessor; import ru.vtosters.lite.hooks.CryptImHook; import ru.vtosters.lite.ui.dialogs.Translate; -import ru.vtosters.lite.utils.AndroidUtils; public class DNRInjector { public static void inject(Dialog dialog, List list) { 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 3b3564fb1..98ca1f94e 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java +++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java @@ -1,8 +1,8 @@ package ru.vtosters.lite.dnr; import static ru.vtosters.lite.net.Request.makeRequest; -import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken; import static ru.vtosters.lite.proxy.ProxyUtils.getApi; +import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken; import android.util.Log; diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java index f7f405936..d548482e2 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java @@ -2,7 +2,6 @@ package ru.vtosters.lite.downloaders; import static ru.vtosters.lite.utils.Preferences.getMusicDir; -import android.os.Environment; import android.util.Log; import androidx.core.app.NotificationCompat; diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java index 287374997..54d81bae1 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java @@ -7,12 +7,10 @@ import static ru.vtosters.lite.utils.Preferences.getPhotosDir; import android.app.DownloadManager; import android.content.Context; import android.net.Uri; -import android.os.Environment; import com.vk.dto.common.ImageSize; import com.vk.dto.stories.model.StoryEntry; -import java.io.File; import java.util.List; public class StoryDownloader { diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java index d5a001773..429e903cb 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java @@ -8,12 +8,10 @@ import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; import static ru.vtosters.lite.utils.AndroidUtils.getString; import static ru.vtosters.lite.utils.Preferences.getVideosDir; -import android.app.AlertDialog; import android.app.DownloadManager; import android.app.ProgressDialog; import android.content.Context; import android.net.Uri; -import android.os.Environment; import android.widget.Toast; import com.vk.core.dialogs.alert.VkAlertDialog; 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 3c0d767f4..94ee315ce 100644 --- a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java +++ b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java @@ -2,11 +2,11 @@ package ru.vtosters.lite.foaf; import static android.widget.Toast.LENGTH_SHORT; import static android.widget.Toast.makeText; +import static ru.vtosters.lite.proxy.ProxyUtils.getApi; +import static ru.vtosters.lite.proxy.ProxyUtils.isAnyProxyEnabled; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; import static ru.vtosters.lite.utils.AndroidUtils.getString; -import static ru.vtosters.lite.proxy.ProxyUtils.isApiProxyEnabled; -import static ru.vtosters.lite.proxy.ProxyUtils.getApi; import android.annotation.SuppressLint; import android.app.ProgressDialog; @@ -35,7 +35,6 @@ import java.util.regex.Pattern; import okhttp3.Headers; import okhttp3.OkHttpClient; import ru.vtosters.lite.net.Request; -import ru.vtosters.lite.utils.AccountManagerUtils; public class FoafBase { private static final Pattern FOAF_REGEX = Pattern.compile(""); @@ -115,7 +114,7 @@ public class FoafBase { private static String getLink(int i) { String str; StringBuilder sb; - if (isApiProxyEnabled()) { + if (isAnyProxyEnabled()) { sb = new StringBuilder(); str = "https://" + getApi() + "/_/vk.ru/foaf.php?id="; } else { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/DeviceInfoHook.java b/app/src/main/java/ru/vtosters/lite/hooks/DeviceInfoHook.java index 0e781bc94..f259a4c4e 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/DeviceInfoHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/DeviceInfoHook.java @@ -4,13 +4,10 @@ import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; import static ru.vtosters.lite.utils.Preferences.getBoolValue; import android.annotation.SuppressLint; -import android.content.Context; import android.os.Build; import android.provider.Settings; import android.util.Log; -import java.util.Random; - public class DeviceInfoHook{ public static String getDeviceInfo(String input) { Log.d("DeviceInfoHook", "getDeviceInfo: " + input); diff --git a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java b/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java index f00a6e004..658494520 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java @@ -35,7 +35,6 @@ import com.vk.core.fragments.FragmentImpl; import com.vk.core.util.StringUtils; import com.vk.navigation.right.RightMenu; import com.vtosters.lite.MenuCountersState; -import com.vtosters.lite.fragments.ProfileFragment; import com.vtosters.lite.ui.bottomnavigation.BottomNavigationMenuView; import com.vtosters.lite.ui.bottomnavigation.BottomNavigationView; diff --git a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java index 2b8b607d4..6874be0e7 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java @@ -1,8 +1,8 @@ package ru.vtosters.lite.hooks; import static ru.vtosters.lite.foaf.FoafBase.getBypassedOnlineInfo; -import static ru.vtosters.lite.hooks.OnlineFormatterHook.onlineHookProfiles; import static ru.vtosters.lite.hooks.DateHook.getLocale; +import static ru.vtosters.lite.hooks.OnlineFormatterHook.onlineHookProfiles; import static ru.vtosters.lite.proxy.ProxyUtils.getApi; import static ru.vtosters.lite.proxy.ProxyUtils.getStatic; import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs; diff --git a/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java b/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java index 59eb29a4a..2fb860edb 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/MessagesHook.java @@ -12,11 +12,10 @@ import android.view.View; import com.vk.api.internal.MethodCall; -import ru.vtosters.lite.translators.BaseTranslator; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.util.ArrayList; +import java.util.regex.Pattern; + +import ru.vtosters.lite.translators.BaseTranslator; public class MessagesHook { public static String injectOwnText(String oldText) { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java b/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java index 018054dbb..a529c43a2 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.hooks; import static java.lang.Long.MAX_VALUE; -import static ru.vtosters.lite.utils.AndroidUtils.*; +import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs; import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue; import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.checkCaption; import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.checkCopyright; @@ -20,7 +20,6 @@ import static ru.vtosters.lite.utils.Preferences.adsslider; import static ru.vtosters.lite.utils.Preferences.authorsrecomm; import static ru.vtosters.lite.utils.Preferences.friendsrecomm; import static ru.vtosters.lite.utils.Preferences.getBoolValue; -import static ru.vtosters.lite.utils.Preferences.milkshake; import static ru.vtosters.lite.utils.Preferences.vkme; import com.vk.core.preference.Preference; @@ -36,7 +35,6 @@ import java.util.LinkedHashSet; import java.util.List; import ru.vtosters.lite.utils.AccountManagerUtils; -import ru.vtosters.lite.utils.AndroidUtils; public class NewsfeedHook { public static boolean injectFilters(JSONObject obj) throws JSONException { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java b/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java index 549bceb5c..55c42093f 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/OnlineFormatterHook.java @@ -3,13 +3,13 @@ package ru.vtosters.lite.hooks; import static ru.vtosters.lite.hooks.JsonInjectors.setOnlineInfo; import static ru.vtosters.lite.hooks.JsonInjectors.setOnlineInfoUsers; import static ru.vtosters.lite.net.Request.makeRequest; +import static ru.vtosters.lite.proxy.ProxyUtils.getApi; import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken; import static ru.vtosters.lite.utils.AndroidUtils.getString; import static ru.vtosters.lite.utils.AndroidUtils.sendToast; import static ru.vtosters.lite.utils.Preferences.dev; import static ru.vtosters.lite.utils.Preferences.getBoolValue; import static ru.vtosters.lite.utils.Preferences.getPrefsFromFile; -import static ru.vtosters.lite.proxy.ProxyUtils.getApi; import android.util.Log; diff --git a/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java b/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java index 773c3392d..97840b7dc 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java @@ -1,8 +1,8 @@ package ru.vtosters.lite.hooks; -import static ru.vtosters.lite.utils.AndroidUtils.getString; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; import static ru.vtosters.lite.utils.AndroidUtils.getPreferences; +import static ru.vtosters.lite.utils.AndroidUtils.getString; import android.annotation.SuppressLint; import android.content.ClipData; diff --git a/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java b/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java index 37fa023c1..712d680af 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java @@ -1,11 +1,11 @@ package ru.vtosters.lite.hooks; +import static ru.vtosters.lite.proxy.ProxyUtils.isRandomProxyEnabled; import static ru.vtosters.lite.proxy.ProxyUtils.isVikaProxyEnabled; +import static ru.vtosters.lite.proxy.ProxyUtils.isZaboronaEnabled; import static ru.vtosters.lite.utils.AndroidUtils.dp2px; import static ru.vtosters.lite.utils.AndroidUtils.edit; import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication; -import static ru.vtosters.lite.proxy.ProxyUtils.isRandomProxyEnabled; -import static ru.vtosters.lite.proxy.ProxyUtils.isZaboronaEnabled; import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor; import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle; import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr; diff --git a/app/src/main/java/ru/vtosters/lite/music/MP3Downloader.java b/app/src/main/java/ru/vtosters/lite/music/MP3Downloader.java index 9eb84fbc7..079d3b1c3 100644 --- a/app/src/main/java/ru/vtosters/lite/music/MP3Downloader.java +++ b/app/src/main/java/ru/vtosters/lite/music/MP3Downloader.java @@ -6,7 +6,6 @@ import static ru.vtosters.lite.utils.Preferences.getMusicDir; import android.app.DownloadManager; import android.net.Uri; import android.os.Build; -import android.os.Environment; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java b/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java index b7bbfe80e..08c2bb551 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/ProxyUtils.java @@ -1,6 +1,9 @@ package ru.vtosters.lite.proxy; import static java.lang.System.clearProperty; +import static ru.vtosters.lite.proxy.api.VikaMobile.getApiHost; +import static ru.vtosters.lite.proxy.api.VikaMobile.getOauthHost; +import static ru.vtosters.lite.proxy.api.VikaMobile.getStaticHost; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue; @@ -23,7 +26,11 @@ public class ProxyUtils{ public static String getApi(){ var proxyapi = getPrefsValue("proxyapi"); - if (isApiProxyEnabled() & !proxyapi.isEmpty()) { + if (isVikaProxyEnabled()) { + proxyapi = getApiHost(); + } + + if (isAnyProxyEnabled() & !proxyapi.isEmpty()) { return proxyapi; } @@ -33,7 +40,11 @@ public class ProxyUtils{ public static String getOauth(){ var oauth = getPrefsValue("proxyoauth"); - if (isApiProxyEnabled() & !oauth.isEmpty()) { + if (isVikaProxyEnabled()) { + oauth = getOauthHost(); + } + + if (isAnyProxyEnabled() & !oauth.isEmpty()) { return oauth; } @@ -41,15 +52,23 @@ public class ProxyUtils{ } public static String getStatic(){ - var oauth = getPrefsValue("proxystatic"); + var staticapi = getPrefsValue("proxystatic"); - if (isApiProxyEnabled() & !oauth.isEmpty()) { - return oauth; + if (isVikaProxyEnabled()) { + staticapi = getStaticHost(); + } + + if (isAnyProxyEnabled() & !staticapi.isEmpty()) { + return staticapi; } return "static.vk.ru"; } + public static Boolean isAnyProxyEnabled(){ + return isApiProxyEnabled() || isVikaProxyEnabled(); + } + public static Boolean isZaboronaEnabled(){ return getPrefsValue("proxy").equals("zaborona"); } @@ -59,7 +78,7 @@ public class ProxyUtils{ } public static Boolean isApiProxyEnabled(){ - return getPrefsValue("proxy").equals("apiproxy") || getPrefsValue("proxy").equals("vika"); + return getPrefsValue("proxy").equals("apiproxy"); } public static Boolean isVikaProxyEnabled(){ diff --git a/app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java b/app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java index ac5d25d1f..d01847cc6 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/RandomProxy.java @@ -2,7 +2,6 @@ package ru.vtosters.lite.proxy; import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying; import static ru.vtosters.lite.proxy.ProxyUtils.resetProxy; import static ru.vtosters.lite.utils.AndroidUtils.edit; -import static ru.vtosters.lite.utils.AndroidUtils.sendToast; import static ru.vtosters.lite.utils.Preferences.preferences; import java.io.IOException; diff --git a/app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java b/app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java index a4227ef86..a312b5ba8 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java @@ -1,5 +1,5 @@ package ru.vtosters.lite.proxy.api; -import static ru.vtosters.lite.proxy.ProxyUtils.isApiProxyEnabled; +import static ru.vtosters.lite.proxy.ProxyUtils.isAnyProxyEnabled; import static ru.vtosters.lite.proxy.ProxyUtils.isVikaProxyEnabled; import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue; @@ -24,7 +24,7 @@ public class ApiProxy{ proxystatic = VikaMobile.getStaticHost(); } - if ((!isApiProxyEnabled() || !isVikaProxyEnabled()) || link.isEmpty()) { + if (!isAnyProxyEnabled() || link.isEmpty()) { return link; } @@ -67,15 +67,21 @@ public class ApiProxy{ string = VikaMobile.getStaticHost(); } - if ((isApiProxyEnabled() || isVikaProxyEnabled()) && string.isEmpty()) return str; + if (isAnyProxyEnabled() && !string.isEmpty()) { + return str.replaceAll(string, "static.vk.ru"); + } - return str.replaceAll(string, "static.vk.ru"); + return str; } public static String getAwayPhpCom(){ var proxyapi = getPrefsValue("proxyapi"); - if ((isApiProxyEnabled() || isVikaProxyEnabled()) & !proxyapi.isEmpty()) { + if (isVikaProxyEnabled()) { + proxyapi = VikaMobile.getApiHost(); + } + + if (isAnyProxyEnabled() && !proxyapi.isEmpty()) { return proxyapi; } diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java index 1801238b0..72ee058e1 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java @@ -9,7 +9,6 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import ru.vtosters.lite.ui.items.DockBarTab; import ru.vtosters.lite.ui.items.SuperAppItem; import ru.vtosters.lite.utils.AndroidUtils; diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/RoundingSeekbarDialog.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/RoundingSeekbarDialog.java index a57ae65da..9522b5cc6 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/RoundingSeekbarDialog.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/RoundingSeekbarDialog.java @@ -8,7 +8,6 @@ import android.content.Context; import android.widget.LinearLayout; import android.widget.SeekBar; - import com.vk.core.dialogs.alert.VkAlertDialog; import ru.vtosters.lite.utils.AndroidUtils; diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java index 4712c52ff..7ce6e6add 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/VKIDProtection.java @@ -1,7 +1,7 @@ package ru.vtosters.lite.ui.dialogs; import static ru.vtosters.lite.proxy.ProxyUtils.getApi; -import static ru.vtosters.lite.proxy.ProxyUtils.isApiProxyEnabled; +import static ru.vtosters.lite.proxy.ProxyUtils.isAnyProxyEnabled; import static ru.vtosters.lite.utils.AndroidUtils.edit; import static ru.vtosters.lite.utils.AndroidUtils.getString; import static ru.vtosters.lite.utils.Preferences.getBoolValue; @@ -25,7 +25,7 @@ public class VKIDProtection { // android.content.DialogInterface.OnClickListener builder.setNeutralButton(getString("vkiddisable"), (dialogInterface, i) -> { edit().putBoolean("showAlertVkId", false).apply(); - VKUIwrapper.setLink((isApiProxyEnabled() ? "https://id.vk.ru/account" : "https://" + getApi() + "/_/id.vk.ru/account")); + VKUIwrapper.setLink((isAnyProxyEnabled() ? "https://id.vk.ru/account" : "https://" + getApi() + "/_/id.vk.ru/account")); Intent a2 = new Navigator(VKUIwrapper.class).b(activity); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); activity.startActivity(a2); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java index e976596b1..cda4ee458 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java @@ -22,8 +22,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.vtosters.lite.R; -import java.util.Objects; - import ru.vtosters.lite.ui.adapters.CategorizedAdapter; import ru.vtosters.lite.ui.components.DockBarEditorManager; import ru.vtosters.lite.ui.components.ItemMovingCallback; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java index 117c12629..24889bf6f 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java @@ -2,13 +2,10 @@ package ru.vtosters.lite.ui.fragments; import static ru.vtosters.lite.utils.AndroidUtils.edit; import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs; -import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue; -import static ru.vtosters.lite.utils.AndroidUtils.getString; import static ru.vtosters.lite.utils.AndroidUtils.sendToast; import static ru.vtosters.lite.utils.Preferences.copyright_post; -import static ru.vtosters.lite.utils.Preferences.getBoolValue; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java index eb66769f5..5a997fb0d 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java @@ -1,12 +1,12 @@ package ru.vtosters.lite.ui.fragments; -import static ru.vtosters.lite.utils.AndroidUtils.*; +import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; import static ru.vtosters.lite.utils.AndroidUtils.getPreferences; import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer; import static ru.vtosters.lite.utils.Preferences.autoalltranslate; import static ru.vtosters.lite.utils.Preferences.vkme; -import static ru.vtosters.lite.utils.ThemesUtils.*; +import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable; import android.annotation.SuppressLint; import android.content.Context; @@ -22,12 +22,9 @@ import com.vk.navigation.Navigator; import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment; import java.util.Arrays; -import java.util.Objects; import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter; import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment; -import ru.vtosters.lite.utils.AndroidUtils; -import ru.vtosters.lite.utils.ThemesUtils; public class MessagesFragment extends MaterialPreferenceToolbarFragment { @Override 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 3bb30b6bd..edd9fc6a1 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 @@ -12,7 +12,6 @@ import static ru.vtosters.lite.utils.AndroidUtils.dp2px; import static ru.vtosters.lite.utils.AndroidUtils.edit; import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; -import static ru.vtosters.lite.utils.CacheUtils.deleteCache; import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication; import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java index be2a48007..7dfba5db5 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ProxySettingsFragment.java @@ -1,7 +1,6 @@ package ru.vtosters.lite.ui.fragments; import static ru.vtosters.lite.proxy.RandomProxy.setupNewProxy; -import static ru.vtosters.lite.utils.AndroidUtils.edit; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; import static ru.vtosters.lite.utils.AndroidUtils.sendToast; @@ -11,7 +10,6 @@ import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment; import java.io.IOException; -import ru.vtosters.lite.proxy.RandomProxy; import ru.vtosters.lite.utils.AndroidUtils; public class ProxySettingsFragment extends MaterialPreferenceToolbarFragment { 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 fecab7839..3ad52847c 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 @@ -40,7 +40,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.vk.navigation.Navigator; import java.io.File; -import java.util.Objects; import ru.vtosters.lite.tgs.TGPref; import ru.vtosters.lite.ui.adapters.StickerPackAdapter; diff --git a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java index 4a9e61689..d177fcf23 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java @@ -8,7 +8,6 @@ import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.removeWallpaper; import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.requestUpdateWallpaper; import static ru.vtosters.lite.utils.AndroidUtils.edit; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; -import static ru.vtosters.lite.utils.CacheUtils.deleteCache; import static ru.vtosters.lite.utils.Preferences.getBoolValue; import static ru.vtosters.lite.utils.Preferences.hasVerification; diff --git a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java index 076136057..6dd452b06 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java +++ b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java @@ -22,8 +22,6 @@ import android.widget.ImageView; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.ThemesUtils; diff --git a/app/src/main/java/ru/vtosters/lite/utils/CacheUtils.java b/app/src/main/java/ru/vtosters/lite/utils/CacheUtils.java index e8d761f83..95fac9ccd 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/CacheUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/CacheUtils.java @@ -13,9 +13,7 @@ import com.vk.im.ui.providers.audiomsg.ImAudioMsgPlayerProvider; import com.vk.im.ui.providers.audiomsg.PlayerActionSources; import com.vk.imageloader.VKImageLoader; import com.vk.media.player.cache.AutoPlayCacheHolder; -import com.vk.mediastore.MediaStorage; import com.vk.stickers.Stickers; -import com.vtosters.lite.im.ImEngineProvider; import java.text.CharacterIterator; import java.text.StringCharacterIterator; diff --git a/app/src/main/java/ru/vtosters/lite/utils/ImageUtils.java b/app/src/main/java/ru/vtosters/lite/utils/ImageUtils.java index 32cdb5694..8c17e11a5 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ImageUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ImageUtils.java @@ -10,7 +10,6 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; -import android.graphics.Paint; import android.graphics.Path; import android.graphics.PorterDuff; import android.graphics.RectF; diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index 1689dd3bd..5233ee5a6 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -1,15 +1,15 @@ package ru.vtosters.lite.utils; import static java.lang.Long.MAX_VALUE; +import static ru.vtosters.lite.proxy.ProxyUtils.setProxy; import static ru.vtosters.lite.utils.AndroidUtils.edit; import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext; import static ru.vtosters.lite.utils.AndroidUtils.getPreferences; import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue; -import static ru.vtosters.lite.utils.CacheUtils.*; import static ru.vtosters.lite.utils.CacheUtils.getInstance; +import static ru.vtosters.lite.utils.CacheUtils.needToDelete; import static ru.vtosters.lite.utils.DeletedMessagesHandler.reloadMessagesList; import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.setupFilters; -import static ru.vtosters.lite.proxy.ProxyUtils.setProxy; import static ru.vtosters.lite.utils.SignatureChecker.validateAppSignature; import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme; import static ru.vtosters.lite.utils.VTVerifications.isPrometheus; diff --git a/app/src/main/java/ru/vtosters/lite/utils/SSFSUtils.java b/app/src/main/java/ru/vtosters/lite/utils/SSFSUtils.java index d854fb575..8419217d3 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/SSFSUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/SSFSUtils.java @@ -1,11 +1,11 @@ package ru.vtosters.lite.utils; import static ru.vtosters.lite.hooks.DateHook.getLocale; +import static ru.vtosters.lite.proxy.ProxyUtils.isAnyProxyEnabled; import static ru.vtosters.lite.utils.About.getBuildNumber; import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue; import static ru.vtosters.lite.utils.Preferences.dev; import static ru.vtosters.lite.utils.Preferences.vksans; -import static ru.vtosters.lite.proxy.ProxyUtils.isApiProxyEnabled; import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme; public class SSFSUtils { @@ -39,7 +39,7 @@ public class SSFSUtils { } public static String getUserProxy() { - return isApiProxyEnabled() ? "1" : "0"; + return isAnyProxyEnabled() ? "1" : "0"; } public static String isVKSansEnabled() {