fixes + disabled debuggable mode

2022-04-11 21:07:08 +03:00
parent 8a680e5429
commit 44cb073de8
21 changed files with 29 additions and 74 deletions
@@ -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;

@@ -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;
@@ -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<String> list = new ArrayList<>();
@@ -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 {
@@ -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;
@@ -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;

@@ -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;
@@ -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) {
@@ -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
@@ -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;
@@ -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();
@@ -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;

@@ -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<MultiAccountAdapter.MultiAccountViewHolder> {

    private final List<MultiAccountItem> mAccounts = MultiAccountManager.buildList();
@@ -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"));
    }
 }
@@ -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;

@@ -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 {

@@ -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;

@@ -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;

@@ -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() {
@@ -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 = "";
@@ -66,7 +66,7 @@
    <uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_READ"/>
    <uses-permission android:name="me.everything.badger.permission.BADGE_COUNT_WRITE"/>
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
-    <application android:allowBackup="false" android:debuggable="true" android:hardwareAccelerated="true" android:icon="@mipmap/vt_launcher" android:label="@string/app_name" android:largeHeap="true" android:requestLegacyExternalStorage="true" android:preserveLegacyExternalStorage="true" android:name="com.vtosters.lite.VKApplication" android:networkSecurityConfig="@xml/network_security_config" android:resizeableActivity="true" android:roundIcon="@mipmap/vt_launcher_round" android:supportsRtl="true" android:theme="@style/BaseStyle">
+    <application android:allowBackup="false" android:debuggable="false" android:hardwareAccelerated="true" android:icon="@mipmap/vt_launcher" android:label="@string/app_name" android:largeHeap="true" android:requestLegacyExternalStorage="true" android:preserveLegacyExternalStorage="true" android:name="com.vtosters.lite.VKApplication" android:networkSecurityConfig="@xml/network_security_config" android:resizeableActivity="true" android:roundIcon="@mipmap/vt_launcher_round" android:supportsRtl="true" android:theme="@style/BaseStyle">
        <meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyBlTHhNGPj7ktPWrUo_d4YJs_Sn_zsISZg"/>
        <meta-data android:name="com.google.android.geo.API_SECRET" android:value="yu6ZAA0OWO3kmr4es7fGtSmiyfk="/>
        <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/fb_app_id"/>