Update WebCachePreloader.smali

@egormetlitsky

app/build.gradle

@@ -91,8 +91,6 @@ android {
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
     implementation 'net.sourceforge.streamsupport:streamsupport-minifuture:1.7.4'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.preference:preference:1.2.0'
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     compileOnly fileTree(dir: 'libs', include: ['*.jar'])
-}
+}

app/src/main/java/com/aefyr/tsg/g2/NotificationsHelper.java

@@ -12,7 +12,8 @@ import androidx.core.app.NotificationManagerCompat;
 import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
 import com.vtosters.lite.R;
 
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 
 import ru.vtosters.lite.utils.AndroidUtils;
@@ -21,22 +22,22 @@ import ru.vtosters.lite.utils.AndroidUtils;
  * Created by Aefyr on 20.05.2018.
  */
 public class NotificationsHelper {
-    private static final int NOTIFICATION_ID_BASE = 3921337;
+//    private static final int NOTIFICATION_ID_BASE = 3921337;
     private static final String NOTIFICATION_CHANNEL_ID = "tgss_chan_v5";
     private static final int MAX_UPDATE_NOTIFICATIONS_PER_SECOND = 3;
     private static final int MIN_TIME_BETWEEN_UPDATE_NOTIFICATIONS = 1000 / MAX_UPDATE_NOTIFICATIONS_PER_SECOND;
-    private final HashMap<TelegramStickersPack, Integer> downloadingPacksNotificationsIds;
+    private final List<Integer> downloadingPacksNotificationsIds;
     private final Context c;
     private final NotificationManagerCompat manager;
     private final AtomicLong lastNotificationTime = new AtomicLong(0);
-    private int currentNotificationN = 0;
+//    private int currentNotificationN = 0;
 
     public NotificationsHelper(Context c) {
         this.c = c;
         manager = NotificationManagerCompat.from(c);
 
 
-        downloadingPacksNotificationsIds = new HashMap<>();
+        downloadingPacksNotificationsIds = new ArrayList<>();
 
         if (oreo()) {
             NotificationChannel notificationChan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, AndroidUtils.getString(R.string.telegram_stickers_service), NotificationManager.IMPORTANCE_HIGH);
@@ -45,19 +46,19 @@ public class NotificationsHelper {
     }
 
     public void packStartedDownloading(TelegramStickersPack pack) {
-        int notificationId = NOTIFICATION_ID_BASE + currentNotificationN++;
-        downloadingPacksNotificationsIds.put(pack, notificationId);
+        downloadingPacksNotificationsIds.add(pack.hash);
 
         Notification.Builder builder = commonBuilder();
         builder.setContentTitle(pack.state == TelegramStickersPack.DOWNLOADING ? pack.title + AndroidUtils.getString(R.string.telegram_stickers_downloading) : pack.title + AndroidUtils.getString(R.string.telegram_stickers_updating));
         builder.setContentText(AndroidUtils.getString(R.string.telegram_stickers_gettinginfo));
         builder.setOngoing(true);
 
-        manager.notify(notificationId, builder.build());
+        manager.notify(pack.hash, builder.build());
     }
 
     public void packDownloadUpdated(TelegramStickersPack pack, int downloadProgress) {
-        if (System.currentTimeMillis() - lastNotificationTime.get() < MIN_TIME_BETWEEN_UPDATE_NOTIFICATIONS)
+        if (System.currentTimeMillis() - lastNotificationTime.get() < MIN_TIME_BETWEEN_UPDATE_NOTIFICATIONS
+                || !downloadingPacksNotificationsIds.contains(pack.hash))
             return;
 
         lastNotificationTime.set(System.currentTimeMillis());
@@ -69,11 +70,13 @@ public class NotificationsHelper {
         builder.setOngoing(true);
         builder.setOnlyAlertOnce(true);
 
-        if (downloadingPacksNotificationsIds.containsKey(pack))
-            manager.notify(downloadingPacksNotificationsIds.get(pack), builder.build());
+        manager.notify(pack.hash, builder.build());
     }
 
     public void packDoneDownloading(TelegramStickersPack pack, boolean success, boolean wasUpdate, @Nullable Exception e) {
+        if (!downloadingPacksNotificationsIds.remove(pack.hash))
+            return;
+
         Notification.Builder builder = commonBuilder();
         builder.setProgress(0, 0, false);
         builder.setOngoing(false);
@@ -91,11 +94,12 @@ public class NotificationsHelper {
 
         builder.setContentText(String.format(text, pack.title));
 
-        manager.notify(downloadingPacksNotificationsIds.remove(pack), builder.build());
+        manager.notify(pack.hash, builder.build());
     }
 
     public void removePackNotification(TelegramStickersPack pack) {
-        manager.cancel(downloadingPacksNotificationsIds.remove(pack));
+        if (downloadingPacksNotificationsIds.remove(pack.hash))
+            manager.cancel(pack.hash);
     }
 
     private Notification.Builder commonBuilder() {

app/src/main/java/com/aefyr/tsg/g2/TelegramStickersPack.java

@@ -32,11 +32,14 @@ public class TelegramStickersPack extends CustomStickersPack {
     public int stickersCount = -1;
     public String version;
     public int index = -1;
+    public Integer hash;
 
     public HashMap<String, List<Integer>> emojis = new HashMap<>();
 
     public TelegramStickersPack(String id) {
-        this.id = id.toLowerCase();
+        final var idLowerCase = id.toLowerCase();
+        this.id = idLowerCase;
+        this.hash = idLowerCase.hashCode();
         title = id;
     }
 
@@ -106,7 +109,7 @@ public class TelegramStickersPack extends CustomStickersPack {
 
     @Override
     public int hashCode() {
-        return id.toLowerCase().hashCode();
+        return hash;
     }
 
     @Override

app/src/main/java/com/aefyr/tsg/g2/TelegramStickersService.java

@@ -235,7 +235,7 @@ public class TelegramStickersService {
                 runOnUiThread(() -> {
                     newPack.state = TelegramStickersPack.DOWNLOADED;
                     notifyPackChanged(newPack, packs.indexOf(newPack));
-                    currentlyDownloading.remove(newPack.id.toLowerCase());
+                    currentlyDownloading.remove(newPack.id);
                     syncPack(newPack);
 
                     if (isUpdate) {

app/src/main/java/com/aefyr/tsg/g2/stickersgrabber/TelegramStickersGrabber.java

@@ -184,7 +184,7 @@ public class TelegramStickersGrabber {
             }
 
             @Override
-            public void onResponse(NetCall call, NetResponse response) throws IOException {
+            public void onResponse(NetCall call, NetResponse response) {
                 if (!response.isSuccessful()) {
                     if (response.getData() != null)
                         listener.onPackDownloadError(new TSGException(response.getDataString() + "\nURL: " + call.request().url()));
@@ -211,21 +211,24 @@ public class TelegramStickersGrabber {
                         return;
                     }
 
-                    if (jPackInfo.optBoolean("is_animated")) {
-                        listener.onPackDownloadError(new TSGException("Animated stickerpacks are not supported!"));
-                        return;
-                    }
-
                     ArrayList<Sticker> stickers = new ArrayList<>(jStickers.length());
 
                     Log.d(TAG, String.format("Parsing stickers in pack %s", packName));
 
                     for (int i = 0; i < jStickers.length(); i++) {
                         JSONObject jSticker = jStickers.getJSONObject(i);
-                        stickers.add(new Sticker(jSticker.getString("file_id"), jSticker.getString("emoji")));
+                        if (jSticker.optBoolean("is_animated") || jSticker.optBoolean("is_video")) {
+                            if (jSticker.has("thumb")) {
+                                stickers.add(new Sticker(jSticker.getJSONObject("thumb").getString("file_id"), jSticker.getString("emoji")));
+                            } else {
+                                listener.onPackDownloadError(new TSGException("Animated and video stickerpacks without thumbs are not supported!"));
+                                return;
+                            }
+                        } else {
+                            stickers.add(new Sticker(jSticker.getString("file_id"), jSticker.getString("emoji")));
+                        }
                     }
 
-
                     set = new StickerSet(jPackInfo.getString("name"), jPackInfo.getString("title"), packVersion, stickers);
                 } catch (Exception e) {
                     listener.onPackDownloadError(e);

app/src/main/java/com/arthenica/ffmpegkit/NativeLoader.java

@@ -8,29 +8,24 @@ import com.arthenica.smartexception.java.Exceptions;
 import java.util.Collections;
 import java.util.List;
 
-import ru.vtosters.lite.utils.AndroidUtils;
-
 public class NativeLoader {
-    static final String[] FFMPEG_LIBRARIES = {"avutil", "swscale", "swresample", "avcodec", "avformat", "avfilter", "avdevice"};
+    static final String[] FFMPEG_LIBRARIES = {"avutil", "swresample", "avcodec", "avformat", "avfilter", "avdevice"};
 
     private static void loadLibrary(String libraryName) {
-        String path = AndroidUtils.getGlobalContext().getFilesDir() + "/lib" + libraryName + ".so";
-        System.load(path);
+        System.loadLibrary(libraryName);
     }
 
     private static List<String> loadExternalLibraries() {
-        // return Packages.getExternalLibraries();
+        //return Packages.getExternalLibraries();
         return Collections.emptyList();
     }
 
     private static String loadNativeAbi() {
-        // return AbiDetect.getNativeAbi();
-        return Abi.ABI_ARMV7A_NEON.getName();
+        return AbiDetect.getNativeAbi();
     }
 
     static String loadAbi() {
-        // return AbiDetect.getAbi();
-        return Abi.ABI_ARMV7A_NEON.getName();
+        return AbiDetect.getAbi();
     }
 
     static String loadPackageName() {

app/src/main/java/com/vtosters/lite/R.java

@@ -1,6 +1,7 @@
 package com.vtosters.lite;
 
-public class R {
+public final class R {
+
     public static final class anim {
         public static final int abc_fade_in = 0x7f010000; // 2130771968
         public static final int abc_fade_out = 0x7f010001; // 2130771969
@@ -220,6 +221,8 @@ public class R {
         public static final int targetlang_value = 0x7f030074; // 2130903156
         public static final int undel_value = 0x7f030075; // 2130903157
         public static final int wallpaper_change_dialog = 0x7f030076; // 2130903158
+        public static final int theme_type_name = 0x7f030077; // 2130903159
+        public static final int theme_type_name_checkbox = 0x7f030078; // 2130903160
     }
 
     public static final class attr {
@@ -19514,6 +19517,17 @@ public class R {
         public static final int whitelisted_filters_groups_title = 0x7f121838; // 2131892280
         public static final int why_news_not_updated_summ = 0x7f121839; // 2131892281
         public static final int why_news_not_updated_title = 0x7f12183a; // 2131892282
+        public static final int blockminiapps_summ = 0x7f12183b; // 2131892283
+        public static final int blockminiapps_title = 0x7f12183c; // 2131892284
+        public static final int current_theme = 0x7f12183d; // 2131892285
+        public static final int invalid_pack_link = 0x7f12183e; // 2131892286
+        public static final int maxquality_summ = 0x7f12183f; // 2131892287
+        public static final int maxquality_title = 0x7f121840; // 2131892288
+        public static final int newsfeed_notif_summ = 0x7f121841; // 2131892289
+        public static final int newsfeed_notif_title = 0x7f121842; // 2131892290
+        public static final int promotedstickers_title = 0x7f121843; // 2131892291
+        public static final int vkx_integration_enabled_info = 0x7f121844; // 2131892292
+        public static final int writebar_ios_title = 0x7f121845; // 2131892293
     }
 
     public static final class style {

app/src/main/java/ru/vtosters/lite/concurrent/VTExecutors.java

@@ -25,14 +25,15 @@ public class VTExecutors {
     }
 
     static class VTMusicDownloadExecutor {
-        private VTMusicDownloadExecutor() {}
-
-        private static class LazyHolder {
-            public static final ExecutorService INSTANCE = Executors.newSingleThreadExecutor();
+        private VTMusicDownloadExecutor() {
         }
 
         public static ExecutorService getInstance() {
             return LazyHolder.INSTANCE;
         }
+
+        private static class LazyHolder {
+            public static final ExecutorService INSTANCE = Executors.newSingleThreadExecutor();
+        }
     }
 }

app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java

@@ -70,8 +70,8 @@ public class OEMDetector {
         }
     }
 
-    public static boolean isIntentResolved(Context ctx, Intent intent ){
-        return (intent!=null && ctx.getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null);
+    public static boolean isIntentResolved(Context ctx, Intent intent) {
+        return (intent != null && ctx.getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null);
     }
 
     public static boolean detectMiuiV2() {

app/src/main/java/ru/vtosters/lite/di/singleton/VtOkHttpClient.java

@@ -0,0 +1,13 @@
+package ru.vtosters.lite.di.singleton;
+
+import okhttp3.OkHttpClient;
+
+public class VtOkHttpClient extends OkHttpClient {
+    public static VtOkHttpClient getInstance() {
+        return LazyHolder.instance;
+    }
+
+    private static class LazyHolder {
+        private static final VtOkHttpClient instance = new VtOkHttpClient();
+    }
+}

app/src/main/java/ru/vtosters/lite/downloaders/MessagesDownloader.java

@@ -12,7 +12,6 @@ import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getResources;
 
 import android.util.SparseArray;
-import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
@@ -330,10 +329,10 @@ public class MessagesDownloader {
                     "\n" +
                     "";
 
-            return "<html><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><meta charset=\"utf-8\"><title>" 
-                    + AndroidUtils.getString(R.string.chat_export_title) 
-                    + "</title><style>" 
-                    + style 
+            return "<html><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><meta charset=\"utf-8\"><title>"
+                    + AndroidUtils.getString(R.string.chat_export_title)
+                    + "</title><style>"
+                    + style
                     + "</style></head><body>";
         }
 

app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java

@@ -9,18 +9,20 @@ import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Environment;
 
+import androidx.core.content.FileProvider;
+
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vtosters.lite.R;
 
 import java.io.File;
 
-import b.h.g.m.FileUtils;
 import ru.vtosters.lite.ui.activities.APKInstallActivity;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class OTADownloader {
 
     private static final BroadcastReceiver callback = new BroadcastReceiver() {
+        @SuppressLint("Range")
         @Override
         public void onReceive(Context context, Intent intent) {
             var extras = intent.getExtras();
@@ -30,24 +32,15 @@ public class OTADownloader {
             var query = new DownloadManager.Query();
             var id = extras.getLong(DownloadManager.EXTRA_DOWNLOAD_ID);
             query.setFilterById(id);
-            var manager = (DownloadManager) AndroidUtils.getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE);
+            var manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
             var cursor = manager.query(query);
             if (cursor.moveToFirst()) {
                 @SuppressLint("Range") var status = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS));
                 if (status == DownloadManager.STATUS_SUCCESSFUL) {
-                    var downloadDir = new File(Environment.getExternalStorageDirectory(), "Download");
-                    if (!downloadDir.exists()) return;
-                    var list = downloadDir.listFiles();
-                    if (list == null || list.length == 0) return;
-                    var maxIndex = -1;
-                    for (File file : list) {
-                        var name = file.getAbsolutePath().substring(file.getAbsolutePath().lastIndexOf("/") + 1);
-                        if (file.isFile()
-                                && name.matches("VTLite-\\d+\\.apk"))
-                            maxIndex = Math.max(maxIndex, Integer.parseInt(name.replaceFirst(".+-(\\d+).+", "$1")));
-                    }
-                    File apk = maxIndex == -1 ? new File(downloadDir, "VTLite.apk") : new File(downloadDir, "VTLite-" + maxIndex + ".apk");
-                    APKInstallActivity.installOta(context, FileUtils.uriFromFile(apk));
+                    var uriStr = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI));
+                    var apk = new File(uriStr.replace("file://", ""));
+                    var uri = FileProvider.getUriForFile(context, "com.vtosters.lite.common.VKFileProvider", apk);
+                    APKInstallActivity.installOta(context, uri);
                 } else if (status == DownloadManager.STATUS_FAILED) {
                     AndroidUtils.sendToast(context.getString(R.string.downloaderr));
                 }
@@ -55,7 +48,7 @@ public class OTADownloader {
         }
     };
 
-    public static void downloadBuild(String url) {
+    public static void downloadBuild(String url, String commitSHA) {
         var context = AndroidUtils.getGlobalContext();
         try {
             var uri = Uri.parse(url);
@@ -64,8 +57,8 @@ public class OTADownloader {
 
             var request = new DownloadManager.Request(uri);
             request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-            request.setTitle("VTLite.apk");
-            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "VTLite_" + System.currentTimeMillis() / 1000 + ".apk");
+            request.setTitle("Скачивание обновления");
+            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "VTLite-" + commitSHA + ".apk");
 
             var manager = (DownloadManager) AndroidUtils.getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE);
             manager.enqueue(request);

app/src/main/java/ru/vtosters/lite/downloaders/StoryDownloader.java

@@ -7,32 +7,35 @@ import android.app.DownloadManager;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Environment;
+import android.util.Log;
 
 import com.vk.dto.common.ImageSize;
 import com.vk.dto.stories.model.StoryEntry;
 
+import org.json.JSONArray;
+
 import java.util.List;
 
 public class StoryDownloader {
     public static Runnable injectButton(StoryEntry story) {
-        return () -> {
-            // if story is a pic
-            if (story.T1()) {
-                List<ImageSize> imageSizes = story.E.Q.t1();
-                String url = imageSizes.get(imageSizes.size() - 1).url;
-                DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
-                request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-                request.setTitle("photo" + story.E.a + ".jpg");
-                request.setDestinationInExternalPublicDir(Environment.DIRECTORY_PICTURES, "photo" + story.E.a + ".jpg");
-                request.allowScanningByMediaScanner();
-                ((DownloadManager) getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
-                return;
-            }
+        return () -> downloadStory(story);
+    }
 
-            // if story is a video
-            if (story.F != null) {
-                downloadVideo(story.F, null);
-            }
-        };
+    public static void downloadStory(StoryEntry story){
+        if (story.T1()) {
+            List<ImageSize> imageSizes = story.E.Q.t1();
+            String url = imageSizes.get(imageSizes.size() - 1).url;
+            DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
+            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+            request.setTitle("photo" + story.E.a + ".jpg");
+            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_PICTURES, "photo" + story.E.a + ".jpg");
+            request.allowScanningByMediaScanner();
+            ((DownloadManager) getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
+            return;
+        }
+        // if story is a video
+        if (story.F != null) {
+            downloadVideo(story.F, null);
+        }
     }
 }

app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java

@@ -11,6 +11,7 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Environment;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
@@ -21,6 +22,7 @@ import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.dialogs.bottomsheet.MenuBottomSheetAction;
 import com.vk.core.util.ToastUtils;
 import com.vk.dto.common.VideoFile;
+import com.vk.dto.stories.model.StoryEntry;
 import com.vtosters.lite.R;
 
 import org.json.JSONArray;
@@ -103,9 +105,9 @@ public class VideoDownloader {
             max[i] = list.get(i);
         }
 
-        if (context == null) context = LifecycleUtils.getCurrentActivity();
+        final Context finalContext = context != null ? context : LifecycleUtils.getCurrentActivity();
 
-        var adapter = new ArrayAdapter(context, android.R.layout.simple_list_item_1, max) {
+        var adapter = new ArrayAdapter(finalContext, android.R.layout.simple_list_item_1, max) {
             @Override
             public View getView(int position, View convertView, ViewGroup parent) {
                 TextView textView = (TextView) super.getView(position, convertView, parent);
@@ -114,22 +116,49 @@ public class VideoDownloader {
             }
         };
 
-        new VkAlertDialog.Builder(context)
+        new VkAlertDialog.Builder(finalContext)
                 .setAdapter(adapter, (dialog, which) -> {
-                    var url = urls.get(which);
-                    DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
-                    request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-                    request.setTitle(videoFile.toString());
-                    request.allowScanningByMediaScanner();
-                    request.setDestinationInExternalPublicDir(Environment.DIRECTORY_MOVIES, videoFile + ".mp4");
-                    ((DownloadManager) getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
+                    try {
+                        var url = urls.get(which);
+                        var request = new DownloadManager.Request(Uri.parse(url))
+                                .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+                                .setTitle(videoFile.toString())
+                                .setDestinationInExternalPublicDir(Environment.DIRECTORY_MOVIES, videoFile + ".mp4");
+                        request.allowScanningByMediaScanner();
+                        ((DownloadManager) finalContext.getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
+                    } catch (Throwable ignored) {
+                    }
                 })
                 .show();
     }
 
     public static void parseVideoLink(String url, Context ctx) {
+        if (url.startsWith("http://")) {
+            url.replace("http://", "https://");
+        } else if (url.startsWith("vk.com"))
+            url = "https://" + url;
+
         if (url.contains("vk.com/story")) {
-            ToastUtils.a(ctx.getString(R.string.video_dl_stories_not_supported));
+            String storyId = url.substring(url.startsWith("https") ? 20 : 19) + "_story";
+
+            ProgressDialog progressDialog = new ProgressDialog(ctx);
+            progressDialog.setMessage(ctx.getString(R.string.video_dl_progress));
+            progressDialog.show();
+
+            makeRequest("https://" + getApi() + "/method/stories.getById?stories=" + storyId + "&v=5.99&access_token=" + getUserToken(),
+                    response -> {
+                        progressDialog.cancel();
+
+                        try {
+                            JSONObject mainJson = new JSONObject(response);
+                            JSONObject responseJson = mainJson.getJSONObject("response").optJSONArray("items").optJSONObject(0);
+                            StoryEntry story = new StoryEntry(responseJson);
+                            StoryDownloader.downloadStory(story);
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                            Toast.makeText(ctx, ctx.getString(R.string.video_dl_error), Toast.LENGTH_SHORT).show();
+                        }
+                    });
             return;
         }
 

app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java

@@ -90,6 +90,14 @@ public class EncryptProvider {
         return (String) decryptMessage(msgBody, peer, showEmoji);
     }
 
+    public static CharSequence decryptMessage(CharSequence msgBody, MsgFromUser msgFromUser, boolean showEmoji) {
+        try {
+            return decryptMessage((String) msgBody, msgFromUser.v1(), showEmoji);
+        } catch (Exception e) {
+            return decryptMessage((String) msgBody, 0, showEmoji);
+        }
+    }
+
     // For MentionsFormatter that requires CharSequence
     public static CharSequence decryptMessage(String msgBody, int peer, boolean showEmoji) {
         var decryptedMessage = decryptMessage(msgBody, peer);

app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java

@@ -31,6 +31,7 @@ import java.util.regex.Pattern;
 
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.net.Request;
 import ru.vtosters.lite.utils.LifecycleUtils;
 
@@ -38,7 +39,7 @@ public class FoafBase {
     private static final Pattern FOAF_REGEX = Pattern.compile("<ya:created dc:date=\"(.+?)\"");
     private static final Pattern FOAF_REGEX_LAST_SEEN = Pattern.compile("<ya:lastLoggedIn dc:date=\"(.*)(((\\+|-)\\d\\d):(\\d\\d))\"");
     private static final String API_VKNEXT = "https://api.vtosters.app/v1/getBypassedOnlineInfo?json=1&ids=";
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
 
     public static long getLastSeen(long origtime, int id) throws ParseException {
         var request = new okhttp3.Request.a()

app/src/main/java/ru/vtosters/lite/hooks/AppVerHook.java

@@ -0,0 +1,15 @@
+package ru.vtosters.lite.hooks;
+
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+
+import b.h.g.g.BuildInfo;
+
+public class AppVerHook {
+    public static int appBuild() {
+        return getBoolValue("useOldAppVer", false) ? 6561 : BuildInfo.i.e();
+    }
+
+    public static String appVer() {
+        return getBoolValue("useOldAppVer", false) ? "6.18.1" : BuildInfo.i.d();
+    }
+}

app/src/main/java/ru/vtosters/lite/hooks/BusinessNotifHook.java

@@ -0,0 +1,9 @@
+package ru.vtosters.lite.hooks;
+
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+
+public class BusinessNotifHook {
+    public static boolean hook(boolean i){
+        return !getBoolValue("businessDisabler", false) && i;
+    }
+}

app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java

@@ -83,7 +83,7 @@ public class DockBarInjector {
             }
 
         } catch (NoSuchFieldException | IllegalAccessException | ClassNotFoundException |
-                 NoSuchMethodException | InvocationTargetException e) {
+                NoSuchMethodException | InvocationTargetException e) {
             e.printStackTrace();
         }
 

app/src/main/java/ru/vtosters/lite/hooks/GcmHook.java

@@ -1,6 +1,6 @@
 package ru.vtosters.lite.hooks;
 
-import static ru.vtosters.lite.utils.Preferences.musicFixNew;
+import static ru.vtosters.lite.utils.Preferences.isValidSignature;
 
 import android.os.Build;
 import android.util.Base64;
@@ -27,9 +27,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.net.ssl.HttpsURLConnection;
 
+
 public class GcmHook {
+
     private static final String agent = String.format("Android-GCM/1.5 (%s %s)", Build.MODEL, Build.MODEL);
+
     private static KeyPair pair;
+
     private static int rid = 0;
 
     static {
@@ -37,14 +41,11 @@ public class GcmHook {
     }
 
     public static String requestTokenV2(String orig) {
-        if (musicFixNew()) return "null"; //not public
-        return orig;
+        return isValidSignature() ? "eyJhbGciOiAibm9uZSJ9eyJub25jZSI6ICJudWxsIn0=" : "e251bGx9";
     }
 
     public static String requestToken(String orig) {
-        if (musicFixNew()) return "{null}"; //not public
-        if (orig.equals("")) return requestToken();
-        return orig;
+        return requestToken();
     }
 
     public static String requestToken() {
@@ -60,6 +61,7 @@ public class GcmHook {
             } catch (NoSuchAlgorithmException e) {
                 xappide = "";
             }
+
             AtomicBoolean wait = new AtomicBoolean(false);
             StringBuilder sb = new StringBuilder();
             List<String> params = new ArrayList<>();
@@ -71,17 +73,20 @@ public class GcmHook {
             while (!wait.get()) {
                 Thread.sleep(100);
             }
+
             String token = sb.toString();
+
             if (token.equals("REGISTRATION_ERROR")) {
                 return requestToken();
             }
+
             rid = 0;
             String pub22 = genNewKey();
             String sig2 = getSig(pub22);
             params.clear();
             fillParams(params, sig2, pub22, xappide, Long.parseLong(aid.split(" ")[1].split(":")[0]), true);
             doRequest("https://android.clients.google.com/c2dm/register3", "POST", params, aid, GcmHook::lambda$requestToken$1);
-            return token;
+            return isValidSignature() ? token : null;
         } catch (FileNotFoundException e2) {
             return requestToken();
         } catch (Exception e3) {
@@ -100,12 +105,14 @@ public class GcmHook {
     private static void fillParams(List<String> params, String sig, String pub2, String xappid, long androidId, boolean del) {
         rid++;
         params.add("X-subtype=841415684880");
+
         if (del) {
             params.add("X-delete=1");
             params.add("X-X-delete=1");
         } else {
             params.add("X-X-subscription=841415684880");
         }
+
         params.add("X-X-subtype=841415684880");
         params.add("X-app_ver=" + "7.26");
         params.add("X-kid=|ID|" + rid + "|");
@@ -115,19 +122,20 @@ public class GcmHook {
         params.add("X-gmsv=11949480");
         params.add("X-pub2=" + pub2);
         params.add("X-X-kid=|ID|" + rid + "|");
-        StringBuilder sb = new StringBuilder();
-        sb.append("X-appid=");
-        sb.append(xappid);
-        params.add(sb.toString());
+        params.add("X-appid=" + xappid);
+
         if (del) {
             params.add("X-scope=GCM");
         } else {
             params.add("X-scope=*");
         }
+
         params.add("X-subscription=841415684880");
+
         if (!del) {
             params.add("X-gmp_app_id=1:841415684880:android:632f429381141121");
         }
+
         params.add("X-app_ver_name=" + "7.26");
         params.add("app=com.vkontakte.android");
         params.add("sender=841415684880");
@@ -139,9 +147,11 @@ public class GcmHook {
 
     private static String join(String chr, Iterable<String> arr) {
         String str = "";
+
         for (String s : arr) {
             str = str.isEmpty() ? s : str + chr + s;
         }
+
         return str;
     }
 
@@ -168,8 +178,12 @@ public class GcmHook {
     }
 
     private static String getRandomAid() {
-        var arr1 = new String[]{"3974055026275073921", "4418584909973341826", "4585634953328772978"};
-        var arr2 = new String[]{"1932960345884890854", "6594645578425092292", "1792344590975444730"};
+        var arr1 = new String[]{
+                "3974055026275073921", "4418584909973341826", "4585634953328772978"
+        };
+        var arr2 = new String[]{
+                "1932960345884890854", "6594645578425092292", "1792344590975444730"
+        };
         int r = new Random().nextInt(2);
         return "AidLogin " + arr1[r] + ":" + arr2[r];
     }
@@ -182,6 +196,7 @@ public class GcmHook {
         } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
         }
+
         return Base64.encodeToString(pair.getPublic().getEncoded(), 0);
     }
 
@@ -190,7 +205,9 @@ public class GcmHook {
             PrivateKey key = pair.getPrivate();
             Signature sign = Signature.getInstance(key instanceof RSAPrivateKey ? "SHA256withRSA" : "SHA256withECDSA");
             sign.initSign(key);
-            sign.update(join("\n", new String[]{"com.vkontakte.android", pub2}).getBytes(StandardCharsets.UTF_8));
+            sign.update(join("\n", new String[]{
+                    "com.vkontakte.android", pub2
+            }).getBytes(StandardCharsets.UTF_8));
             return Base64.encodeToString(sign.sign(), 0);
         } catch (Exception e) {
             e.printStackTrace();
@@ -201,4 +218,4 @@ public class GcmHook {
     public interface Callback {
         void doCallback(String str);
     }
-}
+}

app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java

@@ -1,20 +1,13 @@
 package ru.vtosters.lite.hooks;
 
 import static ru.vtosters.lite.foaf.FoafBase.getBypassedOnlineInfo;
-import static ru.vtosters.lite.hooks.DateHook.getLocale;
 import static ru.vtosters.lite.hooks.OnlineFormatterHook.onlineHookProfiles;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogHeader;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogPlaylist;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogSeparator;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getPlaylist;
-import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.proxy.ProxyUtils.getStatic;
 import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs;
 import static ru.vtosters.lite.utils.Preferences.dev;
 import static ru.vtosters.lite.utils.Preferences.friendsblock;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.Preferences.hasVerification;
-import static ru.vtosters.lite.utils.Preferences.podcastcatalog;
 import static ru.vtosters.lite.utils.VTVerifications.isDeveloper;
 import static ru.vtosters.lite.utils.VTVerifications.isPrometheus;
 import static ru.vtosters.lite.utils.VTVerifications.isVerified;
@@ -22,8 +15,6 @@ import static ru.vtosters.lite.utils.VTVerifications.isVerified;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.vk.core.network.Network;
-import com.vk.core.util.DeviceIdProvider;
 import com.vk.core.util.LangUtils;
 import com.vtosters.lite.R;
 
@@ -37,16 +28,13 @@ import java.util.LinkedHashSet;
 import java.util.Objects;
 import java.util.Random;
 
-import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
-import okhttp3.Headers;
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class JsonInjectors {
-    private static final OkHttpClient mClient = new OkHttpClient();
+    private static final OkHttpClient mClient = VtOkHttpClient.getInstance();
 
     public static JSONObject profileButton(JSONObject orig) throws JSONException {
         var id = orig.getInt("id");
@@ -165,7 +153,8 @@ public class JsonInjectors {
 
         var isPicture = pic.endsWith(".png") || pic.endsWith(".jpg") || pic.endsWith(".jpeg") || pic.endsWith(".webp");
 
-        if (isVerified(peerid)) text = AndroidUtils.getString(R.string.i_bought) + " VTosters Premium";
+        if (isVerified(peerid))
+            text = AndroidUtils.getString(R.string.i_bought) + " VTosters Premium";
         if (isPrometheus(peerid))
             text = AndroidUtils.getString(R.string.i_bought) + " VTosters Premium Gold Prime Pro Plus";
         if (isDeveloper(peerid)) text = AndroidUtils.getString(R.string.i_created_poop);
@@ -242,19 +231,6 @@ public class JsonInjectors {
         return json.putOpt("items", newItems);
     }
 
-    public static JSONObject musiclink(JSONObject json) {
-        var links = json.optJSONArray("links");
-
-        if (links != null) {
-            if (links.optJSONObject(0).optString("url").contains("?section=recent")) {
-                json.remove("links");
-
-                if (dev()) Log.d("VKMusic", "Removed links buttons");
-            }
-        }
-
-        return json;
-    }
 
     public static JSONObject setOnlineInfo(JSONObject json) throws JSONException {
         var id = json.optInt("id");
@@ -368,159 +344,6 @@ public class JsonInjectors {
         return items;
     }
 
-    public static JSONObject music(JSONObject json) throws JSONException {
-        var catalog = json.optJSONObject("catalog");
-
-        JSONArray oldItems = null;
-
-        if (catalog != null) {
-            oldItems = catalog.optJSONArray("sections");
-        }
-
-        if (oldItems != null && oldItems.optJSONObject(0).optString("url").contains("general")) {
-            json.optJSONArray("playlists").put(getPlaylist());
-
-            if (podcastcatalog()) {
-                var podcasts = fetchCatalogPodcast();
-                if (podcasts != null) {
-                    var catalogarr = podcasts.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
-
-                    var title = catalogarr.optString("title");
-                    var id = catalogarr.optString("id");
-                    var url = catalogarr.optString("url");
-
-                    if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
-
-                    oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
-                }
-            }
-
-            var playlists = fetchCatalogId("https://vk.com/audio?section=my_playlists");
-            if (playlists != null) {
-                var catalogarr = playlists.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
-
-                var title = catalogarr.optString("title");
-                var id = catalogarr.optString("id");
-                var url = catalogarr.optString("url");
-
-                if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
-
-                oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
-            }
-
-            var albums = fetchCatalogId("https://vk.com/audio?section=albums");
-            if (albums != null) {
-                var catalogarr = albums.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
-
-                var title = catalogarr.optString("title");
-                var id = catalogarr.optString("id");
-                var url = catalogarr.optString("url");
-
-                if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
-
-                oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
-            }
-
-            var recent = fetchCatalogId("https://vk.com/audio?section=recent");
-            if (recent != null) {
-                var catalogarr = recent.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
-
-                var title = catalogarr.optString("title");
-                var id = catalogarr.optString("id");
-                var url = catalogarr.optString("url");
-
-                if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
-
-                oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
-            }
-
-            for (int i = 0; i < oldItems.length(); i++) {
-                var item = oldItems.optJSONObject(i);
-                var title = item.optString("title");
-                var id = item.optString("id");
-                var url = item.optString("url");
-                var value = AndroidUtils.getPrefsValue("musicdefcatalog");
-
-                Log.d("VKMusic", "title: " + title + " id: " + id + " url: " + url + " value: " + value);
-
-                if (url.contains(value) && !value.isEmpty()) {
-                    catalog.put("default_section", id);
-                    if (dev()) Log.d("VKMusic", "Added " + title + " as default music section");
-                }
-            }
-
-            if (CacheDatabaseDelegate.hasTracks() && !LibVKXClient.isIntegrationEnabled()){ // inj in playlist list
-                var blocks = oldItems.optJSONObject(0).optJSONArray("blocks");
-                var newBlocks = new JSONArray();
-
-                if (blocks != null){
-                    newBlocks
-                            .put(getCatalogHeader())
-                            .put(getCatalogPlaylist())
-                            .put(getCatalogSeparator());
-
-                    Log.d("VKMusic", "added cache catalog playlist");
-
-                    for (int i = 0; i < blocks.length(); i++) {
-                        newBlocks.put(blocks.optJSONObject(i));
-                    }
-
-                    oldItems.optJSONObject(0).put("blocks", newBlocks);
-                }
-            }
-        }
-
-        return json;
-    }
-
-    public static JSONObject fetchCatalogId(String section) {
-        if (section.isEmpty()) return null;
-
-        var request = new Request.a()
-                .b("https://" + getApi() + "/method/catalog.getAudio"
-                        + "?v=5.119"
-                        + "&https=1"
-                        + "&need_blocks=1"
-                        + "&lang="
-                        + getLocale()
-                        + "&device_id="
-                        + DeviceIdProvider.d(AndroidUtils.getGlobalContext())
-                        + "&url="
-                        + section
-                        + "&access_token="
-                        + AccountManagerUtils.getUserToken())
-                .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
-        try {
-            return new JSONObject(mClient.a(request).execute().a().g()).getJSONObject("response");
-        } catch (JSONException | IOException e) {
-            Log.d("VTLMusic", "Error: " + e.getMessage());
-        }
-
-        return null;
-    }
-
-    public static JSONObject fetchCatalogPodcast() {
-        var request = new Request.a()
-                .b("https://" + getApi() + "/method/catalog.getPodcasts"
-                        + "?v=5.119"
-                        + "&https=1"
-                        + "&need_blocks=1"
-                        + "&lang="
-                        + getLocale()
-                        + "&device_id="
-                        + DeviceIdProvider.d(AndroidUtils.getGlobalContext())
-                        + "&access_token="
-                        + AccountManagerUtils.getUserToken())
-                .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
-        try {
-            return new JSONObject(mClient.a(request).execute().a().g()).getJSONObject("response");
-        } catch (JSONException | IOException e) {
-            Log.d("VTLMusic", "Error: " + e.getMessage());
-        }
-
-        return null;
-    }
-
     public static JSONObject friends(JSONObject json) throws JSONException, ParseException, IOException {
         JSONObject catalog = onlineHookProfiles(json);
         boolean sectionexecute = true;

app/src/main/java/ru/vtosters/lite/hooks/MainActivityInjector.java

@@ -4,15 +4,13 @@ import static ru.vtosters.lite.ui.dialogs.ServerDialog.sendRequest;
 import static ru.vtosters.lite.utils.CacheUtils.getInstance;
 import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.setupFilters;
 import static ru.vtosters.lite.utils.Preferences.checkupdates;
-import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
 import static ru.vtosters.lite.utils.ThemesUtils.setNeededTheme;
 
 import android.app.Activity;
 import android.os.Build;
-import android.preference.PreferenceManager;
 
-import ru.vtosters.lite.downloaders.notifications.NotificationChannels;
 import ru.vtosters.lite.concurrent.VTExecutors;
+import ru.vtosters.lite.downloaders.notifications.NotificationChannels;
 import ru.vtosters.lite.ui.dialogs.DisableBattery;
 import ru.vtosters.lite.ui.dialogs.InstallGMS;
 import ru.vtosters.lite.ui.dialogs.OTADialog;

app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java

@@ -5,7 +5,6 @@ import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.ads;
-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;
@@ -115,14 +114,16 @@ public class NewsfeedHook {
     }
 
     public static void adsParams(HashSet<String> hashSet) {
-        if (ads())
+        if (ads()) {
             hashSet.add("ads_disabled");
+        } else {
+            hashSet.add("ads_app_slider");
+            hashSet.add("ads_site_slider");
+        }
+
         hashSet.add("ads_app");
         hashSet.add("ads_site");
         hashSet.add("ads_post");
-        if (!adsslider())
-            hashSet.add("ads_app_slider");
-        hashSet.add("ads_site_slider");
         hashSet.add("ads_app_video");
         hashSet.add("ads_post_pretty_cards");
         hashSet.add("ads_post_snippet_video");

app/src/main/java/ru/vtosters/lite/hooks/PhotoViewer.java

@@ -37,11 +37,12 @@ import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.ThemesUtils;
 
 public class PhotoViewer {
-    static OkHttpClient client = new OkHttpClient();
+    static OkHttpClient client = VtOkHttpClient.getInstance();
 
     public static boolean interceptClick(AttachmentWithMedia attachment, MenuItem item, View view) {
         if (item.getItemId() == R.id.search_photo) {

app/src/main/java/ru/vtosters/lite/hooks/PromoStickersHook.java

@@ -3,7 +3,7 @@ package ru.vtosters.lite.hooks;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 
 public class PromoStickersHook {
-    public static String hook(){
+    public static String hook() {
         return getBoolValue("promotedstickers", true) ? "purchased,active" : "purchased,active,promoted";
     }
 }

app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java

@@ -70,11 +70,11 @@ public class ProxyHook {
         rgRandomProxy.setChecked(isRandomProxyEnabled());
         rgVika.setChecked(isVikaProxyEnabled());
 
-       new VkAlertDialog.Builder(ctx)
-               .setTitle(ctx.getString(R.string.vtlproxy))
-               .setMessage(ctx.getString(R.string.proxy_warning))
-               .setView(rg)
-               .setPositiveButton(ctx.getString(R.string.vtl_confirm), ((dialog, which) -> { // Применить
+        new VkAlertDialog.Builder(ctx)
+                .setTitle(ctx.getString(R.string.vtlproxy))
+                .setMessage(ctx.getString(R.string.proxy_warning))
+                .setView(rg)
+                .setPositiveButton(ctx.getString(R.string.vtl_confirm), ((dialog, which) -> { // Применить
                     if (rgZaborona.isChecked()) {
                         edit().putString("proxy", "zaborona").commit();
                         restartApplication();
@@ -88,13 +88,13 @@ public class ProxyHook {
                         edit().putString("proxy", "noproxy").commit();
                         restartApplication();
                     }
-               }))
-               .setNeutralButton(ctx.getString(R.string.proxy_settings), ((dialog, which) -> {
+                }))
+                .setNeutralButton(ctx.getString(R.string.proxy_settings), ((dialog, which) -> {
                     var intent = new Navigator(ProxySettingsFragment.class)
                             .b(ctx)
                             .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     ctx.startActivity(intent);
-               }))
-               .show();
+                }))
+                .show();
     }
 }

app/src/main/java/ru/vtosters/lite/hooks/WritebarHook.java

@@ -8,7 +8,7 @@ import ru.vtosters.lite.utils.ThemesUtils;
 
 public class WritebarHook {
     public static int getWriteBar() {
-        return wbios() ? R.layout.write_bar_i :  R.layout.write_bar;
+        return wbios() ? R.layout.write_bar_i : R.layout.write_bar;
     }
 
     public static int getIconsColors(int def) {

app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java

@@ -26,6 +26,7 @@ import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.downloaders.AudioDownloader;
 import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
 import ru.vtosters.lite.utils.AndroidUtils;
@@ -35,7 +36,7 @@ public class LastFMScrobbler {
     private static final String KEY = "5965d63402414776c54c266db0211746";
     private static final String KEY_SECRET = "d982180eed13275bb948e41cf225f88f";
     private static final String URL = "https://ws.audioscrobbler.com/2.0/";
-    private static final OkHttpClient CLIENT = new OkHttpClient();
+    private static final OkHttpClient CLIENT = VtOkHttpClient.getInstance();
     private static final List<String> SCROBBLED_UUIDS = new ArrayList<>();
 
     public static void grabMusicTrack(MusicTrack musictrack) {
@@ -55,7 +56,7 @@ public class LastFMScrobbler {
         }
 
         if (Preferences.autocache() && !CacheDatabaseDelegate.isCached(uid)) {
-            if (LibVKXClient.isIntegrationEnabled()){
+            if (LibVKXClient.isIntegrationEnabled()) {
                 LibVKXClient.getInstance().runOnService(service -> {
                     try {
                         service.addTrackToCache(track_id, owner_id, access_key);
@@ -100,7 +101,7 @@ public class LastFMScrobbler {
         fetch(params, new Callback() {
             @Override
             public void a(Call call, IOException e) {
-                Log.d("Scrobbler", e+"");
+                Log.d("Scrobbler", e + "");
             }
 
             @Override

app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java

@@ -17,6 +17,7 @@ import javax.crypto.NoSuchPaddingException;
 import java8.util.concurrent.CompletableFuture;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.music.converter.ts.FFMpeg;
 import ru.vtosters.lite.music.converter.ts.TSMerger;
 import ru.vtosters.lite.music.downloader.ThumbnailDownloader;
@@ -25,7 +26,7 @@ import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.IOUtils;
 
 public class M3UDownloader implements ITrackDownloader {
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
 
     public static M3UDownloader getInstance() {
         return Holder.INSTANCE;

app/src/main/java/ru/vtosters/lite/music/cache/injectors/PlaylistInjector.java

@@ -25,9 +25,8 @@ import ru.vtosters.lite.music.cache.helpers.PlaylistHelper;
 import ru.vtosters.lite.music.cache.helpers.TracklistHelper;
 
 public class PlaylistInjector {
-    private static final ExecutorService executor = Executors.newCachedThreadPool();
-
     public final static String CHANNEL_NAME = "VTCH";
+    private static final ExecutorService executor = Executors.newCachedThreadPool();
 
     public static void injectDownloadPlaylist(Playlist playlist) {
         executor.submit(() -> AudioDownloader.cachePlaylist(playlist));

app/src/main/java/ru/vtosters/lite/music/cache/injectors/TracklistInjector.java

@@ -1,6 +1,11 @@
 package ru.vtosters.lite.music.cache.injectors;
 
 import static ru.vtosters.lite.music.cache.CacheDatabaseDelegate.hasTracks;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogHeader;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogPlaylist;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogSeparator;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getPlaylist;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId;
 
 import android.util.Log;
 
@@ -20,9 +25,8 @@ import java.util.UUID;
 import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
-import ru.vtosters.lite.music.cache.helpers.PlaylistHelper;
+import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
 import ru.vtosters.lite.music.cache.helpers.TracklistHelper;
-import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.NetworkUtils;
 
@@ -76,76 +80,67 @@ public class TracklistInjector {
     public static void injectIntoExistingCatalog(JSONObject catalogNode) {
         Log.d("TracklistInjector", "injectIntoExistingCatalog");
 
-        if (!hasTracks()) return;
         try {
-            var sectionsNode = catalogNode.getJSONObject("catalog")
-                    .getJSONArray("sections");
+            var catalog = catalogNode.getJSONObject("catalog");
+            var sectionsNode = catalog.getJSONArray("sections");
             var firstSection = sectionsNode.getJSONObject(0);
-            if (!firstSection.getString("url").equals("https://vk.com/audios" + AccountManagerUtils.getUserId() + "?section=all"))
-                return;
 
-            var foundPlaylistBlock = false;
-            var suitableIndex = 0;
+            if (!firstSection.getString("url").equals("https://vk.com/audios" + getUserId() + "?section=all"))
+                return;
 
             var blocks = firstSection.getJSONArray("blocks");
-            for (int i = 0; i < blocks.length(); i++) {
-                var block = blocks.getJSONObject(i);
-                var dataType = block.getString("data_type");
-                if ("music_audios".equals(dataType)) {
-                    suitableIndex = i - 1;
-                    continue;
+
+            if (CacheDatabaseDelegate.hasTracks() && !LibVKXClient.isIntegrationEnabled()) { // inj in playlist list
+                var noPlaylists = blocks.optJSONObject(0).optJSONArray("buttons").optJSONObject(0).optJSONObject("action").optString("type").equals("create_playlist");
+
+                if (noPlaylists) {
+                    catalogNode.put("playlists", new JSONArray().put(getPlaylist()));
+                    Log.d("catalogInjector", "added new pl");
+
+                    var newBlocks = new JSONArray();
+
+                    newBlocks
+                            .put(getCatalogHeader())
+                            .put(getCatalogPlaylist())
+                            .put(getCatalogSeparator());
+
+                    Log.d("catalogInjector", "added cache catalog playlist");
+
+                    for (int i = 0; i < blocks.length(); i++) {
+                        newBlocks.put(blocks.optJSONObject(i));
+                    }
+
+                    firstSection.put("blocks", newBlocks);
+                } else {
+                    try {
+                        catalogNode.optJSONArray("playlists").put(getPlaylist());
+                        Log.d("catalogInjector", "added to exist pl");
+
+                        for (int i = 0; i < blocks.length(); i++) {
+                            var j = blocks.optJSONObject(i);
+                            var type = j.optString("data_type");
+
+                            if (type.equals("music_playlists") && j.has("playlists_ids")) {
+                                var newarr = new JSONArray();
+                                var playlists_ids = j.optJSONArray("playlists_ids");
+
+                                newarr.put(getUserId() + "_-1");
+
+                                for (int n = 0; n < playlists_ids.length(); n++) {
+                                    newarr.put(playlists_ids.optString(n));
+                                }
+
+                                j.put("playlists_ids", newarr);
+                                break;
+                            }
+                        }
+                    } catch (Exception e) {
+                        Log.d("catalogInjector", e.toString());
+                    }
                 }
-
-                if (!"music_playlists".equals(dataType))
-                    continue;
-
-                var playlistIds = block.getJSONArray("playlists_ids");
-                var newPlaylistIds = new JSONArray()
-                        .put(AccountManagerUtils.getUserId() + "_-1");
-
-                for (int j = 0; j < playlistIds.length(); j++)
-                    newPlaylistIds.put(playlistIds.get(j));
-
-                block.put("playlists_ids", newPlaylistIds);
-
-                // need test
-                blocks.remove(i);
-                blocks.put(i, block);
-
-                foundPlaylistBlock = true;
             }
-
-            if (foundPlaylistBlock) {
-                var playlists = catalogNode.getJSONArray("playlists")
-                        .put(0, PlaylistHelper.createCachedPlaylistMetadata().J());
-                catalogNode.put("playlists", playlists);
-                return;
-            }
-
-            var ids = new JSONArray()
-                    .put(0, AccountManagerUtils.getUserId() + "_-1");
-
-            var playlistsBlock = new JSONObject()
-                    .put("id", getRandomId())
-                    .put("data_type", "music_playlists")
-                    .put("url", "synth:cache:playlists")
-                    .put("playlists_ids", ids);
-
-            var layout = new JSONObject()
-                    .put("name", "large_slider")
-                    .put("owner_id", AccountManagerUtils.getUserId());
-
-            playlistsBlock.put("layout", layout);
-
-            blocks.put(suitableIndex, playlistsBlock);
-
-            firstSection.put("blocks", blocks);
-
-            var playlists = new JSONArray()
-                    .put(0, PlaylistHelper.createCachedPlaylistMetadata().J());
-            catalogNode.put("playlists", playlists);
-        } catch (JSONException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
+            Log.d("TracklistInjector", e.toString());
         }
     }
 
@@ -175,7 +170,7 @@ public class TracklistInjector {
 
         var layout = new JSONObject()
                 .put("name", "list")
-                .put("owner_id", AccountManagerUtils.getUserId());
+                .put("owner_id", getUserId());
 
         audiosBlock.put("layout", layout);
 

app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java

@@ -0,0 +1,293 @@
+package ru.vtosters.lite.music.catalog.inject;
+
+import static ru.vtosters.lite.hooks.DateHook.getLocale;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogHeader;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogPlaylist;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogSeparator;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getPlaylist;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId;
+import static ru.vtosters.lite.utils.Preferences.dev;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+
+import android.util.Log;
+
+import com.vk.core.network.Network;
+import com.vk.core.util.DeviceIdProvider;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
+import okhttp3.Headers;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
+import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
+import ru.vtosters.lite.utils.AccountManagerUtils;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class CatalogJsonInjector {
+    private static final OkHttpClient mClient = VtOkHttpClient.getInstance();
+
+    public static JSONObject music(JSONObject json) throws JSONException {
+        var catalog = json.optJSONObject("catalog");
+
+        JSONArray oldItems = null;
+
+        if (catalog != null) {
+            oldItems = catalog.optJSONArray("sections");
+        }
+
+        var useOldAppVer = getBoolValue("useOldAppVer", false);
+        var isUsersCatalog = oldItems.optJSONObject(0).optString("url").equals("https://vk.com/audios" + getUserId() + "?section=" + (useOldAppVer ? "all" : "general"));
+
+        if (oldItems != null && isUsersCatalog) {
+            var blocks = oldItems.optJSONObject(0).optJSONArray("blocks");
+
+            if (!useOldAppVer) {
+                if (blocks != null) {
+                    for (int i = 0; i < blocks.length(); i++) {
+                        var block = blocks.optJSONObject(i);
+                        var layout = block.optJSONObject("layout");
+                        if (layout != null) {
+                            var name = layout.optString("name");
+                            if (name.equals("header_extended")) {
+                                if (layout.has("top_title")) blocks.remove(i);
+                                try {
+                                    layout.put("name", "header");
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                    }
+                }
+
+                var playlists = fetchCatalogId("https://vk.com/audio?section=my_playlists");
+                if (playlists != null) {
+                    var catalogarr = playlists.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
+
+                    var title = catalogarr.optString("title");
+                    var id = catalogarr.optString("id");
+                    var url = catalogarr.optString("url");
+
+                    if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
+
+                    oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
+                }
+
+                var albums = fetchCatalogId("https://vk.com/audio?section=albums");
+                if (albums != null) {
+                    var catalogarr = albums.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
+
+                    var title = catalogarr.optString("title");
+                    var id = catalogarr.optString("id");
+                    var url = catalogarr.optString("url");
+
+                    if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
+
+                    oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
+                }
+
+                var recent = fetchCatalogId("https://vk.com/audio?section=recent");
+                if (recent != null) {
+                    var catalogarr = recent.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
+
+                    var title = catalogarr.optString("title");
+                    var id = catalogarr.optString("id");
+                    var url = catalogarr.optString("url");
+
+                    if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
+
+                    oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
+                }
+
+                for (int i = 0; i < oldItems.length(); i++) {
+                    var item = oldItems.optJSONObject(i);
+                    var title = item.optString("title");
+                    var id = item.optString("id");
+                    var url = item.optString("url");
+                    var value = AndroidUtils.getPrefsValue("musicdefcatalog");
+
+                    Log.d("VKMusic", "title: " + title + " id: " + id + " url: " + url + " value: " + value);
+
+                    if (url.contains(value) && !value.isEmpty()) {
+                        catalog.put("default_section", id);
+                        if (dev()) Log.d("VKMusic", "Added " + title + " as default music section");
+                    }
+                }
+            }
+
+            if (CacheDatabaseDelegate.hasTracks() && !LibVKXClient.isIntegrationEnabled()) { // inj in playlist list
+                var noPlaylists = !json.has("playlists");
+
+                if (noPlaylists) {
+                    json.put("playlists", new JSONArray().put(getPlaylist()));
+                    Log.d("catalogInjector", "added new pl");
+                } else {
+                    try {
+                        json.optJSONArray("playlists").put(getPlaylist());
+                        Log.d("catalogInjector", "added to exist pl");
+                    } catch (Exception e) {
+                        Log.d("catalogInjector", e.toString());
+                    }
+                }
+
+                if (blocks != null && (!useOldAppVer || noPlaylists)) {
+                    var newBlocks = new JSONArray();
+
+                    newBlocks
+                            .put(getCatalogHeader())
+                            .put(getCatalogPlaylist())
+                            .put(getCatalogSeparator());
+
+                    Log.d("VKMusic", "added cache catalog playlist");
+
+                    for (int i = 0; i < blocks.length(); i++) {
+                        newBlocks.put(blocks.optJSONObject(i));
+                    }
+
+                    oldItems.optJSONObject(0).put("blocks", newBlocks);
+                }
+            }
+        }
+
+        return json;
+    }
+
+    public static JSONObject catalogInjector(JSONObject json) {
+        try {
+            var section = json.optJSONObject("section");
+            var useOldAppVer = getBoolValue("useOldAppVer", false);
+            var isUsersCatalog = section.optString("url").equals("https://vk.com/audios" + getUserId() + "?section=" + (useOldAppVer ? "all" : "general"));
+
+            if (isUsersCatalog && CacheDatabaseDelegate.hasTracks() && !LibVKXClient.isIntegrationEnabled()) {
+                var blocks = section.getJSONArray("blocks");
+                var noPlaylists = !json.has("playlists");
+
+                // Log.d("catalogInjector", "type: " + blocks.optJSONObject(0).optJSONArray("buttons").optJSONObject(0).optJSONObject("action").optString("type"));
+
+                if (noPlaylists) {
+                    json.put("playlists", new JSONArray().put(getPlaylist()));
+                    Log.d("catalogInjector", "added new pl");
+                } else {
+                    try {
+                        json.optJSONArray("playlists").put(getPlaylist());
+                        Log.d("catalogInjector", "added to exist pl");
+                    } catch (Exception e) {
+                        Log.d("catalogInjector", e.toString());
+                    }
+                }
+
+                if (!useOldAppVer || noPlaylists) {
+                    var newBlocks = new JSONArray();
+
+                    newBlocks
+                            .put(getCatalogHeader())
+                            .put(getCatalogPlaylist())
+                            .put(getCatalogSeparator());
+
+                    Log.d("catalogInjector", "added cache catalog playlist");
+
+                    for (int i = 0; i < blocks.length(); i++) {
+                        newBlocks.put(blocks.optJSONObject(i));
+                    }
+
+                    section.put("blocks", newBlocks);
+                } else {
+                    for (int i = 0; i < blocks.length(); i++) {
+                        var j = blocks.optJSONObject(i);
+                        var type = j.optString("data_type");
+
+                        if (type.equals("music_playlists") && j.has("playlists_ids")) {
+                            var newarr = new JSONArray();
+                            var playlists_ids = j.optJSONArray("playlists_ids");
+
+                            newarr.put(getUserId() + "_-1");
+
+                            for (int n = 0; n < playlists_ids.length(); n++) {
+                                newarr.put(playlists_ids.optString(n));
+                            }
+
+                            Log.d("catalogInjector", "added to pl ids");
+
+                            j.put("playlists_ids", newarr);
+                            break;
+                        }
+                    }
+                }
+            }
+
+        } catch (JSONException e) {
+            Log.d("catalogInjector", e.toString());
+        }
+
+        return json;
+    }
+
+    public static JSONObject musiclink(JSONObject json) {
+        var links = json.optJSONArray("links");
+
+        if (links != null && !getBoolValue("useOldAppVer", false)) {
+            if (links.optJSONObject(0).optString("url").contains("?section=recent")) {
+                json.remove("links");
+
+                if (dev()) Log.d("VKMusic", "Removed links buttons");
+            }
+        }
+
+        var section = json.optJSONObject("section");
+        if (section != null) {
+            var blocks = section.optJSONArray("blocks");
+            if (blocks != null) {
+                for (int i = 0; i < blocks.length(); i++) {
+                    var block = blocks.optJSONObject(i);
+                    var layout = block.optJSONObject("layout");
+                    if (layout != null) {
+                        var name = layout.optString("name");
+                        if (name.equals("header_extended")) {
+                            if (layout.has("top_title")) blocks.remove(i);
+                            try {
+                                layout.put("name", "header");
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return catalogInjector(json);
+    }
+
+    private static JSONObject fetchCatalogId(String section) {
+        if (section.isEmpty()) return null;
+
+        var request = new Request.a()
+                .b("https://" + getApi() + "/method/" + "catalog.getAudio"
+                        + "?v=5.119"
+                        + "&https=1"
+                        + "&need_blocks=1"
+                        + "&lang="
+                        + getLocale()
+                        + "&device_id="
+                        + DeviceIdProvider.d(AndroidUtils.getGlobalContext())
+                        + "&url="
+                        + section
+                        + "&access_token="
+                        + AccountManagerUtils.getUserToken())
+                .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
+        try {
+            return new JSONObject(mClient.a(request).execute().a().g()).getJSONObject("response");
+        } catch (JSONException | IOException e) {
+            Log.d("VTLMusic", "Error: " + e.getMessage());
+        }
+
+        return null;
+    }
+}

app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java

@@ -28,15 +28,13 @@ public class FFMpeg {
      * @return True if success, else false
      */
     public static boolean convert(File in, String out, MusicTrack track) {
-        checkFFMpegLibs();
-
 
         // convert .ts file to .mp3 file via ffmpeg
         var sb = new StringBuilder();
         sb.append("-y -i \"").append(in.getAbsolutePath()).append("\"");
         sb.append(" -map 0 -dn ");
-        sb.append(" -loglevel error");
-        sb.append(" -hide_banner");
+        //sb.append(" -loglevel error");
+        //sb.append(" -hide_banner");
         sb.append(" -write_id3v2 1");
 
         String title = null;

app/src/main/java/ru/vtosters/lite/music/hook/MusicArtistSelectorHook.java

@@ -1,4 +1,4 @@
-package ru.vtosters.lite.feature.music;
+package ru.vtosters.lite.music.hook;
 
 import android.content.Context;
 

app/src/main/java/ru/vtosters/lite/music/hook/MusicBottomSheetHook.java

@@ -1,4 +1,4 @@
-package ru.vtosters.lite.hooks.ui;
+package ru.vtosters.lite.music.hook;
 
 import static bruhcollective.itaysonlab.libvkx.client.LibVKXClient.asId;
 import static bruhcollective.itaysonlab.libvkx.client.LibVKXClient.getInstance;

app/src/main/java/ru/vtosters/lite/proxy/GithubList.java

@@ -8,9 +8,10 @@ import java.util.Arrays;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class GithubList {
-    private static final OkHttpClient mClient = new OkHttpClient();
+    private static final OkHttpClient mClient = VtOkHttpClient.getInstance();
 
     public static ArrayList<String> getProxy(String url, String proxyname) throws IOException {
         Request link = new Request.a()
@@ -28,7 +29,7 @@ public class GithubList {
             Log.d(proxyname, response);
 
             return new ArrayList<>(Arrays.asList(response.split("\n")));
-        } catch (Exception e){
+        } catch (Exception e) {
             Log.d(proxyname, "Failed to fetch data, link: " + link);
 
             return null;

app/src/main/java/ru/vtosters/lite/translators/DeepLTranslator.java

@@ -16,10 +16,11 @@ import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class DeepLTranslator extends BaseTranslator {
 
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
     private static final Pattern pattern = Pattern.compile("[i]");
     private static final String REQUEST_BODY_FORMAT = "{\n" +
             "    \"method\": \"LMT_handle_texts\",\n" +

app/src/main/java/ru/vtosters/lite/translators/GoogleTranslator.java

@@ -10,10 +10,11 @@ import java.net.URLEncoder;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class GoogleTranslator extends BaseTranslator {
 
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
     private static final String[] devices = new String[]{
             "Linux; U; Android 10; Pixel 4",
             "Linux; U; Android 10; Pixel 4 XL",

app/src/main/java/ru/vtosters/lite/translators/YandexTranslator.java

@@ -13,10 +13,11 @@ import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class YandexTranslator extends BaseTranslator {
 
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
     private static final String uuid = UUID.randomUUID().toString().replace("-", "");
 
     private static YandexTranslator instance;

app/src/main/java/ru/vtosters/lite/ui/activities/APKInstallActivity.java

@@ -67,6 +67,7 @@ public class APKInstallActivity extends AppCompatActivity {
 
             startActivity(intent);
         } catch (Exception e) {
+            e.printStackTrace();
             Toast.makeText(this, getString(R.string.apk_install_error) + " " + e.getLocalizedMessage(), Toast.LENGTH_LONG).show();
         }
 

app/src/main/java/ru/vtosters/lite/ui/adapters/ImagineArrayAdapter.java

@@ -97,8 +97,8 @@ public class ImagineArrayAdapter extends ArrayAdapter<ImagineArrayAdapter.Imagin
                 .inflate(R.layout.select_dialog_singlechoice_material, parent, false);
         // for amoled
         var tintList = new ColorStateList(
-                new int[][] { new int[] { android.R.attr.state_checked }, new int[] { -android.R.attr.state_checked }},
-                new int[] { ThemesUtils.getAccentColor(), ThemesUtils.getSTextAttr() });
+                new int[][]{new int[]{android.R.attr.state_checked}, new int[]{-android.R.attr.state_checked}},
+                new int[]{ThemesUtils.getAccentColor(), ThemesUtils.getSTextAttr()});
         TextViewCompat.setCompoundDrawableTintList(checkedTextView, tintList);
         checkedTextView.setChecked(position == mSelectedIndex);
         container.addView(checkedTextView, LayoutUtils.createLinear(AndroidUtils.dp2px(50.0f), -2));

app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java

@@ -32,7 +32,7 @@ public class OTADialog implements OTAUtils.OTAListener {
                     .setTitle(mActivity.getString(R.string.newversion) + " " + mHelper.getNewVersionName())
                     .setUpdateInfoView(mHelper.getUpdateDescription())
                     .setPositiveButton(mActivity.getString(R.string.updateanddownload), () -> {
-                        OTADownloader.downloadBuild(mHelper.getDownloadUrl());
+                        OTADownloader.downloadBuild(mHelper.getDownloadUrl(), mHelper.getCommitSHA());
                     })
                     .show();
         });

app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java

@@ -22,10 +22,11 @@ import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.utils.LifecycleUtils;
 
 public class ServerDialog {
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
     public static Boolean showAlert;
     private static String title;
     private static String message;

app/src/main/java/ru/vtosters/lite/ui/dialogs/Start.java

@@ -28,10 +28,10 @@ public class Start {
                             (dialogInterface, i) -> edit().putBoolean("showAlert", false).apply()
                     )
                     .setNeutralButton(R.string.startbtn1,
-                        (dialogInterface, i) -> {
-                            edit().putBoolean("showAlert", false).apply();
-                            activity.startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://t.me/vtosters")));
-                        }
+                            (dialogInterface, i) -> {
+                                edit().putBoolean("showAlert", false).apply();
+                                activity.startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://t.me/vtosters")));
+                            }
                     )
                     .show();
 

app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java

@@ -132,6 +132,11 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
         return super.onPreferenceTreeClick(preference);
     }
 
+    @Override
+    public int T4() {
+        return R.string.vtlfeed;
+    }
+
     public class openofficialsett implements Preference.OnPreferenceClickListener {
         @Override // android.support.v7.preference.Preference.c
         public boolean onPreferenceClick(Preference preference) {
@@ -142,9 +147,4 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
             return true;
         }
     }
-
-    @Override
-    public int T4() {
-        return R.string.vtlfeed;
-    }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java

@@ -54,15 +54,15 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
         return true;
     }
 
+    @Override
+    public int T4() {
+        return R.string.vtlinterface;
+    }
+
     public class restart implements Preference.OnPreferenceClickListener {
         @Override
         public boolean onPreferenceClick(Preference preference) {
             return InterfaceFragment.this.restart(preference);
         }
     }
-
-    @Override
-    public int T4() {
-        return R.string.vtlinterface;
-    }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java

@@ -9,6 +9,7 @@ import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
 import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
 import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
@@ -131,6 +132,12 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
             findPreference("vkx_sett").setVisible(false);
         }
 
+        findPreference("musicdefcatalog").setVisible(!getBoolValue("useOldAppVer", false));
+        findPreference("useOldAppVer").setOnPreferenceClickListener(preference -> {
+            restartApplicationWithTimer();
+            return true;
+        });
+
         findPreference("select_photo_search_engine").setOnPreferenceClickListener(preference -> {
             var items = Arrays.asList(
                     new ImagineArrayAdapter.ImagineArrayAdapterItem(R.drawable.yandex, "Yandex"),
@@ -269,6 +276,11 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
                 .show();
     }
 
+    @Override
+    public int T4() {
+        return R.string.vtlmedia;
+    }
+
     private static class restart implements Preference.OnPreferenceChangeListener {
         @Override
         public boolean onPreferenceChange(Preference preference, Object o) {
@@ -285,9 +297,4 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
             return true;
         }
     }
-
-    @Override
-    public int T4() {
-        return R.string.vtlmedia;
-    }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java

@@ -41,7 +41,6 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
         findPreference("vkme_notifs").setOnPreferenceClickListener(new MessagesFragment.restart());
         findPreference("systememoji").setOnPreferenceClickListener(new MessagesFragment.restart());
         findPreference("wallpapers").setOnPreferenceClickListener(new MessagesFragment.openwp());
-        findPreference("promotedstickers").setOnPreferenceChangeListener(new clearStickersCache());
 
         findPreference("autotranslate").setEnabled(!autoalltranslate());
 
@@ -79,7 +78,6 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
     public boolean onPreferenceTreeClick(Preference preference) {
         findPreference("autotranslate").setEnabled(!autoalltranslate());
         findPreference("vkme_notifs").setEnabled(vkme());
-        findPreference("promotedstickers").setOnPreferenceChangeListener(new clearStickersCache());
         return super.onPreferenceTreeClick(preference);
     }
 
@@ -88,6 +86,11 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
         return true;
     }
 
+    @Override
+    public int T4() {
+        return R.string.vtlmessages;
+    }
+
     public class restart implements Preference.OnPreferenceClickListener {
         @Override
         public boolean onPreferenceClick(Preference preference) {
@@ -102,16 +105,6 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
         }
     }
 
-    public class clearStickersCache implements Preference.OnPreferenceChangeListener {
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object o) {
-            SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
-            prefs2.edit().clear().commit();
-            Stickers.l.c();
-            return true;
-        }
-    }
-
     public class openwp implements Preference.OnPreferenceClickListener {
         @Override
         public boolean onPreferenceClick(Preference preference) {
@@ -122,9 +115,4 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
             return true;
         }
     }
-
-    @Override
-    public int T4() {
-        return R.string.vtlmessages;
-    }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java

@@ -65,6 +65,7 @@ import ru.vtosters.lite.utils.ContactsUtils;
 
 public class OtherFragment extends MaterialPreferenceToolbarFragment {
     private static final int VK_ADMIN_TOKEN_REQUEST_CODE = 1;
+
     @Override
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
@@ -187,7 +188,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
                 .setNegativeButton(requireContext().getString(R.string.cancel), null)
                 .setView(rg)
                 .setPositiveButton(requireContext().getString(R.string.save), (dialog, which) -> {
-                    var sizes = new String[] { "Default", "100mb", "500mb", "1gb", "2gb", "5gb" };
+                    var sizes = new String[]{"Default", "100mb", "500mb", "1gb", "2gb", "5gb"};
                     var id = rg.getCheckedRadioButtonId();
                     getDefaultPrefs().edit()
                             .putInt("autoclearcache_size", id)
@@ -251,7 +252,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
 
     private void delprefs(Context context) {
         new VkAlertDialog.Builder(context)
-               .setTitle(requireContext().getString(R.string.warning))
+                .setTitle(requireContext().getString(R.string.warning))
                 .setMessage(requireContext().getString(R.string.settings_reset_confirm))
                 .setCancelable(false)
                 .setPositiveButton(requireContext().getString(R.string.yes), (dialogInterface, i) -> {
@@ -262,6 +263,11 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
                 .show();
     }
 
+    @Override
+    public int T4() {
+        return R.string.vtlother;
+    }
+
     public static class d implements Preference.OnPreferenceClickListener {
         @Override // android.support.v7.preference.Preference.c
         public boolean onPreferenceClick(Preference preference) {
@@ -368,9 +374,4 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
             return true;
         }
     }
-
-    @Override
-    public int T4() {
-        return R.string.vtlother;
-    }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java

@@ -129,7 +129,7 @@ public class SystemInfo extends MaterialPreferenceToolbarFragment {
 
         addPreferenceCategory(this, "OEM Information");
 
-        if (isOneUi){
+        if (isOneUi) {
             addPreference(this, "", "OneUiMajorVersion", oneUiMajorVersion, 0, preference -> {
                 ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", oneUiMajorVersion));
                 sendToast(requireContext().getString(R.string.copied_to_clipboard));
@@ -161,7 +161,7 @@ public class SystemInfo extends MaterialPreferenceToolbarFragment {
                     return false;
                 });
             }
-        } else if (isEMUI){
+        } else if (isEMUI) {
             addPreference(this, "", "emuiVersionCode", emuiVersionCode, 0, preference -> {
                 ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", emuiVersionCode));
                 sendToast(requireContext().getString(R.string.copied_to_clipboard));

app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java

@@ -42,6 +42,11 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
         }
     }
 
+    @Override
+    public int T4() {
+        return R.string.vtlthemes;
+    }
+
     public static class restart implements Preference.OnPreferenceClickListener {
         @Override
         public boolean onPreferenceClick(Preference preference) {
@@ -78,9 +83,4 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
             return true;
         }
     }
-
-    @Override
-    public int T4() {
-        return R.string.vtlthemes;
-    }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java

@@ -13,7 +13,6 @@ import static ru.vtosters.lite.utils.AccountManagerUtils.isVKTester;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
-import static ru.vtosters.lite.utils.CacheUtils.humanReadableByteCountBin;
 import static ru.vtosters.lite.utils.GmsUtils.isGmsInstalled;
 import static ru.vtosters.lite.utils.ImageUtils.getDrawableFromUrl;
 import static ru.vtosters.lite.utils.Preferences.ads;
@@ -38,7 +37,6 @@ import static ru.vtosters.lite.utils.VTVerifications.vtverif;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -69,7 +67,6 @@ import ru.vtosters.lite.ui.components.SuperAppEditorManager;
 import ru.vtosters.lite.ui.dialogs.OTADialog;
 import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment;
 import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.CacheUtils;
 import ru.vtosters.lite.utils.SSFSUtils;
 import ru.vtosters.lite.utils.ThemesUtils;
 
@@ -202,7 +199,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
                     requireContext().getString(R.string.appearance_theme_use_system),
                     R.drawable.ic_palette_outline_28, getThemesumm(),
                     AndroidUtils.getArray("theme_type_name_checkbox"),
-                    new String[] { "system", "dark", "light" },
+                    new String[]{"system", "dark", "light"},
                     (preference, o) -> {
                         String value = (String) o;
                         if (!value.equals("system")) {
@@ -251,7 +248,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
                 return true;
             });
 
-            if (dev()) {
+            if (dev() && isValidSignature()) {
                 addMaterialSwitchPreference(this, "autoupdates", requireContext().getString(R.string.checkupdates), "", R.drawable.ic_camera_switch_outline_24, true, (preference, o) -> {
                     boolean value = (boolean) o;
                     edit().putBoolean("autoupdates", value).commit();
@@ -396,7 +393,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
             return false;
         });
 
-        if(!vkme()){
+        if (!vkme()) {
             if (!isTablet()) {
                 addPreference(this, "", requireContext().getString(R.string.dockbar_editor), docksumm, R.drawable.ic_list_outline_28, preference -> {
                     Context context = requireContext();
@@ -417,7 +414,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
                 }
             }
         }
-        
+
         addPreference(this, "", requireContext().getString(R.string.vtlactivity), activitysumm, R.drawable.ic_write_outline_28_new_accent, preference -> {
             Context context = requireContext();
             Intent a2 = new Navigator(ActivityFragment.class).b(context);

app/src/main/java/ru/vtosters/lite/utils/DeletedMessagesHandler.java

@@ -42,7 +42,7 @@ public class DeletedMessagesHandler {
     }
 
     public static boolean hook() {
-        return getBoolValue("undeletemsg", true);
+        return getBoolValue("undeletemsg", false);
     }
 
     public static void setBodyDBParser(Msg msg) {

app/src/main/java/ru/vtosters/lite/utils/ImageUtils.java

@@ -25,10 +25,11 @@ import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class ImageUtils {
 
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
 
     public static Bitmap bmp = null;
 

app/src/main/java/ru/vtosters/lite/utils/OTAUtils.java

@@ -12,15 +12,17 @@ import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class OTAUtils {
 
     private static final String LATEST_RELEASE_URL = "https://api.github.com/repositories/473685743/releases/latest";
     private static final String LATEST_RELEASE_COMMIT_URL = "https://api.github.com/repositories/473685743/git/ref/tags/%s";
-    private final OkHttpClient mClient = new OkHttpClient();
+    private final OkHttpClient mClient = VtOkHttpClient.getInstance();
     private final OTAListener mListener;
     private JSONObject mReleaseJson;
     private JSONObject mCommitJson;
+    private String mCommitSHA = "";
 
     public OTAUtils(OTAListener listener) {
         this.mListener = listener;
@@ -69,9 +71,11 @@ public class OTAUtils {
             public void a(Call call, Response response) throws IOException {
                 try {
                     mCommitJson = new JSONObject(response.a().g());
+                    mCommitSHA = mCommitJson.getJSONObject("object").getString("sha");
                     if (isNewVersion())
                         mListener.onUpdateApplied();
-                    else mListener.onUpdateCanceled();
+                    else
+                        mListener.onUpdateCanceled();
                 } catch (NullPointerException | JSONException e) {
                     e.printStackTrace();
                     mListener.onUpdateCanceled();
@@ -80,10 +84,13 @@ public class OTAUtils {
         });
     }
 
+    public String getCommitSHA() {
+        return mCommitSHA;
+    }
+
     public boolean isNewVersion() {
         try {
-            String commitSHA = mCommitJson.getJSONObject("object").getString("sha");
-            return !commitSHA.startsWith(About.getBuildNumber());
+            return !mCommitSHA.startsWith(About.getBuildNumber());
         } catch (Exception e) {
             return false;
         }

app/src/main/java/ru/vtosters/lite/utils/Preferences.java

@@ -2,13 +2,11 @@ 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.NewsFeedFiltersUtils.setupFilters;
 import static ru.vtosters.lite.utils.SignatureChecker.validateAppSignature;
-import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
 import static ru.vtosters.lite.utils.VTVerifications.isPrometheus;
 import static ru.vtosters.lite.utils.VTVerifications.isVerified;
 
@@ -104,10 +102,6 @@ public class Preferences {
         return getBoolValue("vkme", false);
     }
 
-    public static boolean adsslider() {
-        return getBoolValue("__dbg_no_slider_ads", true);
-    }
-
     public static boolean autocache() {
         return getBoolValue("autocache", false);
     }
@@ -136,10 +130,6 @@ public class Preferences {
         return getBoolValue("awayphp", true);
     }
 
-    public static boolean musicFixNew() {
-        return getBoolValue("musicFixNew", true);
-    }
-
     public static boolean foaf() {
         return getBoolValue("foaf", false);
     }
@@ -217,10 +207,6 @@ public class Preferences {
         return getBoolValue("returnnorifs", false);
     }
 
-    public static boolean gcmfix() {
-        return getBoolValue("gcmfix", true) && isValidSignature();
-    }
-
     public static boolean hasMusicSubscription() {
         return getBoolValue("hasMusicSubscription", true);
     }
@@ -241,10 +227,6 @@ public class Preferences {
         return getBoolValue("offline", false);
     }
 
-    public static boolean oldabout() {
-        return getBoolValue("oldabout", false);
-    }
-
     public static boolean postsrecomm() {
         return getBoolValue("postsrecomm", false);
     }

app/src/main/java/ru/vtosters/lite/utils/ProfileHider.java

@@ -20,10 +20,11 @@ import java.util.HashMap;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 // Jesus cries
 public class ProfileHider {
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
 
     public static void injectMap(HashMap<Integer, UserPresenter.a.a> hashMap) {
         if (VTVerifications.isServiceAccount(getUserId())) {
@@ -53,7 +54,7 @@ public class ProfileHider {
                     z2.set(extendedUserProfile, response);
                 }
             } catch (IOException | JSONException | NoSuchFieldException |
-                     IllegalAccessException e) {
+                    IllegalAccessException e) {
                 e.printStackTrace();
             } catch (NullPointerException e) {
                 Log.e("ProfileHide", "null \"profiles\" node\n" + e);

app/src/main/java/ru/vtosters/lite/utils/RenameTool.java

@@ -180,41 +180,41 @@ public class RenameTool {
                 .setMessage(R.string.rename_message)
                 .setView(linearLayout)
                 .setPositiveButton("OK", (dialog, which) -> {
-                   String firstName = fn.getText().toString();
-                   String lastName = ln.getText().toString();
-                   SQLiteDatabase writableDatabase = getHelper().getWritableDatabase();
-                   try {
-                       if (isChangedName(id)) {
-                           writableDatabase.execSQL(
-                                   String.format("UPDATE %s SET %s='%s', %s='%s' WHERE %s='%s'",
-                                   TABLE_NAME,
-                                   COLUMN_FIRSTNAME, URLEncoder.encode(firstName, "UTF-8"),
-                                   COLUMN_LASTNAME, URLEncoder.encode(lastName, "UTF-8"),
-                                   COLUMN_VKID, id));
-                       } else {
-                           writableDatabase.execSQL(
-                                   String.format("INSERT INTO %s (%s, %s, %s) VALUES (%s, '%s', '%s')",
-                                   TABLE_NAME,
-                                   COLUMN_VKID, COLUMN_FIRSTNAME, COLUMN_LASTNAME,
-                                   id, URLEncoder.encode(firstName, "UTF-8"), URLEncoder.encode(lastName, "UTF-8")));
-                       }
-                       updateRequested = true;
-                       if (id == AccountManagerUtils.getUserId()) {
-                           ctx.sendBroadcast(new Intent("com.vkontakte.android.USER_NAME_CHANGED"));
-                       }
-                       ctx.sendBroadcast(new Intent("com.vkontakte.android.ACTION_PROFILE_UPDATED").putExtra("uid", id));
+                    String firstName = fn.getText().toString();
+                    String lastName = ln.getText().toString();
+                    SQLiteDatabase writableDatabase = getHelper().getWritableDatabase();
+                    try {
+                        if (isChangedName(id)) {
+                            writableDatabase.execSQL(
+                                    String.format("UPDATE %s SET %s='%s', %s='%s' WHERE %s='%s'",
+                                            TABLE_NAME,
+                                            COLUMN_FIRSTNAME, URLEncoder.encode(firstName, "UTF-8"),
+                                            COLUMN_LASTNAME, URLEncoder.encode(lastName, "UTF-8"),
+                                            COLUMN_VKID, id));
+                        } else {
+                            writableDatabase.execSQL(
+                                    String.format("INSERT INTO %s (%s, %s, %s) VALUES (%s, '%s', '%s')",
+                                            TABLE_NAME,
+                                            COLUMN_VKID, COLUMN_FIRSTNAME, COLUMN_LASTNAME,
+                                            id, URLEncoder.encode(firstName, "UTF-8"), URLEncoder.encode(lastName, "UTF-8")));
+                        }
+                        updateRequested = true;
+                        if (id == AccountManagerUtils.getUserId()) {
+                            ctx.sendBroadcast(new Intent("com.vkontakte.android.USER_NAME_CHANGED"));
+                        }
+                        ctx.sendBroadcast(new Intent("com.vkontakte.android.ACTION_PROFILE_UPDATED").putExtra("uid", id));
 
-                       sendToast(ctx.getString(R.string.rename_success));
-                   } catch (Exception e) {
-                       e.printStackTrace();
-                       sendToast(ctx.getString(R.string.rename_error));
-                   }
+                        sendToast(ctx.getString(R.string.rename_success));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        sendToast(ctx.getString(R.string.rename_error));
+                    }
                 });
         if (isChangedName(id))
             builder.setNeutralButton(R.string.rename_reset, (dialog, which) -> {
                 getHelper().getWritableDatabase().execSQL(
                         String.format(
-                        "DELETE FROM %s WHERE %s='%s'",
+                                "DELETE FROM %s WHERE %s='%s'",
                                 TABLE_NAME,
                                 COLUMN_VKID, id));
                 if (id == AccountManagerUtils.getUserId()) {
@@ -261,17 +261,17 @@ public class RenameTool {
                         if (isChangedNameGroup(id)) {
                             writableDatabase.execSQL(
                                     String.format(
-                                    "UPDATE %s SET %s='%s' WHERE %s='%s'",
-                                    TABLE_NAME_GROUP,
-                                    COLUMN_NAME, URLEncoder.encode(firstName, "UTF-8"),
-                                    COLUMN_VKID, id));
+                                            "UPDATE %s SET %s='%s' WHERE %s='%s'",
+                                            TABLE_NAME_GROUP,
+                                            COLUMN_NAME, URLEncoder.encode(firstName, "UTF-8"),
+                                            COLUMN_VKID, id));
                         } else {
                             writableDatabase.execSQL(
                                     String.format(
-                                    "INSERT INTO %s (%s, %s) VALUES (%s, '%s')",
-                                    TABLE_NAME_GROUP,
-                                    COLUMN_VKID, COLUMN_NAME,
-                                    id, URLEncoder.encode(firstName, "UTF-8")));
+                                            "INSERT INTO %s (%s, %s) VALUES (%s, '%s')",
+                                            TABLE_NAME_GROUP,
+                                            COLUMN_VKID, COLUMN_NAME,
+                                            id, URLEncoder.encode(firstName, "UTF-8")));
                         }
                         updateRequested = true;
                         sendToast(AndroidUtils.getString(R.string.rename_group_success));

app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java

@@ -61,14 +61,14 @@ public class ThemesUtils {
         }
     } // Apply VKTheme and ImTheme (hard applying without dynamic theme changing)
 
-    public static void setSystemModeTheme(int theme) {
-        AppCompatDelegate.setDefaultNightMode(theme);
-    }
-
     public static int getSystemModeTheme() {
         return AppCompatDelegate.getDefaultNightMode();
     }
 
+    public static void setSystemModeTheme(int theme) {
+        AppCompatDelegate.setDefaultNightMode(theme);
+    }
+
     public static void setTheme(VKTheme theme, Activity activity) {
         if (activity == null) {
             activity = getCurrentActivity();

app/src/main/java/ru/vtosters/lite/utils/VTVerifications.java

@@ -23,13 +23,14 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class VTVerifications {
     public static final List<Integer> sVerifications = new ArrayList<>();
     public static final List<Integer> sPrometheuses = new ArrayList<>();
     public static final List<Integer> sDevelopers = new ArrayList<>();
     public static final List<Integer> sServiceAccounts = new ArrayList<>();
-    private static final OkHttpClient sClient = new OkHttpClient();
+    private static final OkHttpClient sClient = VtOkHttpClient.getInstance();
 
     public static void load(Context context) {
         var prefs = context.getSharedPreferences("vt_another_data", 0);

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle.properties

@@ -11,7 +11,6 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Fri Jun 03 17:38:03 MSK 2022
-org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
 android.useAndroidX=true
 android.enableJetifier=true
 android.jetifier.ignorelist=classes-dex2jar.jar, classes2-dex2jar.jar, classes3-dex2jar.jar, classes4-dex2jar.jar, classes5-dex2jar.jar, classes6-dex2jar.jar, classes7-dex2jar.jar

scripts/rclass_regenerator.bat

@@ -0,0 +1,36 @@
+@echo off
+
+cd scripts
+
+echo.
+echo Decompile release APK...
+echo.
+call java -jar apktool.jar d VTLite.apk -f -o tmp -s --use-aapt2 -p ../scripts/framework/
+if "%ERRORLEVEL%" == "0" (
+    echo %ESC%[92mSuccessful%ESC%[0m
+) else (
+    echo %ESC%[31mFailed%ESC%[0m
+    exit /B 1
+)
+
+echo.
+echo Generate R.java
+echo.
+call java -jar rclass-generator.jar -f tmp/res/values/public.xml -o ..\app\src\main\java\com\vtosters\lite\R.java -p com.vtosters.lite --comments
+if "%ERRORLEVEL%" == "0" (
+    echo %ESC%[92mSuccessful%ESC%[0m
+) else (
+    echo %ESC%[31mFailed%ESC%[0m
+    exit /B 1
+)
+
+echo.
+echo Clean temp dir
+echo.
+call rmdir /s/q tmp
+if "%ERRORLEVEL%" == "0" (
+    echo %ESC%[92mSuccessful%ESC%[0m
+) else (
+    echo %ESC%[31mFailed%ESC%[0m
+    exit /B 1
+)

scripts/rclass_regenrator.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+RED='\033[31m'
+GREEN='\033[92m'
+NC='\033[0m'
+BOLD='\033[1m'
+UNDERLINE='\033[4m'
+
+cd ../
+
+echo -e "${BOLD}${UNDERLINE}Decompile release APK...${NC}\n"
+java -jar ../scripts/apktool.jar d VTLite.apk -f -o tmp -s --use-aapt2 -p ../scripts/framework/
+if [ $? -eq 0 ]; then
+	echo -e "${GREEN}Успех!${NC}\n"
+else
+	echo -e "${RED}Провал.${NC}\n"
+	exit 1
+fi
+
+echo -e "${BOLD}${UNDERLINE}Regenerate R.java file...${NC}\n"
+java -jar ../scripts/rclass-generator.jar -f ../scripts/tmp/res/values/public.xml -o ../scripts/app/src/main/java/com/vtosters/lite/R.java -p com.vtosters.lite --comments
+if [ $? -eq 0 ]; then
+	echo -e "${GREEN}Успех!${NC}\n"
+else
+	echo -e "${RED}Провал.${NC}\n"
+	exit 1
+fi
+
+echo -e "${BOLD}${UNDERLINE}Clean temp dir...${NC}\n"
+rm -rf ../scripts/tmp
+if [ $? -eq 0 ]; then
+	echo -e "${GREEN}Успех!${NC}\n"
+else
+	echo -e "${RED}Провал.${NC}\n"
+	exit 1
+fi

smali/AndroidManifest.xml

@@ -1764,31 +1764,13 @@
             android:name="com.google.android.gms.auth.api.signin.RevocationBoundService"
             android:exported="true"
             android:permission="com.google.android.gms.auth.api.signin.permission.REVOCATION_NOTIFICATION" />
-        <provider
-            android:name="com.google.firebase.perf.provider.FirebasePerfProvider"
-            android:authorities="com.vtosters.lite.firebaseperfprovider"
-            android:exported="false"
-            android:initOrder="101" />
-
         <service
             android:name="com.google.firebase.components.ComponentDiscoveryService"
             android:directBootAware="true"
             android:exported="false">
-            <meta-data
-                android:name="com.google.firebase.components:com.google.firebase.perf.FirebasePerfRegistrar"
-                android:value="com.google.firebase.components.ComponentRegistrar" />
-            <meta-data
-                android:name="com.google.firebase.components:com.google.firebase.analytics.connector.internal.AnalyticsConnectorRegistrar"
-                android:value="com.google.firebase.components.ComponentRegistrar" />
-            <meta-data
-                android:name="com.google.firebase.components:com.google.firebase.remoteconfig.RemoteConfigRegistrar"
-                android:value="com.google.firebase.components.ComponentRegistrar" />
             <meta-data
                 android:name="com.google.firebase.components:com.google.firebase.iid.Registrar"
                 android:value="com.google.firebase.components.ComponentRegistrar" />
-            <meta-data
-                android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar"
-                android:value="com.google.firebase.components.ComponentRegistrar" />
         </service>
         <service
             android:name="com.google.firebase.messaging.FirebaseMessagingService"
@@ -2044,30 +2026,6 @@
             android:exported="false"
             android:initOrder="100" />
 
-        <receiver
-            android:name="com.google.android.gms.measurement.AppMeasurementReceiver"
-            android:enabled="true"
-            android:exported="false" />
-        <receiver
-            android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver"
-            android:enabled="true"
-            android:exported="true"
-            android:permission="android.permission.INSTALL_PACKAGES">
-            <intent-filter>
-                <action android:name="com.android.vending.INSTALL_REFERRER" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name="com.google.android.gms.measurement.AppMeasurementService"
-            android:enabled="true"
-            android:exported="false" />
-        <service
-            android:name="com.google.android.gms.measurement.AppMeasurementJobService"
-            android:enabled="true"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
         <provider
             android:name="com.facebook.internal.FacebookInitProvider"
             android:authorities="com.vtosters.lite.FacebookInitProvider"
@@ -2088,21 +2046,7 @@
                 <action android:name="com.android.vending.INSTALL_REFERRER" />
             </intent-filter>
         </receiver>
-
-        <activity
-            android:name="com.google.android.play.core.missingsplits.PlayCoreMissingSplitsActivity"
-            android:enabled="false"
-            android:exported="false"
-            android:launchMode="singleInstance"
-            android:process=":playcore_missing_splits_activity"
-            android:stateNotNeeded="true" />
-        <activity
-            android:name="com.google.android.play.core.common.PlayCoreDialogWrapperActivity"
-            android:enabled="false"
-            android:exported="false"
-            android:process=":playcore_dialog_wrapper_activity"
-            android:stateNotNeeded="true"
-            android:theme="@style/Theme.PlayCore.Transparent" />
+        
         <activity
             android:name="vigo.sdk.FeedbackActivity"
             android:screenOrientation="portrait"

smali/assets/StandartFilter.txt

@@ -92,4 +92,6 @@ cкорее подписывайся
 напиши Нашему боту
 пиши Нашему боту
 Подписывайтесь👇
-Подписывайся👇
+Подписывайся👇
+ссылка в комментариях
+в комментариях👇