From 0ccc8b26075163ea372944bb818d842f3df60e06 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 11 Apr 2022 21:07:08 +0300 Subject: [PATCH] fixes + disabled debuggable mode --- .../ru/vtosters/lite/dnr/DNRInjector.java | 2 -- .../java/ru/vtosters/lite/dnr/DNRModule.java | 2 -- .../lite/downloaders/VideoDownloader.java | 2 -- .../ru/vtosters/lite/f0x1d/Crashreporter.java | 2 +- .../vtosters/lite/f0x1d/VTVerifications.java | 6 ++-- .../java/ru/vtosters/lite/foaf/FoafBase.java | 4 +-- .../java/ru/vtosters/lite/tgs/TGRoot.java | 1 - .../vtosters/lite/ui/dialogs/InstallGMS.java | 2 +- .../lite/ui/fragments/ActivityFragment.java | 3 +- .../ui/fragments/dockbar/DockBarAdapter.java | 6 ---- .../ui/fragments/dockbar/DockBarInjector.java | 5 --- .../ui/fragments/dockbar/DockBarManager.java | 32 ++++++++----------- .../multiaccount/MultiAccountAdapter.java | 14 +------- .../multiaccount/MultiAccountFragment.java | 3 +- .../tgstickers/StickersFragment.java | 2 +- .../StickersPreferencesFragment.java | 2 +- .../lite/ui/vkui/ModalBottomSheetProxy.java | 5 --- .../java/ru/vtosters/lite/utils/Helper.java | 1 - .../java/ru/vtosters/lite/utils/Themes.java | 3 -- .../ru/vtosters/lite/utils/VKUIInjector.java | 4 +-- smali/AndroidManifest.xml | 2 +- 21 files changed, 29 insertions(+), 74 deletions(-) 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 afdc50b53..7777dd281 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java +++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java @@ -1,7 +1,5 @@ package ru.vtosters.lite.dnr; -import android.util.Log; - 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 b7bca9b1a..e5ca882c9 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,5 @@ package ru.vtosters.lite.dnr; -import android.util.Log; - import com.vk.core.util.ToastUtils; import com.vk.im.engine.commands.messages.SetUserActivityCmd; import com.vk.im.engine.models.dialogs.Dialog; diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java index 61a980f00..b41bc137b 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java @@ -13,8 +13,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import ru.vtosters.lite.R; - public class VideoDownloader { public static void downloadVideo(VideoFile videoFile, Context context) { final List list = new ArrayList<>(); 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 2bcc5b265..81b74ea08 100644 --- a/app/src/main/java/ru/vtosters/lite/f0x1d/Crashreporter.java +++ b/app/src/main/java/ru/vtosters/lite/f0x1d/Crashreporter.java @@ -16,8 +16,8 @@ import com.vtosters.lite.R; import java.io.PrintWriter; import java.io.StringWriter; -import ru.vtosters.lite.utils.Helper; import ru.vtosters.lite.badmanners.DeviceInfoCollector; +import ru.vtosters.lite.utils.Helper; import ru.vtosters.lite.utils.Prefs; public class Crashreporter { 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 8449a4d55..233ff1c01 100644 --- a/app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java +++ b/app/src/main/java/ru/vtosters/lite/f0x1d/VTVerifications.java @@ -9,14 +9,14 @@ import android.widget.Toast; import com.vk.dto.common.VerifyInfo; import com.vk.navigation.NavigatorKeys; +import org.json.JSONArray; +import org.json.JSONObject; + import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import org.json.JSONArray; -import org.json.JSONObject; - import okhttp3.Call; import okhttp3.Callback; import okhttp3.MediaType; 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 27dc2c7cc..082bb6370 100644 --- a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java +++ b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java @@ -11,6 +11,7 @@ import android.widget.Toast; import androidx.exifinterface.media.ExifInterface; import com.vk.core.dialogs.alert.VkAlertDialog; +import com.vtosters.lite.R; import java.io.IOException; import java.text.ParseException; @@ -24,9 +25,6 @@ import java.util.regex.Pattern; import okhttp3.OkHttpClient; import okhttp3.Request; import ru.f0x1d.net.F0x1dRequest; - -import com.vtosters.lite.R; - import ru.vtosters.lite.utils.Helper; import ru.vtosters.lite.utils.Prefs; 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 ae11388e2..987c7ab1b 100644 --- a/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java +++ b/app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java @@ -2,7 +2,6 @@ package ru.vtosters.lite.tgs; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.util.Log; import com.aefyr.tsg.g2.TelegramStickersPack; import com.aefyr.tsg.g2.TelegramStickersService; 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 6f9d40944..d1a4e20bc 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 @@ -8,9 +8,9 @@ import android.content.Intent; import com.vk.navigation.Navigator; +import ru.vtosters.lite.ui.fragments.InstallGMSFragment; import ru.vtosters.lite.utils.Helper; import ru.vtosters.lite.utils.Prefs; -import ru.vtosters.lite.ui.fragments.InstallGMSFragment; public class InstallGMS { public static void alert(final Activity activity) { diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java index 353b2c98f..dd394534f 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ActivityFragment.java @@ -2,9 +2,8 @@ package ru.vtosters.lite.ui.fragments; import android.os.Bundle; -import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; - import com.vtosters.lite.R; +import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; public class ActivityFragment extends MaterialPreferenceToolbarFragment { @Override 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 903161b35..dd386ef60 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,11 +1,8 @@ package ru.vtosters.lite.ui.fragments.dockbar; import android.content.res.ColorStateList; -import android.graphics.Color; import android.graphics.Typeface; import android.support.v7.widget.RecyclerView; -import android.util.Log; -import android.util.TypedValue; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; @@ -13,10 +10,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.vtosters.lite.R; - import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; import ru.vtosters.lite.utils.Helper; import ru.vtosters.lite.utils.Themes; 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 f167a26a4..dc4c73a4e 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,11 +1,7 @@ package ru.vtosters.lite.ui.fragments.dockbar; -import static ru.vtosters.lite.utils.Themes.color_grishka; -import static ru.vtosters.lite.utils.Themes.isAndroidMonet; - import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; -import android.os.Build; import android.view.Menu; import android.view.MenuItem; @@ -29,7 +25,6 @@ import java.util.List; import java.util.Map; import ru.vtosters.lite.utils.Helper; -import ru.vtosters.lite.utils.Themes; public class DockBarInjector { private static final DockBarManager sManager = DockBarManager.getInstance(); 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 d980bb684..9fbe74c56 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,7 +1,5 @@ package ru.vtosters.lite.ui.fragments.dockbar; -import androidx.recyclerview.widget.RecyclerView; - import com.vk.apps.AppsFragment; import com.vk.discover.DiscoverFeedFragment; import com.vk.discover.DiscoverFragment; @@ -10,6 +8,20 @@ import com.vk.menu.MenuFragment; import com.vk.music.fragment.MusicFragment; import com.vk.newsfeed.Feed2049; import com.vk.newsfeed.NewsfeedFragment; +import com.vk.notifications.NotificationsContainerFragment; +import com.vtosters.lite.R; +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.LivesPostListFragment; +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.JSONArray; import org.json.JSONException; @@ -27,22 +39,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import com.vk.notifications.NotificationsContainerFragment; -import com.vk.notifications.NotificationsFragment; -import com.vtosters.lite.R; -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.LivesPostListFragment; -import com.vtosters.lite.fragments.m.VideosFragment; -import com.vtosters.lite.fragments.messages.dialogs.DialogsFragment; -import com.vtosters.lite.fragments.money.MoneyTransfersFragment; - import ru.vtosters.lite.utils.Helper; import ru.vtosters.lite.utils.Prefs; 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 15ec1351e..673bc1602 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,19 +1,12 @@ package ru.vtosters.lite.ui.fragments.multiaccount; -import static android.content.Context.MODE_PRIVATE; -import static ru.vtosters.lite.utils.Helper.GetContext; - -import android.content.SharedPreferences; -import android.content.res.ColorStateList; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ImageButton; -import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; @@ -25,20 +18,15 @@ import com.vk.core.util.ToastUtils; import com.vk.imageloader.VKImageLoader; import com.vk.imageloader.view.VKCircleImageView; import com.vk.pushes.PushSubscriber; +import com.vtosters.lite.R; import com.vtosters.lite.auth.VKAccountManager; import com.vtosters.lite.im.ImEngineProvider; -import com.vtosters.lite.ui.refreshlayout.CircleImageView; -import org.w3c.dom.Text; - -import java.util.ArrayList; import java.util.List; import ru.vtosters.lite.utils.Helper; import ru.vtosters.lite.utils.Themes; -import com.vtosters.lite.R; - public class MultiAccountAdapter extends RecyclerView.a { private final List mAccounts = MultiAccountManager.buildList(); 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 db687a5dc..5b09c55a5 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 @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import me.grishka.appkit.fragments.ToolbarFragment; +import ru.vtosters.lite.utils.Helper; public class MultiAccountFragment extends ToolbarFragment { @@ -35,6 +36,6 @@ public class MultiAccountFragment extends ToolbarFragment { super.a(arg0, arg1); - a("Аккаунты"); + a(Helper.getString("accounts")); } } 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 abb4f644e..8f7eb401b 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 @@ -42,8 +42,8 @@ import java.io.File; import me.grishka.appkit.fragments.ToolbarFragment; import ru.vtosters.lite.tgs.TGPref; -import ru.vtosters.lite.utils.Helper; import ru.vtosters.lite.ui.PreferencesUtil; +import ru.vtosters.lite.utils.Helper; import ru.vtosters.lite.utils.Prefs; import ru.vtosters.lite.utils.Themes; 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 4efdf060e..beca84259 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 @@ -8,8 +8,8 @@ import com.vtosters.lite.fragments.MaterialPreferenceToolbarFragment; import ru.vtosters.lite.tgs.TGPref; import ru.vtosters.lite.tgs.TGRoot; -import ru.vtosters.lite.utils.Helper; import ru.vtosters.lite.ui.PreferencesUtil; +import ru.vtosters.lite.utils.Helper; public class StickersPreferencesFragment extends MaterialPreferenceToolbarFragment { diff --git a/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetProxy.java b/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetProxy.java index 80d546d6f..44fee4e18 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetProxy.java +++ b/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetProxy.java @@ -1,15 +1,10 @@ package ru.vtosters.lite.ui.vkui; import android.app.Activity; -import android.content.DialogInterface; import android.view.View; import com.vk.core.dialogs.bottomsheet.ModalBottomSheet; -import com.vtosters.lite.R; - -import ru.vtosters.lite.utils.Helper; - public class ModalBottomSheetProxy { public final ModalBottomSheet.a builder; diff --git a/app/src/main/java/ru/vtosters/lite/utils/Helper.java b/app/src/main/java/ru/vtosters/lite/utils/Helper.java index 24daa047b..bb0db9184 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Helper.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Helper.java @@ -6,7 +6,6 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.content.res.Resources; import android.net.ConnectivityManager; -import android.net.Network; import android.net.NetworkInfo; import android.preference.PreferenceManager; 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 1b555e3a8..59dfa58f7 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -10,9 +10,6 @@ import android.widget.ImageButton; import com.vk.core.d.RecoloredDrawable; import com.vk.core.ui.themes.VKThemeHelper; import com.vtosters.lite.R; -import com.vtosters.lite.auth.VKAccountManager; - -import ru.vtosters.lite.f0x1d.VTVerifications; public class Themes { public static int getAccentColor() { 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 9466f2202..fde4f34df 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/VKUIInjector.java +++ b/app/src/main/java/ru/vtosters/lite/utils/VKUIInjector.java @@ -4,14 +4,14 @@ import android.util.Base64; import android.util.Log; import android.webkit.WebView; +import com.vtosters.lite.R; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import com.vtosters.lite.R; - public class VKUIInjector { private static boolean isLoaded = false; private static String loadedCSS = ""; diff --git a/smali/AndroidManifest.xml b/smali/AndroidManifest.xml index f4a78b7f2..8bd0404e5 100644 --- a/smali/AndroidManifest.xml +++ b/smali/AndroidManifest.xml @@ -66,7 +66,7 @@ - +