fixed friends recomms issue

libvkmedia.so armv7/arm64

.github/workflows/build.yml

@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Set up JDK 14
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '14'
+          java-version: '17'
           distribution: 'adopt'
           
       - uses: actions/checkout@v3

README.md

@@ -37,7 +37,7 @@
 
 * Стабильные сборки находятся в [Releases](https://github.com/vtosters/lite/releases)
 
-Зеркало на нашем [<img src="https://gitea.com/assets/img/logo.svg" align="center" width="20" height="20"/> Git](https://git.maki.su/gdlbo/lite)
+Зеркало на нашем [<img src="https://gitea.com/assets/img/logo.svg" align="center" width="20" height="20"/> Git](https://git.maki.su/vtosters/lite)
 
 ### Быстрая навигация
 

app/build.gradle

@@ -1,8 +1,6 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
-import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
-import java.util.zip.ZipInputStream
 
 plugins {
     id 'com.android.application'
@@ -21,6 +19,10 @@ cargo {
 
 def smaliFolder = projectDir.toPath().resolve("../smali").normalize()
 def scriptsFolder = projectDir.toPath().resolve("../scripts").normalize()
+//you can add own folders with decompiled smali code
+def dexes=smaliFolder.toFile()
+            .listFiles( { f -> f.isDirectory() && f.name.startsWith("smali") } as FileFilter)
+            .size()
 
 versionFile {
     file = projectDir.toPath().resolve("src/main/assets/version.properties").toFile()
@@ -50,19 +52,24 @@ android {
     }
 
     buildTypes {
+        release {
+            minifyEnabled true
+            buildConfigField 'String', 'APPCENTER_KEY', '""'
+            proguardFile 'proguard-rules.pro'
+        }
+        rc {
+            minifyEnabled true
+            buildConfigField 'String', 'APPCENTER_KEY', '""'
+            proguardFile 'proguard-rules.pro'
+        }
         dev {
-            initWith release
+            minifyEnabled false
             buildConfigField 'String', 'APPCENTER_KEY', '""'
         }
         beta {
-            initWith release
+            minifyEnabled false
             buildConfigField 'String', 'APPCENTER_KEY', '""'
         }
-        release {
-            buildConfigField 'String', 'APPCENTER_KEY', '""'
-            minifyEnabled true
-            proguardFile 'proguard-rules.pro'
-        }
     }
 
     compileOptions {
@@ -72,77 +79,60 @@ android {
     }
     namespace 'ru.vtosters.lite'
     ndkVersion '25.2.9519653'
+    buildFeatures {
+        aidl true
+    }
+}
+
+task testClasses {
+    doLast {
+        println 'This is a dummy testClasses task'
+    }
 }
 
 dependencies {
-    implementation 'com.microsoft.appcenter:appcenter-analytics:5.0.1'
-    implementation 'com.microsoft.appcenter:appcenter-crashes:5.0.1'
+    implementation 'com.microsoft.appcenter:appcenter-analytics:5.0.2'
+    implementation 'com.microsoft.appcenter:appcenter-crashes:5.0.2'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
     implementation 'net.sourceforge.streamsupport:streamsupport-minifuture:1.7.4'
+    implementation 'com.google.guava:guava:23.3-android'
+
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     compileOnly fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.google.guava:guava:23.3-android'
 }
 
 task generateBuildTasks() {
     android.applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def buildType = output.name.toString().capitalize()
-            def lowerBuildType = buildType.toLowerCase()
+            if(buildType=="Base")return
             task "exportDex$buildType"() {
                 dependsOn('assemble' + buildType)
                 doLast {
                     try {
-                        var z = ""
-                        if (lowerBuildType != "debug") {
-                            z = "-unsigned"
-                        }
-
-                        File moduleDir = projectDir
-                        ZipInputStream inputStream = new ZipInputStream(new FileInputStream(moduleDir.getAbsolutePath() + "/build/outputs/apk/$lowerBuildType/app-$lowerBuildType${z}.apk"))
-                        ZipFile file = new ZipFile(moduleDir.getAbsolutePath() + "/build/outputs/apk/$lowerBuildType/app-$lowerBuildType${z}.apk");
-                        ZipEntry entry
-                        while ((entry = inputStream.nextEntry) != null) {
-                            if (entry.getName().equals("classes.dex")) {
-                                print('classes.dex found!')
-
-                                FileOutputStream outputStream = new FileOutputStream(new File(moduleDir.getAbsoluteFile(), "classes6.dex"))
-
-                                byte[] buffer = new byte[1024]
-                                int len = 0
-                                while ((len = inputStream.read(buffer)) > 0) {
-                                    outputStream.write(buffer, 0, len)
-                                }
-                                outputStream.close()
-                            }
-                            if (entry.getName().equals("classes2.dex")) {
-                                print('\nclasses2.dex found!')
-
-                                FileOutputStream outputStream = new FileOutputStream(new File(moduleDir.getAbsoluteFile(), "classes7.dex"))
-
-                                byte[] buffer = new byte[1024]
-                                int len = 0
-                                while ((len = inputStream.read(buffer)) > 0) {
-                                    outputStream.write(buffer, 0, len)
-                                }
-                                outputStream.close()
-                            }
-                        }
-
-                        for (ZipEntry e : Collections.list(file.entries())) {
-                            if (e.getName().endsWith("assets/version.properties")) {
-                                var is = file.getInputStream(e)
-                                FileOutputStream outputStream = new FileOutputStream(new File(moduleDir.getAbsoluteFile(), "version.properties"))
-
-                                byte[] buffer = new byte[1024]
-                                int len = 0
-                                while ((len = is.read(buffer)) > 0) {
-                                    outputStream.write(buffer, 0, len)
-                                }
-                                outputStream.close()
-
-                                print('\nversion.properties found!')
-                            }
+                        def suffix=buildType.toLowerCase()
+                        String apkPath=projectDir.getAbsolutePath()+"/build/outputs/apk/$suffix/app-$suffix"
+                        def apk=new File(apkPath+"-unsigned.apk")
+                        if(!apk.exists())apk=new File(apkPath+".apk")
+                        def zip=new ZipFile(apk)
+                        def entries=zip.entries()
+                        def dexCounter=dexes
+                        while(entries.hasMoreElements())
+                        {
+                            def entry=entries.nextElement()
+                            String filename
+                            if(entry.name.matches("^classes(?:(?=\\d)2|)\\.dex\$"))filename="classes${++dexCounter}.dex"
+                            else if(entry.name=="assets/version.properties")filename="version.properties"
+                            else continue
+                            println("Exporting "+entry.name)
+                            def tmpFile=new File(projectDir,filename)
+                            def is=zip.getInputStream(entry)
+                            def fos=new FileOutputStream(tmpFile)
+                            def buff=new byte[0x800]
+                            int len
+                            while((len=is.read(buff))>0)fos.write(buff,0,len)
+                            is.close()
+                            fos.close()
                         }
                     } catch (Exception e) {
                         e.printStackTrace()
@@ -152,17 +142,16 @@ task generateBuildTasks() {
             task "prepareDexForMerge$buildType"(type: Copy) {
                 dependsOn('exportDex' + buildType)
                 // Remove comment for native lib build
-                dependsOn('cargoBuild')
+                //dependsOn('cargoBuild')
                 into smaliFolder.toString()
                 from(projectDir) {
-                    include 'classes6.dex'
-                    include 'classes7.dex'
+                    into '../smali'
+                    include "classes*.dex"
                 }
                 from(projectDir) {
                     include 'version.properties'
                     into 'assets'
                 }
-                // Remove comment for native lib build
                 from('../native-effects/target/aarch64-linux-android/release'){
                     include 'libnative_effects.so'
                     into 'lib/arm64-v8a'
@@ -171,15 +160,16 @@ task generateBuildTasks() {
                     include 'libnative_effects.so'
                     into 'lib/armeabi-v7a'
                 }
-                doLast {
-                    new File(projectDir, "classes6.dex").delete()
-                    new File(projectDir, "classes7.dex").delete()
-                    new File(projectDir, "version.properties").delete()
-                }
+            }
+            task "cleanTemporaryFiles$buildType"(type:Delete)
+            {
+                delete fileTree(dir:projectDir,include:["*.dex","version.properties"])
+                delete fileTree(dir:smaliFolder,include:['*.dex',"assets/version.properties"])
             }
             task "buildVTL$buildType"(type: Exec) {
                 dependsOn('prepareDexForMerge' + buildType)
                 workingDir(projectDir.parentFile)
+                finalizedBy "cleanTemporaryFiles$buildType"
                 if (Os.isFamily("unix") || Os.isFamily("mac")) {
                     commandLine 'bash', '-c', './scripts/build.sh'
                 } else {
@@ -207,7 +197,6 @@ task generateBuildTasks() {
     }
 }
 
-
 task generateRjava(type: Exec) {
     workingDir(projectDir.parentFile)
     if (Os.isFamily("unix") || Os.isFamily("mac"))

app/src/main/java/bruhcollective/itaysonlab/libvkx/client/LibVKXClient.java

@@ -10,9 +10,9 @@ import com.vk.music.common.MusicPlaybackLaunchContext;
 import java.util.ArrayList;
 import java.util.List;
 
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.hooks.other.Preferences.getBoolValue;
 import static ru.vtosters.hooks.other.Preferences.isValidSignature;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 
 public class LibVKXClient {
     @SuppressLint("StaticFieldLeak")
@@ -80,11 +80,6 @@ public class LibVKXClient {
         lambdaplay(list, musicTrack, iLibVkxService, null);
     }
 
-    public static String asId(MusicTrack musicTrack) {
-        String id = musicTrack.e + "_" + musicTrack.d;
-        if (musicTrack.O != null && !musicTrack.O.equals("")) {
-            id += "_" + musicTrack.O;
-        }
-        return id;
-    }
+    public static String asId(MusicTrack musicTrack)
+    { return musicTrack.y1(); }
 }

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

@@ -36,10 +36,8 @@ public class TelegramStickersPack extends CustomStickersPack {
     public HashMap<String, List<Integer>> emojis = new HashMap<>();
 
     public TelegramStickersPack(String id) {
-        final var idLowerCase = id.toLowerCase();
-        this.id = idLowerCase;
-        this.hash = idLowerCase.hashCode();
-        title = id;
+        this.id = this.title = id;
+        this.hash = id.hashCode();
     }
 
     public JSONObject encodeEmojis() throws JSONException {
@@ -103,7 +101,7 @@ public class TelegramStickersPack extends CustomStickersPack {
 
     @Override
     public boolean equals(Object obj) {
-        return obj instanceof TelegramStickersPack && ((TelegramStickersPack) obj).id.equalsIgnoreCase(id);
+        return obj instanceof TelegramStickersPack && ((TelegramStickersPack) obj).id.equals(id);
     }
 
     @Override

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

@@ -8,6 +8,7 @@ import android.util.Log;
 import com.aefyr.tsg.g2.sql.TelegramStickersDbHelper;
 import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
 import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersPackInfo;
+import ru.vtosters.lite.ui.fragments.VTSettings;
 import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment;
 
 import java.io.File;
@@ -25,19 +26,13 @@ import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 public class TelegramStickersService {
     private static final String TAG = "TGStickersService";
     private static TelegramStickersService instance;
-
-    private final Context c;
-
     private final ArrayList<TelegramStickersPack> packs;
     private final ArrayList<TelegramStickersPack> activePacks;
     private final ArrayList<TelegramStickersPack> inactivePacks;
     private final ArrayList<StickersEventsListener> listeners;
     private final HashSet<String> currentlyDownloading;
-
     private final Handler uiThreadHandler;
-
     private final TelegramStickersGrabber grabber;
-
     private final TelegramStickersDbHelper dbHelper;
     private final ArrayList<Runnable> queuedTasks;
     private final ThreadPoolExecutor executor;
@@ -47,16 +42,14 @@ public class TelegramStickersService {
     private TelegramStickersService(Context context) {
         instance = this;
 
-        this.c = context.getApplicationContext();
-
         listeners = new ArrayList<>();
         currentlyDownloading = new HashSet<>();
         uiThreadHandler = new Handler(Looper.getMainLooper());
         grabber = new TelegramStickersGrabber(null);
-        dbHelper = new TelegramStickersDbHelper(c);
+        dbHelper = new TelegramStickersDbHelper(context);
         queuedTasks = new ArrayList<>();
         executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(2);
-        notificationsHelper = new NotificationsHelper(c);
+        notificationsHelper = new NotificationsHelper(context);
 
         packs = new ArrayList<>();
         activePacks = new ArrayList<>();
@@ -69,11 +62,11 @@ public class TelegramStickersService {
         return instance == null ? new TelegramStickersService(c) : instance;
     }
 
-    private void updatePacks(final boolean notify) {
+    private void updatePacks(boolean notify) {
         packs.clear();
         dbHelper.getAllPacks(new TelegramStickersDbHelper.PacksLoadingListener() {
             @Override
-            public void onPackLoaded(final TelegramStickersPack pack) {
+            public void onPackLoaded(TelegramStickersPack pack) {
                 runOnUiThread(() -> {
                     packs.add(pack);
 
@@ -102,14 +95,6 @@ public class TelegramStickersService {
         });
     }
 
-    public void addStickersEventsListener(StickersEventsListener listener) {
-        listeners.add(listener);
-    }
-
-    public void removeStickersEventsListener(StickersEventsListener listener) {
-        listeners.remove(listener);
-    }
-
     private void notifyPackAdded(TelegramStickersPack pack, int atIndex) {
         getGlobalContext().sendBroadcast(new Intent(StickersFragment.ACTION_RELOAD));
         if (listeners.isEmpty())
@@ -152,6 +137,7 @@ public class TelegramStickersService {
 
     private void notifyActivePacksListChanged() {
         getGlobalContext().sendBroadcast(new Intent(StickersFragment.ACTION_RELOAD));
+        getGlobalContext().sendBroadcast(new Intent(VTSettings.ACTION_INVALIDATE_TGS_COUNT));
         if (listeners.isEmpty())
             return;
 
@@ -186,20 +172,16 @@ public class TelegramStickersService {
         return inactivePacks;
     }
 
-    public boolean isDoneLoading() {
-        return ready;
-    }
-
-    public boolean requestPackDownload(final String id, File packFolder) {
+    public void requestPackDownload(String id, File packFolder) {
         if (currentlyDownloading.contains(id)) {
             Log.e(TAG, String.format("Got request to download pack %s which is already downloading", id));
-            return false;
+            return;
         }
 
         if (!ready) {
-            final File folder = packFolder;
+            File folder = packFolder;
             queuedTasks.add(() -> requestPackDownload(id, folder));
-            return true;
+            return;
         }
 
         TelegramStickersPack pack = new TelegramStickersPack(id);
@@ -219,85 +201,86 @@ public class TelegramStickersService {
             notifyPackAdded(pack, packs.size() - 1);
         }
 
-        final TelegramStickersPack newPack = pack;
-        final boolean isUpdate = update;
+        TelegramStickersPack newPack = pack;
+        boolean isUpdate = update;
 
-        currentlyDownloading.add(id.toLowerCase());
+        currentlyDownloading.add(id);
         notificationsHelper.packStartedDownloading(newPack);
 
-
-        grabber.enableProxy();
-        grabber.grabPack(id, packFolder, pack.version, new TelegramStickersGrabber.PackDownloadListener() {
-            @Override
-            public void onPackDownloaded(TelegramStickersPackInfo packInfo, boolean newVersionFound) {
-
-                runOnUiThread(() -> {
-                    newPack.state = TelegramStickersPack.DOWNLOADED;
-                    notifyPackChanged(newPack, packs.indexOf(newPack));
-                    currentlyDownloading.remove(newPack.id);
-                    syncPack(newPack);
-
-                    if (isUpdate) {
-                        if (newPack.enabled)
-                            notifyActivePacksListChanged();
-                    } else {
-                        activePacks.add(newPack);
-                        notifyActivePacksListChanged();
-                    }
-                });
-                notificationsHelper.packDoneDownloading(newPack, true, isUpdate, null);
-            }
-
-            @Override
-            public void onPackDownloadError(final Exception e) {
-                runOnUiThread(() -> {
-                    Log.e(TAG, "Error while downloading pack " + newPack.id);
-                    e.printStackTrace();
-
-                    if (!isUpdate) {
-                        int index = packs.indexOf(newPack);
-                        packs.remove(index);
-                        notifyPackRemoved(newPack, index);
-                    } else {
+        // try-catch block to handle possible timeout exception
+        try {
+            grabber.grabPack(id, packFolder, pack.version, new TelegramStickersGrabber.PackDownloadListener() {
+                @Override
+                public void onPackDownloaded(TelegramStickersPackInfo packInfo, boolean newVersionFound) {
+                    runOnUiThread(() -> {
                         newPack.state = TelegramStickersPack.DOWNLOADED;
                         notifyPackChanged(newPack, packs.indexOf(newPack));
-                    }
+                        currentlyDownloading.remove(newPack.id);
+                        syncPack(newPack);
 
-                    notifyPackDownloadError(newPack, e);
-                    currentlyDownloading.remove(newPack.id);
-                });
-                notificationsHelper.packDoneDownloading(newPack, false, isUpdate, e);
-            }
+                        if (isUpdate) {
+                            if (newPack.enabled)
+                                notifyActivePacksListChanged();
+                        } else {
+                            activePacks.add(newPack);
+                            notifyActivePacksListChanged();
+                        }
+                    });
+                    notificationsHelper.packDoneDownloading(newPack, true, isUpdate, null);
+                }
 
-            @Override
-            public void onGotPackInfo(final TelegramStickersPackInfo packInfo) {
-                runOnUiThread(() -> {
-                    newPack.title = packInfo.title;
-                    newPack.stickersCount = packInfo.stickersCount;
-                    newPack.version = packInfo.version;
-                    notifyPackChanged(newPack, packs.indexOf(newPack));
-                });
+                @Override
+                public void onPackDownloadError(Exception e) {
+                    runOnUiThread(() -> {
+                        Log.e(TAG, "Error while downloading pack " + newPack.id);
+                        e.printStackTrace();
 
-                notificationsHelper.packDownloadUpdated(newPack, 0);
-            }
+                        if (!isUpdate) {
+                            int index = packs.indexOf(newPack);
+                            packs.remove(index);
+                            notifyPackRemoved(newPack, index);
+                        } else {
+                            newPack.state = TelegramStickersPack.DOWNLOADED;
+                            notifyPackChanged(newPack, packs.indexOf(newPack));
+                        }
 
-            @Override
-            public void onStickerDownloaded(String pack, File sticker, String boundEmoji, int stickerIndex, int downloadedStickersCount, int totalStickersCount) {
-                stickerIndex--;
+                        notifyPackDownloadError(newPack, e);
+                        currentlyDownloading.remove(newPack.id);
+                    });
+                    notificationsHelper.packDoneDownloading(newPack, false, isUpdate, e);
+                }
 
-                List<Integer> list = newPack.emojis.get(boundEmoji);
-                if (list == null) list = new ArrayList<>();
-                list.add(stickerIndex);
-                newPack.emojis.put(boundEmoji, list);
+                @Override
+                public void onGotPackInfo(TelegramStickersPackInfo packInfo) {
+                    runOnUiThread(() -> {
+                        newPack.title = packInfo.title;
+                        newPack.stickersCount = packInfo.stickersCount;
+                        newPack.version = packInfo.version;
+                        notifyPackChanged(newPack, packs.indexOf(newPack));
+                    });
 
-                notificationsHelper.packDownloadUpdated(newPack, downloadedStickersCount);
-            }
-        });
+                    notificationsHelper.packDownloadUpdated(newPack, 0);
+                }
 
-        return true;
+                @Override
+                public void onStickerDownloaded(String pack, File sticker, String boundEmoji, int stickerIndex, int downloadedStickersCount, int totalStickersCount) {
+                    stickerIndex--;
+
+                    List<Integer> list = newPack.emojis.get(boundEmoji);
+                    if (list == null) list = new ArrayList<>();
+                    list.add(stickerIndex);
+                    newPack.emojis.put(boundEmoji, list);
+
+                    notificationsHelper.packDownloadUpdated(newPack, downloadedStickersCount);
+                }
+            });
+        } catch (Exception e) {
+            // handle other possible exceptions
+            e.printStackTrace();
+        }
     }
 
-    public void setPackEnabled(final TelegramStickersPack pack, final boolean enabled, final boolean notify) {
+    public void setPackEnabled(TelegramStickersPack pack, boolean enabled, boolean notify) {
         if (!ready) {
             queuedTasks.add(() -> setPackEnabled(pack, enabled, notify));
             return;
@@ -323,7 +306,7 @@ public class TelegramStickersService {
         }
     }
 
-    public void deletePack(final TelegramStickersPack pack) {
+    public void deletePack(TelegramStickersPack pack) {
         if (!ready) {
             queuedTasks.add(() -> deletePack(pack));
             return;
@@ -332,7 +315,6 @@ public class TelegramStickersService {
         boolean d = dbHelper.deletePack(pack);
         Log.d(TAG, "Delete from DB=" + d);
 
-
         int index = packs.indexOf(pack);
         packs.remove(index);
         notifyPackRemoved(pack, index);
@@ -353,7 +335,7 @@ public class TelegramStickersService {
         uiThreadHandler.post(r);
     }
 
-    private void syncPack(final TelegramStickersPack pack) {
+    private void syncPack(TelegramStickersPack pack) {
         if (!ready) {
             queuedTasks.add(() -> syncPack(pack));
             return;
@@ -395,6 +377,4 @@ public class TelegramStickersService {
 
         void onInactivePacksListChanged();
     }
-
-
 }

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

@@ -7,23 +7,20 @@ import android.os.Looper;
 import android.util.Log;
 import com.aefyr.tsg.g2.stickersgrabber.util.Flag;
 import com.aefyr.tsg.g2.stickersgrabber.util.GoalCounter;
+import okhttp3.*;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
-import ru.vtosters.lite.net.*;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.PasswordAuthentication;
-import java.net.Proxy;
-import java.net.Socket;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -31,14 +28,19 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 public class TelegramStickersGrabber {
     private static final String TAG = "TSG";
-    public static String REAL_TG_IP = null;
-    public static String PROXY_IP = null;
-    public static int PROXY_PORT = -1;
-    public static String PROXY_USER = null;
-    public static String PROXY_PASS = null;
-    public static boolean PROXY_SOCKS = true;
-    public static boolean HAS_PASS = false;
-    public static boolean USE_PROXY = false;
+    private static final OkHttpClient sClient = VtOkHttpClient.getInstance();
+    private static final int MAX_RETRIES = 2;
+    private static final AtomicInteger retryCount = new AtomicInteger();
+    private static final int STICKER_QUALITY = 100;
+    private static final String STICKER_FILE_NAME_FORMAT = "%03d.png";
+    private static final String STICKERS_KEY = "stickers";
+    private static final String FILE_ID_KEY = "file_id";
+    private static final String EMOJI_KEY = "emoji";
+    private static final String IS_ANIMATED_KEY = "is_animated";
+    private static final String IS_VIDEO_KEY = "is_video";
+    private static final String THUMB_KEY = "thumb";
+    private static final String NAME_KEY = "name";
+    private static final String TITLE_KEY = "title";
     private static String BOT_API_BASE_URL;
     private static String GET_STICKER_SET_URL;
     private static String GET_FILE_URL;
@@ -50,12 +52,10 @@ public class TelegramStickersGrabber {
 
     private final MessageDigest sha256;
     private final Handler uiThreadHandler;
-    private String botApiKey = "";
-    private NetClient httpClient;
+    private String botApiKey;
 
     public TelegramStickersGrabber(String botApiKey) {
         this.botApiKey = botApiKey;
-        httpClient = new NetClient.Builder().connectTimeout(5, TimeUnit.SECONDS).build();
         uiThreadHandler = new Handler(Looper.getMainLooper());
         try {
             sha256 = MessageDigest.getInstance("SHA-256");
@@ -69,81 +69,12 @@ public class TelegramStickersGrabber {
     public static void updateURLs() {
         BOT_API_BASE_FILE_URL = "https://api.telegram.org/file/bot%s/%s";
 
-
-        BOT_API_BASE_URL = REAL_TG_IP != null ? "https://" + REAL_TG_IP + "/bot%s/" : "https://api.telegram.org/bot%s/";
+        BOT_API_BASE_URL = "https://api.telegram.org/bot%s/";
         GET_STICKER_SET_URL = BOT_API_BASE_URL + "getStickerSet?name=%s";
         GET_FILE_URL = BOT_API_BASE_URL + "getFile?file_id=%s";
     }
 
-    public static boolean isTelegramBlocked() {
-        NetClient client = new NetClient.Builder().connectTimeout(5, TimeUnit.SECONDS).build();
-        try {
-            if (PROXY_IP != null) {
-                Socket socket = new Socket(PROXY_IP, PROXY_PORT);
-                Proxy proxy = new Proxy(Proxy.Type.SOCKS, socket.getRemoteSocketAddress());
-                NetClient.Builder b = new NetClient.Builder().proxy(proxy);
-                if (PROXY_USER != null) {
-                    b = b.proxyAuthenticator(new PasswordAuthentication(PROXY_USER, PROXY_PASS.toCharArray()));
-                }
-                client = b.build();
-                socket.close();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        NetRequest req = new NetRequest.Builder().url(REAL_TG_IP != null ? "https://" + REAL_TG_IP + "/test/" : "https://api.telegram.org/test/").build();
-        try {
-            NetResponse res = client.newCall(req).execute();
-            String s = res.getDataString();
-
-            if (!s.equals("{\"ok\":false,\"error_code\":404,\"description\":\"Not Found\"}"))
-                return true;
-        } catch (Exception e) {
-            return true;
-        }
-        return false;
-    }
-
-    public void resetProxy() {
-        httpClient = new NetClient.Builder().connectTimeout(5, TimeUnit.SECONDS).build();
-    }
-
-    public void enableProxy() {
-        Thread kostil = new Thread() {
-            @Override
-            public void run() {
-                try {
-                    if (PROXY_IP != null) {
-                        Socket socket = new Socket(PROXY_IP, PROXY_PORT);
-                        Proxy proxy = new Proxy(Proxy.Type.SOCKS, socket.getRemoteSocketAddress());
-                        NetClient.Builder b = httpClient.newBuilder().proxy(proxy);
-
-                        if (PROXY_USER != null) {
-                            httpClient = b.proxyAuthenticator(new PasswordAuthentication(PROXY_USER, PROXY_PASS.toCharArray())).build();
-                        }
-
-                        httpClient = b.build();
-                        socket.close();
-                    }
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        };
-
-        kostil.start();
-        try {
-            kostil.join();
-            Log.d(TAG, "Proxy set");
-        } catch (InterruptedException e) {
-            Log.e(TAG, "Unable to set proxy:");
-            e.printStackTrace();
-
-        }
-    }
-
-    public void grabPack(String id, File packFolder, String installedVersion, final PackDownloadListener listener) {
+    public void grabPack(String id, File packFolder, String installedVersion, PackDownloadListener listener) {
         getPackInfo(id, packFolder, installedVersion, listener);
     }
 
@@ -151,264 +82,247 @@ public class TelegramStickersGrabber {
         botApiKey = key;
     }
 
-    public void checkKey(final KeyCheckListener listener) {
+    public void checkKey(KeyCheckListener listener) {
         Log.d(TAG, "Checking key: " + botApiKey);
-        NetRequest request = new NetRequest.Builder().get().url(String.format(BOT_API_BASE_URL + "getMe", botApiKey)).build();
-        httpClient.newCall(request).enqueue(new NetCallback() {
+        // Create a request object with the URL and bot API key
+        Request request = new Request.a()
+                .b(String.format(BOT_API_BASE_URL + "getMe", botApiKey))
+                .a();
+        // Create a new call object and enqueue it to run asynchronously
+        sClient.a(request).a(new Callback() {
             @Override
-            public void onFailure(NetCall call, IOException e) {
-                e.printStackTrace();
+            public void a(Call call, IOException e) {
+                // Handle the failure case
+                Log.d(TAG, e.getMessage());
                 runOnUiThread(listener::onNetError);
             }
 
             @Override
-            public void onResponse(NetCall call, final NetResponse response) throws IOException {
-                runOnUiThread(() -> listener.onKeyChecked(response.code() == 200));
+            public void a(Call call, Response response) {
+                Log.d(TAG, response.toString());
+                runOnUiThread(() -> listener.onKeyChecked(response.h()));
             }
         });
     }
 
-    private void getPackInfo(final String packName, final File packFolder, final String installedVersion, final PackDownloadListener listener) {
-        NetRequest packInfoRequest = new NetRequest.Builder().get().url(String.format(GET_STICKER_SET_URL, botApiKey, packName)).build();
-        httpClient.newCall(packInfoRequest).enqueue(new NetCallback() {
+    private void getPack(StickerSet set, File packFolder, TelegramStickersPackInfo packInfo, PackDownloadListener listener) {
+        GoalCounter downloadedStickers = new GoalCounter(set.stickers.size(), () -> {
+            Log.d(TAG, String.format("Pack %s has been downloaded to %s", set.id, packFolder.getAbsolutePath()));
+            listener.onPackDownloaded(packInfo, true);
+        });
+
+        Flag deathFlag = new Flag();
+
+        for (int i = 0; i < set.stickers.size(); i++) {
+            Sticker sticker = set.stickers.get(i);
+            String getFileUrl = String.format(GET_FILE_URL, botApiKey, sticker.fileId);
+            Request fileInfoRequest = new Request.a()
+                    .b(getFileUrl)
+                    .a();
+
+            int stickerIndex = i + 1;
+
+            sClient.a(fileInfoRequest).a(new Callback() {
+                @Override
+                public void a(Call call, IOException e) {
+                    handleFailure(deathFlag, listener, e, downloadedStickers, call, fileInfoRequest, this);
+                }
+
+                @Override
+                public void a(Call call, Response response) {
+                    if (deathFlag.up())
+                        return;
+
+                    if (!response.h()) {
+                        retryRequest(call, fileInfoRequest, this);
+                        return;
+                    }
+
+                    try (ResponseBody responseBody = response.a()) {
+                        JSONObject fileInfoResponse = new JSONObject(responseBody.g()).getJSONObject("result");
+                        String filePath = fileInfoResponse.getString("file_path");
+
+                        if (botApiKey == null) botApiKey = "";
+
+                        String fileDownloadUrl = String.format(BOT_API_BASE_FILE_URL, botApiKey, filePath);
+                        Request fileDownloadRequest = new Request.a()
+                                .b(fileDownloadUrl)
+                                .a();
+
+                        sClient.a(fileDownloadRequest).a(new Callback() {
+                            @Override
+                            public void a(Call call, IOException e) {
+                                handleFailure(deathFlag, listener, e, downloadedStickers, call, fileDownloadRequest, this);
+                            }
+
+                            @Override
+                            public void a(Call call, Response response) {
+                                if (deathFlag.up())
+                                    return;
+
+                                if (!response.h()) {
+                                    retryRequest(call, fileDownloadRequest, this);
+                                    return;
+                                }
+
+                                try (ResponseBody responseBody = response.a()) {
+                                    if (responseBody == null) {
+                                        handleFailure(deathFlag, listener, new TSGException("Response body for a sticker is null :/"), downloadedStickers, call, fileDownloadRequest, this);
+                                        return;
+                                    }
+
+                                    InputStream stickerInputStream = responseBody.a();
+                                    Bitmap stickerImage = BitmapFactory.decodeStream(stickerInputStream);
+
+                                    if (stickerImage == null) {
+                                        handleFailure(deathFlag, listener, new TSGException("Unable to decode sticker image"), downloadedStickers, call, fileDownloadRequest, this);
+                                        return;
+                                    }
+
+                                    File stickerFile = new File(packFolder, String.format(STICKER_FILE_NAME_FORMAT, stickerIndex));
+
+                                    try {
+                                        saveStickerImage(stickerImage, stickerFile);
+                                    } catch (TSGException e) {
+                                        throw new RuntimeException(e);
+                                    }
+
+                                    listener.onStickerDownloaded(set.name, stickerFile, sticker.emoji, stickerIndex,
+                                            downloadedStickers.value() + 1, set.stickers.size());
+                                    downloadedStickers.increase();
+                                }
+                            }
+                        });
+                    } catch (Exception e) {
+                        handleFailure(deathFlag, listener, e, downloadedStickers, call, fileInfoRequest, this);
+                    }
+                }
+            });
+        }
+    }
+
+    private void handleFailure(Flag deathFlag, PackDownloadListener listener, Exception e, GoalCounter downloadedStickers, Call call, Request request, Callback callback) {
+        if ((e instanceof IOException || e instanceof TSGException) && retryCount.get() > MAX_RETRIES) {
+            Log.e(TAG, "Unable to download sticker: " + e.getMessage());
+            downloadedStickers.increase();
+            return;
+        } else if (retryCount.get() < MAX_RETRIES) {
+            retryRequest(call, request, callback);
+            return;
+        }
+
+        if (deathFlag.up()) {
+            return;
+        }
+
+        deathFlag.raise();
+        listener.onPackDownloadError(e);
+    }
+
+    private void retryRequest(Call call, Request request, Callback callback) {
+        retryCount.incrementAndGet();
+
+        if (retryCount.get() > MAX_RETRIES) {
+            Log.e(TAG, "retryRequest: max retries");
+            callback.a(call, new IOException());
+        } else {
+            Log.e(TAG, "retryRequest");
+            sClient.a(request).a(callback);
+        }
+    }
+
+    private void saveStickerImage(Bitmap image, File file) throws TSGException {
+        try (FileOutputStream fos = new FileOutputStream(file)) {
+            image.compress(Bitmap.CompressFormat.PNG, 100, fos);
+        } catch (IOException e) {
+            throw new TSGException("Unable to save sticker image");
+        }
+    }
+
+    private void getPackInfo(String packName, File packFolder, String installedVersion, PackDownloadListener listener) {
+        String getStickerSetUrl = String.format(GET_STICKER_SET_URL, botApiKey, packName);
+        Request packInfoRequest = new Request.a()
+                .b(getStickerSetUrl)
+                .a();
+        sClient.a(packInfoRequest).a(new Callback() {
             @Override
-            public void onFailure(NetCall call, IOException e) {
+            public void a(Call call, IOException e) {
+                Log.d(TAG, e.getMessage());
                 listener.onPackDownloadError(e);
             }
 
             @Override
-            public void onResponse(NetCall call, NetResponse response) {
-                if (!response.isSuccessful()) {
-                    if (response.getData() != null)
-                        listener.onPackDownloadError(new TSGException(response.getDataString() + "\nURL: " + call.request().url()));
-                    else
-                        listener.onPackDownloadError(new TSGException("Unknown Exception, no response body"));
+            public void a(Call call, Response response) throws IOException {
+                Log.d(TAG, response.toString());
 
+                if (!response.h()) {
+                    String errorMessage = response.a() != null ? response.a().g() + "\nURL: " + call.m0().g() : "Unknown Exception, no response body";
+                    listener.onPackDownloadError(new TSGException(errorMessage));
                     return;
                 }
 
-                StickerSet set;
-                try {
-                    JSONObject jPackInfo = new JSONObject(response.getDataString()).getJSONObject("result");
-                    String packVersion = new String(sha256.digest(jPackInfo.toString().getBytes(StandardCharsets.UTF_8)));
+                try (ResponseBody responseBody = response.a()) {
+                    JSONObject packInfoResponse = new JSONObject(responseBody.g()).getJSONObject("result");
+                    String packVersion = new String(sha256.digest(packInfoResponse.toString().getBytes(StandardCharsets.UTF_8)));
 
                     if (packVersion.equals(installedVersion)) {
                         listener.onPackDownloaded(null, false);
                         return;
                     }
 
-                    JSONArray jStickers = jPackInfo.getJSONArray("stickers");
+                    JSONArray stickersArray = packInfoResponse.getJSONArray(STICKERS_KEY);
 
-                    if (jStickers.length() == 0) {
+                    if (stickersArray.length() == 0) {
                         listener.onPackDownloadError(new TSGException("No stickers in pack"));
                         return;
                     }
 
-                    ArrayList<Sticker> stickers = new ArrayList<>(jStickers.length());
+                    ArrayList<Sticker> stickers = parseStickers(stickersArray);
 
-                    Log.d(TAG, String.format("Parsing stickers in pack %s", packName));
+                    StickerSet set = new StickerSet(packInfoResponse.getString(NAME_KEY), packInfoResponse.getString(TITLE_KEY), packVersion, stickers);
 
-                    for (int i = 0; i < jStickers.length(); i++) {
-                        JSONObject jSticker = jStickers.getJSONObject(i);
-                        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")));
-                        }
+                    if (!packFolder.exists() && !packFolder.mkdirs()) {
+                        // Handle the folder creation failure case
+                        listener.onPackDownloadError(new IOException("Can't create folder for the pack!"));
+                        return;
                     }
 
-                    set = new StickerSet(jPackInfo.getString("name"), jPackInfo.getString("title"), packVersion, stickers);
+                    Log.d(TAG, String.format("Got info for pack %s, now downloading stickers to %s", packName, packFolder.getAbsolutePath()));
+
+                    TelegramStickersPackInfo packInfo = new TelegramStickersPackInfo(packName, set.name, set.stickers.size(), set.version);
+
+                    listener.onGotPackInfo(packInfo);
+
+                    getPack(set, packFolder, packInfo, listener);
                 } catch (Exception e) {
                     listener.onPackDownloadError(e);
-                    return;
                 }
-
-                if (!packFolder.exists() && !packFolder.mkdirs()) {
-                    listener.onPackDownloadError(new IOException("Can't create folder for the pack!"));
-                    return;
-                }
-
-                Log.d(TAG, String.format("Got info for pack %s, now downloading stickers to %s", packName, packFolder.getAbsolutePath()));
-
-                TelegramStickersPackInfo packInfo = new TelegramStickersPackInfo(packName, set.name, set.stickers.size(), set.version);
-                listener.onGotPackInfo(packInfo);
-                getPack(set, packFolder, packInfo, listener);
             }
         });
     }
 
-    private void getPack(final StickerSet set, final File packFolder, final TelegramStickersPackInfo packInfo, final PackDownloadListener listener) {
-        final GoalCounter downloadedStickers = new GoalCounter(set.stickers.size(), () -> {
-            Log.d(TAG, String.format("Pack %s has been downloaded to %s", set.id, packFolder.getAbsolutePath()));
+    private ArrayList<Sticker> parseStickers(JSONArray stickersArray) throws JSONException, TSGException {
+        ArrayList<Sticker> stickers = new ArrayList<>(stickersArray.length());
 
-            listener.onPackDownloaded(packInfo, true);
-        });
-        final Flag deathFlag = new Flag();
+        for (int i = 0; i < stickersArray.length(); i++) {
+            JSONObject stickerObject = stickersArray.getJSONObject(i);
+            boolean isAnimated = stickerObject.optBoolean(IS_ANIMATED_KEY);
+            boolean isVideo = stickerObject.optBoolean(IS_VIDEO_KEY);
+            String fileId = stickerObject.getString(FILE_ID_KEY);
+            String emoji = stickerObject.getString(EMOJI_KEY);
 
-        AtomicInteger retryed = new AtomicInteger();
-        for (int i = 0; i < set.stickers.size(); i++) {
-            final Sticker sticker = set.stickers.get(i);
-            NetRequest fileInfoRequest = new NetRequest.Builder().get().url(String.format(GET_FILE_URL, botApiKey, sticker.fileId)).build();
-
-            final int stickerIndex = i + 1;
-
-            AtomicBoolean sync = new AtomicBoolean();
-            httpClient.newCall(fileInfoRequest).enqueue(new NetCallback() {
-                @Override
-                public void onFailure(NetCall call, IOException e) {
-                    if (deathFlag.up())
-                        return;
-
-                    deathFlag.raise();
-                    listener.onPackDownloadError(e);
-
-                    sync.set(true);
+            if (isAnimated || isVideo) {
+                if (stickerObject.has(THUMB_KEY)) {
+                    fileId = stickerObject.getJSONObject(THUMB_KEY).getString(FILE_ID_KEY);
+                } else {
+                    throw new TSGException("Animated and video stickerpacks without thumbs are not supported!");
                 }
+            }
 
-                @Override
-                public void onResponse(NetCall call, NetResponse response) throws IOException {
-                    if (deathFlag.up())
-                        return;
-
-                    if (response.code() != 200) {
-                        retryed.incrementAndGet();
-
-                        if (retryed.get() > 5)
-                            onFailure(call, new IOException());
-                        else httpClient.newCall(fileInfoRequest)
-                                .enqueue(this);
-
-                        return;
-                    }
-
-                    String filePath;
-                    try {
-                        JSONObject jFileInfo = new JSONObject(response.getDataString()).getJSONObject("result");
-                        filePath = jFileInfo.getString("file_path");
-                    } catch (Exception e) {
-                        deathFlag.raise();
-                        listener.onPackDownloadError(e);
-                        sync.set(true);
-                        return;
-                    }
-
-                    if (botApiKey == null) botApiKey = "";
-
-                    NetRequest fileDownloadRequest = new NetRequest.Builder().get().url(String.format(BOT_API_BASE_FILE_URL, botApiKey, filePath)).build();
-
-                    httpClient.newCall(fileDownloadRequest).enqueue(new NetCallback() {
-                        @Override
-                        public void onFailure(NetCall call, IOException e) {
-                            if (deathFlag.up())
-                                return;
-
-                            deathFlag.raise();
-                            listener.onPackDownloadError(e);
-
-                            sync.set(true);
-                        }
-
-                        @Override
-                        public void onResponse(NetCall call, NetResponse response) throws IOException {
-                            if (deathFlag.up())
-                                return;
-
-                            if (response.code() != 200) {
-                                retryed.incrementAndGet();
-
-                                if (retryed.get() > 5)
-                                    onFailure(call, new IOException());
-                                else httpClient.newCall(fileDownloadRequest)
-                                        .enqueue(this);
-
-                                return;
-                            }
-
-                            if (response.getData() == null) {
-                                deathFlag.raise();
-                                listener.onPackDownloadError(new TSGException("Response body for a sticker is null :/"));
-                                sync.set(true);
-                                return;
-                            }
-
-                            InputStream stickerInputStream = response.getDataStream();
-
-                            Bitmap stickerImage = BitmapFactory.decodeStream(stickerInputStream);
-
-                            try {
-                                stickerInputStream.close();
-                            } catch (IOException e) {
-                                e.printStackTrace();
-
-                                deathFlag.raise();
-                                listener.onPackDownloadError(e);
-                                sync.set(true);
-                                return;
-                            }
-
-                            if (stickerImage == null) {
-                                deathFlag.raise();
-                                listener.onPackDownloadError(new TSGException("Unable to decode sticker image"));
-                                sync.set(true);
-                                return;
-                            }
-
-                            File stickerFile = new File(packFolder, String.format("%03d.png", stickerIndex));
-
-                            FileOutputStream fileOutputStream;
-                            try {
-                                fileOutputStream = new FileOutputStream(stickerFile);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-
-                                deathFlag.raise();
-                                listener.onPackDownloadError(e);
-                                sync.set(true);
-                                return;
-                            }
-
-                            if (!stickerImage.compress(Bitmap.CompressFormat.PNG, 100, fileOutputStream)) {
-                                stickerImage.recycle();
-                                deathFlag.raise();
-                                listener.onPackDownloadError(new TSGException("Unable to compress sticker to a png file at path: " + stickerFile.getAbsolutePath()));
-                                sync.set(true);
-                                return;
-                            }
-
-                            stickerImage.recycle();
-
-                            try {
-                                fileOutputStream.close();
-                            } catch (IOException e) {
-                                e.printStackTrace();
-
-                                deathFlag.raise();
-                                listener.onPackDownloadError(e);
-                                sync.set(true);
-                                return;
-                            }
-
-
-                            listener.onStickerDownloaded(set.name, stickerFile, sticker.emoji, stickerIndex, downloadedStickers.value() + 1, set.stickers.size());
-                            downloadedStickers.increase();
-
-                            sync.set(true);
-                        }
-                    });
-                }
-            });
-
-            while (!sync.get())
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException e1) {
-                }
+            stickers.add(new Sticker(fileId, emoji));
         }
+
+        return stickers;
     }
 
     private void runOnUiThread(Runnable r) {
@@ -431,15 +345,13 @@ public class TelegramStickersGrabber {
         void onNetError();
     }
 
-    public class TSGException extends Exception {
-        private static final long serialVersionUID = 7866915509988422944L;
-
+    public static class TSGException extends Exception {
         private TSGException(String message) {
             super(message);
         }
     }
 
-    private class StickerSet {
+    private static class StickerSet {
         String id;
         String name;
         String version;
@@ -453,7 +365,7 @@ public class TelegramStickersGrabber {
         }
     }
 
-    private class Sticker {
+    private static class Sticker {
         String emoji;
         String fileId;
 

app/src/main/java/com/google/devrel/gmscore/tools/apk/arsc/BinaryResourceValue.java

@@ -130,9 +130,9 @@ public class BinaryResourceValue implements SerializableResource {
      */
     public static final int SIZE = 8;
 
-    private final int size;
-    private final Type type;
-    private final int data;
+    public int size;
+    public Type type;
+    public int data;
 
     public static BinaryResourceValue create(ByteBuffer buffer) {
         int size = (buffer.getShort() & 0xFFFF);

app/src/main/java/com/vk/api/audio/AudioGetLyrics.java

@@ -6,9 +6,9 @@ import com.vk.api.base.ApiRequest;
 import com.vk.dto.music.MusicTrack;
 import com.vk.log.L;
 import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.music.Genius;
 import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.hooks.other.Preferences;
 
 import java.util.ArrayList;
 

app/src/main/java/com/vk/medianative/MediaNative.java

@@ -0,0 +1,502 @@
+package com.vk.medianative;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.os.Process;
+import android.os.*;
+import android.util.Log;
+import androidx.annotation.Keep;
+import androidx.annotation.Nullable;
+import com.facebook.soloader.SoLoader;
+
+import java.io.InputStream;
+import java.lang.ref.WeakReference;
+import java.nio.ByteBuffer;
+import java.util.Scanner;
+
+public final class MediaNative {
+    private static final String a = NativeMediaEncoder.class.getSimpleName();
+    private static final Object f17443d = new Object();
+    @SuppressLint("StaticFieldLeak")
+    @Keep
+    public static volatile Context context;
+    private static boolean isMediaLoaded = false;
+    private static boolean isMediaMasksLoaded = false;
+
+    public static int HSLToIntRGB(float f2, float f3, float f4) {
+        int[] iArr = new int[3];
+        waitForContext();
+        nativeHSLToRGB(f2, f3, f4, iArr);
+        return Color.argb(255, iArr[0], iArr[1], iArr[2]);
+    }
+
+    public static void HSLToRGB(float f2, float f3, float f4, int[] iArr) {
+        waitForContext();
+        nativeHSLToRGB(f2, f3, f4, iArr);
+    }
+
+    public static int HSVToIntRGB(float f2, float f3, float f4) {
+        int[] iArr = new int[3];
+        waitForContext();
+        nativeHSVToRGB(f2, f3, f4, iArr);
+        return Color.argb(255, iArr[0], iArr[1], iArr[2]);
+    }
+
+    public static void HSVToRGB(float f2, float f3, float f4, int[] iArr) {
+        waitForContext();
+        nativeHSVToRGB(f2, f3, f4, iArr);
+    }
+
+    public static int LabToIntRGB(float f2, float f3, float f4) {
+        int[] iArr = new int[3];
+        waitForContext();
+        nativeLabToRGB(f2, f3, f4, iArr);
+        return Color.argb(255, iArr[0], iArr[1], iArr[2]);
+    }
+
+    public static void LabToRGB(float f2, float f3, float f4, int[] iArr) {
+        waitForContext();
+        nativeLabToRGB(f2, f3, f4, iArr);
+    }
+
+    public static void RGBToHSL(int i, int i2, int i3, float[] fArr) {
+        waitForContext();
+        nativeRGBToHSL(i, i2, i3, fArr);
+    }
+
+    public static void RGBToHSV(int i, int i2, int i3, float[] fArr) {
+        waitForContext();
+        nativeRGBToHSV(i, i2, i3, fArr);
+    }
+
+    public static void RGBToLab(int i, int i2, int i3, float[] fArr) {
+        waitForContext();
+        nativeRGBToLab(i, i2, i3, fArr);
+    }
+
+    public static long animationPlayerCreate(String str, int i, int i2, boolean z) {
+        waitForContext();
+        return nativeAnimationPlayerCreate(str, i, i2, z);
+    }
+
+    public static int animationPlayerDecode(long j, Bitmap bitmap) {
+        waitForContext();
+        return nativeAnimationPlayerDecode(j, bitmap);
+    }
+
+    public static int animationPlayerGetSize(long j) {
+        waitForContext();
+        return nativeAnimationPlayerGetSize(j);
+    }
+
+    public static void animationPlayerRelease(long j) {
+        waitForContext();
+        nativeAnimationPlayerRelease(j);
+    }
+
+    public static boolean animationPlayerSeek(long j, int i) {
+        waitForContext();
+        return nativeAnimationPlayerSeek(j, i);
+    }
+
+    public static void applyCurveAndSaturationBitmap(Bitmap bitmap, int[] iArr, float f2) {
+        waitForContext();
+        nativeCurveSaturation(bitmap, iArr, f2, Runtime.getRuntime().availableProcessors());
+    }
+
+    public static long audioGetTotalPcmDuration() {
+        waitForContext();
+        return nativeAudioGetTotalPcmDuration();
+    }
+
+    public static byte[] audioGetWaveform(short[] sArr, int i) {
+        waitForContext();
+        return nativeAudioGetWaveform(sArr, i);
+    }
+
+    public static int audioIsOpusFile(String str) {
+        waitForContext();
+        return nativeAudioIsOpusFile(str);
+    }
+
+    public static void audioReadOpusFile(ByteBuffer byteBuffer, int i, int[] iArr) {
+        waitForContext();
+        nativeAudioReadOpusFile(byteBuffer, i, iArr);
+    }
+
+    public static int audioSeekOpusFile(float f2) {
+        waitForContext();
+        return nativeAudioSeekOpusFile(f2);
+    }
+
+    public static int audioStartRecord(String str) { // need to hack
+        waitForContext();
+        return nativeAudioStartRecord(str);
+    }
+
+    public static void audioStopRecord() { // need to hack
+        waitForContext();
+        nativeAudioStopRecord();
+    }
+
+    public static int audioWriteFrame(ByteBuffer byteBuffer, int i) { // need to hack
+        waitForContext();
+        return nativeAudioWriteFrame(byteBuffer, i);
+    }
+
+    private static void waitForContext() {
+        synchronized (f17443d) {
+            if (context == null) {
+                try {
+                    f17443d.wait();
+                } catch (InterruptedException e2) {
+                    Log.e(a, "Interrupted while waiting for context", e2);
+                }
+            }
+        }
+    }
+
+    public static void blurBitmap(Bitmap bitmap, int i) {
+        waitForContext();
+        nativeBlur(bitmap, i);
+    }
+
+    private static String c() {
+        return getProcMaps(String.valueOf(Process.myPid()));
+    }
+
+    public static void cameraProcessorCreate() {
+        waitForContext();
+        nativeProcessorCreate();
+    }
+
+    public static boolean cameraProcessorDo(byte[] bArr, long[] jArr) {
+        waitForContext();
+        return nativeProcessorDo(bArr, jArr);
+    }
+
+    public static int cameraProcessorGetVersion() {
+        waitForContext();
+        return nativeProcessorGetVersion();
+    }
+
+    public static boolean cameraProcessorInit(String str, int i, int i2) {
+        waitForContext();
+        return nativeProcessorInit(str, i, i2);
+    }
+
+    public static boolean cameraProcessorLoad(String str, boolean z) {
+        waitForContext();
+        return nativeProcessorLoad(str, z);
+    }
+
+    public static void cameraProcessorMouseTap(int i, float f2, float f3) {
+        waitForContext();
+        nativeProcessorMouseTap(i, f2, f3);
+    }
+
+    public static void cameraProcessorRelease() {
+        waitForContext();
+        nativeProcessorRelease();
+    }
+
+    public static void colorCorrectionBitmap(Bitmap bitmap, Bitmap bitmap2, float[] fArr) {
+        waitForContext();
+        nativeColorCorrection(bitmap, bitmap2, fArr, fArr.length, Runtime.getRuntime().availableProcessors());
+    }
+
+    public static byte[] compressBitmapJpeg(Bitmap bitmap, int i) {
+        waitForContext();
+        return nativeJpegTurboCompress(bitmap, i);
+    }
+
+    public static String createAllInOneShader() {
+        waitForContext();
+        return nativeAllInOneShader();
+    }
+
+    public static void createCurve(int[] iArr, int[] iArr2, int[] iArr3, int[] iArr4, int[] iArr5, float f2, float f3, float f4, float f5, float f6) {
+        waitForContext();
+        nativeCreateCurve(iArr, iArr2, iArr3, iArr4, iArr5, f2, f3, f4, f5, f6);
+    }
+
+    public static String createOneInAllShader() {
+        waitForContext();
+        return nativeOneInAllShader();
+    }
+
+    private static String d() {
+        return getProcMaps("self");
+    }
+
+    public static String dump() {
+        return "LD_LIBRARY_PATH:\n" + SoLoader.makeLdLibraryPath() + "\nSELF_MAPS:\n" + d() + "\nPID_MAPS:\n" + c() + "\n";
+    }
+
+    private static void e() {
+        isMediaMasksLoaded = NativeLibLoader.loadLibrary("vkmediamasks");
+    }
+
+    public static void enhanceBitmap(Bitmap bitmap, float f2) {
+        waitForContext();
+        nativeEnhance(bitmap, f2, Runtime.getRuntime().availableProcessors());
+    }
+
+    private static void loadVKMediaLibs() {
+        if (isMediaLoaded) {
+            return;
+        }
+        NativeLibLoader.loadLibrary("ffmpeg");
+        isMediaLoaded = NativeLibLoader.loadLibrary("vkmedia");
+        isMediaLoaded = NativeLibLoader.loadLibrary("vkmediaencoder");
+    }
+
+    public static void flipHorizontallyBitmap(Bitmap bitmap) {
+        waitForContext();
+        nativeFlipHorizontally(bitmap);
+    }
+
+    public static void flipVerticallyBitmap(Bitmap bitmap) {
+        waitForContext();
+        nativeFlipVertically(bitmap);
+    }
+
+    public static void generateHistogram(Bitmap bitmap, int[] iArr, int[] iArr2, int[] iArr3, int[] iArr4) {
+        waitForContext();
+        nativeHistogram(bitmap, iArr, iArr2, iArr3, iArr4);
+    }
+
+    public static void init(Context context2) {
+        synchronized (f17443d) {
+            context = context2;
+            SoLoader.init(context2, false);
+            NativeLibLoader.loadLibrary("gnustl_shared");
+            NativeLibLoader.loadLibrary("vkchronicle");
+            loadVKMediaLibs();
+            f17443d.notifyAll();
+        }
+    }
+
+    public static void intRGBToHSL(int i, float[] fArr) {
+        waitForContext();
+        nativeRGBToHSL(Color.red(i), Color.green(i), Color.blue(i), fArr);
+    }
+
+    public static void intRGBToHSV(int i, float[] fArr) {
+        waitForContext();
+        nativeRGBToHSV(Color.red(i), Color.green(i), Color.blue(i), fArr);
+    }
+
+    public static void intRGBToLab(int i, float[] fArr) {
+        waitForContext();
+        nativeRGBToLab(Color.red(i), Color.green(i), Color.blue(i), fArr);
+    }
+
+    public static boolean isAsus() {
+        return "asus".equalsIgnoreCase(Build.MANUFACTURER);
+    }
+
+    public static boolean isMediaSupported() {
+        if (!isMediaMasksLoaded) {
+            e();
+        }
+        return isMediaMasksLoaded;
+    }
+
+    public static boolean isX86() {
+        try {
+            String str = Build.SUPPORTED_ABIS[0];
+            if (str != null) {
+                return str.startsWith("x86");
+            }
+            return false;
+        } catch (Throwable unused) {
+            return false;
+        }
+    }
+
+    public static void lookupBitmap(Bitmap bitmap, Bitmap bitmap2) {
+        waitForContext();
+        nativeLookup(bitmap, bitmap2, Runtime.getRuntime().availableProcessors());
+    }
+
+    public static long mediaEncoderCreate(MediaEncoderSettings mediaEncoderSettings) {
+        waitForContext();
+        return nativeCreateEncoder(mediaEncoderSettings);
+    }
+
+    public static int mediaEncoderDoEncode(long j) {
+        waitForContext();
+        return nativeDoEncode(j);
+    }
+
+    public static void mediaEncoderDoRelease(long j) {
+        waitForContext();
+        nativeReleaseEncoder(j);
+    }
+
+    private static native String nativeAllInOneShader();
+
+    private static native long nativeAnimationPlayerCreate(String str, int i, int i2, boolean z);
+
+    private static native int nativeAnimationPlayerDecode(long j, Bitmap bitmap);
+
+    private static native int nativeAnimationPlayerGetSize(long j);
+
+    private static native void nativeAnimationPlayerRelease(long j);
+
+    private static native boolean nativeAnimationPlayerSeek(long j, int i);
+
+    private static native long nativeAudioGetTotalPcmDuration();
+
+    private static native byte[] nativeAudioGetWaveform(short[] sArr, int i);
+
+    private static native int nativeAudioIsOpusFile(String str);
+
+    private static native int nativeAudioOpenOpusFile(String str);
+
+    private static native void nativeAudioReadOpusFile(ByteBuffer byteBuffer, int i, int[] iArr);
+
+    private static native int nativeAudioSeekOpusFile(float f2);
+
+    private static native int nativeAudioStartRecord(String str);
+
+    private static native void nativeAudioStopRecord();
+
+    private static native int nativeAudioWriteFrame(ByteBuffer byteBuffer, int i);
+
+    private static native void nativeBlur(Bitmap bitmap, int i);
+
+    private static native void nativeColorCorrection(Bitmap bitmap, Bitmap bitmap2, float[] fArr, int i, int i2);
+
+    private static native String nativeCreateColorCorrectionShader(float[] fArr, int i, int i2);
+
+    private static native void nativeCreateCurve(int[] iArr, int[] iArr2, int[] iArr3, int[] iArr4, int[] iArr5, float f2, float f3, float f4, float f5, float f6);
+
+    private static native long nativeCreateEncoder(MediaEncoderSettings mediaEncoderSettings);
+
+    private static native void nativeCurveSaturation(Bitmap bitmap, int[] iArr, double d2, int i);
+
+    private static native int nativeDoEncode(long j);
+
+    private static native void nativeEnhance(Bitmap bitmap, double d2, int i);
+
+    private static native void nativeFlipHorizontally(Bitmap bitmap);
+
+    private static native void nativeFlipVertically(Bitmap bitmap);
+
+    private static native void nativeHSLToRGB(float f2, float f3, float f4, int[] iArr);
+
+    private static native void nativeHSVToRGB(float f2, float f3, float f4, int[] iArr);
+
+    private static native void nativeHistogram(Bitmap bitmap, int[] iArr, int[] iArr2, int[] iArr3, int[] iArr4);
+
+    private static native byte[] nativeJpegTurboCompress(Bitmap bitmap, int i);
+
+    private static native void nativeLabToRGB(float f2, float f3, float f4, int[] iArr);
+
+    private static native void nativeLookup(Bitmap bitmap, Bitmap bitmap2, int i);
+
+    private static native String nativeOneInAllShader();
+
+    private static native void nativePinBitmap(Bitmap bitmap);
+
+    private static native void nativeProcessorCreate();
+
+    private static native boolean nativeProcessorDo(byte[] bArr, long[] jArr);
+
+    private static native int nativeProcessorGetVersion();
+
+    private static native boolean nativeProcessorInit(String str, int i, int i2);
+
+    private static native boolean nativeProcessorLoad(String str, boolean z);
+
+    private static native void nativeProcessorMouseTap(int i, float f2, float f3);
+
+    private static native void nativeProcessorRelease();
+
+    private static native void nativeRGBToHSL(int i, int i2, int i3, float[] fArr);
+
+    private static native void nativeRGBToHSV(int i, int i2, int i3, float[] fArr);
+
+    private static native void nativeRGBToLab(int i, int i2, int i3, float[] fArr);
+
+    private static native void nativeReleaseEncoder(long j);
+
+    private static native void nativeResize(Bitmap bitmap, Bitmap bitmap2, int i);
+
+    public static int openOpusFile(String str) {
+        waitForContext();
+        return nativeAudioOpenOpusFile(str);
+    }
+
+    public static void pinBitmap(Bitmap bitmap) {
+        waitForContext();
+        nativePinBitmap(bitmap);
+    }
+
+    public static void resizeBitmap(Bitmap bitmap, Bitmap bitmap2) {
+        waitForContext();
+        nativeResize(bitmap, bitmap2, Runtime.getRuntime().availableProcessors());
+    }
+
+    private static String getProcMaps(String str) {
+        try (InputStream inputStream = Runtime.getRuntime().exec("cat /proc/" + str + "/maps").getInputStream()) {
+            return new Scanner(inputStream).useDelimiter("\\A").next();
+        } catch (Exception e) {
+            return "empty";
+        }
+    }
+
+    public static class EncoderHandler extends Handler {
+        private Callback a;
+
+        public EncoderHandler(Looper looper) {
+            super(looper);
+        }
+
+        @Keep
+        public static Object postEventFromNative(Object obj, int i, int i2, int i3) {
+            EncoderHandler encoderHandler;
+            if (obj != null && (encoderHandler = (EncoderHandler) ((WeakReference<?>) obj).get()) != null) {
+                if (i == 2) {
+                    return encoderHandler.a.getLayerBitmap(i2, i3);
+                }
+                encoderHandler.sendMessage(encoderHandler.obtainMessage(i, i2, i3, null));
+            }
+            return null;
+        }
+
+        @Override // android.os.Handler
+        public void handleMessage(Message message) {
+            Callback callback = this.a;
+            if (callback == null) {
+                return;
+            }
+            int i = message.what;
+            if (i == 0) {
+                callback.onBytes(message.arg1);
+            } else if (i != 1) {
+                String str = MediaNative.a;
+                Log.e(str, "Unknown message type " + message.what);
+            } else {
+                callback.onProgress(message.arg1);
+            }
+        }
+
+        public void setCallback(Callback callback) {
+            this.a = callback;
+        }
+
+        public interface Callback {
+            @Nullable
+            Bitmap getLayerBitmap(int i, int i2);
+
+            void onBytes(int i);
+
+            void onProgress(int i);
+        }
+    }
+}

app/src/main/java/com/vk/music/view/x/LyricsHolder.java

@@ -23,8 +23,8 @@ import com.vtosters.lite.R;
 import com.vtosters.lite.ViewUtils;
 import com.vtosters.lite.ui.MusicErrorViewHelper;
 import com.vtosters.lite.ui.holder.RecyclerHolder;
-import ru.vtosters.lite.music.Genius;
 import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.music.Genius;
 
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;

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

@@ -4976,30 +4976,29 @@ public final class R {
         public static final int ic_deepl_logo_icon = 0x7f080bcb; // 2131233739
         public static final int ic_google_translate_logo = 0x7f080bcc; // 2131233740
         public static final int ic_yandex_translate_icon = 0x7f080bd1; // 2131233745
-        public static final int microsoft = 0x7f080bd2; // 2131233746
+        public static final int $splash__0 = 0x7f080bd2; // 2131233746
         public static final int roundmsg = 0x7f080bd3; // 2131233747
         public static final int tgs_entry_background = 0x7f080bd4; // 2131233748
         public static final int yandex = 0x7f080bd7; // 2131233751
-        public static final int $splash__0 = 0x7f080bd8; // 2131233752
-        public static final int $splash__1 = 0x7f080bd9; // 2131233753
-        public static final int $splash__10 = 0x7f080bda; // 2131233754
-        public static final int $splash__11 = 0x7f080bdb; // 2131233755
-        public static final int $splash__12 = 0x7f080bdc; // 2131233756
-        public static final int $splash__13 = 0x7f080bdd; // 2131233757
-        public static final int $splash__14 = 0x7f080bde; // 2131233758
-        public static final int $splash__15 = 0x7f080bdf; // 2131233759
-        public static final int $splash__2 = 0x7f080be0; // 2131233760
-        public static final int $splash__3 = 0x7f080be1; // 2131233761
-        public static final int $splash__4 = 0x7f080be2; // 2131233762
-        public static final int $splash__5 = 0x7f080be3; // 2131233763
-        public static final int $splash__6 = 0x7f080be4; // 2131233764
-        public static final int $splash__7 = 0x7f080be5; // 2131233765
-        public static final int $splash__8 = 0x7f080be6; // 2131233766
-        public static final int $splash__9 = 0x7f080be7; // 2131233767
+        public static final int $splash__1 = 0x7f080bd8; // 2131233752
+        public static final int $splash__10 = 0x7f080bd9; // 2131233753
+        public static final int $splash__11 = 0x7f080bda; // 2131233754
+        public static final int $splash__12 = 0x7f080bdb; // 2131233755
+        public static final int $splash__13 = 0x7f080bdc; // 2131233756
+        public static final int $splash__14 = 0x7f080bdd; // 2131233757
+        public static final int $splash__15 = 0x7f080bde; // 2131233758
+        public static final int $splash__2 = 0x7f080bdf; // 2131233759
+        public static final int $splash__3 = 0x7f080be0; // 2131233760
+        public static final int $splash__4 = 0x7f080be1; // 2131233761
+        public static final int $splash__5 = 0x7f080be2; // 2131233762
+        public static final int $splash__6 = 0x7f080be3; // 2131233763
+        public static final int $splash__7 = 0x7f080be4; // 2131233764
+        public static final int $splash__8 = 0x7f080be5; // 2131233765
+        public static final int $splash__9 = 0x7f080be6; // 2131233766
         public static final int checker_background = 0x7f080be8; // 2131233768
         public static final int custom_thumb_selector = 0x7f080be9; // 2131233769
         public static final int custom_track_selector = 0x7f080bea; // 2131233770
-        public static final int splash = 0x7f080beb; // 2131233771
+        public static final int splash = 0x7f080bec; // 2131233772
         public static final int abc_control_background_material = 0x7f080032; // 2131230770
         public static final int ic_action_close = 0x7f080322; // 2131231522
         public static final int ic_camera_outline_28_new = 0x7f0803a0; // 2131231648
@@ -6797,6 +6796,9 @@ public final class R {
         public static final int ic_telegram_24 = 0x7f080bcf; // 2131233743
         public static final int ic_telegram_outline_28 = 0x7f080bd0; // 2131233744
         public static final int vtlogo = 0x7f080bd6; // 2131233750
+        public static final int bing = 0x7f080be7; // 2131233767
+        public static final int sauceNAO = 0x7f080beb; // 2131233771
+        public static final int tracemoe = 0x7f080bed; // 2131233773
         public static final int bg_music_play_button_white = 0x7f08015e; // 2131231070
         public static final int bg_poll_bg_thumb = 0x7f080181; // 2131231105
         public static final int bg_stickers_suggestions_left = 0x7f0801ad; // 2131231149
@@ -19592,67 +19594,76 @@ public final class R {
         public static final int calls_not_available = 0x7f12184a; // 2131892298
         public static final int cannot_write = 0x7f12184b; // 2131892299
         public static final int change_accent_color = 0x7f12184c; // 2131892300
-        public static final int copydebuginfo_summ = 0x7f12184d; // 2131892301
-        public static final int copydebuginfo_title = 0x7f12184e; // 2131892302
-        public static final int copyownlink_summ = 0x7f12184f; // 2131892303
-        public static final int copyownlink_title = 0x7f121850; // 2131892304
-        public static final int crash_service_name = 0x7f121851; // 2131892305
-        public static final int currentLanguage = 0x7f121852; // 2131892306
-        public static final int current_theme = 0x7f121853; // 2131892307
-        public static final int custom_links_warning = 0x7f121854; // 2131892308
-        public static final int data = 0x7f121855; // 2131892309
-        public static final int data_updated = 0x7f121856; // 2131892310
-        public static final int datasettings_title = 0x7f121857; // 2131892311
-        public static final int device_info = 0x7f121858; // 2131892312
-        public static final int device_info_copied = 0x7f121859; // 2131892313
-        public static final int dialogstats = 0x7f12185a; // 2131892314
-        public static final int disable_analytics = 0x7f12185b; // 2131892315
-        public static final int disable_analytics_summ = 0x7f12185c; // 2131892316
-        public static final int downloading_update = 0x7f12185d; // 2131892317
-        public static final int error_applying_accent = 0x7f12185e; // 2131892318
-        public static final int error_no_text = 0x7f12185f; // 2131892319
-        public static final int error_saving_file = 0x7f121860; // 2131892320
-        public static final int failed_to_get_text = 0x7f121861; // 2131892321
-        public static final int invalid_pack_link = 0x7f121862; // 2131892322
-        public static final int invalidate_theme_cache_title = 0x7f121863; // 2131892323
-        public static final int logColors_title = 0x7f121864; // 2131892324
-        public static final int maxquality_summ = 0x7f121865; // 2131892325
-        public static final int maxquality_title = 0x7f121866; // 2131892326
-        public static final int monettheme_summ = 0x7f121867; // 2131892327
-        public static final int monettheme_title = 0x7f121868; // 2131892328
-        public static final int newsfeed_notif_summ = 0x7f121869; // 2131892329
-        public static final int newsfeed_notif_title = 0x7f12186a; // 2131892330
-        public static final int open_bot = 0x7f12186b; // 2131892331
-        public static final int promotedstickers_title = 0x7f12186c; // 2131892332
-        public static final int remove_encryption_key = 0x7f12186d; // 2131892333
-        public static final int remove_from_ads_stories_whitelist = 0x7f12186e; // 2131892334
-        public static final int reset_accounts = 0x7f12186f; // 2131892335
-        public static final int reset_all_settings = 0x7f121870; // 2131892336
-        public static final int restore_accounts = 0x7f121871; // 2131892337
-        public static final int restore_settings = 0x7f121872; // 2131892338
-        public static final int save_accounts = 0x7f121873; // 2131892339
-        public static final int save_online_data = 0x7f121874; // 2131892340
-        public static final int select_color = 0x7f121875; // 2131892341
-        public static final int select_palette = 0x7f121876; // 2131892342
-        public static final int sources = 0x7f121877; // 2131892343
-        public static final int storiesGroupsAdBlock = 0x7f121878; // 2131892344
-        public static final int storiesGroupsAdBlocksummary = 0x7f121879; // 2131892345
-        public static final int systemtheme = 0x7f12187a; // 2131892346
-        public static final int systemtheme_enabled = 0x7f12187b; // 2131892347
-        public static final int systemtheme_summ = 0x7f12187c; // 2131892348
-        public static final int updateverifdata_summ = 0x7f12187d; // 2131892349
-        public static final int updateverifdata_title = 0x7f12187e; // 2131892350
-        public static final int useCustomPrefsStyle_summ = 0x7f12187f; // 2131892351
-        public static final int useCustomPrefsStyle_title = 0x7f121880; // 2131892352
-        public static final int useGenius_summ = 0x7f121881; // 2131892353
-        public static final int useGenius_title = 0x7f121882; // 2131892354
-        public static final int useNewColorEngine_summ = 0x7f121883; // 2131892355
-        public static final int useNewColorEngine_title = 0x7f121884; // 2131892356
-        public static final int useOldAppVer_summ = 0x7f121885; // 2131892357
-        public static final int useOldAppVer_title = 0x7f121886; // 2131892358
-        public static final int vkx_integration_enabled_info = 0x7f121887; // 2131892359
-        public static final int whitelisted_ad_groups_stories_title = 0x7f121888; // 2131892360
-        public static final int writebar_ios_title = 0x7f121889; // 2131892361
+        public static final int compression_types = 0x7f12184d; // 2131892301
+        public static final int compression_types_selection = 0x7f12184e; // 2131892302
+        public static final int copydebuginfo_summ = 0x7f12184f; // 2131892303
+        public static final int copydebuginfo_title = 0x7f121850; // 2131892304
+        public static final int copyownlink_summ = 0x7f121851; // 2131892305
+        public static final int copyownlink_title = 0x7f121852; // 2131892306
+        public static final int crash_service_name = 0x7f121853; // 2131892307
+        public static final int currentLanguage = 0x7f121854; // 2131892308
+        public static final int current_theme = 0x7f121855; // 2131892309
+        public static final int custom_links_warning = 0x7f121856; // 2131892310
+        public static final int data = 0x7f121857; // 2131892311
+        public static final int data_updated = 0x7f121858; // 2131892312
+        public static final int datasettings_title = 0x7f121859; // 2131892313
+        public static final int device_info = 0x7f12185a; // 2131892314
+        public static final int device_info_copied = 0x7f12185b; // 2131892315
+        public static final int dialogstats = 0x7f12185c; // 2131892316
+        public static final int disable_analytics = 0x7f12185d; // 2131892317
+        public static final int disable_analytics_summ = 0x7f12185e; // 2131892318
+        public static final int downloading_update = 0x7f12185f; // 2131892319
+        public static final int error_applying_accent = 0x7f121860; // 2131892320
+        public static final int error_no_text = 0x7f121861; // 2131892321
+        public static final int error_saving_file = 0x7f121862; // 2131892322
+        public static final int failed_to_get_text = 0x7f121863; // 2131892323
+        public static final int invalid_pack_link = 0x7f121864; // 2131892324
+        public static final int invalidate_theme_cache_title = 0x7f121865; // 2131892325
+        public static final int logColors_title = 0x7f121866; // 2131892326
+        public static final int maxquality_summ = 0x7f121867; // 2131892327
+        public static final int maxquality_title = 0x7f121868; // 2131892328
+        public static final int microgsett = 0x7f121869; // 2131892329
+        public static final int monettheme_summ = 0x7f12186a; // 2131892330
+        public static final int monettheme_title = 0x7f12186b; // 2131892331
+        public static final int newsfeed_notif_summ = 0x7f12186c; // 2131892332
+        public static final int newsfeed_notif_title = 0x7f12186d; // 2131892333
+        public static final int open_bot = 0x7f12186e; // 2131892334
+        public static final int promotedstickers_title = 0x7f12186f; // 2131892335
+        public static final int remove_encryption_key = 0x7f121870; // 2131892336
+        public static final int remove_from_ads_stories_whitelist = 0x7f121871; // 2131892337
+        public static final int reset_accounts = 0x7f121872; // 2131892338
+        public static final int reset_all_settings = 0x7f121873; // 2131892339
+        public static final int restore_accounts = 0x7f121874; // 2131892340
+        public static final int restore_settings = 0x7f121875; // 2131892341
+        public static final int save_accounts = 0x7f121876; // 2131892342
+        public static final int save_online_data = 0x7f121877; // 2131892343
+        public static final int select_color = 0x7f121878; // 2131892344
+        public static final int select_palette = 0x7f121879; // 2131892345
+        public static final int sources = 0x7f12187a; // 2131892346
+        public static final int storiesGroupsAdBlock = 0x7f12187b; // 2131892347
+        public static final int storiesGroupsAdBlocksummary = 0x7f12187c; // 2131892348
+        public static final int systemtheme = 0x7f12187d; // 2131892349
+        public static final int systemtheme_enabled = 0x7f12187e; // 2131892350
+        public static final int systemtheme_summ = 0x7f12187f; // 2131892351
+        public static final int updateverifdata_summ = 0x7f121880; // 2131892352
+        public static final int updateverifdata_title = 0x7f121881; // 2131892353
+        public static final int useCustomPrefsStyle_summ = 0x7f121882; // 2131892354
+        public static final int useCustomPrefsStyle_title = 0x7f121883; // 2131892355
+        public static final int useGenius_summ = 0x7f121884; // 2131892356
+        public static final int useGenius_title = 0x7f121885; // 2131892357
+        public static final int useNewColorEngine_summ = 0x7f121886; // 2131892358
+        public static final int useNewColorEngine_title = 0x7f121887; // 2131892359
+        public static final int useOldAppVer_summ = 0x7f121888; // 2131892360
+        public static final int useOldAppVer_title = 0x7f121889; // 2131892361
+        public static final int vkx_integration_enabled_info = 0x7f12188a; // 2131892362
+        public static final int whitelisted_ad_groups_stories_title = 0x7f12188b; // 2131892363
+        public static final int writebar_ios_title = 0x7f12188c; // 2131892364
+        public static final int cache_size = 0x7f12188d; // 2131892365
+        public static final int cache_size_summ = 0x7f12188e; // 2131892366
+        public static final int clear_all_cache = 0x7f12188f; // 2131892367
+        public static final int invalidate_theme_cache_each_update_title = 0x7f121890; // 2131892368
+        public static final int invertFilters = 0x7f121891; // 2131892369
+        public static final int invertFilters_summ = 0x7f121892; // 2131892370
     }
 
     public static final class style {

app/src/main/java/com/vtosters/lite/api/execute/GetFullUserProfile.java

@@ -0,0 +1,505 @@
+package com.vtosters.lite.api.execute;
+
+import android.annotation.SuppressLint;
+import android.graphics.RectF;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.SparseArray;
+import com.vk.api.base.utils.ApiUtils;
+import com.vk.core.network.Network;
+import com.vk.core.util.AppContextHolder;
+import com.vk.core.util.Screen;
+import com.vk.dto.common.data.VKList;
+import com.vk.dto.gift.GiftItem;
+import com.vk.dto.group.Group;
+import com.vk.dto.newsfeed.entries.ProfilesRecommendations;
+import com.vk.dto.photo.Photo;
+import com.vk.dto.user.UserProfile;
+import com.vk.dto.user.deactivation.UserDeactivation;
+import com.vtosters.lite.api.ExtendedUserProfile;
+import com.vtosters.lite.auth.VKAccountManager;
+import com.vtosters.lite.utils.Utils;
+import okhttp3.Headers;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import ru.vtosters.hooks.OnlineFormatterHook;
+import ru.vtosters.hooks.RenameHook;
+import ru.vtosters.hooks.ssfs.ProfileHook;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
+import ru.vtosters.lite.proxy.ProxyUtils;
+import ru.vtosters.lite.utils.AccountManagerUtils;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GetFullUserProfile extends GetFullProfile<ExtendedUserProfile> {
+    private static final OkHttpClient mClient = VtOkHttpClient.getInstance();
+
+    public GetFullUserProfile(int i, String str, String str2) {
+        super(i, "execute.getFullProfileNewNew");
+        i = i == 0 ? VKAccountManager.d().D0() : i;
+        b("user_id", i);
+        b("func_v", 23); // 11
+        this.F = i;
+        if (!TextUtils.isEmpty(str2)) {
+            c("source", str2);
+        }
+        b("photo_sizes", 1);
+        b("skip_hidden", 1);
+        if (TextUtils.isEmpty(str)) {
+            return;
+        }
+        c("access_keys", str);
+    }
+
+    public JSONArray getCitiesNames(String ids) {
+        var request = new Request.a()
+                .b("https://" + ProxyUtils.getApi() + "/method/" + "database.getCitiesById"
+                        + "?v=5.119"
+                        + "&city_ids="
+                        + ids
+                        + "&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()).getJSONArray("response");
+        } catch (JSONException | IOException e) {
+            Log.d(this.getClass().getSimpleName(), e.toString());
+        }
+
+        return new JSONArray();
+    }
+
+    public JSONArray getCountriesNames(String ids) {
+        var request = new Request.a()
+                .b("https://" + ProxyUtils.getApi() + "/method/" + "database.getCountriesById"
+                        + "?v=5.119"
+                        + "&country_ids="
+                        + ids
+                        + "&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()).getJSONArray("response");
+        } catch (JSONException | IOException e) {
+            Log.d(this.getClass().getSimpleName(), e.toString());
+        }
+
+        return new JSONArray();
+    }
+
+
+    protected ExtendedUserProfile o() {
+        return new ExtendedUserProfile();
+    }
+
+    @SuppressLint("ResourceType")
+    public void a(ExtendedUserProfile extendedUserProfile, JSONObject jSONObject) throws JSONException {
+        char c;
+        RenameHook.injectIntoJson(jSONObject);
+        JSONObject onlineHook = OnlineFormatterHook.onlineHook(jSONObject);
+        UserProfile userProfile = extendedUserProfile.a;
+        int i = onlineHook.getInt("id");
+        this.F = i;
+        userProfile.b = i;
+        ProfileHook.fetchInfo(extendedUserProfile, onlineHook);
+
+        extendedUserProfile.a.c = onlineHook.getString("first_name");
+        extendedUserProfile.a.e = onlineHook.getString("last_name");
+        extendedUserProfile.a.d = extendedUserProfile.a.c + " " + extendedUserProfile.a.e;
+        extendedUserProfile.a.f = onlineHook.getString(Screen.a() > 1.0f ? "photo_medium_rec" : "photo_rec");
+        extendedUserProfile.a.h = onlineHook.getInt("friend_status") == 3;
+        extendedUserProfile.j = onlineHook.optString("photo_max", onlineHook.getString("photo_medium_rec"));
+        extendedUserProfile.m = onlineHook.optString("activity", "");
+        extendedUserProfile.a.g = onlineHook.getInt("sex") == 1;
+        extendedUserProfile.a.E = UserProfile.d(jSONObject);
+
+        if (onlineHook.has("crop_photo")) {
+            extendedUserProfile.k = new Photo(onlineHook.getJSONObject("crop_photo").getJSONObject("photo"));
+            JSONObject jSONObject2 = onlineHook.getJSONObject("crop_photo").getJSONObject("rect");
+            JSONObject jSONObject3 = onlineHook.getJSONObject("crop_photo").getJSONObject("crop");
+            double d = jSONObject3.getDouble("x");
+            double d2 = jSONObject3.getDouble("x2");
+            double d3 = jSONObject3.getDouble("y");
+            double d4 = jSONObject3.getDouble("y2");
+            double d5 = jSONObject2.getDouble("x");
+            double d6 = jSONObject2.getDouble("x2");
+            double d7 = jSONObject2.getDouble("y");
+            double d8 = (d2 - d) / 100.0d;
+            double d9 = (d4 - d3) / 100.0d;
+            double d10 = (d / 100.0d) + ((d5 / 100.0d) * d8);
+            double d11 = (d3 / 100.0d) + ((d7 / 100.0d) * d9);
+            extendedUserProfile.l = new RectF((float) d10, (float) d11, (float) (d10 + (((d6 - d5) / 100.0d) * d8)), (float) (d11 + (((jSONObject2.getDouble("y2") - d7) / 100.0d) * d9)));
+        }
+
+        SparseArray<String> sparseArray = new SparseArray<>();
+        SparseArray<String> sparseArray2 = new SparseArray<>();
+
+        if (onlineHook.has("cities") && onlineHook.getJSONArray("cities").length() > 0) {
+            List<String> cityNames = new ArrayList<>();
+
+            JSONArray cities = onlineHook.getJSONArray("cities");
+
+            for (int i21 = 0; i21 < cities.length(); i21++) {
+                cityNames.add(cities.getString(i21));
+            }
+
+            JSONArray citiesNamesJSONArray = getCitiesNames(String.join(", ", cityNames));
+
+            Log.d(this.getClass().getSimpleName(), citiesNamesJSONArray.toString());
+
+            for (int i22 = 0; i22 < citiesNamesJSONArray.length(); i22++) {
+                JSONObject cityJSONObject = citiesNamesJSONArray.getJSONObject(i22);
+                int cityid = cityJSONObject.getInt("id");
+                String cityTitle = cityJSONObject.getString("title");
+                sparseArray.put(cityid, cityTitle);
+            }
+
+            extendedUserProfile.i0 = sparseArray.get(cities.getInt(0));
+        }
+
+        if (onlineHook.has("countries") && onlineHook.getJSONArray("countries").length() > 0) {
+            JSONArray countries = onlineHook.getJSONArray("countries");
+            List<String> countryList = new ArrayList<>();
+
+            for (int i23 = 0; i23 < countries.length(); i23++) {
+                countryList.add(countries.getString(i23));
+            }
+
+            JSONArray countryInfo = getCountriesNames(String.join(", ", countryList));
+
+            Log.d(this.getClass().getSimpleName(), countryInfo.toString());
+
+            for (int i24 = 0; i24 < countryInfo.length(); i24++) {
+                JSONObject country = countryInfo.getJSONObject(i24);
+                int countryid = country.getInt("id");
+                String countryTitle = country.getString("title");
+                sparseArray2.put(countryid, countryTitle);
+            }
+
+            extendedUserProfile.j0 = sparseArray2.get(countries.getInt(0));
+        }
+
+        extendedUserProfile.U = onlineHook.getInt("can_write_private_message") == 1;
+        extendedUserProfile.X = onlineHook.getInt("can_post") == 1;
+        extendedUserProfile.Y = onlineHook.optInt("can_suggest") == 1;
+        extendedUserProfile.V = onlineHook.optInt("can_see_all_posts") == 1;
+        extendedUserProfile.f0 = onlineHook.optInt("can_see_archived_posts") == 1;
+        extendedUserProfile.a0 = "all".equals(onlineHook.optString("wall_default"));
+        extendedUserProfile.W = onlineHook.optBoolean("can_call", false);
+        extendedUserProfile.Z = onlineHook.optInt("blacklisted_by_me") == 1;
+
+        if (onlineHook.optInt("blacklisted") == 1) {
+            extendedUserProfile.Y0 = new ExtendedUserProfile.c();
+        }
+
+        extendedUserProfile.u = onlineHook.optInt("relation");
+        if (onlineHook.has("relation_partner")) {
+            extendedUserProfile.v = onlineHook.getJSONObject("relation_partner").getInt("id");
+            extendedUserProfile.w = onlineHook.getJSONObject("relation_partner").getString("first_name") + " " + onlineHook.getJSONObject("relation_partner").getString("last_name");
+        }
+
+        if (onlineHook.has("bdate")) {
+            String string = onlineHook.getString("bdate");
+            extendedUserProfile.a.I = string;
+            String[] split = string.split("\\.");
+            extendedUserProfile.s = Integer.parseInt(split[0]);
+            extendedUserProfile.t = Integer.parseInt(split[1]);
+            if (split.length > 2) {
+                extendedUserProfile.r = Integer.parseInt(split[2]);
+            }
+        }
+
+        extendedUserProfile.d = onlineHook.optString("first_name_dat", extendedUserProfile.a.c);
+        extendedUserProfile.b = onlineHook.optString("first_name_gen", extendedUserProfile.a.c);
+        extendedUserProfile.c = onlineHook.optString("first_name_ins", extendedUserProfile.a.c);
+        extendedUserProfile.h = onlineHook.optString("first_name_acc", extendedUserProfile.a.c);
+        extendedUserProfile.g = onlineHook.optString("last_name_dat", extendedUserProfile.a.e);
+        extendedUserProfile.e = onlineHook.optString("last_name_gen", extendedUserProfile.a.e);
+        extendedUserProfile.f = onlineHook.optString("last_name_ins", extendedUserProfile.a.e);
+
+        String optString = onlineHook.optString("last_name_acc", extendedUserProfile.a.e);
+        extendedUserProfile.i = optString;
+
+        if (onlineHook.has("mobile_phone") && !onlineHook.getString("mobile_phone").isEmpty()) {
+            extendedUserProfile.l0 = onlineHook.getString("mobile_phone");
+        }
+
+        if (onlineHook.has("home_phone") && !onlineHook.getString("home_phone").isEmpty()) {
+            extendedUserProfile.m0 = onlineHook.getString("home_phone");
+        }
+
+        if (onlineHook.has("skype")) {
+            extendedUserProfile.n0 = onlineHook.getString("skype");
+        }
+
+        if (onlineHook.has("twitter")) {
+            extendedUserProfile.o0 = onlineHook.getString("twitter");
+        }
+
+        if (onlineHook.has("livejournal")) {
+            extendedUserProfile.r0 = onlineHook.getString("livejournal");
+        }
+
+        if (onlineHook.has("facebook") && onlineHook.optLong("facebook", -1L) != -1) {
+            extendedUserProfile.q0 = onlineHook.getLong("facebook");
+            extendedUserProfile.p0 = onlineHook.getString("facebook_name");
+        }
+
+        if (onlineHook.has("instagram")) {
+            extendedUserProfile.u0 = onlineHook.getString("instagram");
+        }
+
+        extendedUserProfile.R0 = onlineHook.getInt("friend_status");
+        JSONArray optJSONArray = onlineHook.optJSONArray("schools");
+        extendedUserProfile.v0 = new ArrayList<>();
+
+        ArrayList arrayList = null;
+        if (optJSONArray != null) {
+            for (int i4 = 0; i4 < optJSONArray.length(); i4++) {
+                ExtendedUserProfile.f fVar = new ExtendedUserProfile.f();
+                JSONObject jSONObject6 = optJSONArray.getJSONObject(i4);
+                fVar.c = sparseArray.get(jSONObject6.optInt(optString));
+                fVar.a = jSONObject6.optString("name", "???");
+                fVar.g = jSONObject6.optInt("year_from");
+                fVar.f = jSONObject6.optInt("year_to");
+                fVar.h = jSONObject6.optInt("year_graduated");
+                fVar.b = jSONObject6.optString("class", null);
+                fVar.d = jSONObject6.optString("speciality", null);
+                fVar.e = jSONObject6.optString("type_str", AppContextHolder.a.getResources().getString(2131889117));
+                extendedUserProfile.v0.add(fVar);
+            }
+        }
+        extendedUserProfile.w0 = new ArrayList<>();
+
+        JSONArray optJSONArray2 = onlineHook.optJSONArray("universities");
+        if (optJSONArray2 != null) {
+            for (int i5 = 0; i5 < optJSONArray2.length(); i5++) {
+                ExtendedUserProfile.g gVar = new ExtendedUserProfile.g();
+                JSONObject jSONObject7 = optJSONArray2.getJSONObject(i5);
+                gVar.a = jSONObject7.getString("name").trim();
+                if (jSONObject7.has("faculty_name")) {
+                    gVar.b = jSONObject7.getString("faculty_name").trim();
+                }
+                if (jSONObject7.has("chair_name")) {
+                    gVar.c = jSONObject7.getString("chair_name").trim();
+                }
+                gVar.d = jSONObject7.optInt("graduation");
+                extendedUserProfile.w0.add(gVar);
+            }
+        }
+
+        if (onlineHook.has("interests") && onlineHook.getString("interests").length() > 0) {
+            extendedUserProfile.y0 = onlineHook.getString("interests");
+        }
+
+        if (onlineHook.has("movies") && onlineHook.getString("movies").length() > 0) {
+            extendedUserProfile.A0 = onlineHook.getString("movies");
+        }
+
+        if (onlineHook.has("music") && onlineHook.getString("music").length() > 0) {
+            extendedUserProfile.z0 = onlineHook.getString("music");
+        }
+
+        if (onlineHook.has("tv") && onlineHook.getString("tv").length() > 0) {
+            extendedUserProfile.B0 = onlineHook.getString("tv");
+        }
+
+        if (onlineHook.has("books") && onlineHook.getString("books").length() > 0) {
+            extendedUserProfile.C0 = onlineHook.getString("books");
+        }
+
+        if (onlineHook.has("games") && onlineHook.getString("games").length() > 0) {
+            extendedUserProfile.D0 = onlineHook.getString("games");
+        }
+
+        if (onlineHook.has("about") && onlineHook.getString("about").length() > 0) {
+            extendedUserProfile.F0 = onlineHook.getString("about");
+        }
+
+        if (onlineHook.has("quotes") && onlineHook.getString("quotes").length() > 0) {
+            extendedUserProfile.E0 = onlineHook.getString("quotes");
+        }
+
+        if (onlineHook.has("activities") && onlineHook.getString("activities").length() > 0) {
+            extendedUserProfile.x0 = onlineHook.getString("activities");
+        }
+
+        if (onlineHook.has("home_town") && onlineHook.getString("home_town").length() > 0) {
+            extendedUserProfile.g0 = onlineHook.getString("home_town");
+        }
+
+        if (onlineHook.has("site") && onlineHook.getString("site").length() > 0) {
+            extendedUserProfile.M = onlineHook.getString("site");
+        }
+
+        extendedUserProfile.a.Q.b(onlineHook);
+
+        JSONObject optJSONObject = onlineHook.optJSONObject("personal");
+        if (optJSONObject != null) {
+            JSONArray optJSONArray3 = optJSONObject.optJSONArray("langs");
+
+            if (optJSONArray3 != null) {
+                ArrayList arrayList2 = new ArrayList<>();
+                for (int i6 = 0; i6 < optJSONArray3.length(); i6++) {
+                    arrayList2.add(optJSONArray3.getString(i6));
+                }
+                extendedUserProfile.G0 = TextUtils.join(", ", arrayList2);
+            }
+
+            extendedUserProfile.J0 = optJSONObject.optInt("political");
+            extendedUserProfile.H0 = optJSONObject.optString("religion");
+            extendedUserProfile.K0 = optJSONObject.optInt("life_main");
+            extendedUserProfile.L0 = optJSONObject.optInt("people_main");
+            extendedUserProfile.I0 = optJSONObject.optString("inspired_by");
+            extendedUserProfile.M0 = optJSONObject.optInt("smoking");
+            extendedUserProfile.N0 = optJSONObject.optInt("alcohol");
+        }
+
+        SparseArray sparseArray3 = new SparseArray();
+        JSONArray optJSONArray4 = onlineHook.optJSONArray("relatives_profiles");
+        if (optJSONArray4 != null) {
+            for (int i7 = 0; i7 < optJSONArray4.length(); i7++) {
+                UserProfile userProfile2 = new UserProfile(optJSONArray4.getJSONObject(i7));
+                sparseArray3.put(userProfile2.b, userProfile2);
+            }
+        }
+
+        JSONArray optJSONArray5 = onlineHook.optJSONArray("relatives");
+        if (optJSONArray5 != null) {
+            ArrayList arrayList3 = null;
+            ArrayList arrayList4 = null;
+            ArrayList arrayList5 = null;
+            ArrayList arrayList6 = null;
+            for (int i8 = 0; i8 < optJSONArray5.length(); i8++) {
+                JSONObject jSONObject8 = optJSONArray5.getJSONObject(i8);
+                int i9 = jSONObject8.getInt("id");
+                if (ApiUtils.a(sparseArray3, i9)) {
+                    String valueOf = jSONObject8.getString("type");
+                    switch (valueOf.hashCode()) {
+                        case -995424086 -> {
+                            if (valueOf.equals("parent")) {
+                                c = 4;
+                                break;
+                            }
+                            c = 65535;
+                        }
+                        case -268316490 -> {
+                            if (valueOf.equals("grandparent")) {
+                                c = 1;
+                                break;
+                            }
+                            c = 65535;
+                        }
+                        case 94631196 -> {
+                            if (valueOf.equals("child")) {
+                                c = 2;
+                                break;
+                            }
+                            c = 65535;
+                        }
+                        case 395180944 -> {
+                            if (valueOf.equals("grandchild")) {
+                                c = 0;
+                                break;
+                            }
+                            c = 65535;
+                        }
+                        case 2083595970 -> {
+                            if (valueOf.equals("sibling")) {
+                                c = 3;
+                                break;
+                            }
+                            c = 65535;
+                        }
+                        default -> c = 65535;
+                    }
+                    switch (c) {
+                        case 0 -> arrayList6 = Utils.a(arrayList6, sparseArray3.get(i9));
+                        case 1 -> arrayList5 = Utils.a(arrayList5, sparseArray3.get(i9));
+                        case 2 -> arrayList4 = Utils.a(arrayList4, sparseArray3.get(i9));
+                        case 3 -> arrayList3 = Utils.a(arrayList3, sparseArray3.get(i9));
+                        case 4 -> arrayList = Utils.a(arrayList, sparseArray3.get(i9));
+                    }
+                }
+            }
+
+            extendedUserProfile.A = Utils.a((ArrayList<UserProfile>) arrayList, UserProfile.CREATOR);
+            extendedUserProfile.B = Utils.a((ArrayList<UserProfile>) arrayList3, UserProfile.CREATOR);
+            extendedUserProfile.C = Utils.a((ArrayList<UserProfile>) arrayList4, UserProfile.CREATOR);
+            extendedUserProfile.D = Utils.a((ArrayList<UserProfile>) arrayList5, UserProfile.CREATOR);
+            extendedUserProfile.E = Utils.a((ArrayList<UserProfile>) arrayList6, UserProfile.CREATOR);
+        }
+
+        JSONObject optJSONObject2 = onlineHook.optJSONObject("owner_state");
+        if (optJSONObject2 != null) {
+            extendedUserProfile.q = UserDeactivation.CREATOR.a(optJSONObject2);
+        }
+
+        JSONObject optJSONObject3 = onlineHook.optJSONObject("gifts");
+        if (optJSONObject3 != null) {
+            extendedUserProfile.y1 = new VKList<>(optJSONObject3, GiftItem.C);
+        }
+
+        JSONArray optJSONArray6 = onlineHook.optJSONArray("friends");
+        if (optJSONArray6 != null) {
+            extendedUserProfile.H = new ArrayList<>();
+            for (int i10 = 0; i10 < optJSONArray6.length(); i10++) {
+                extendedUserProfile.H.add(new UserProfile(optJSONArray6.getJSONObject(i10)));
+            }
+        }
+
+        if (onlineHook.has("career")) {
+            extendedUserProfile.I = new ArrayList<>();
+            JSONArray jSONArray3 = onlineHook.getJSONArray("career");
+            for (int i11 = 0; i11 < jSONArray3.length(); i11++) {
+                JSONObject jSONObject9 = jSONArray3.getJSONObject(i11);
+                ExtendedUserProfile.e eVar = new ExtendedUserProfile.e();
+                if (jSONObject9.has("group")) {
+                    eVar.a = new Group(jSONObject9.getJSONObject("group"));
+                } else {
+                    eVar.c = jSONObject9.getString("company");
+                }
+                eVar.e = jSONObject9.optInt("from");
+                eVar.f = jSONObject9.optInt("until");
+                eVar.d = jSONObject9.optString("position");
+                extendedUserProfile.I.add(eVar);
+            }
+        }
+
+        if (onlineHook.has("display_fields")) {
+            JSONArray jSONArray4 = onlineHook.getJSONArray("display_fields");
+            extendedUserProfile.j1 = new ArrayList<>();
+            for (int i12 = 0; i12 < jSONArray4.length(); i12++) {
+                extendedUserProfile.j1.add(jSONArray4.getString(i12));
+            }
+        }
+
+        extendedUserProfile.u1 = onlineHook.getBoolean("all_photos_are_hidden");
+        JSONObject optJSONObject4 = onlineHook.optJSONObject("friends_recommendations");
+        if (optJSONObject4 != null) {
+            extendedUserProfile.J = getFriendsRecomms(optJSONObject4);
+        }
+    }
+
+    public ProfilesRecommendations getFriendsRecomms(JSONObject json) {
+        try {
+            Method method = ProfilesRecommendations.class.getDeclaredMethod("b", JSONObject.class);
+            return (ProfilesRecommendations) method.invoke(null, json);
+        } catch (Exception e) {
+            Log.d(this.getClass().getSimpleName(), e.toString());
+            return null;
+        }
+    }
+
+    public GetFullProfile.a a(JSONObject jSONObject) {
+        return super.a(jSONObject);
+    }
+}

app/src/main/java/ru/vtosters/hooks/CatalogsHook.java

@@ -2,7 +2,7 @@ package ru.vtosters.hooks;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import ru.vtosters.lite.music.catalog.inject.CatalogJsonInjector;
+import ru.vtosters.hooks.music.injectors.CatalogJsonInjector;
 
 public class CatalogsHook {
     public static JSONObject injectCatalogGetAudio(JSONObject json) {

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

@@ -19,11 +19,8 @@ import static ru.vtosters.hooks.other.Preferences.isValidSignature;
 
 
 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 {
@@ -35,15 +32,15 @@ public class GcmHook {
     }
 
     public static String requestToken(String orig) {
-        return "yssp9o9p9pamz5t-nvmq8spgwtin3e0==";
+        return isValidSignature() ? "yssp9o9p9pamz5t-nvmq8spgwtin3e0==" : requestToken();
     }
 
     public static String requestToken() {
-        String xappide;
         try {
             String aid = getRandomAid();
             String pub2 = genNewKey();
             String sig = getSig(pub2);
+            String xappide;
             try {
                 byte[] bytes = MessageDigest.getInstance("SHA1").digest(pair.getPublic().getEncoded());
                 bytes[0] = (byte) (((bytes[0] & 15) + 112) & 255);
@@ -200,7 +197,6 @@ public class GcmHook {
             }).getBytes(StandardCharsets.UTF_8));
             return Base64.encodeToString(sign.sign(), 0);
         } catch (Exception e) {
-            e.printStackTrace();
             return null;
         }
     }

app/src/main/java/ru/vtosters/hooks/GmsHook.java

@@ -6,11 +6,12 @@ import android.content.Context;
 import android.os.Build;
 import com.google.firebase.iid.FirebaseInstanceIdReceiver;
 import com.google.firebase.iid.FirebaseInstanceIdReceiver2;
+import com.google.firebase.iid.FirebaseInstanceIdReceiver3;
 import com.vtosters.lite.R;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class GmsHook {
-    private static final boolean needToSpoof = !isGmsInstalled() && isFakeGmsInstalled();
+    private static final boolean needToSpoof = !isGmsInstalled() && (isFakeGmsInstalled() || isFakeGms2Installed());
 
     public static boolean isGmsInstalled() {
         try {
@@ -30,8 +31,17 @@ public class GmsHook {
         }
     } // Microg Google Market Services check
 
+    public static boolean isFakeGms2Installed() {
+        try {
+            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("app.revanced.android.gms", 0);
+            return true;
+        } catch (Exception unused) {
+            return false;
+        }
+    } // Microg Google Market Services check
+
     public static boolean isAnyServicesInstalled() {
-        return isGmsInstalled() || isFakeGmsInstalled();
+        return isGmsInstalled() || isFakeGmsInstalled() || isFakeGms2Installed();
     }
 
     public static void fixGapps() {
@@ -45,7 +55,7 @@ public class GmsHook {
     } // Music channels fix
 
     public static String replaceGMSPackage(String str) {
-        return needToSpoof ? str.replaceAll("com.google", "com.mgoogle") : str;
+        return needToSpoof ? str.replaceAll("com.google", (isFakeGms2Installed() ? "app.revanced" : "com.mgoogle")) : str;
     }
 
     public static String getFirebaseInstanceIdReceiver() {
@@ -53,6 +63,6 @@ public class GmsHook {
     }
 
     public static Class getFirebaseInstanceIdReceiverClass() {
-        return needToSpoof ? FirebaseInstanceIdReceiver2.class : FirebaseInstanceIdReceiver.class;
+        return needToSpoof ? (isFakeGms2Installed() ? FirebaseInstanceIdReceiver3.class : FirebaseInstanceIdReceiver2.class) : FirebaseInstanceIdReceiver.class;
     }
 }

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import b.h.g.k.VKProgressDialog;
+import com.aefyr.tsg.g2.TelegramStickersService;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vtosters.lite.R;
 import ru.vtosters.hooks.other.Preferences;
@@ -13,7 +14,6 @@ import ru.vtosters.lite.concurrent.VTExecutors;
 import ru.vtosters.lite.downloaders.notifications.NotificationChannels;
 import ru.vtosters.lite.ssfs.UsersList;
 import ru.vtosters.lite.themes.ThemesManager;
-import ru.vtosters.lite.ui.dialogs.DisableBattery;
 import ru.vtosters.lite.ui.dialogs.InstallGMS;
 import ru.vtosters.lite.ui.dialogs.OTADialog;
 import ru.vtosters.lite.ui.dialogs.Start;
@@ -23,14 +23,12 @@ import ru.vtosters.lite.utils.NavigatorUtils;
 import ru.vtosters.lite.utils.VTVerifications;
 
 import static ru.vtosters.hooks.other.Preferences.checkupdates;
-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;
 
 public class MainActivityInjector {
     public static void inject(Activity activity) {
         SystemThemeChangerHook.themeOnStart(activity);
-        sendRequest();
         UsersList.getUsersList();
         VTVerifications.load(activity);
 
@@ -46,7 +44,9 @@ public class MainActivityInjector {
             NotificationChannels.createChannels();
         }
 
-        if (Preferences.isNewBuild() && !ThemesUtils.isMonetTheme() && ThemesManager.canApplyCustomAccent() && ThemesUtils.useNewColorEngine()) {
+        if (Preferences.isNewBuild()
+                && !ThemesUtils.isMonetTheme()
+                && ThemesManager.canApplyCustomAccent()) {
             Preferences.updateBuildNumber();
             updateBinsAndTmpArchive(activity);
         }
@@ -60,8 +60,9 @@ public class MainActivityInjector {
 
         Start.alert(activity);
         InstallGMS.alert(activity);
-        DisableBattery.alert(activity);
         // VKIDProtection.alert(activity);
+        //needs to show selected tgs pack count in settings after cold launch
+        TelegramStickersService.getInstance(activity);
     }
 
     private static void updateBinsAndTmpArchive(Activity activity) {

app/src/main/java/ru/vtosters/hooks/MusicCacheFilesHook.java

@@ -1,16 +0,0 @@
-package ru.vtosters.hooks;
-
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
-import ru.vtosters.lite.music.cache.FileCacheImplementation;
-
-import java.io.File;
-
-public class MusicCacheFilesHook {
-    public static File getTrackFile(String trackId) {
-        return new File(FileCacheImplementation.getTrackFolder(trackId), "track.mp3");
-    }
-
-    public static boolean isTrackExist(String trackId) {
-        return CacheDatabaseDelegate.isCached(trackId);
-    }
-}

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

@@ -6,7 +6,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.vk.core.preference.Preference;
 import com.vk.discover.DiscoverItemDecorator;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 import static java.lang.Long.MAX_VALUE;
 import static ru.vtosters.hooks.other.Preferences.*;
@@ -91,6 +93,7 @@ public class NewsfeedHook {
     public static boolean isPowerSaveMode() {
         var pw = (PowerManager) getGlobalContext().getSystemService(Context.POWER_SERVICE);
 
-        return !getBoolValue("force_disable_psm", false) && pw.isPowerSaveMode();
+//        return !getBoolValue("force_disable_psm", false) && pw.isPowerSaveMode();
+        return false;
     }
 }

app/src/main/java/ru/vtosters/hooks/OnlineFormatterHook.java

@@ -5,6 +5,7 @@ import com.vtosters.lite.R;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 import java.io.IOException;
@@ -115,14 +116,20 @@ public class OnlineFormatterHook {
         return AndroidUtils.getString(R.string.custom_online) + " " + appname;
     }
 
-    public static JSONObject onlineHook(JSONObject json) throws ParseException, IOException, JSONException {
-        if (getBoolValue("onlinefix", false)) JsonInjectors.setOnlineInfo(json);
+    public static JSONObject onlineHook(JSONObject json) {
+        if (!getBoolValue("onlinefix", false) || Preferences.serverFeaturesDisable()) return json;
+
+        try {
+            JsonInjectors.setOnlineInfo(json);
+        } catch (JSONException e) {
+            Log.e("onlineHook", e.getMessage());
+        }
 
         return json;
     }
 
-    public static JSONArray onlineHookList(JSONArray jsonArr) throws ParseException, IOException, JSONException {
-        if (!getBoolValue("onlinefix", false)) return jsonArr;
+    public static JSONArray onlineHookList(JSONArray jsonArr) {
+        if (!getBoolValue("onlinefix", false) || Preferences.serverFeaturesDisable()) return jsonArr;
 
         try {
             JsonInjectors.setOnlineInfoUsers(jsonArr);
@@ -134,7 +141,7 @@ public class OnlineFormatterHook {
     }
 
     public static JSONObject onlineHookProfiles(JSONObject json) {
-        if (!getBoolValue("onlinefix", false)) return json;
+        if (!getBoolValue("onlinefix", false) || Preferences.serverFeaturesDisable()) return json;
 
         try {
             JsonInjectors.setOnlineInfoUsers(json.optJSONArray("profiles"));
@@ -146,7 +153,7 @@ public class OnlineFormatterHook {
     }
 
     public static JSONObject onlineHookItems(JSONObject json) {
-        if (!getBoolValue("onlinefix", false)) return json;
+        if (!getBoolValue("onlinefix", false) || Preferences.serverFeaturesDisable()) return json;
 
         try {
             JsonInjectors.setOnlineInfoUsers(json.optJSONArray("items"));
@@ -157,8 +164,8 @@ public class OnlineFormatterHook {
         return json;
     }
 
-    public static JSONObject onlineHookRequestsAndRecommendations(JSONObject json) throws ParseException, IOException, JSONException {
-        if (!getBoolValue("onlinefix", false)) return json;
+    public static JSONObject onlineHookRequestsAndRecommendations(JSONObject json) {
+        if (!getBoolValue("onlinefix", false) || Preferences.serverFeaturesDisable()) return json;
 
         try {
             JsonInjectors.setOnlineInfoUsers(json.optJSONObject("read_requests").optJSONArray("items"));

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

@@ -7,16 +7,14 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
-import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 import com.vk.core.dialogs.actionspopup.ActionsPopup;
 import com.vk.core.dialogs.alert.VkAlertDialog;
-import com.vk.core.ui.themes.VKThemeHelper;
-import com.vk.core.util.ContextExtKt;
 import com.vk.core.util.ToastUtils;
 import com.vk.dto.common.AttachmentWithMedia;
 import com.vk.dto.common.ImageSize;
@@ -24,318 +22,157 @@ import com.vtosters.lite.R;
 import com.vtosters.lite.attachments.DocumentAttachment;
 import com.vtosters.lite.attachments.PhotoAttachment;
 import okhttp3.*;
-import okio.BufferedSink;
 import okio.Okio;
-import org.json.JSONException;
-import org.json.JSONObject;
-import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.di.singleton.VtOkHttpClient;
+import ru.vtosters.lite.themes.utils.RecolorUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.LifecycleUtils;
+import ru.vtosters.lite.utils.SearchEngine;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URLEncoder;
 import java.util.List;
 
 public class PhotoViewer {
     static OkHttpClient client = VtOkHttpClient.getInstance();
 
+    //region INSERTION INTO SMALI
+    @SuppressLint("UseCompatLoadingForDrawables")
+    public static void addMenuItems(AttachmentWithMedia attachment, ActionsPopup.b actionPopup, int i, boolean z) {
+        actionPopup.a(
+                R.string.copy,
+                RecolorUtils.fixActionMenuIcons(R.drawable.ic_copy_outline_28),
+                false,
+                () -> {
+                    copyImage(attachment);
+                    return null;
+                }
+        ).a(
+                R.string.search_photo_content,
+                RecolorUtils.fixActionMenuIcons(R.drawable.ic_menu_search_outline_28),
+                false,
+                () -> {
+                    searchImageWithUrl(attachment);
+                    return null;
+                }
+        ).a(
+                R.string.copy_photo_url_content,
+                RecolorUtils.fixActionMenuIcons(R.drawable.ic_copy_outline_28),
+                false,
+                () -> {
+                    copyImageUrl(attachment);
+                    return null;
+                }
+        ).a(
+                R.string.open_original_photo_content,
+                RecolorUtils.fixActionMenuIcons(R.drawable.ic_link_outline_28),
+                false,
+                () -> {
+                    openUrl(getImageUrlFromAttachment(attachment));
+                    return null;
+                }
+        );
+    }
+
     @SuppressLint("NonConstantResourceId")
     public static boolean interceptClick(AttachmentWithMedia attachment, MenuItem item, View view) {
         switch (item.getItemId()) {
-            case R.id.copy_image -> {
-                if (attachment instanceof PhotoAttachment) {
-                    copyImage(getUrlFromPhotoAttachment((PhotoAttachment) attachment), String.valueOf(attachment.getId()));
-                } else if (attachment instanceof DocumentAttachment) {
-                    var documentAttachment = (DocumentAttachment) attachment;
-                    if (documentAttachment.J != null)
-                        try {
-                            copyImage(getUrlFromDocumentAttachment(documentAttachment), String.valueOf(attachment.getId()));
-                        } catch (Exception e) {
-                            ToastUtils.a(R.string.photo_get_error);
-                        }
-                    else
-                        ToastUtils.a(R.string.photo_get_error);
-                }
-                return true;
-            }
-            case R.id.copy_photo_url -> {
-                if (attachment instanceof PhotoAttachment) {
-                    copyPhotoUrl(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
-                } else if (attachment instanceof DocumentAttachment) {
-                    var documentAttachment = (DocumentAttachment) attachment;
-                    if (documentAttachment.J != null)
-                        try {
-                            copyPhotoUrl(getUrlFromDocumentAttachment(documentAttachment));
-                        } catch (Exception e) {
-                            ToastUtils.a(R.string.photo_get_error);
-                        }
-                    else
-                        ToastUtils.a(R.string.photo_get_error);
-                }
-                return true;
-            }
-            case R.id.open_original_photo -> {
-                if (attachment instanceof PhotoAttachment) {
-                    openUrl(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
-                } else if (attachment instanceof DocumentAttachment) {
-                    var documentAttachment = (DocumentAttachment) attachment;
-                    if (documentAttachment.J != null)
-                        try {
-                            openUrl(getUrlFromDocumentAttachment(documentAttachment));
-                        } catch (Exception e) {
-                            ToastUtils.a(R.string.photo_get_error);
-                        }
-                    else
-                        ToastUtils.a(R.string.photo_get_error);
-                }
-                return true;
-            }
+            case R.id.copy_image -> copyImage(attachment);
+            case R.id.search_photo -> searchImageWithUrl(attachment);
+            case R.id.copy_photo_url -> copyImageUrl(attachment);
+            case R.id.open_original_photo -> openUrl(getImageUrlFromAttachment(attachment));
         }
         return true;
     }
+    //endregion
 
-    @SuppressLint("UseCompatLoadingForDrawables")
-    public static void addMenuItems(AttachmentWithMedia attachment, ActionsPopup.b actionPopup, int i, boolean z) {
-        actionPopup.a(R.string.copy,
-                ContextExtKt.b(AndroidUtils.getGlobalContext(), R.drawable.ic_copy_outline_28, VKThemeHelper.g(R.attr.header_tint)),
-                false,
-                () -> {
-                    if (attachment instanceof PhotoAttachment) {
-                        copyImage(getUrlFromPhotoAttachment((PhotoAttachment) attachment), String.valueOf(attachment.getId()));
-                    } else if (attachment instanceof DocumentAttachment) {
-                        var documentAttachment = (DocumentAttachment) attachment;
-                        if (documentAttachment.J != null)
-                            try {
-                                copyImage(getUrlFromDocumentAttachment(documentAttachment), String.valueOf(attachment.getId()));
-                            } catch (Exception e) {
-                                ToastUtils.a(R.string.photo_get_error);
-                            }
-                        else
-                            ToastUtils.a(R.string.photo_get_error);
-                    }
-                    return null;
-                }
-        );
-        actionPopup.a(R.string.search_photo_content,
-                ContextExtKt.b(AndroidUtils.getGlobalContext(), R.drawable.ic_menu_search_outline_28, VKThemeHelper.g(R.attr.header_tint)),
-                false,
-                () -> {
-                    if (attachment instanceof PhotoAttachment) {
-                        searchDialog(LifecycleUtils.getCurrentActivity(), getUrlFromPhotoAttachment((PhotoAttachment) attachment));
-                    } else if (attachment instanceof DocumentAttachment) {
-                        var documentAttachment = (DocumentAttachment) attachment;
-                        if (documentAttachment.J != null)
-                            try {
-                                searchDialog(LifecycleUtils.getCurrentActivity(), getUrlFromDocumentAttachment(documentAttachment));
-                            } catch (Exception e) {
-                                ToastUtils.a(R.string.photo_get_error);
-                            }
-                        else
-                            ToastUtils.a(R.string.photo_get_error);
-                    }
-                    return null;
-                }
-        );
-        actionPopup.a(R.string.copy_photo_url_content,
-                ContextExtKt.b(AndroidUtils.getGlobalContext(), R.drawable.ic_copy_outline_28, VKThemeHelper.g(R.attr.header_tint)),
-                false,
-                () -> {
-                    if (attachment instanceof PhotoAttachment) {
-                        copyPhotoUrl(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
-                    } else if (attachment instanceof DocumentAttachment) {
-                        var documentAttachment = (DocumentAttachment) attachment;
-                        if (documentAttachment.J != null)
-                            try {
-                                copyPhotoUrl(getUrlFromDocumentAttachment(documentAttachment));
-                            } catch (Exception e) {
-                                ToastUtils.a(R.string.photo_get_error);
-                            }
-                        else
-                            ToastUtils.a(R.string.photo_get_error);
-                    }
-                    return null;
-                }
-        );
-        actionPopup.a(R.string.open_original_photo_content,
-                ContextExtKt.b(AndroidUtils.getGlobalContext(), R.drawable.ic_link_outline_28, VKThemeHelper.g(R.attr.header_tint)),
-                false,
-                () -> {
-                    if (attachment instanceof PhotoAttachment) {
-                        openUrl(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
-                    } else if (attachment instanceof DocumentAttachment) {
-                        var documentAttachment = (DocumentAttachment) attachment;
-                        if (documentAttachment.J != null)
-                            try {
-                                openUrl(getUrlFromDocumentAttachment(documentAttachment));
-                            } catch (Exception e) {
-                                ToastUtils.a(R.string.photo_get_error);
-                            }
-                        else
-                            ToastUtils.a(R.string.photo_get_error);
-                    }
-                    return null;
-                }
-        );
-    }
-
-    private static String getUrlFromDocumentAttachment(DocumentAttachment attachment) {
-        List<ImageSize> imageSizes = null;
-        if (attachment.J != null) {
-            imageSizes = attachment.J.t1();
-        }
-        return getUrlFromImageSizeList(imageSizes);
-    }
-
-    private static String getUrlFromPhotoAttachment(PhotoAttachment attachment) {
-        var imageSizes = attachment.D.Q.t1();
-        return getUrlFromImageSizeList(imageSizes);
-    }
-
-    @Nullable
-    private static String getUrlFromImageSizeList(List<ImageSize> imageSizes) {
-        if (imageSizes.isEmpty())
-            return null;
-        var max = imageSizes.get(0);
-        for (int i = 1; i < imageSizes.size(); ++i) {
-            var size = imageSizes.get(i);
-            if (max != null && max.t1() < size.t1()) {
-                max = size;
-            }
-        }
-        return max.url;
-    }
-
-    private static void searchDialog(Context context, String url) {
-        if (selectedEngine() == 0) {
-            var items = new String[]{
-                    "Yandex", "Google", "Bing", "TraceMoe", "Ascii2d", "Saucenao"
-            };
-
-            new VkAlertDialog.Builder(context)
-                    .setItems(items, (dl, i) -> {
-                        searchPhoto(i + 1, url);
-                    })
-                    .show();
-        } else {
-            searchPhoto(selectedEngine(), url);
-        }
-    }
-
-    private static void copyImage(String link, String name) {
-        Request request = new Request.a().b(link).a();
-        File file = new File(AndroidUtils.getGlobalContext().getExternalCacheDir(), name + ".jpg");
-
-        if (file.exists()) {
-            copyImageToClipboard(file);
-            return;
-        }
-
-        new Thread() {
-            @Override
-            public void run() {
-                try (Response response = client.a(request).execute()) {
-                    try (BufferedSink sink = Okio.a(Okio.b(file))) {
-                        sink.a(response.a().f());
-                    }
-
-                    copyImageToClipboard(file);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }.start();
-    }
-
-    private static void copyImageToClipboard(File file) {
-        Uri path = FileProvider.getUriForFile(AndroidUtils.getGlobalContext(), "com.vtosters.lite.common.VKFileProvider", file);
-        ClipData clip = ClipData.newUri(AndroidUtils.getGlobalContext().getContentResolver(), "Image", path);
-        ((ClipboardManager) AndroidUtils.getGlobalContext().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(clip);
-    }
-
-    private static int selectedEngine() {
-        return Preferences.getPreferences().getInt("search_engine", 0);
-    }
-
-    private static void searchPhoto(int i, String url) {
-        if (url == null || url.isEmpty()) {
-            Log.d("PhotoViewer", "url is null or empty");
-            return;
-        }
-
-        switch (i) {
-            case 1 -> searchWithYandex(url);
-            case 2 -> searchWithGoogle(url);
-            case 3 -> searchWithBing(url);
-            case 4 -> searchWithTraceMoe(url);
-            case 5 -> searchWithAscii2d(url);
-            case 6 -> searchWithSaucenao(url);
-        }
-    }
-
-    private static void searchPhoto(String url) {
-        searchPhoto(selectedEngine(), url);
-    }
-
-    private static void searchWithYandex(String url) {
-        var request = new Request.a()
-                .b(String.format("https://yandex.ru/images-apphost/image-download?url=%s&images_avatars_size=preview&images_avatars_namespace=images-cbir",
-                        URLEncoder.encode(url)))
+    private static void copyImage(AttachmentWithMedia attachment) {
+        var req = new Request.a()
+                .b(getImageUrlFromAttachment(attachment))
                 .a();
-        client.a(request).a(new Callback() {
+        client.a(req).a(new Callback() {
             @Override
             public void a(Call call, IOException e) {
-                Log.d("PhotoViewer", e.getMessage());
+                e.printStackTrace();
             }
 
             @Override
-            public void a(Call call, Response response) throws IOException {
-                try {
-                    JSONObject payload = new JSONObject(response.a().g());
-                    var cbirId = payload.optInt("image_shard") + "/" + payload.optString("image_id");
-                    var imageUrl = String.format("https://avatars.mds.yandex.net/get-images-cbir/%s/orig", cbirId);
-                    var searchUrl = String.format("https://yandex.ru/images/search?rpt=imageview&url=%s&cbir_id=%s", imageUrl, cbirId);
-                    openUrl(searchUrl);
-                } catch (JSONException e) {
-                    e.printStackTrace();
+            public void a(Call call, Response response)
+                    throws IOException {
+                var tmpImage = new File(AndroidUtils.getGlobalContext().getExternalCacheDir(), attachment.getId() + ".jpg");
+                try (var resp = client.a(req).execute();
+                     var sink = Okio.a(Okio.b(tmpImage))) {
+                    sink.a(resp.a().f());
+                    var manager = (ClipboardManager) AndroidUtils.getGlobalContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                    var uri = FileProvider.getUriForFile(
+                            AndroidUtils.getGlobalContext(),
+                            "com.vtosters.lite.common.VKFileProvider",
+                            tmpImage);
+                    var data = ClipData.newUri(
+                            AndroidUtils.getGlobalContext().getContentResolver(),
+                            "image",
+                            uri);
+                    manager.setPrimaryClip(data);
                 }
             }
         });
     }
 
-    private static void searchWithGoogle(String url) {
-        openUrl("https://www.google.com/searchbyimage?image_url=" + URLEncoder.encode(url) + "&client=app");
+    private static void searchImageWithUrl(AttachmentWithMedia attachment) {
+        String url = getImageUrlFromAttachment(attachment);
+        if (TextUtils.isEmpty(url)) return;
+        int selectedEngine = SearchEngine.getDefaultSearchEngine();
+        if (selectedEngine < 0) {
+            var items = new String[SearchEngine.values().length];
+            for (int i = 0; i < SearchEngine.values().length; ++i)
+                items[i] = SearchEngine.values()[i].mTitle;
+            new VkAlertDialog.Builder(LifecycleUtils.getCurrentActivity())
+                    .setItems(items, (di, i) -> openUrl(SearchEngine.values()[i].buildSearchUrl(url)))
+                    .show();
+        } else {
+            // index correction for old versions with numeration "1-x"
+            if (selectedEngine >= SearchEngine.values().length) SearchEngine.setDefaultSearchEngine(--selectedEngine);
+            openUrl(SearchEngine.values()[selectedEngine].buildSearchUrl(url));
+        }
     }
 
-    private static void searchWithTraceMoe(String url) {
-        openUrl("https://trace.moe/?url=" + URLEncoder.encode(url));
-    }
-
-    private static void searchWithAscii2d(String url) {
-        openUrl("https://ascii2d.net/search/url/" + URLEncoder.encode(url));
-    }
-
-    private static void searchWithSaucenao(String url) {
-        openUrl("https://saucenao.com/search.php?url=" + URLEncoder.encode(url));
-    }
-
-    private static void searchWithBing(String url) {
-        openUrl("https://www.bing.com/images/search?view=detailv2&iss=SBI&form=SBIIDP&sbisrc=UrlPaste&q=imgurl:"
-                + URLEncoder.encode(url));
-    }
-
-    private static void copyPhotoUrl(String url) {
-        if (url == null || url.isEmpty()) return;
+    private static void copyImageUrl(AttachmentWithMedia attachment) {
+        String url = getImageUrlFromAttachment(attachment);
+        if (TextUtils.isEmpty(url)) return;
         ClipboardManager manager = (ClipboardManager) AndroidUtils.getGlobalContext().getSystemService(Context.CLIPBOARD_SERVICE);
         manager.setPrimaryClip(ClipData.newPlainText("vk_photo_url", url));
         Toast.makeText(AndroidUtils.getGlobalContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show();
     }
 
     private static void openUrl(String url) {
-        var uri = Uri.parse(url);
-        var intent = new Intent(Intent.ACTION_VIEW, uri);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (TextUtils.isEmpty(url)) {
+            Log.d("PhotoViewer", "url is null or empty");
+            return;
+        }
+        var intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         AndroidUtils.getGlobalContext().startActivity(intent);
     }
+
+    private static String getImageUrlFromAttachment(AttachmentWithMedia attachment) {
+        List<ImageSize> imageSizes;
+
+        if (attachment instanceof PhotoAttachment) {
+            imageSizes = ((PhotoAttachment) attachment).D.Q.t1();
+        } else if (attachment instanceof DocumentAttachment && ((DocumentAttachment) attachment).J != null) {
+            imageSizes = ((DocumentAttachment) attachment).J.t1();
+        } else {
+            ToastUtils.a(R.string.photo_get_error);
+            return "";
+        }
+
+        if (imageSizes.isEmpty()) return "";
+
+        var max = imageSizes.get(0);
+        for (int i = 1; i < imageSizes.size(); i++) {
+            var tmp = imageSizes.get(i);
+            if (max.t1() < tmp.t1()) max = tmp;
+        }
+        return max.url;
+    }
 }

app/src/main/java/ru/vtosters/hooks/RenameHook.java

@@ -1,31 +1,29 @@
 package ru.vtosters.hooks;
 
-import androidx.core.util.Pair;
 import org.json.JSONException;
 import org.json.JSONObject;
-import ru.vtosters.lite.utils.RenameTool;
 
 public class RenameHook {
     public static void injectIntoJson(JSONObject obj) throws JSONException {
-        int i = obj.getInt("id");
-        if (RenameTool.updateRequested) {
-            RenameTool.reloadDB();
-        }
-
-        Pair<String, String> user = RenameTool.renamedUsers.get(i);
-        if (user == null) return;
-        obj.put(RenameTool.COLUMN_FIRSTNAME, user.first).put(RenameTool.COLUMN_LASTNAME, user.second);
+//        int i = obj.getInt("id");
+//        if (RenameTool.updateRequested) {
+//            RenameTool.reloadDB();
+//        }
+//
+//        Pair<String, String> user = RenameTool.renamedUsers.get(i);
+//        if (user == null) return;
+//        obj.put(RenameTool.COLUMN_FIRSTNAME, user.first).put(RenameTool.COLUMN_LASTNAME, user.second);
     }
 
     public static void injectIntoJsonGroup(JSONObject obj) throws JSONException {
-        int i = obj.getInt("id");
-
-        if (RenameTool.updateRequested) {
-            RenameTool.reloadDB();
-        }
-
-        String user = RenameTool.renamedGroups.get(i);
-        if (user == null) return;
-        obj.put("name", user);
+//        int i = obj.getInt("id");
+//
+//        if (RenameTool.updateRequested) {
+//            RenameTool.reloadDB();
+//        }
+//
+//        String user = RenameTool.renamedGroups.get(i);
+//        if (user == null) return;
+//        obj.put("name", user);
     }
 }

app/src/main/java/ru/vtosters/hooks/TabletHook.java

@@ -0,0 +1,10 @@
+package ru.vtosters.hooks;
+
+import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class TabletHook {
+    public static boolean hook() {
+        return AndroidUtils.isTablet() && !Preferences.getBoolValue("disableForceTabletMode", false);
+    }
+}

app/src/main/java/ru/vtosters/hooks/VKUIHook.java

@@ -23,7 +23,7 @@ public class VKUIHook {
     }
 
     private static void applyVKUIStyles(WebView webView) {
-        if (getBoolValue("VKUI_INJ", true)) {
+        if (getBoolValue("VKUI_INJ", true) && webView != null && webView.getUrl() != null && !webView.getUrl().contains("static.vk.com/memories")) {
             if (!WebViewColoringUtils.isLoaded) {
                 WebViewColoringUtils.load();
             }

app/src/main/java/ru/vtosters/hooks/VerificationsHook.java

@@ -2,6 +2,7 @@ package ru.vtosters.hooks;
 
 import com.vk.dto.common.VerifyInfo;
 import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.utils.VTVerifications;
 
 import static ru.vtosters.hooks.other.Preferences.getBoolValue;
@@ -20,7 +21,7 @@ public class VerificationsHook {
             return true;
         }
 
-        if (!getBoolValue("VT_Verification", true)) {
+        if (!getBoolValue("VT_Verification", true) || Preferences.serverFeaturesDisable()) {
             return false;
         }
 
@@ -32,7 +33,7 @@ public class VerificationsHook {
             return true;
         }
 
-        if (!getBoolValue("VT_Fire", true)) {
+        if (!getBoolValue("VT_Fire", true) || Preferences.serverFeaturesDisable()) {
             return false;
         }
 
@@ -40,10 +41,6 @@ public class VerificationsHook {
     }
 
     public static boolean hasDeveloper(JSONObject jSONObject) {
-        if (!getBoolValue("VT_Dev", true)) {
-            return false;
-        }
-
         return VTVerifications.isDeveloper(VTVerifications.getId(jSONObject));
     }
 

app/src/main/java/ru/vtosters/hooks/music/MusicArtistSelectorHook.java

@@ -1,4 +1,4 @@
-package ru.vtosters.lite.music.hook;
+package ru.vtosters.hooks.music;
 
 import android.content.Context;
 import com.vk.music.fragment.MusicFragment;

app/src/main/java/ru/vtosters/hooks/music/MusicBottomSheetHook.java

@@ -1,4 +1,4 @@
-package ru.vtosters.lite.music.hook;
+package ru.vtosters.hooks.music;
 
 import android.os.RemoteException;
 import bruhcollective.itaysonlab.libvkx.client.LibVKXClientImpl;
@@ -8,45 +8,29 @@ import com.vk.music.bottomsheets.a.MusicAction;
 import com.vk.music.common.MusicPlaybackLaunchContext;
 import com.vtosters.lite.R;
 import ru.vtosters.lite.downloaders.AudioDownloader;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.music.VKXUtils;
 
 import java.util.ArrayList;
 
 import static bruhcollective.itaysonlab.libvkx.client.LibVKXClient.*;
 import static ru.vtosters.hooks.other.Preferences.milkshake;
-import static ru.vtosters.lite.music.cache.CacheDatabaseDelegate.isCached;
-import static ru.vtosters.lite.music.cache.CacheDatabaseDelegate.isVkxCached;
 import static ru.vtosters.lite.utils.NetworkUtils.isNetworkConnected;
 
 public class MusicBottomSheetHook {
-    public static ArrayList<MusicAction> hook(ArrayList<MusicAction> actions, MusicTrack musicTrack) {
+    public static ArrayList<MusicAction> hook(final ArrayList<MusicAction> actions, final MusicTrack musicTrack) {
         if (musicTrack.F1()) return actions;
-
-        var trackid = asId(musicTrack);
-
-        if (isVkxInstalled()) {
-            actions.add(getPlayInVKXAction());
-        }
-
+        final var trackId = asId(musicTrack);
+        if (isVkxInstalled()) actions.add(getPlayInVKXAction());
         if (isIntegrationEnabled()) {
-            if (isVkxCached(trackid)) {
-                actions.add(getRemoveCacheTrackVkxAction());
-            } else if (isNetworkConnected()) {
-                actions.add(addToCacheTrackVkxAction());
-            }
+            if (VKXUtils.isVkxCached(trackId)) actions.add(getRemoveCacheTrackVkxAction());
+            else if (isNetworkConnected()) actions.add(addToCacheTrackVkxAction());
         } else {
-            if (isCached(trackid)) {
-                actions.add(getRemoveCacheTrackAction());
-            } else if (isNetworkConnected()) {
-                actions.add(addToCacheTrackAction());
-            }
+            if (MusicCacheImpl.isCachedTrack(trackId)) actions.add(getRemoveCacheTrackAction());
+            else if (isNetworkConnected()) actions.add(addToCacheTrackAction());
         }
-
-        if (isNetworkConnected()) {
-            actions.add(downloadAsMp3Action());
-        }
-
+        if (isNetworkConnected()) actions.add(downloadAsMp3Action());
         return actions;
     }
 
@@ -54,9 +38,7 @@ public class MusicBottomSheetHook {
     public static ArrayList<MusicAction> hookDownloadBTN(ArrayList<MusicAction> actions, MusicTrack musicTrack) {
         if (musicTrack.F1()) return actions;
 
-        var trackid = asId(musicTrack);
-
-        if (isCached(trackid)) {
+        if (MusicCacheImpl.isCachedTrack(musicTrack.y1())) {
             actions.add(new MusicAction(
                     R.id.music_action_toggle_download,
                     milkshake() ? R.drawable.ic_delete_outline_28 : R.drawable.ic_delete_24,
@@ -85,7 +67,7 @@ public class MusicBottomSheetHook {
         if (isVkxInstalled()) actions.add(getPlayInVKXAction());
 
         if (isIntegrationEnabled()) {
-            if (isVkxCached(playlist.a, playlist.b)) {
+            if (VKXUtils.isVkxCached(playlist.a, playlist.b)) {
                 actions.add(getRemoveCacheTrackVkxAction());
             } else if (isNetworkConnected()) {
                 actions.add(addToCacheTrackVkxAction());
@@ -124,7 +106,7 @@ public class MusicBottomSheetHook {
         }
 
         if (actionId == R.id.remove_from_cache) {
-            CacheDatabaseDelegate.removeTrackFromCache(asId(track));
+            MusicCacheImpl.removeTrack(asId(track));
             AndroidUtils.sendToast(AndroidUtils.getString("audio_deleted_from_cache"));
             return true;
         } else if (actionId == R.id.add_to_cache) {

app/src/main/java/ru/vtosters/hooks/music/MusicCacheFilesHook.java

@@ -0,0 +1,16 @@
+package ru.vtosters.hooks.music;
+
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
+import ru.vtosters.lite.utils.music.MusicCacheStorageUtils;
+
+import java.io.File;
+
+public class MusicCacheFilesHook {
+    public static File getTrackFile(String trackId) {
+        return MusicCacheStorageUtils.getTrackFile(trackId);
+    }
+
+    public static boolean isTrackExist(String trackId) {
+        return MusicCacheImpl.isCachedTrack(trackId);
+    }
+}

app/src/main/java/ru/vtosters/hooks/music/PlaylistFormatterHook.java

@@ -1,4 +1,4 @@
-package ru.vtosters.lite.music.hook;
+package ru.vtosters.hooks.music;
 
 import android.content.Context;
 import androidx.annotation.AttrRes;

app/src/main/java/ru/vtosters/hooks/music/injectors/CatalogJsonInjector.java

@@ -1,4 +1,4 @@
-package ru.vtosters.lite.music.catalog.inject;
+package ru.vtosters.hooks.music.injectors;
 
 import android.util.Log;
 import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
@@ -12,15 +12,15 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.di.singleton.VtOkHttpClient;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 import java.io.IOException;
 
 import static ru.vtosters.hooks.DateHook.getLocale;
-import static ru.vtosters.hooks.other.Preferences.getBoolValue;
 import static ru.vtosters.hooks.GroupsCatalogInjector.injectIntoCatalog;
+import static ru.vtosters.hooks.other.Preferences.getBoolValue;
 import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.*;
 import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId;
@@ -30,97 +30,36 @@ public class CatalogJsonInjector {
 
     public static JSONObject music(JSONObject json) throws JSONException {
         var catalog = json.optJSONObject("catalog");
-
-        JSONArray oldItems = null;
-
-        if (catalog != null) {
-            oldItems = catalog.optJSONArray("sections");
-        }
-
+        var oldItems = catalog != null ? catalog.optJSONArray("sections") : null;
         var useOldAppVer = getBoolValue("useOldAppVer", false);
         var isUsersCatalog = oldItems.optJSONObject(0).optString("url").equals("https://vk.com/audios" + getUserId() + "?section=" + (useOldAppVer ? "all" : "general"));
+        var blocks = oldItems.optJSONObject(0).optJSONArray("blocks");
 
-        if (isUsersCatalog) {
-            var blocks = oldItems.optJSONObject(0).optJSONArray("blocks");
-
+        if (isUsersCatalog && blocks != null) {
             if (!useOldAppVer) {
                 fixDailyMix(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();
-                                }
-                            }
-                        }
-                    }
-                }
 
-                var playlists = fetchCatalogId("https://vk.com/audio?section=my_playlists");
-                if (playlists != null) {
-                    var catalogarr = playlists.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
+                removeUnsupportedLayouts(blocks);
 
-                    var title = catalogarr.optString("title");
-                    var id = catalogarr.optString("id");
-                    var url = catalogarr.optString("url");
+                fetchCatalogId("https://vk.com/audio?section=my_playlists", oldItems);
 
-                    Log.d("VKMusic", "Added " + title + " in music sections");
+                fetchCatalogId("https://vk.com/audio?section=albums", oldItems);
 
-                    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");
-
-                    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 = Preferences.getString("musicdefcatalog");
-
-                    Log.d("VKMusic", "title: " + title + " id: " + id + " url: " + url + " value: " + value);
-
-                    if (url.contains(value) && !value.isEmpty()) {
-                        catalog.put("default_section", id);
-                        Log.d("VKMusic", "Added " + title + " as default music section");
-                    }
-                }
+                setDefaultAudioPage(oldItems, catalog);
             }
 
-            if (CacheDatabaseDelegate.hasTracks() && !LibVKXClient.isIntegrationEnabled()) { // inj in playlist list
+            if (!MusicCacheImpl.isEmpty() && !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());
-                    }
+                    json.optJSONArray("playlists").put(getPlaylist());
+                    Log.d("catalogInjector", "added to exist pl");
                 }
 
-                if (blocks != null && (!useOldAppVer || noPlaylists)) {
+                if (!useOldAppVer || noPlaylists) {
                     var newBlocks = new JSONArray();
 
                     newBlocks
@@ -152,9 +91,10 @@ public class CatalogJsonInjector {
 
             fixDailyMix(blocks);
 
-            if (!isUsersCatalog || !CacheDatabaseDelegate.hasTracks() || LibVKXClient.isIntegrationEnabled()) {
+            if (!isUsersCatalog || MusicCacheImpl.isEmpty() || LibVKXClient.isIntegrationEnabled()) {
                 return; // early return if not users catalog or no tracks or integration enabled
             }
+
             var noPlaylists = !json.has("playlists");
 
             if (noPlaylists) {
@@ -169,7 +109,7 @@ public class CatalogJsonInjector {
                 }
             }
 
-            if (!useOldAppVer || noPlaylists) {
+            if (!useOldAppVer && !noPlaylists) {
                 var newBlocks = new JSONArray();
 
                 newBlocks
@@ -278,9 +218,38 @@ public class CatalogJsonInjector {
         }
     }
 
-    private static JSONObject fetchCatalogId(String section) {
-        if (section.isEmpty()) return null;
+    private static void removeUnsupportedLayouts(JSONArray blocks) throws JSONException {
+        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);
+                    layout.put("name", "header");
+                }
+            }
+        }
+    }
 
+    private static void setDefaultAudioPage(JSONArray jsonArray, JSONObject catalog) throws JSONException {
+        for (int i = 0; i < jsonArray.length(); i++) {
+            var item = jsonArray.optJSONObject(i);
+            var title = item.optString("title");
+            var id = item.optString("id");
+            var url = item.optString("url");
+            var value = Preferences.getString("musicdefcatalog");
+
+            Log.d("VKMusic", "title: " + title + " id: " + id + " url: " + url + " value: " + value);
+
+            if (url.contains(value) && !value.isEmpty()) {
+                catalog.put("default_section", id);
+                Log.d("VKMusic", "Added " + title + " as default music section");
+            }
+        }
+    }
+
+    private static void fetchCatalogId(String sectionUrl, JSONArray jsonArray) {
         var request = new Request.a()
                 .b("https://" + getApi() + "/method/" + "catalog.getAudio"
                         + "?v=5.119"
@@ -291,16 +260,23 @@ public class CatalogJsonInjector {
                         + "&device_id="
                         + DeviceIdProvider.d(AndroidUtils.getGlobalContext())
                         + "&url="
-                        + section
+                        + sectionUrl
                         + "&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");
+            var json = new JSONObject(mClient.a(request).execute().a().g()).getJSONObject("response");
+            var catalogarr = json.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
+
+            var title = catalogarr.optString("title");
+            var id = catalogarr.optString("id");
+            var url = catalogarr.optString("url");
+
+            Log.d("VKMusic", "Added " + title + " in music sections");
+
+            jsonArray.put(new JSONObject().put("id", id).put("title", title).put("url", url));
         } catch (JSONException | IOException e) {
             Log.d("VTLMusic", "Error: " + e.getMessage());
         }
-
-        return null;
     }
 }

app/src/main/java/ru/vtosters/hooks/music/injectors/PlaylistInjector.java

@@ -1,4 +1,4 @@
-package ru.vtosters.lite.music.cache.injectors;
+package ru.vtosters.hooks.music.injectors;
 
 import android.os.RemoteException;
 import android.text.TextUtils;
@@ -12,7 +12,7 @@ import io.reactivex.ObservableOnSubscribe;
 import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.lite.downloaders.AudioDownloader;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.music.cache.helpers.PlaylistHelper;
 import ru.vtosters.lite.music.cache.helpers.TracklistHelper;
 
@@ -30,7 +30,7 @@ public class PlaylistInjector {
     }
 
     public static boolean eligibleForOfflineCaching() {
-        return CacheDatabaseDelegate.hasTracks();
+        return !MusicCacheImpl.isEmpty();
     }
 
     public static Observable<AudioGetPlaylist.c> injectGetPlaylist(AudioGetPlaylist audioGetPlaylist) {

app/src/main/java/ru/vtosters/hooks/music/injectors/ShuffleInjector.java

@@ -1,4 +1,4 @@
-package ru.vtosters.lite.music.cache.injectors;
+package ru.vtosters.hooks.music.injectors;
 
 import com.vk.dto.music.MusicTrack;
 import com.vk.music.model.IpcPlayerModelImpl;

app/src/main/java/ru/vtosters/hooks/music/injectors/TracklistInjector.java

@@ -1,4 +1,4 @@
-package ru.vtosters.lite.music.cache.injectors;
+package ru.vtosters.hooks.music.injectors;
 
 import android.util.Log;
 import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
@@ -11,7 +11,7 @@ import io.reactivex.ObservableOnSubscribe;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.music.cache.helpers.PlaylistHelper;
 import ru.vtosters.lite.music.cache.helpers.TracklistHelper;
 import ru.vtosters.lite.utils.AccountManagerUtils;
@@ -56,7 +56,7 @@ public class TracklistInjector {
                     }
                 });
             } else {
-                if (!CacheDatabaseDelegate.hasTracks()) {
+                if (MusicCacheImpl.isEmpty()) {
                     observableEmitter.b(parser.c(getEmptyCatalog()));
                 } else {
                     observableEmitter.b(parser.c(createVirtualCatalog(TracklistHelper.getTracks())));
@@ -135,7 +135,7 @@ public class TracklistInjector {
 
         button.put("action", action);
         button.put("block_id", "shuffle");
-        button.put("ref_items_count", CacheDatabaseDelegate.getTrackCount());
+        button.put("ref_items_count", MusicCacheImpl.getTracksCount());
         button.put("ref_layout_name", "list");
         button.put("ref_data_type", "music_audios");
 
@@ -158,7 +158,7 @@ public class TracklistInjector {
 
             JSONArray blocks = firstSection.getJSONArray("blocks");
 
-            if (CacheDatabaseDelegate.hasTracks() && !LibVKXClient.isIntegrationEnabled()) { // inj in playlist list
+            if (!MusicCacheImpl.isEmpty() && !LibVKXClient.isIntegrationEnabled()) { // inj in playlist list
                 boolean noPlaylists = hasNoPlaylists(blocks);
 
                 if (noPlaylists) {

app/src/main/java/ru/vtosters/hooks/other/Preferences.java

@@ -7,6 +7,7 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.StrictMode;
 import com.vk.medianative.MediaImageEncoder;
+import com.vk.medianative.MediaNative;
 import com.vtosters.lite.data.Users;
 import com.vtosters.lite.fragments.SettingsListFragment;
 import ru.vtosters.hooks.GmsHook;
@@ -22,7 +23,9 @@ public class Preferences {
 
     public static void init(Application application) throws Exception {
         StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
-        StrictMode.setThreadPolicy(policy);
+        StrictMode.setThreadPolicy(policy); // fix profiles hide hook
+
+        MediaNative.init(application);
 
         GmsHook.fixGapps();
         ProxyUtils.setProxy();
@@ -163,7 +166,7 @@ public class Preferences {
     }
 
     public static boolean superapp() {
-        return getBoolValue("superapp", true);
+        return getBoolValue("superapp", true) && milkshake();
     }
 
     public static boolean vkpay() {
@@ -239,6 +242,10 @@ public class Preferences {
         return getBoolValue("autoalltranslate", false);
     }
 
+    public static boolean serverFeaturesDisable() {
+        return getBoolValue("serverFeaturesDisable", false);
+    }
+
     public static boolean shortinfo() {
         return getBoolValue("shortinfo", true);
     }
@@ -260,7 +267,7 @@ public class Preferences {
     }
 
     public static boolean stories() {
-        return getBoolValue("stories", true);
+        return getBoolValue("stories", false);
     }
 
     public static boolean swipe() {
@@ -285,16 +292,20 @@ public class Preferences {
 
     @SuppressWarnings("ConstantConditions")
     public static boolean checkupdates() {
-        return !getBoolValue("isRoamingState", false) && isValidSignature() && BuildConfig.BUILD_TYPE.equals("release");
+        return !getBoolValue("isRoamingState", false) && isValidSignature() && BuildConfig.BUILD_TYPE.equals("release") && getBoolValue("autoupdates", true);
     }
 
     public static boolean isNewBuild() {
-        try {
-            return getPreferences().getLong("setupTime", 0L) != AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo(AndroidUtils.getPackageName(), 0).lastUpdateTime;
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-            return false;
-        }
+        if (Preferences.getBoolValue("invalidate_theme_cache_each_update", true))
+            try {
+                return AndroidUtils.getGlobalContext()
+                        .getPackageManager()
+                        .getPackageInfo(AndroidUtils.getPackageName(), 0)
+                        .lastUpdateTime != getPreferences().getLong("setupTime", 0L);
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
+            }
+        return false;
     }
 
     public static void updateBuildNumber() {
@@ -327,7 +338,7 @@ public class Preferences {
     }
 
     public static long getSizeForDelete() {
-        return switch (Preferences.getPreferences().getString("clearcache", "")) {
+        return switch (Preferences.getPreferences().getString("autoclearcache", "")) {
             case "100mb" -> 104857600L;
             case "500mb" -> 524288000L;
             case "1gb" -> 1073741824L;

app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java

@@ -16,19 +16,19 @@ import android.webkit.WebView;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
 import com.vk.articles.preload.WebCachePreloader;
 import com.vk.core.drawable.RecoloredDrawable;
-import com.vk.core.preference.Preference;
 import com.vk.core.ui.themes.MilkshakeHelper;
 import com.vk.core.ui.themes.VKTheme;
 import com.vk.core.ui.themes.VKThemeHelper;
 import com.vtosters.lite.R;
 import com.vtosters.lite.data.ThemeTracker;
 import ru.vtosters.lite.deviceinfo.OEMDetector;
+import ru.vtosters.lite.themes.ThemesCore;
 import ru.vtosters.lite.themes.ThemesHacks;
+import ru.vtosters.lite.themes.ThemesManager;
 import ru.vtosters.lite.ui.wallpapers.WallpapersHooks;
 import ru.vtosters.lite.utils.LifecycleUtils;
 import ru.vtosters.lite.utils.WebViewColoringUtils;
@@ -47,22 +47,10 @@ public class ThemesUtils {
         }
     } // Apply VKTheme and ImTheme (hard applying without dynamic theme changing)
 
-    public static boolean isCustomAccentEnabled() {
-        return ThemesUtils.isMonetTheme() || !useNewColorEngine();
-    }
-
     public static ColorStateList getAccenedColorStateList() {
         return ColorStateList.valueOf(getAccentColor());
     }
 
-    public static int getSystemModeTheme() {
-        return AppCompatDelegate.getDefaultNightMode();
-    }
-
-    public static void setSystemModeTheme(int theme) {
-        AppCompatDelegate.setDefaultNightMode(theme);
-    }
-
     public static void setTheme(VKTheme theme, Activity activity, Boolean restartActivity) {
         setThemeFL(theme, activity, getCenterScreenCoords(), restartActivity);
     } // apply changed theme
@@ -72,6 +60,7 @@ public class ThemesUtils {
             activity = LifecycleUtils.getCurrentActivity();
         }
         VKThemeHelper.theme(theme, activity, fl);
+        if (isMonetTheme() || ThemesManager.canApplyCustomAccent()) ThemesCore.clear();
         if (restartActivity) activity.recreate();
         ThemeTracker.a();
         WebViewColoringUtils.isLoaded = false;
@@ -91,13 +80,8 @@ public class ThemesUtils {
         return getBoolValue("amoledtheme", false);
     }
 
-    public static boolean useNewColorEngine() {
-        return getBoolValue("useNewColorEngine", false);
-    }
-
     public static int getAccentColor() {
-        var color = Preferences.getPreferences().getInt("accent_color", getColorFromAttr(R.attr.accent));
-        return color == 0 || useNewColorEngine() || isMonetTheme() ? getColorFromAttr(R.attr.accent) : color;
+        return getColorFromAttr(R.attr.accent);
     } // Color accent
 
     //region Used for migrating accent color to new version
@@ -261,14 +245,6 @@ public class ThemesUtils {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? isDarkTheme() ? View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR : 0 : 0;
     }
 
-    public static int getStockAccent() {
-        if (isMilkshake()) {
-            return isDarkTheme() ? Color.parseColor("#71aaeb") : Color.parseColor("#3f8ae0");
-        } else {
-            return isDarkTheme() ? Color.parseColor("#71aaeb") : Color.parseColor("#528bcc");
-        }
-    }
-
     public static int getDarkThemeRes() {
         if (isMonetTheme()) {
             if (isAmoledTheme()) {
@@ -323,7 +299,7 @@ public class ThemesUtils {
     } // Recolor drawable to accent color
 
     public static Drawable recolorToolbarDrawable(Drawable drawable) {
-        if (!ThemesUtils.isCustomAccentEnabled()) return drawable;
+        if (!ThemesUtils.isMonetTheme()) return drawable;
         if (drawable == null) return null;
         return new RecoloredDrawable(drawable, (ThemesUtils.isMilkshake() && !ThemesUtils.isDarkTheme()) ? ThemesUtils.getAccentColor() : ThemesUtils.getHeaderText());
     }
@@ -408,15 +384,11 @@ public class ThemesUtils {
     }
 
     public static int getNavigationHeight(int Default) {
-        int VKME = R.dimen.design_bottom_sheet_peek_height_min;
-
-        return vkme() ? VKME : Default;
+        return vkme() ? R.dimen.design_bottom_sheet_peek_height_min : Default;
     }
 
     public static int getNavigationWidth(int Default) {
-        int VKME = R.dimen.app_minimumsize_h;
-
-        return vkme() ? VKME : Default;
+        return vkme() ? R.dimen.app_minimumsize_h : Default;
     }
 
     public static ColorStateList getCSTDock() {
@@ -427,12 +399,8 @@ public class ThemesUtils {
                 },
                 new int[]{
                         dockbar_accent() ? getAccentColor() : (isDarkTheme() ? getResources().getColor(R.color.white) : getResources().getColor(R.color.gray_700)),
-                        isDarkTheme() ? getResources().getColor(R.color.gray_500) : getResources().getColor(R.color.vk_steel_gray_300)
+                        getColorFromAttr(R.attr.tabbar_inactive_icon)
                 }
         );
     }
-
-    private void getCurrentThemeID(VKTheme paramVKTheme) {
-        Preference.b("vk_theme_helper", "current_theme", paramVKTheme.getId());
-    }
 }

app/src/main/java/ru/vtosters/hooks/ssfs/BannerHook.java

@@ -1,7 +1,6 @@
 package ru.vtosters.hooks.ssfs;
 
 import com.vk.core.dialogs.alert.VkAlertDialog;
-import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.ssfs.ImBanner;
@@ -9,8 +8,8 @@ import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.LifecycleUtils;
 
 public class BannerHook {
-    public static JSONObject convBar(JSONObject orig) throws JSONException {
-        return ImBanner.convBar(orig);
+    public static JSONObject convBar(JSONObject orig) {
+        return ImBanner.convertToBanner(orig);
     }
 
     public static boolean showAlert() {

app/src/main/java/ru/vtosters/hooks/ssfs/ProfileHook.java

@@ -24,7 +24,10 @@ public class ProfileHook {
 
         if (UsersList.hasDescription(userID)) {
             try {
-                extendedUserProfile.z2 = Handler.getDescription(userID);
+                String description = Handler.getDescription(userID);
+                if (!TextUtils.isEmpty(description)) {
+                    extendedUserProfile.z2 = description;
+                }
             } catch (NullPointerException e) {
                 Log.e(TAG, "null \"profiles\" node\n" + e);
             }

app/src/main/java/ru/vtosters/lite/dialogs/Requests.java

@@ -8,6 +8,7 @@ import com.vk.im.engine.utils.ImDialogsUtils;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import ru.vtosters.hooks.other.ThemesUtils;
+import ru.vtosters.lite.concurrent.VTExecutors;
 import ru.vtosters.lite.net.Request;
 import ru.vtosters.lite.proxy.ProxyUtils;
 import ru.vtosters.lite.utils.AccountManagerUtils;
@@ -43,7 +44,7 @@ public class Requests {
     }
 
     public static void pinnedMsg(int dialogid, boolean needToBePinned) {
-        Thread thread = new Thread(() -> {
+        VTExecutors.getIoExecutor().execute(() -> {
             try {
                 var request = new okhttp3.Request.a()
                         .b("https://" + ProxyUtils.getApi() + "/method/" + (needToBePinned ? "messages.pinConversation" : "messages.unpinConversation") + "?peer_id=" + dialogid + "&access_token=" + AccountManagerUtils.getUserToken() + "&v=5.119")
@@ -56,8 +57,6 @@ public class Requests {
             }
         });
 
-        thread.start();
-
         AndroidUtils.sendToast(AndroidUtils.getString(com.vtosters.lite.R.string.pin_dialog) + " " + AndroidUtils.getString(needToBePinned ? com.vtosters.lite.R.string.dialog_pinned : com.vtosters.lite.R.string.dialog_unpinned));
     }
 }

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

@@ -6,8 +6,8 @@ import com.vk.core.util.ToastUtils;
 import com.vk.dto.music.MusicTrack;
 import com.vk.dto.music.Playlist;
 import com.vtosters.lite.R;
-import ru.vtosters.hooks.MusicCacheFilesHook;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
+import ru.vtosters.hooks.music.MusicCacheFilesHook;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.music.callback.MusicCallbackBuilder;
 import ru.vtosters.lite.music.converter.playlist.PlaylistConverter;
 import ru.vtosters.lite.music.downloader.AudioGet;
@@ -58,10 +58,10 @@ public class AudioDownloader {
     }
 
     public static void cacheTrack(MusicTrack track) {
-        var trackId = track.y1();
+        var trackId = LibVKXClient.asId(track);
 
-        if (CacheDatabaseDelegate.isCached(trackId)) {
-            CacheDatabaseDelegate.removeTrackFromCache(LibVKXClient.asId(track));
+        if (MusicCacheImpl.isCachedTrack(trackId)) {
+            MusicCacheImpl.removeTrack(trackId);
             AndroidUtils.sendToast(AndroidUtils.getString("audio_deleted_from_cache"));
             return;
         }

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

@@ -1,13 +1,10 @@
 package ru.vtosters.lite.foaf;
 
-import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.util.Log;
 import com.vk.core.dialogs.alert.VkAlertDialog;
-import com.vk.core.network.Network;
 import com.vtosters.lite.R;
-import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -15,13 +12,9 @@ import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.net.Request;
 import ru.vtosters.lite.utils.LifecycleUtils;
 
-import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -34,43 +27,15 @@ import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 
 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 = VtOkHttpClient.getInstance();
 
-    public static long getLastSeen(long origtime, int id) throws ParseException {
-        var request = new okhttp3.Request.a()
-                .b(getLink(id))
-                .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
-
-        String response = null;
-
-        try {
-            response = client.a(request).execute().a().g();
-        } catch (IOException e) {
-            Log.e("FoafBase", e.getMessage());
-        }
-
-        Matcher matcher = FOAF_REGEX_LAST_SEEN.matcher(response);
-
-        if (!matcher.find()) {
-            return origtime;
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);
-        sdf.setTimeZone(TimeZone.getTimeZone("Europe/Moscow"));
-        Date date = sdf.parse(Objects.requireNonNull(matcher.group(1)));
-        sdf.setTimeZone(TimeZone.getDefault());
-        return sdf.parse(sdf.format(date)).getTime() / 1000;
-    }
-
-
     public static JSONObject getBypassedOnlineInfo(int id) throws JSONException {
         var request = new okhttp3.Request.a()
                 .b(API_VKNEXT + id)
                 .a();
 
-        String response = null;
+        String response;
 
         var dummy = new JSONObject();
         dummy.put("last_seen", 0);
@@ -86,7 +51,6 @@ public class FoafBase {
     }
 
     public static JSONObject getBypassedOnlineInfo(String ids) {
-
         var request = new okhttp3.Request.a()
                 .b(API_VKNEXT + ids)
                 .a();
@@ -135,7 +99,15 @@ public class FoafBase {
             progressDialog.cancel();
             Matcher matcher = FOAF_REGEX.matcher(str);
             matcher.find();
-            String normalHumanDate = getNormalHumanDate(Objects.requireNonNull(matcher.group(1)));
+
+            String m = matcher.group(1);
+
+            if (m == null) {
+                LifecycleUtils.getCurrentActivity().runOnUiThread(() -> makeText(getGlobalContext(), context.getString(R.string.foaferr), LENGTH_SHORT).show());
+                return;
+            }
+
+            String normalHumanDate = getNormalHumanDate(m);
 
             LifecycleUtils.getCurrentActivity().runOnUiThread(() -> new VkAlertDialog.Builder(context)
                     .setTitle(R.string.addinf)
@@ -147,17 +119,14 @@ public class FoafBase {
                     .show());
         } catch (Exception e) {
             LifecycleUtils.getCurrentActivity().runOnUiThread(() -> makeText(getGlobalContext(), context.getString(R.string.foaferr), LENGTH_SHORT).show());
-            e.printStackTrace();
         }
     }
 
     private static long daysPassedFromFoafDate(String str) {
         try {
-            @SuppressLint("SimpleDateFormat")
             Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(str.split(" ")[1]);
             return TimeUnit.DAYS.convert(new Date().getTime() - parse.getTime(), TimeUnit.MILLISECONDS);
         } catch (ParseException e) {
-            e.printStackTrace();
             return -1;
         }
     }

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

@@ -7,14 +7,13 @@ import androidx.annotation.Nullable;
 import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
 import com.vk.dto.music.MusicTrack;
 import com.vtosters.lite.R;
-import okhttp3.Callback;
 import okhttp3.*;
 import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.downloaders.AudioDownloader;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 import java.io.IOException;
@@ -47,7 +46,7 @@ public class LastFMScrobbler {
             return;
         }
 
-        if (Preferences.autocache() && !CacheDatabaseDelegate.isCached(uid)) {
+        if (Preferences.autocache() && !MusicCacheImpl.isCachedTrack(uid)) {
             if (LibVKXClient.isIntegrationEnabled()) {
                 LibVKXClient.getInstance().runOnService(service -> {
                     try {

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

@@ -1,158 +0,0 @@
-package ru.vtosters.lite.music;
-
-import android.util.Log;
-import com.vk.dto.music.MusicTrack;
-import java8.util.concurrent.CompletableFuture;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import ru.vtosters.lite.di.singleton.VtOkHttpClient;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
-import ru.vtosters.lite.music.converter.ts.FFMpeg;
-import ru.vtosters.lite.music.converter.ts.TSMerger;
-import ru.vtosters.lite.music.downloader.ThumbnailDownloader;
-import ru.vtosters.lite.music.interfaces.ITrackDownloader;
-import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.IOUtils;
-
-import javax.crypto.NoSuchPaddingException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class M3UDownloader implements ITrackDownloader {
-    private static final OkHttpClient client = VtOkHttpClient.getInstance();
-
-    public static M3UDownloader getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    public static String getTitle(MusicTrack track) {
-        String title = null;
-
-        if (track.f != null) {
-            title = track.f;
-            if (!track.g.isEmpty()) {
-                title += " (" + track.g + ")";
-            }
-        }
-
-        return title;
-    }
-
-    public void downloadTrack(MusicTrack track, File outDir, Callback callback, boolean cache) {
-        if (track.D.isEmpty()) {
-            Log.d("TrackDownloader", "link error: " + track.y1() + ", title: " + M3UDownloader.getTitle(track));
-            callback.onFailure();
-            return;
-        }
-
-        try {
-            Request request = new Request.a().b(track.D).a();
-            String response = client.a(request).execute().a().g();
-            parse(response, outDir, callback, track, cache);
-        } catch (IOException e) {
-            e.printStackTrace();
-            callback.onFailure();
-        }
-    }
-
-    private void parse(String payload, File outDir, Callback callback, MusicTrack track, boolean cache) throws UnsupportedEncodingException {
-        if (cache) downloadThumbnails(track);
-
-        VKM3UParser parser = new VKM3UParser(track.D.substring(0, track.D.lastIndexOf("/") + 1), payload);
-        AtomicInteger progress = new AtomicInteger(0);
-        List<CompletableFuture<Void>> futures = createFutures(parser, progress, callback, track);
-
-        var resultTs = getResultTsFile(track);
-        var resultMp3 = getResultMp3File(outDir, cache, track);
-
-        callback.onProgress(5);
-        var future = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
-        future.join();
-        future.exceptionally(throwable -> {
-                    callback.onFailure();
-                    return null;
-                }).thenApply(v -> TSMerger.merge(getTsesDir(track), resultTs))
-                .thenApply(mergeResult -> mergeResult && FFMpeg.convert(resultTs, resultMp3.getAbsolutePath(), track))
-                .thenApply(convertResult -> {
-                    if (convertResult)
-                        callback.onProgress(10 + Math.round(80.0f * progress.addAndGet(1) / parser.mTransportStreams.size()));
-                    else callback.onFailure();
-                    return convertResult;
-                }).thenRun(() -> IOUtils.deleteRecursive(getTsesDir(track))).thenRun(() -> {
-                    callback.onSuccess();
-                    if (cache) CacheDatabaseDelegate.insertTrack(track);
-                });
-    }
-
-    private void downloadThumbnails(MusicTrack track) {
-        try {
-            ThumbnailDownloader.downloadThumbnails(track);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private List<CompletableFuture<Void>> createFutures(VKM3UParser parser, AtomicInteger progress, Callback callback, MusicTrack track) {
-        List<CompletableFuture<Void>> futures = new ArrayList<>(parser.mTransportStreams.size());
-
-        var tses = parser.mTransportStreams;
-        for (var i = 0; i < tses.size(); ++i) {
-            final var ts = tses.get(i);
-            final var filename = i + ".ts";
-            futures.add(CompletableFuture.runAsync(() -> processTransportStream(parser, ts, filename, progress, tses.size(), callback, track)));
-        }
-        return futures;
-    }
-
-    private void processTransportStream(VKM3UParser parser, TransportStream ts, String filename, AtomicInteger progress, int size, Callback callback, MusicTrack track) {
-        try {
-            InputStream mediaIs = IOUtils.openStream(ts.getMediaSegmentUri());
-            byte[] content;
-            if (ts.needDecoding()) {
-                InputStream keyPubIs = IOUtils.openStream(ts.getKeyURL());
-                content = IOUtils.decodeStream(mediaIs, IOUtils.readFully(keyPubIs));
-                keyPubIs.close();
-            } else {
-                content = IOUtils.readFully(mediaIs);
-            }
-            File tsDump = new File(getTsesDir(track), filename);
-            IOUtils.writeToFile(tsDump, content);
-            callback.onProgress(10 + Math.round(80.0f * progress.addAndGet(1) / size));
-            callback.onSizeReceived((long) content.length * size, parser.mHeapSize);
-            mediaIs.close();
-        } catch (IOException | NoSuchPaddingException | NoSuchAlgorithmException |
-                 InvalidAlgorithmParameterException | InvalidKeyException e) {
-            callback.onFailure();
-            throw new RuntimeException(e);
-        }
-    }
-
-    private File getTsesDir(MusicTrack track) {
-        var filesDir = AndroidUtils.getGlobalContext().getFilesDir();
-        var tsesDir = new File(filesDir, String.valueOf(track.d));
-        tsesDir.mkdirs();
-        return tsesDir;
-    }
-
-    private File getResultTsFile(MusicTrack track) {
-        return new File(getTsesDir(track), "result.ts");
-    }
-
-    private File getResultMp3File(File outDir, boolean cache, MusicTrack track) {
-        var fileName = IOUtils.getValidFileName((cache ? "track" : track.C + " - " + getTitle(track)) + ".mp3");
-        return new File(outDir, fileName);
-    }
-
-    // Initialization-on-demand
-    private static class Holder {
-        private static final M3UDownloader INSTANCE = new M3UDownloader();
-    }
-}

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

@@ -1,36 +0,0 @@
-package ru.vtosters.lite.music;
-
-import android.text.TextUtils;
-
-public class TransportStream {
-
-    private String mKeyUri;
-    private final String mMediaSegmentUri;
-    private String mMediaSegmentName;
-
-    public TransportStream(String baseURI, String mediaSegmentName) {
-        this.mMediaSegmentUri = baseURI + mediaSegmentName;
-    }
-
-    public TransportStream(String keyURI, String baseURI, String mediaSegmentName) {
-        this.mKeyUri = keyURI;
-        this.mMediaSegmentUri = baseURI + mediaSegmentName;
-        this.mMediaSegmentName = mediaSegmentName;
-    }
-
-    public boolean needDecoding() {
-        return !TextUtils.isEmpty(mKeyUri);
-    }
-
-    public String getKeyURL() {
-        return mKeyUri;
-    }
-
-    public String getMediaSegmentUri() {
-        return this.mMediaSegmentUri;
-    }
-
-    public String getMediaSegmentName() {
-        return this.mMediaSegmentName;
-    }
-}

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

@@ -1,127 +0,0 @@
-package ru.vtosters.lite.music;
-
-import android.text.TextUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-/**
- * The parser for extended M3U playlist format used by VK.
- *
- * @see <a href="https://datatracker.ietf.org/doc/html/rfc8216#ref-M3U">M3U</a>
- **/
-public class VKM3UParser {
-    //Playlist types
-    static public int PLAYLIST_TYPE_VOD = 0;
-    static public int PLAYLIST_TYPE_EVENT = 1;
-
-    //region Extended M3U global extensions
-    public List<TransportStream> mTransportStreams = new ArrayList<>();
-    private final String mData;
-    /**
-     * @see <a href="https://datatracker.ietf.org/doc/html/rfc8216#section-4.3.1.2">EXT-X-VERSION</a>
-     **/
-    public int mVersion = -1;
-    /**
-     * The EXT-X-ALLOW-CACHE tag is used in protocol version 6 or lower.
-     * If the protocol version is upgraded by VK, we will not support that.
-     **/
-    public boolean mAllowCache = false;
-    /**
-     * @see <a href="https://datatracker.ietf.org/doc/html/rfc8216#section-4.3.3.1">EXT-X-TARGETDURATION</a>
-     **/
-    public int mTargetDuration = -1;
-    /**
-     * @see <a href="https://datatracker.ietf.org/doc/html/rfc8216#section-4.3.3.2">EXT-X-MEDIA-SEQUENCE</a>
-     **/
-    public int mMediaSequence = -1;
-    /**
-     * @see <a href="https://datatracker.ietf.org/doc/html/rfc8216#section-4.3.3.3">EXT-X-DISCONTINUITY-SEQUENCE</a>
-     **/
-    public int mDiscontinuitySequence = -1;
-    //endregion
-    /**
-     * @see <a href="https://datatracker.ietf.org/doc/html/rfc8216#section-4.3.3.5">EXT-X-PLAYLIST-TYPE</a>
-     **/
-    public int mPlaylistType = -1;
-    /**
-     * @see <a href="https://datatracker.ietf.org/doc/html/rfc8216#section-4.3.3.6">EXT-X-I-FRAMES-ONLY</a>
-     **/
-    public boolean mIFramesOnly = false;
-    public long mHeapSize = 0;
-
-    public VKM3UParser(String baseUri, String data) {
-        mData = data;
-        init(baseUri);
-    }
-
-    public static boolean isTS(String str) {
-        return str.matches(".+\\.ts.*");
-    }
-
-    private void init(String baseUri) {
-        if (TextUtils.isEmpty(mData)) throw new NullPointerException("mData==null");
-        Scanner scanner = new Scanner(mData);
-        String line = scanner.nextLine();
-        if (!"#EXTM3U".equals(line))
-            throw new IllegalStateException(String.format("Unknown initial M3U tag: %s", line));
-        boolean aes128 = false;
-        String keyUri = "";
-        while (scanner.hasNextLine()) {
-            line = scanner.nextLine();
-            if ('#' == line.charAt(0)) {
-                parseTag(line);
-                if (line.startsWith("#EXT-X-KEY:") && line.contains("METHOD=AES-128")) {
-                    aes128 = true;
-                    keyUri = getKeyUri(line, baseUri);
-                }
-            } else if (isTS(line)) {
-                addTransportStream(aes128, keyUri, baseUri, line);
-                aes128 = false;
-            } else {
-                throw new RuntimeException(String.format("Failed to parse: %s", line));
-            }
-            mHeapSize += line.getBytes().length;
-        }
-    }
-
-    private void parseTag(String line) {
-        if (line.startsWith("#EXT-X-VERSION:"))
-            mVersion = Integer.parseInt(line.substring(15));
-        else if (line.startsWith("#EXT-X-ALLOW-CACHE:"))
-            mAllowCache = "YES".equalsIgnoreCase(line.substring(19));
-        else if (line.startsWith("#EXT-X-TARGETDURATION:"))
-            mTargetDuration = Integer.parseInt(line.substring(22));
-        else if (line.startsWith("#EXT-X-MEDIA-SEQUENCE:"))
-            mMediaSequence = Integer.parseInt(line.substring(22));
-        else if (line.startsWith("#EXT-X-DISCONTINUITY-SEQUENCE:"))
-            mDiscontinuitySequence = Integer.parseInt(line.substring(30));
-        else if (line.startsWith("#EXT-X-PLAYLIST-TYPE:"))
-            parsePlaylistType(line.substring(21));
-        else if (line.startsWith("#EXT-X-I-FRAMES-ONLY"))
-            mIFramesOnly = true;
-    }
-
-    private void parsePlaylistType(String type) {
-        switch (type) {
-            case "VOD" -> mPlaylistType = PLAYLIST_TYPE_VOD;
-            case "EVENT" -> mPlaylistType = PLAYLIST_TYPE_EVENT;
-            default -> throw new IllegalStateException(String.format("Unknown playlist type: %s", type));
-        }
-    }
-
-    private String getKeyUri(String line, String baseUri) {
-        String substr = line.substring(11);
-        substr = substr.substring(substr.indexOf('"') + 1, substr.lastIndexOf('"'));
-        //TODO: supposed endpoint
-        return substr.startsWith("http") ? substr : baseUri + substr;
-    }
-
-    private void addTransportStream(boolean aes128, String keyUri, String baseUri, String line) {
-        TransportStream ts = aes128
-                ? new TransportStream(keyUri, baseUri, line)
-                : new TransportStream(baseUri, line);
-        mTransportStreams.add(ts);
-    }
-}

app/src/main/java/ru/vtosters/lite/music/cache/CacheDatabaseDelegate.java

@@ -1,343 +0,0 @@
-package ru.vtosters.lite.music.cache;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.SQLException;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.os.RemoteException;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import bruhcollective.itaysonlab.libvkx.ILibVkxService;
-import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
-import bruhcollective.itaysonlab.libvkx.client.LibVKXClientImpl;
-import com.vk.core.util.ToastUtils;
-import com.vk.dto.music.MusicTrack;
-import com.vtosters.lite.R;
-import org.json.JSONObject;
-import ru.vtosters.lite.utils.AndroidUtils;
-
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
-
-import static ru.vtosters.lite.music.cache.FileCacheImplementation.getCacheDir;
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
-import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
-import static ru.vtosters.lite.utils.IOUtils.deleteRecursive;
-
-public class CacheDatabaseDelegate {
-    private static final int DB_VERSION = 0x1;
-    private static final String DB_NAME = "vt_lite_cache.db";
-    private static final String TABLE_NAME = "tracks";
-    private static final String COLUMN_ID = "id";
-    private static final String COLUMN_TRACK_ID = "trackId";
-    private static final String COLUMN_ALBUM_ID = "albumId";
-    private static final String COLUMN_TITLE = "title";
-    private static final String COLUMN_SUBTITLE = "subtitle";
-    private static final String COLUMN_ARTIST = "artist";
-    private static final String COLUMN_ALBUM_TITLE = "albumTitle";
-    private static final String COLUMN_EXPLICIT = "explicit";
-    private static final String COLUMN_HAS_ARTWORK = "hasArtwork";
-    private static final String COLUMN_DURATION = "duration";
-    private static DbHelper helperInstance;
-
-    protected static DbHelper getHelper() {
-        if (helperInstance == null) helperInstance = new DbHelper(getGlobalContext());
-        return helperInstance;
-    }
-
-    // You MUST call this method ONLY AFTER TRACK IS DOWNLOADED!
-    public static void insertTrack(MusicTrack track) {
-        try {
-            var json = track.J();
-            var albumNode = json.optJSONObject("album");
-
-            var hasArtwork = false;
-            var albumId = -1;
-            var albumName = "";
-
-            if (albumNode != null) {
-                hasArtwork = albumNode.has("thumb");
-                albumId = albumNode.getInt("id");
-                albumName = albumNode.getString("title");
-            }
-
-            var formula = String.format(
-                    "INSERT INTO %s (%s, %s, %s, %s, %s, %s, %s, %s, %s) VALUES ('%s', %s, '%s', '%s', '%s', '%s', %s, %s, %s)",
-                    TABLE_NAME,
-                    COLUMN_TRACK_ID, COLUMN_ALBUM_ID, COLUMN_TITLE, COLUMN_SUBTITLE, COLUMN_ARTIST, COLUMN_ALBUM_TITLE, COLUMN_EXPLICIT, COLUMN_DURATION, COLUMN_HAS_ARTWORK,
-                    track.y1(),
-                    albumId,
-                    URLEncoder.encode(json.getString("title"), "UTF-8"),
-                    URLEncoder.encode(json.optString("subtitle"), "UTF-8"),
-                    URLEncoder.encode(json.getString("artist"), "UTF-8"),
-                    URLEncoder.encode(albumName, "UTF-8"),
-                    json.optInt("is_explicit"),
-                    json.getInt("duration"),
-                    hasArtwork ? 1 : 0
-            );
-            getHelper().getReadableDatabase().execSQL(formula);
-        } catch (Exception e) {
-            e.printStackTrace();
-            ToastUtils.a(AndroidUtils.getString(R.string.track_bd_insert_err) + " [" + e.getMessage() + "]", true);
-        }
-    }
-
-    public static void insertTracks(List<MusicTrack> tracks) {
-        for (var track : tracks) insertTrack(track);
-    }
-
-    public static void clear() {
-        getHelper().getReadableDatabase().execSQL(String.format("DELETE FROM %s", TABLE_NAME));
-        deleteRecursive(getCacheDir());
-        sendToast(AndroidUtils.getString(R.string.cached_tracks_deleted));
-    }
-
-    @NonNull
-    private static JSONObject reconstructFromDb(Cursor cursor) {
-        try {
-            var trackId = cursor.getString(getColumnIndex(cursor, COLUMN_TRACK_ID));
-            var splits = trackId.split("_");
-            var id = Integer.parseInt(splits[1]);
-            var ownerId = Integer.parseInt(splits[0]);
-
-            return new JSONObject()
-                    .put("url", FileCacheImplementation.getServerPath())
-                    .put("id", id)
-                    .put("owner_id", ownerId)
-                    .put("title", URLDecoder.decode(cursor.getString(getColumnIndex(cursor, COLUMN_TITLE)), "UTF-8"))
-                    .put("subtitle", URLDecoder.decode(cursor.getString(getColumnIndex(cursor, COLUMN_SUBTITLE)), "UTF-8"))
-                    .put("artist", URLDecoder.decode(cursor.getString(getColumnIndex(cursor, COLUMN_ARTIST)), "UTF-8"))
-                    .put("duration", cursor.getInt(getColumnIndex(cursor, COLUMN_DURATION)))
-                    .put("is_explicit", cursor.getInt(getColumnIndex(cursor, COLUMN_EXPLICIT)))
-                    .put("access_key", 2281488)
-                    .putOpt("album", reconstructAlbumFromDb(cursor, trackId));
-        } catch (Exception e) {
-            e.printStackTrace();
-            return new JSONObject();
-        }
-    }
-
-    @Nullable
-    private static JSONObject reconstructAlbumFromDb(Cursor cursor, String trackId) {
-        try {
-            if (!FileCacheImplementation.getTrackThumbnail(trackId, 300).exists()
-                    && !FileCacheImplementation.getTrackThumbnail(trackId, 600).exists()
-                    && !FileCacheImplementation.getTrackThumbnail(trackId, 1200).exists()
-            ) {
-                var ownerId = Integer.parseInt(trackId.split("_")[1]);
-                return new JSONObject()
-                        .put("id", cursor.getInt(getColumnIndex(cursor, COLUMN_ALBUM_ID)))
-                        .put("owner_id", ownerId)
-                        .put("title", URLDecoder.decode(cursor.getString(getColumnIndex(cursor, COLUMN_ALBUM_TITLE)), "UTF-8"))
-                        .putOpt("thumb", reconstructAlbumThumbFromDb(cursor, trackId));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    @Nullable
-    private static JSONObject reconstructAlbumThumbFromDb(Cursor cursor, String trackId) {
-        try {
-            if (cursor.getInt(getColumnIndex(cursor, COLUMN_HAS_ARTWORK)) != 0)
-                new JSONObject()
-                        .put("height", 600)
-                        .put("width", 600)
-                        .putOpt("photo_300", FileCacheImplementation.getFileUri(FileCacheImplementation.getTrackThumbnail(trackId, 300)))
-                        .putOpt("photo_600", FileCacheImplementation.getFileUri(FileCacheImplementation.getTrackThumbnail(trackId, 600)))
-                        .putOpt("photo_1200", FileCacheImplementation.getFileUri(FileCacheImplementation.getTrackThumbnail(trackId, 1200)));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private static int getColumnIndex(Cursor cursor, String name) {
-        return cursor.getColumnIndexOrThrow(name);
-    }
-
-    public static boolean hasTracks() {
-        if (LibVKXClient.isIntegrationEnabled()) {
-            return true;
-        }
-
-        var formula = String.format(
-                "SELECT COUNT(%s) FROM %s",
-                COLUMN_ID,
-                TABLE_NAME
-        );
-        var cursor = getHelper().getReadableDatabase().rawQuery(formula, null);
-        if (cursor != null) {
-            cursor.moveToFirst();
-            int count = cursor.getInt(0);
-            cursor.close();
-            return count > 0;
-        }
-        return false;
-    }
-
-    public static List<MusicTrack> getTracks() {
-        return getTracks(String.format(
-                "SELECT * FROM %s",
-                TABLE_NAME
-        ));
-    }
-
-    public static List<MusicTrack> getTracksAsPlaylist() {
-        return getTracks(String.format(
-                "SELECT * FROM %s WHERE %s > -1 GROUP BY %s HAVING COUNT(*) > 1 ORDER by id DESC",
-                TABLE_NAME,
-                COLUMN_ALBUM_ID,
-                COLUMN_ALBUM_ID
-        ));
-    }
-
-    public static List<MusicTrack> getTracksByAlbum(String id) {
-        return getTracks(String.format(
-                "SELECT COUNT(%s) FROM %s WHERE %s = %s",
-                COLUMN_ID,
-                TABLE_NAME,
-                COLUMN_ALBUM_ID,
-                id
-        ));
-    }
-
-    public static List<MusicTrack> getTracksByAlbumOne(String id) {
-        return getTracks(String.format(
-                "SELECT * FROM %s WHERE %s = %s LIMIT 1",
-                TABLE_NAME,
-                COLUMN_ALBUM_ID,
-                id
-        ));
-    }
-
-    public static List<MusicTrack> getTracks(String query) {
-        List<MusicTrack> list = new ArrayList<>();
-        try (Cursor cursor = getHelper().getReadableDatabase().rawQuery(query, new String[0])) {
-            while (cursor.moveToNext()) {
-                list.add(new MusicTrack(reconstructFromDb(cursor)));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return list;
-    }
-
-    public static boolean isCached(String trackId) {
-        var formula = String.format(
-                "SELECT COUNT(%s) FROM %s WHERE %s = '%s'",
-                COLUMN_ID,
-                TABLE_NAME,
-                COLUMN_TRACK_ID,
-                trackId
-        );
-        try {
-            Cursor size = getHelper().getReadableDatabase().rawQuery(formula, null);
-            if (size != null) {
-                size.moveToFirst();
-                int count = size.getInt(0);
-                size.close();
-                return count != 0;
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    public static boolean isVkxCached(int playlist_id, int owner_id) {
-        return LibVKXClient.getInstance().runOnServiceSync(new LibVKXClientImpl.LibVKXActionGeneric<>() {
-            @Override
-            public Boolean run(ILibVkxService service) {
-                try {
-                    return service.isPlaylistCached(playlist_id, owner_id);
-                } catch (RemoteException e) {
-                    return false;
-                }
-            }
-
-            @Override
-            public Boolean defaultValue() {
-                return false;
-            }
-        });
-    }
-
-    public static boolean isVkxCached(String trackId) {
-        return LibVKXClient.getInstance().runOnServiceSync(new LibVKXClientImpl.LibVKXActionGeneric<>() {
-            @Override
-            public Boolean run(ILibVkxService service) {
-                try {
-                    var splits = trackId.split("_");
-                    var id = Integer.parseInt(splits[1]);
-                    var owner = Integer.parseInt(splits[0]);
-                    return service.isTrackCached(id, owner);
-                } catch (RemoteException e) {
-                    return false;
-                }
-            }
-
-            @Override
-            public Boolean defaultValue() {
-                return false;
-            }
-        });
-    }
-
-    public static void removeTrackFromCache(String trackId) {
-        deleteRecursive(FileCacheImplementation.getTrackFolder(trackId));
-
-        var formula = String.format(
-                "DELETE FROM %s WHERE %s = '%s'",
-                TABLE_NAME,
-                COLUMN_TRACK_ID,
-                trackId
-        );
-        getHelper().getWritableDatabase().execSQL(formula);
-    }
-
-    public static long getTrackCount() {
-        if (!LibVKXClient.isIntegrationEnabled())
-            return DatabaseUtils.queryNumEntries(getHelper().getReadableDatabase(), TABLE_NAME);
-        return LibVKXClient.getInstance().runOnServiceSync(new LibVKXClientImpl.LibVKXActionGeneric<Long>() {
-            @Override
-            public Long run(ILibVkxService service) {
-                try {
-                    return (long) service.getCache().size();
-                } catch (RemoteException e) {
-                    e.printStackTrace();
-                    return defaultValue();
-                }
-            }
-
-            @Override
-            public Long defaultValue() {
-                return 0L;
-            }
-        });
-    }
-
-    private static class DbHelper extends SQLiteOpenHelper {
-        public DbHelper(Context context) {
-            super(context, DB_NAME, null, DB_VERSION);
-        }
-
-        public void onCreate(SQLiteDatabase db) {
-            var formula = String.format(
-                    "CREATE TABLE %s (%s INTEGER PRIMARY KEY AUTOINCREMENT, %s TEXT, %s INTEGER, %s TEXT, %s TEXT, %s TEXT, %s TEXT, %s INTEGER, %s INTEGER, %s INTEGER)",
-                    TABLE_NAME,
-                    COLUMN_ID, COLUMN_TRACK_ID, COLUMN_ALBUM_ID, COLUMN_TITLE, COLUMN_SUBTITLE, COLUMN_ARTIST, COLUMN_ALBUM_TITLE, COLUMN_EXPLICIT, COLUMN_DURATION, COLUMN_HAS_ARTWORK
-            );
-            db.execSQL(formula);
-        }
-
-        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
-        }
-    }
-}

app/src/main/java/ru/vtosters/lite/music/cache/FileCacheImplementation.java

@@ -1,50 +0,0 @@
-package ru.vtosters.lite.music.cache;
-
-import android.net.Uri;
-import com.vk.dto.music.MusicTrack;
-import ru.vtosters.hooks.MusicCacheFilesHook;
-import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.IOUtils;
-
-import java.io.File;
-
-public class FileCacheImplementation {
-
-    public static void clear() {
-        CacheDatabaseDelegate.clear();
-        IOUtils.deleteRecursive(getCacheDir(), false);
-    }
-
-    public static File getCacheDir() {
-        return AndroidUtils.getGlobalContext().getExternalFilesDir("vt_tracks");
-    }
-
-    public static File getTrackFolder(String trackId) {
-        var dir = new File(getCacheDir(), trackId);
-        dir.mkdirs();
-        return dir;
-    }
-
-    public static File getThumbnailsFolder(String trackId) {
-        var dir = new File(getTrackFolder(trackId), "thumbs");
-        dir.mkdirs();
-        return dir;
-    }
-
-    public static File getTrackFile(MusicTrack track) {
-        return MusicCacheFilesHook.getTrackFile(track.y1());
-    }
-
-    public static File getTrackThumbnail(String trackId, int factor) {
-        return new File(getThumbnailsFolder(trackId), "thumb_" + factor + ".png");
-    }
-
-    public static String getFileUri(File file) {
-        if (!file.exists()) return null;
-        return Uri.fromFile(file).toString();
-    }
-
-    public static String getServerPath() {
-        return "https://vtosters.app";
-    }
-}

app/src/main/java/ru/vtosters/lite/music/cache/MusicCacheDbDelegate.java

@@ -0,0 +1,85 @@
+package ru.vtosters.lite.music.cache;
+
+import android.content.Context;
+import com.vk.dto.music.MusicTrack;
+import ru.vtosters.lite.music.cache.db.MusicCacheDb;
+
+import java.util.List;
+
+public class MusicCacheDbDelegate {
+    static synchronized private MusicCacheDb connectToDb(Context context) {
+        synchronized (MusicCacheDb.class) {
+            return new MusicCacheDb(context);
+        }
+    }
+
+    public static void addTrack(Context context,
+                                String trackId,
+                                String albumId,
+                                String title,
+                                String subtitle,
+                                String artist,
+                                String albumTitle,
+                                boolean explicit,
+                                int duration,
+                                boolean hasArtwork) {
+        try (var db = connectToDb(context)) {
+            db.addTrack(
+                    trackId,
+                    albumId,
+                    title,
+                    subtitle,
+                    artist,
+                    albumTitle,
+                    explicit,
+                    duration,
+                    hasArtwork);
+        }
+    }
+
+    public static void removeTrack(Context context, String trackId) {
+        try (var db = connectToDb(context)) {
+            db.deleteTrack(trackId);
+        }
+    }
+
+    public static List<MusicTrack> getAllTracks(Context context) {
+        try (var db = connectToDb(context)) {
+            return db.getAllTracks();
+        }
+    }
+
+    public static List<MusicTrack> getAlbumById(Context context, String albumId) {
+        try (var db = connectToDb(context)) {
+            return db.getAlbum(albumId);
+        }
+    }
+
+    public static List<MusicTrack> getFirstAlbumTrack(Context context, String albumId) {
+        try (var db = connectToDb(context)) {
+            return db.getFirstAlbumTrack(albumId);
+        }
+    }
+
+    public static List<MusicTrack> getPlaylist(Context context) {
+        try (var db = connectToDb(context)) {
+            return db.getPlaylist();
+        }
+    }
+
+    public static long getTracksCount(Context context) {
+        try (var db = connectToDb(context)) {
+            return db.getTracksCount();
+        }
+    }
+
+    public static boolean isCachedTrack(Context context, String trackId) {
+        try (var db = connectToDb(context)) {
+            return db.isCachedTrack(trackId);
+        }
+    }
+
+    public static void drop(Context context) {
+        context.deleteDatabase(MusicCacheDb.Constants.DB_NAME);
+    }
+}

app/src/main/java/ru/vtosters/lite/music/cache/MusicCacheImpl.java

@@ -0,0 +1,84 @@
+package ru.vtosters.lite.music.cache;
+
+import android.os.RemoteException;
+import android.text.TextUtils;
+import bruhcollective.itaysonlab.libvkx.ILibVkxService;
+import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
+import bruhcollective.itaysonlab.libvkx.client.LibVKXClientImpl;
+import com.vk.dto.music.MusicTrack;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.music.MusicCacheStorageUtils;
+
+import java.util.List;
+
+public class MusicCacheImpl {
+    public static void addTrack(MusicTrack track) {
+        MusicCacheDbDelegate.addTrack(
+                AndroidUtils.getGlobalContext(),
+                track.y1(),
+                track.I != null ? track.I.getId() + "" : "-1",
+                track.f,
+                !TextUtils.isEmpty(track.g) ? track.g : "",
+                track.C,
+                track.I != null ? track.I.getTitle() : "",
+                track.K,
+                track.h,
+                track.I != null && track.I.u1() != null);
+    }
+
+    public static void removeTrack(String trackId) {
+        MusicCacheDbDelegate.removeTrack(AndroidUtils.getGlobalContext(), trackId);
+        MusicCacheStorageUtils.removeTrackDirById(trackId);
+    }
+
+    public static List<MusicTrack> getAllTracks() {
+        return MusicCacheDbDelegate.getAllTracks(AndroidUtils.getGlobalContext());
+    }
+
+    public static List<MusicTrack> getAlbumById(String albumId) {
+        return MusicCacheDbDelegate.getAlbumById(AndroidUtils.getGlobalContext(), albumId);
+    }
+
+    public static List<MusicTrack> getFirstAlbumTrack(String albumId) {
+        return MusicCacheDbDelegate.getFirstAlbumTrack(AndroidUtils.getGlobalContext(), albumId);
+    }
+
+    public static List<MusicTrack> getPlaylist() {
+        return MusicCacheDbDelegate.getPlaylist(AndroidUtils.getGlobalContext());
+    }
+
+    public static long getTracksCount() {
+        return !LibVKXClient.isIntegrationEnabled()
+                ? MusicCacheDbDelegate.getTracksCount(AndroidUtils.getGlobalContext())
+                : LibVKXClient.getInstance().runOnServiceSync(
+                new LibVKXClientImpl.LibVKXActionGeneric<Long>() {
+                    @Override
+                    public Long run(ILibVkxService service) {
+                        try {
+                            return (long) service.getCache().size();
+                        } catch (RemoteException e) {
+                            e.printStackTrace();
+                            return defaultValue();
+                        }
+                    }
+
+                    @Override
+                    public Long defaultValue() {
+                        return 0L;
+                    }
+                });
+    }
+
+    public static boolean isCachedTrack(String trackId) {
+        return MusicCacheDbDelegate.isCachedTrack(AndroidUtils.getGlobalContext(), trackId);
+    }
+
+    public static boolean isEmpty() {
+        return !LibVKXClient.isIntegrationEnabled() && getTracksCount() == 0L;
+    }
+
+    public static void clear() {
+        MusicCacheDbDelegate.drop(AndroidUtils.getGlobalContext());
+        MusicCacheStorageUtils.clear();
+    }
+}

app/src/main/java/ru/vtosters/lite/music/cache/db/MusicCacheDb.java

@@ -0,0 +1,246 @@
+package ru.vtosters.lite.music.cache.db;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.net.Uri;
+import android.util.Log;
+import androidx.annotation.Nullable;
+import com.vk.dto.music.AlbumLink;
+import com.vk.dto.music.MusicTrack;
+import com.vk.dto.music.Thumb;
+import org.json.JSONObject;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.music.MusicCacheStorageUtils;
+
+import java.io.File;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p class="note"><strong>Note:</strong> the {@link AutoCloseable} interface was
+ * first added in the {@link android.os.Build.VERSION_CODES#Q} release for the {@link SQLiteOpenHelper} </p>
+ */
+public class MusicCacheDb extends SQLiteOpenHelper implements AutoCloseable { //for pre-Q
+    public MusicCacheDb(Context context) {
+        super(context, Constants.DB_NAME, null, Constants.DV_VERSION);
+    }
+
+    private static MusicTrack fromCursor(Cursor cur) {
+        try {
+            int trackIdIndex = cur.getColumnIndex(Constants.COLUMN_TRACK_ID);
+            int titleIndex = cur.getColumnIndex(Constants.COLUMN_TITLE);
+            int subtitleIndex = cur.getColumnIndex(Constants.COLUMN_SUBTITLE);
+            int artistIndex = cur.getColumnIndex(Constants.COLUMN_ARTIST);
+            int durationIndex = cur.getColumnIndex(Constants.COLUMN_DURATION);
+            int explicitIndex = cur.getColumnIndex(Constants.COLUMN_EXPLICIT);
+            int albumIdIndex = cur.getColumnIndex(Constants.COLUMN_ALBUM_ID);
+            int albumTitleIndex = cur.getColumnIndex(Constants.COLUMN_ALBUM_TITLE);
+
+            if (trackIdIndex == -1 || titleIndex == -1 || subtitleIndex == -1 || artistIndex == -1 || durationIndex == -1 || explicitIndex == -1 || albumIdIndex == -1) {
+                return null;
+            }
+
+            String trackId = cur.getString(trackIdIndex);
+            String[] splits = trackId.split("_");
+
+            if (splits.length != 2) {
+                return null;
+            }
+
+            MusicTrack res = new MusicTrack();
+            res.J = Integer.MAX_VALUE + ""; //access_key
+            res.D = "https://vtosters.app"; //url
+            res.d = Integer.parseInt(splits[1]); //id
+            res.e = Integer.parseInt(splits[0]); //owner_id
+            res.f = URLDecoder.decode(cur.getString(titleIndex), "UTF-8"); //title
+            res.g = URLDecoder.decode(cur.getString(subtitleIndex), "UTF-8"); //subtitle
+            res.C = URLDecoder.decode(cur.getString(artistIndex), "UTF-8"); //artist
+            res.h = cur.getInt(durationIndex); //duration
+            res.K = cur.getInt(explicitIndex) > 0; //is_explicit
+
+            int albumId = Integer.parseInt(cur.getString(albumIdIndex));
+            String albumTitle = albumTitleIndex != -1 ? cur.getString(albumTitleIndex) : null;
+
+            JSONObject node = new JSONObject();
+
+            File f300 = MusicCacheStorageUtils.getTrackThumb(trackId, 300);
+            File f600 = MusicCacheStorageUtils.getTrackThumb(trackId, 600);
+            File f1200 = MusicCacheStorageUtils.getTrackThumb(trackId, 1200);
+
+            if (f300.exists()) node.putOpt("photo_300", Uri.fromFile(f300).toString());
+            if (f600.exists()) node.putOpt("photo_600", Uri.fromFile(f600).toString());
+            if (f1200.exists()) node.putOpt("photo_1200", Uri.fromFile(f1200).toString());
+
+            res.I = new AlbumLink(
+                    albumId,
+                    res.e,
+                    res.J,
+                    albumTitle,
+                    node.length() > 0
+                            ? new Thumb(node.put("width", 600)
+                            .put("height", 600))
+                            : null
+            ); //album
+
+            return res;
+        } catch (Throwable ignored) {
+            // ignored
+        }
+        return null;
+    }
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(Constants.CREATE_QUERY);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        if (oldVersion < newVersion) {
+            List<MusicTrack> tracks = getTracksWithCursor(db.query(Constants.TABLE_NAME, null, null, null, null, null, null));
+            
+            db.execSQL(Constants.DROP_QUERY);
+            
+            onCreate(db);
+            
+            for (MusicTrack track : tracks) {
+                ContentValues vals = new ContentValues();
+                vals.put(Constants.COLUMN_TRACK_ID, track.y1());
+                vals.put(Constants.COLUMN_ALBUM_ID, track.I != null ? track.I.getId() + "" : "-1");
+                vals.put(Constants.COLUMN_TITLE, track.f);
+                vals.put(Constants.COLUMN_SUBTITLE, track.g);
+                vals.put(Constants.COLUMN_ARTIST, track.C);
+                vals.put(Constants.COLUMN_ALBUM_TITLE, track.I != null ? track.I.getTitle() : "");
+                vals.put(Constants.COLUMN_EXPLICIT, Boolean.compare(track.K, true));
+                vals.put(Constants.COLUMN_DURATION, track.h);
+                vals.put(Constants.COLUMN_HAS_ARTWORK, track.I != null && track.I.u1() != null);
+                db.insert(Constants.TABLE_NAME, null, vals);
+            }
+        }
+    }
+
+    public void addTrack(String trackId, String albumId, String title, String subtitle, String artist, String albumTitle, boolean explicit, int duration, boolean hasArtwork) {
+        ContentValues vals = new ContentValues();
+        vals.put(Constants.COLUMN_TRACK_ID, trackId);
+        vals.put(Constants.COLUMN_ALBUM_ID, albumId);
+        vals.put(Constants.COLUMN_TITLE, title);
+        vals.put(Constants.COLUMN_SUBTITLE, subtitle);
+        vals.put(Constants.COLUMN_ARTIST, artist);
+        vals.put(Constants.COLUMN_ALBUM_TITLE, albumTitle);
+        vals.put(Constants.COLUMN_EXPLICIT, Boolean.compare(explicit, true));
+        vals.put(Constants.COLUMN_DURATION, duration);
+        vals.put(Constants.COLUMN_HAS_ARTWORK, Boolean.compare(hasArtwork, true));
+        
+        long row = getWritableDatabase().insert(Constants.TABLE_NAME, null, vals);
+        
+        if (AndroidUtils.isDebuggable()) Log.d("MusicCacheDb", "addTrack(): " + row);
+    }
+
+    public void deleteTrack(String trackId) {
+        getWritableDatabase().delete(Constants.TABLE_NAME, Constants.COLUMN_TRACK_ID + " = ?", new String[]{trackId});
+    }
+
+    public boolean isCachedTrack(String trackId) {
+        try (var cur = getReadableDatabase().query(
+                Constants.TABLE_NAME,
+                new String[]{Constants.COLUMN_TRACK_ID},
+                Constants.COLUMN_TRACK_ID + " = ?",
+                new String[]{trackId},
+                null,
+                null,
+                null,
+                "0,1")) {
+            return cur.moveToFirst();
+        }
+    }
+
+    public long getTracksCount() {
+        return DatabaseUtils.queryNumEntries(getReadableDatabase(), Constants.TABLE_NAME);
+    }
+
+    public List<MusicTrack> getAllTracks() {
+        return getTracksWithCursor(getReadableDatabase().query(Constants.TABLE_NAME, null, null, null, null, null, null));
+    }
+
+    public List<MusicTrack> getAlbum(String albumId) {
+        return getAlbumTracks(albumId, null);
+    }
+
+    public List<MusicTrack> getFirstAlbumTrack(String albumId) {
+        return getAlbumTracks(albumId, "0,1");
+    }
+
+    private List<MusicTrack> getAlbumTracks(String albumId, @Nullable String limit) {
+        return getTracksWithCursor(getReadableDatabase().query(
+                Constants.TABLE_NAME,
+                null,
+                Constants.COLUMN_ALBUM_ID + " = ?",
+                new String[]{albumId},
+                null,
+                null,
+                null,
+                limit));
+    }
+
+    public List<MusicTrack> getPlaylist() {
+        return getTracksWithCursor(getWritableDatabase().query(
+                Constants.TABLE_NAME,
+                null,
+                Constants.COLUMN_ALBUM_ID + " > -1",
+                null,
+                Constants.COLUMN_ALBUM_ID,
+                "count(*) > 1",
+                Constants.COLUMN_ID + " desc"));
+    }
+
+    private List<MusicTrack> getTracksWithCursor(Cursor cur) {
+        List<MusicTrack> res = new ArrayList<>();
+        if (cur != null && cur.moveToFirst()) {
+            try (cur) {
+                do {
+                    MusicTrack track = fromCursor(cur);
+                    if (track != null) res.add(track);
+                } while (cur.moveToNext());
+            }
+        }
+        return res;
+    }
+
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Constants {
+        int DV_VERSION = 0x2;
+        String DB_NAME = "vt_lite_cache.db";
+        String TABLE_NAME = "tracks";
+        //columns
+        String COLUMN_ID = "id";
+        String COLUMN_TRACK_ID = "trackId";
+        String COLUMN_ALBUM_ID = "albumId";
+        String COLUMN_TITLE = "title";
+        String COLUMN_SUBTITLE = "subtitle";
+        String COLUMN_ARTIST = "artist";
+        String COLUMN_ALBUM_TITLE = "albumTitle";
+        String COLUMN_EXPLICIT = "explicit";
+        String COLUMN_DURATION = "duration";
+        String COLUMN_HAS_ARTWORK = "hasArtwork";
+        //queries
+        String CREATE_QUERY = "create table " + TABLE_NAME + "("
+                + COLUMN_ID + " INTEGER PRIMARY KEY autoincrement,"
+                + COLUMN_TRACK_ID + " text not null,"
+                + COLUMN_ALBUM_ID + " text not null,"
+                + COLUMN_TITLE + " text not null,"
+                + COLUMN_SUBTITLE + " text not null,"
+                + COLUMN_ARTIST + " text not null,"
+                + COLUMN_ALBUM_TITLE + " text not null,"
+                + COLUMN_EXPLICIT + " int not null,"
+                + COLUMN_DURATION + " int not null,"
+                + COLUMN_HAS_ARTWORK + " int not null"
+                + ")";
+        String DROP_QUERY = "drop table if exists " + TABLE_NAME;
+    }
+}

app/src/main/java/ru/vtosters/lite/music/cache/helpers/PlaylistHelper.java

@@ -1,13 +1,14 @@
 package ru.vtosters.lite.music.cache.helpers;
 
+import android.net.Uri;
 import com.vk.dto.music.Playlist;
 import com.vtosters.lite.R;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
-import ru.vtosters.lite.music.cache.FileCacheImplementation;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.music.MusicCacheStorageUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,8 +45,8 @@ public class PlaylistHelper {
             if (!photo.isEmpty())
                 jPhoto.put("height", 600)
                         .put("width", 600)
-                        .putOpt("photo_300", FileCacheImplementation.getFileUri(FileCacheImplementation.getTrackThumbnail(trackId, 300)))
-                        .putOpt("photo_600", FileCacheImplementation.getFileUri(FileCacheImplementation.getTrackThumbnail(trackId, 600)));
+                        .putOpt("photo_300", Uri.fromFile(MusicCacheStorageUtils.getTrackThumb(trackId, 300)).toString())
+                        .putOpt("photo_600", Uri.fromFile(MusicCacheStorageUtils.getTrackThumb(trackId, 600)).toString());
             var obj = new JSONObject()
                     .put("id", -2)
                     .put("owner_id", albumId)
@@ -68,7 +69,7 @@ public class PlaylistHelper {
 
     public static List<Playlist> getAlbumPlaylists() {
         List<Playlist> list = new ArrayList<>();
-        for (var track : CacheDatabaseDelegate.getTracksAsPlaylist()) {
+        for (var track : MusicCacheImpl.getPlaylist()) {
             var albumLink = track.I;
             var thumb = albumLink.u1();
             list.add(createAlbum(

app/src/main/java/ru/vtosters/lite/music/cache/helpers/TracklistHelper.java

@@ -6,12 +6,14 @@ import com.vk.dto.music.MusicTrack;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
-import ru.vtosters.lite.music.cache.FileCacheImplementation;
+import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
+import ru.vtosters.lite.utils.music.MusicCacheStorageUtils;
 
 import java.io.File;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class TracklistHelper {
@@ -20,22 +22,33 @@ public class TracklistHelper {
     }
 
     public static List<MusicTrack> getTracks() {
-        return CacheDatabaseDelegate.getTracks();
+        List<MusicTrack> tracks = MusicCacheImpl.getAllTracks();
+
+        boolean doNotinvertOrder = Preferences.getBoolValue("invertCachedTracks", false);
+
+        if (!doNotinvertOrder) {
+            Collections.reverse(tracks);
+        }
+
+        return tracks;
     }
 
+
     public static List<MusicTrack> getTracks(String id) {
-        return CacheDatabaseDelegate.getTracksByAlbum(id);
+        return MusicCacheImpl.getAlbumById(id);
     }
 
     public static List<MusicTrack> getTracksOne(String id) {
-        return CacheDatabaseDelegate.getTracksByAlbumOne(id);
+        return MusicCacheImpl.getFirstAlbumTrack(id);
     }
 
     public static JSONArray tracksToIds(List<MusicTrack> tracks) {
         var arr = new JSONArray();
+
         for (MusicTrack track : tracks) {
             arr.put(track.y1());
         }
+
         return arr;
     }
 
@@ -43,7 +56,7 @@ public class TracklistHelper {
         var arr = new JSONArray();
         for (MusicTrack track : tracks) {
             var json = track.J();
-            var folder = FileCacheImplementation.getThumbnailsFolder(LibVKXClient.asId(track));
+            var folder = MusicCacheStorageUtils.getThumbDirById(LibVKXClient.asId(track));
             try {
                 addCachedThumbnails(json, folder);
             } catch (JSONException | MalformedURLException e) {
@@ -58,7 +71,7 @@ public class TracklistHelper {
         List<MusicTrack> tracks = new ArrayList<>();
         for (MusicTrack track : list) {
             var json = track.J();
-            var folder = FileCacheImplementation.getThumbnailsFolder(LibVKXClient.asId(track));
+            var folder = MusicCacheStorageUtils.getThumbDirById(LibVKXClient.asId(track));
             try {
                 addCachedThumbnails(json, folder);
             } catch (JSONException | MalformedURLException e) {

app/src/main/java/ru/vtosters/lite/music/callback/MusicCallbackBuilder.java

@@ -5,7 +5,7 @@ import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import com.vtosters.lite.R;
 import ru.vtosters.lite.downloaders.notifications.NotificationChannels;
-import ru.vtosters.lite.music.Callback;
+import ru.vtosters.lite.music.interfaces.Callback;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class MusicCallbackBuilder {

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

@@ -1,23 +1,17 @@
 package ru.vtosters.lite.music.converter.ts;
 
-import android.util.Log;
 import com.arthenica.ffmpegkit.FFmpegKit;
-import com.arthenica.ffmpegkit.ReturnCode;
-import com.vk.core.util.ToastUtils;
 import com.vk.dto.music.Artist;
 import com.vk.dto.music.MusicTrack;
-import com.vtosters.lite.R;
-import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.music.downloader.M3UDownloader;
 import ru.vtosters.lite.utils.IOUtils;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.text.Normalizer;
 import java.util.stream.Collectors;
 
 public class FFMpeg {
-    private static final int BUFFER_SIZE = 2048;
 
     /**
      * @param in    Merged .ts file via {@link ru.vtosters.lite.music.converter.ts.TSMerger}
@@ -25,79 +19,26 @@ public class FFMpeg {
      * @param track Track to be converted
      * @return True if success, else false
      */
-    public static boolean convert(File in, String out, MusicTrack track) {
-
+    public static void convert(File in, String out, MusicTrack track) {
         // 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(" -write_id3v2 1");
-
-        String title = null;
-
-        if (track.f != null) {
-            title = track.f;
-            if (!track.g.isEmpty()) {
-                title += " (" + track.g + ")";
-            }
-        }
-
-        if (title != null) {
-            sb.append(" -metadata title=\"").append(IOUtils.getValidFileName(title)).append("\"");
-        }
-
-        if (track.L != null) {
-            sb.append(" -metadata artist=\"").append(track.L.stream().map(Artist::w1).collect(Collectors.joining(", "))).append("\"");
-        } else if (track.C != null) {
-            sb.append(" -metadata artist=\"").append(track.C).append("\"");
-        }
-        if (track.I != null) {
-            sb.append(" -metadata album=\"").append(track.I.getTitle()).append("\"");
-        }
-
-        sb.append(" -c copy \"").append(out).append("\"");
-
-        var command = sb.toString();
-
-        var session = FFmpegKit.execute(command);
-        var rc = session.getReturnCode();
-
-        if (ReturnCode.isSuccess(rc)) {
-            return true;
-        }
-
-        Log.e("FFMpeg", "FFmpegKit failed with return code " + rc);
-        return false;
+        var cmd = " -y -i \"" + in.getAbsolutePath() + '"'
+                + " -map 0 -dn"
+                + " -loglevel error"
+                + " -hide_banner"
+                + " -write_id3v2 1"
+                + setMetadata(track)
+                + " -c copy \"" + out + '"';
+        var ses = FFmpegKit.execute(cmd);
+        if (ses.getReturnCode().isValueCancel()) throw new RuntimeException(ses.getLogsAsString());
     }
 
-    private static void copyAssets() {
-        try {
-            String[] files = AndroidUtils.getGlobalContext().getAssets().list("ffmpeg");
-            for (String file : files) {
-                if (file.endsWith(".so")) {
-                    InputStream in = AndroidUtils.getGlobalContext().getAssets().open("ffmpeg" + File.separator + file);
-                    FileOutputStream out = new FileOutputStream(AndroidUtils.getGlobalContext().getFilesDir() + File.separator + file);
-                    byte[] buffer = new byte[BUFFER_SIZE];
-                    int read;
-                    while ((read = in.read(buffer)) != -1) {
-                        out.write(buffer, 0, read);
-                    }
-                    in.close();
-                    out.close();
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+    private static String setMetadata(MusicTrack track) {
+        return Preferences.getBoolValue("setMetaData", false) ? " -metadata title=\"" + IOUtils.getValidFileName(M3UDownloader.getTitle(track)) + '"'
+                + " -metadata artist=\"" + normalizeMetadata(track.L.stream().map(Artist::w1).collect(Collectors.joining(", "))) + '"'
+                + " -metadata album=\"" + normalizeMetadata(track.I.getTitle()) + '"' : "";
     }
 
-    private static void checkFFMpegLibs() {
-        var lib = new File(AndroidUtils.getGlobalContext().getFilesDir(), "libffmpegkit_abidetect.so");
-        if (!lib.exists()) {
-            ToastUtils.a(R.string.ffmpegkit_copy);
-            copyAssets();
-        }
+    private static String normalizeMetadata(String in) {
+        return in.replaceAll("[\\\\/:*?\"<>|]", "");
     }
 }

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

@@ -9,66 +9,62 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Arrays;
+import java.util.Comparator;
 
 public class TSMerger {
     /**
      * Merge multiple .ts files into one .ts file
      *
      * @param in Directory with .ts files
-     * @return True if success, else false
      */
-    public static boolean merge(File in, File out) {
-        var tsesList = in.listFiles();
+    public static void merge(File in, File out) {
+        File[] tsesList = in.listFiles();
 
         if (tsesList == null) {
-            return false;
+            return;
         }
 
-        var mergedByteArrayStream = new ByteArrayOutputStream();
+        ByteArrayOutputStream mergedByteArrayStream = new ByteArrayOutputStream();
 
         sortTsesList(tsesList);
 
-        for (var file : tsesList) {
+        for (File file : tsesList) {
             if (file.getName().endsWith(".ts")) {
                 try {
                     mergedByteArrayStream.write(IOUtils.readFully(file));
                 } catch (IOException e) {
-                    e.printStackTrace();
-                    return false;
+                    return;
                 }
             }
         }
 
-        return writeOutputFile(out, mergedByteArrayStream);
+        writeOutputFile(out, mergedByteArrayStream);
     }
 
     private static void sortTsesList(File[] tsesList) {
-        Arrays.sort(tsesList, (ts1, ts2) -> {
-            String ts1Name = ts1.getName();
-            String ts2Name = ts2.getName();
-            int i1 = Integer.parseInt(ts1Name.substring(0, ts1Name.indexOf('.', 1)));
-            int i2 = Integer.parseInt(ts2Name.substring(0, ts2Name.indexOf('.', 1)));
-            return Integer.compare(i1, i2);
-        });
+        Arrays.sort(tsesList, Comparator.comparingInt(TSMerger::getFileIndex));
     }
 
-    private static boolean writeOutputFile(File out, ByteArrayOutputStream mergedByteArrayStream) {
+    private static int getFileIndex(File file) {
+        String fileName = file.getName();
+        int dotIndex = fileName.indexOf('.', 1);
+        return Integer.parseInt(fileName.substring(0, dotIndex));
+    }
+
+    private static void writeOutputFile(File out, ByteArrayOutputStream mergedByteArrayStream) {
+        byte[] bytes = mergedByteArrayStream.toByteArray();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             try {
-                Files.write(out.toPath(), mergedByteArrayStream.toByteArray());
-            } catch (IOException e) {
-                e.printStackTrace();
-                return false;
+                Files.write(out.toPath(), bytes);
+            } catch (IOException ignored) {
+                // ignored
             }
         } else {
             try (FileOutputStream fos = new FileOutputStream(out)) {
-                fos.write(mergedByteArrayStream.toByteArray());
-            } catch (IOException e) {
-                e.printStackTrace();
-                return false;
+                fos.write(bytes);
+            } catch (IOException ignored) {
+                // ignored
             }
         }
-
-        return true;
     }
 }

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

@@ -0,0 +1,181 @@
+package ru.vtosters.lite.music.downloader;
+
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
+import com.google.android.exoplayer2.source.hls.playlist.e;
+import com.google.android.exoplayer2.source.hls.playlist.f;
+import com.google.android.exoplayer2.source.hls.playlist.f.a;
+import com.vk.dto.music.MusicTrack;
+import java8.util.concurrent.CompletableFuture;
+import java8.util.concurrent.CompletionException;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
+import ru.vtosters.lite.music.converter.ts.FFMpeg;
+import ru.vtosters.lite.music.converter.ts.TSMerger;
+import ru.vtosters.lite.music.interfaces.Callback;
+import ru.vtosters.lite.music.interfaces.ITrackDownloader;
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.IOUtils;
+import ru.vtosters.lite.utils.music.MusicCacheStorageUtils;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class M3UDownloader
+        implements ITrackDownloader {
+    public static M3UDownloader getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    static void parse(
+            File outDir,
+            Callback callback,
+            MusicTrack track,
+            boolean cache)
+            throws IOException {
+        var parser = new com.google.android.exoplayer2.source.hls.playlist.h(e.a(track.D));
+        var baseUri = track.D.substring(0, track.D.lastIndexOf("/") + 1);
+        var segments = ((f) parser.a(Uri.parse(baseUri), IOUtils.openStream(track.D))).o;
+        var progress = new AtomicInteger();
+        callback.onProgress(5);
+        var resultTs = getResultTsFile(track);
+        var resultMp3 = getResultMp3File(outDir, cache, track);
+        try {
+            CompletableFuture.allOf(createFutures(baseUri, segments, progress, callback, track))
+                    .thenRun(() -> {
+                        if (cache) {
+                            try {
+                                ThumbnailDownloader.downloadThumbnails(track);
+                            } catch (IOException e) {
+                                throw new RuntimeException("Failed to download thumbs", e);
+                            }
+                        }
+                    })
+                    .thenRun(() -> {
+                        try {
+                            TSMerger.merge(getTsesDir(track), resultTs);
+                        } catch (Throwable e) {
+                            throw new RuntimeException("Failed to merge ts files", e);
+                        }
+                    })
+                    .thenRun(() -> {
+                        try {
+                            FFMpeg.convert(resultTs, resultMp3.getAbsolutePath(), track);
+                        } catch (Throwable e) {
+                            throw new RuntimeException("FFmpeg error", e);
+                        }
+                    })
+                    .thenRun(() -> callback.onProgress(10 + Math.round(80.0f * progress.addAndGet(1) / segments.size())))
+                    .thenRun(() -> {
+                        if (cache) {
+                            MusicCacheImpl.addTrack(track);
+                        }
+                    })
+                    .whenComplete((unused, tr) -> {
+                        if (tr != null) {
+                            IOUtils.deleteRecursive(MusicCacheStorageUtils.getTrackDirById(track.y1()));
+                            callback.onFailure();
+                        } else {
+                            callback.onSuccess();
+                        }
+                        IOUtils.deleteRecursive(getTsesDir(track));
+                    })
+                    .join();
+        } catch (CompletionException e) {
+            Log.e("M3UDownloader", "Failed to download track", e.getCause());
+        }
+    }
+
+    @SuppressWarnings("rawtypes")
+    static CompletableFuture[] createFutures(
+            String baseUri,
+            List<a> segments,
+            AtomicInteger progress,
+            Callback callback,
+            MusicTrack track) {
+        var futures = new CompletableFuture[segments.size()];
+        for (var i = 0; i < segments.size(); ++i) {
+            var segment = segments.get(i);
+            var filename = i + ".ts";
+            futures[i] = CompletableFuture.runAsync(() -> processSegment(baseUri, segment, filename, progress, segments.size(), callback, track));
+        }
+        return futures;
+    }
+
+    private static void processSegment(
+            String baseUri,
+            a segment,
+            String filename,
+            AtomicInteger progress,
+            int size,
+            Callback callback,
+            MusicTrack track) {
+        try {
+            var buff = IOUtils.readFully(IOUtils.openStream(baseUri + segment.a/*url*/));
+            if (!TextUtils.isEmpty(segment.g)) {
+                var cipher = Cipher.getInstance("AES/CBC/PKCS7Padding");
+                var cipherKey = new SecretKeySpec(IOUtils.readFully(IOUtils.openStream(segment.g)), "AES");
+                var cipherBytes = segment.h.getBytes();
+                //if IV doesn't pass, it must be created manually and filled with zeros
+                if (cipherBytes.length != 16) Arrays.fill((cipherBytes = new byte[16]), (byte) 0x0);
+                var cipherIv = new IvParameterSpec(cipherBytes);
+                cipher.init(Cipher.DECRYPT_MODE, cipherKey, cipherIv);
+                buff = cipher.doFinal(buff);
+            }
+            IOUtils.writeToFile(new File(getTsesDir(track), filename), buff);
+            callback.onProgress(10 + Math.round(80.0f * progress.addAndGet(1) / size));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static String getTitle(MusicTrack track) {
+        return track.f + (!TextUtils.isEmpty(track.g) ? + '(' + track.g + ')' : "");
+    }
+
+    static File getTsesDir(MusicTrack track) {
+        var filesDir = AndroidUtils.getGlobalContext().getFilesDir();
+        var tsesDir = new File(filesDir, String.valueOf(track.d));
+        tsesDir.mkdirs();
+        return tsesDir;
+    }
+
+    static File getResultTsFile(MusicTrack track) {
+        return new File(getTsesDir(track), "result.ts");
+    }
+
+    static File getResultMp3File(File outDir, boolean cache, MusicTrack track) {
+        return new File(outDir, IOUtils.getValidFileName((cache ? "track" : track.C + " - " + getTitle(track)) + ".mp3"));
+    }
+
+    @Override
+    public void downloadTrack(
+            MusicTrack track,
+            File outDir,
+            Callback callback,
+            boolean cache) {
+        if (track.D.isEmpty()) {
+            Log.d("TrackDownloader", "link error: " + track.y1() + ", title: " + M3UDownloader.getTitle(track));
+            callback.onFailure();
+            return;
+        }
+        try {
+            parse(outDir, callback, track, cache);
+        } catch (IOException e) {
+            callback.onFailure();
+            Log.e("M3UDownloader", e + "");
+            throw new RuntimeException(e);
+        }
+    }
+
+    // Initialization-on-demand
+    private static class Holder {
+        private static final M3UDownloader INSTANCE = new M3UDownloader();
+    }
+}

app/src/main/java/ru/vtosters/lite/music/downloader/MP3Downloader.java

@@ -70,7 +70,7 @@
 //    }
 //
 //    @Override
-//    public void downloadTrack(String url, File outDir, ru.vtosters.lite.music.Callback callback) {
+//    public void downloadTrack(String url, File outDir, ru.vtosters.lite.music.interfaces.Callback callback) {
 //
 //    }
 //}

app/src/main/java/ru/vtosters/lite/music/downloader/PlaylistDownloader.java

@@ -2,7 +2,7 @@ package ru.vtosters.lite.music.downloader;
 
 import android.util.Log;
 import com.vk.dto.music.MusicTrack;
-import ru.vtosters.lite.music.Callback;
+import ru.vtosters.lite.music.interfaces.Callback;
 
 import java.io.File;
 import java.util.List;
@@ -10,16 +10,12 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public class PlaylistDownloader {
     public static void downloadPlaylist(List<MusicTrack> playlist, String playlistName, String path, Callback callback) {
-        File outDir = new File(path);
+        var outDir = new File(path);
         if (!outDir.exists())
-            if (outDir.mkdirs())
-                Log.v("PlaylistDownloader", "Directory created");
-            else
-                Log.e("PlaylistDownloader", "Directory creation failed");
-
-        var downloadedTracks = new AtomicInteger(0);
-
-        for (MusicTrack musicTrack : playlist) {
+            if (outDir.mkdirs()) Log.v("PlaylistDownloader", "Directory created");
+            else Log.e("PlaylistDownloader", "Directory creation failed");
+        var downloadedTracks = new AtomicInteger();
+        for (var musicTrack : playlist)
             TrackDownloader.downloadTrack(musicTrack, path, new Callback() {
                 @Override
                 public void onProgress(int progress) {
@@ -27,8 +23,7 @@ public class PlaylistDownloader {
 
                 @Override
                 public void onSuccess() {
-                    var currentProgress = downloadedTracks.incrementAndGet();
-                    callback.onProgress(currentProgress);
+                    callback.onProgress(downloadedTracks.incrementAndGet());
                 }
 
                 @Override
@@ -40,13 +35,11 @@ public class PlaylistDownloader {
                 public void onSizeReceived(long size, long header) {
                 }
             });
-        }
     }
 
     public static void cachePlaylist(List<MusicTrack> playlist, Callback callback) {
-        var downloadedTracks = new AtomicInteger(0);
-
-        for (MusicTrack musicTrack : playlist) {
+        var downloadedTracks = new AtomicInteger();
+        for (var musicTrack : playlist)
             TrackDownloader.cacheTrack(musicTrack, new Callback() {
                 @Override
                 public void onProgress(int progress) {
@@ -54,8 +47,7 @@ public class PlaylistDownloader {
 
                 @Override
                 public void onSuccess() {
-                    var currentProgress = downloadedTracks.incrementAndGet();
-                    callback.onProgress(currentProgress);
+                    callback.onProgress(downloadedTracks.incrementAndGet());
                 }
 
                 @Override
@@ -67,6 +59,5 @@ public class PlaylistDownloader {
                 public void onSizeReceived(long size, long header) {
                 }
             });
-        }
     }
 }

app/src/main/java/ru/vtosters/lite/music/downloader/ThumbnailDownloader.java

@@ -2,45 +2,42 @@ package ru.vtosters.lite.music.downloader;
 
 import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
 import com.vk.dto.music.MusicTrack;
-import ru.vtosters.lite.music.cache.FileCacheImplementation;
+import org.json.JSONArray;
+import org.json.JSONObject;
 import ru.vtosters.lite.utils.IOUtils;
+import ru.vtosters.lite.utils.music.MusicCacheStorageUtils;
 
 import java.io.IOException;
 import java.net.URL;
 
 public class ThumbnailDownloader {
 
-    public static void downloadThumbnails(MusicTrack track)
-            throws IOException {
-        var obj = track.J();
-        var trackId = LibVKXClient.asId(track);
-
-        if (!obj.has("album")) return;
-        var album = obj.optJSONObject("album");
-
-        if (!album.has("thumb")) return;
-        var thumb = album.optJSONObject("thumb");
-
-        if (thumb.has("sizes")) {
-            var sizes = thumb.optJSONArray("sizes");
-            for (int i = 0; i < sizes.length(); i++) {
-                var size = sizes.optJSONObject(i);
-                var width = size.optInt("width");
-                var src = size.optString("src");
-                downloadThumbnail(src, width, trackId);
+    public static void downloadThumbnails(MusicTrack track) throws IOException {
+        JSONObject json = track.J();
+        JSONObject album = json.optJSONObject("album");
+        if (album == null) return;
+        JSONObject thumb = album.optJSONObject("thumb");
+        if (thumb == null) return;
+        JSONArray sizes = thumb.optJSONArray("sizes");
+        String trackId = LibVKXClient.asId(track);
+        if (sizes == null) {
+            JSONArray names = thumb.names();
+            if (names == null) return;
+            for (int i = 0; i < names.length(); ++i) {
+                String name = names.optString(i);
+                downloadThumbnail(thumb.optString(name), Integer.parseInt(name.substring(6)), trackId);
             }
         } else {
-            var names = thumb.names();
-            for (int i = 0; i < names.length(); i++) {
-                var name = names.optString(i);
-                downloadThumbnail(thumb.optString(name), Integer.parseInt(name.substring(6)), trackId);
+            for (int i = 0; i < sizes.length(); ++i) {
+                JSONObject size = sizes.optJSONObject(i);
+                int width = size.optInt("width");
+                String src = size.optString("src");
+                downloadThumbnail(src, width, trackId);
             }
         }
     }
 
-    private static void downloadThumbnail(String url, int res, String trackId)
-            throws IOException {
-        var data = IOUtils.readFully(new URL(url).openStream());
-        IOUtils.writeToFile(FileCacheImplementation.getTrackThumbnail(trackId, res), data);
+    private static void downloadThumbnail(String url, int res, String trackId) throws IOException {
+        IOUtils.writeToFile(MusicCacheStorageUtils.getTrackThumb(trackId, res), IOUtils.readFully(new URL(url).openStream()));
     }
 }

app/src/main/java/ru/vtosters/lite/music/downloader/TrackDownloader.java

@@ -4,11 +4,10 @@ import android.util.Log;
 import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
 import com.vk.dto.music.MusicTrack;
 import ru.vtosters.lite.concurrent.VTExecutors;
-import ru.vtosters.lite.music.Callback;
-import ru.vtosters.lite.music.M3UDownloader;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
-import ru.vtosters.lite.music.cache.FileCacheImplementation;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
+import ru.vtosters.lite.music.interfaces.Callback;
 import ru.vtosters.lite.music.interfaces.ITrackDownloader;
+import ru.vtosters.lite.utils.music.MusicCacheStorageUtils;
 
 import java.io.File;
 
@@ -24,7 +23,7 @@ public class TrackDownloader {
     }
 
     public static void cacheTrack(MusicTrack track, Callback callback) {
-        if (CacheDatabaseDelegate.isCached(track.y1())) {
+        if (MusicCacheImpl.isCachedTrack(LibVKXClient.asId(track))) {
             callback.onSuccess();
             return;
         } else if (track.D.isEmpty()) {
@@ -33,7 +32,7 @@ public class TrackDownloader {
             return;
         }
 
-        var path = FileCacheImplementation.getTrackFolder(LibVKXClient.asId(track)).getAbsolutePath();
+        var path = MusicCacheStorageUtils.getTrackDirById(LibVKXClient.asId(track)).getAbsolutePath();
         download(track, path, callback, M3UDownloader.getInstance(), true);
     }
 

app/src/main/java/ru/vtosters/lite/music/interfaces/Callback.java

@@ -1,4 +1,4 @@
-package ru.vtosters.lite.music;
+package ru.vtosters.lite.music.interfaces;
 
 public interface Callback {
     void onProgress(int progress);

app/src/main/java/ru/vtosters/lite/music/interfaces/ITrackDownloader.java

@@ -1,7 +1,6 @@
 package ru.vtosters.lite.music.interfaces;
 
 import com.vk.dto.music.MusicTrack;
-import ru.vtosters.lite.music.Callback;
 
 import java.io.File;
 

app/src/main/java/ru/vtosters/lite/net/NetCall.java

@@ -3,16 +3,19 @@ package ru.vtosters.lite.net;
 import android.util.Base64;
 import android.util.Log;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.net.*;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.TreeMap;
 
 public final class NetCall {
+    // Constants for the request methods, content types, and encoding
+    private static final String GET = "GET";
+    private static final String POST = "POST";
+    private static final String FORM = "application/x-www-form-urlencoded";
+    private static final String UTF_8 = "UTF-8";
+
     private final NetRequest req;
     private final NetClient cl;
 
@@ -22,13 +25,17 @@ public final class NetCall {
     }
 
     private static String constructArgs(Map<String, String> args) throws UnsupportedEncodingException {
+        // Use a TreeMap to sort the arguments by key
         args = new TreeMap<>(args);
-        String str = "";
-        for (Map.Entry<String, String> en : args.entrySet()) {
-            if (!str.isEmpty()) str += "&";
-            str += URLEncoder.encode(en.getKey(), "UTF-8") + "=" + URLEncoder.encode(en.getValue(), "UTF-8");
+        // Use a StringBuilder to append the arguments
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> entry : args.entrySet()) {
+            if (sb.length() > 0) sb.append("&");
+            sb.append(URLEncoder.encode(entry.getKey(), UTF_8))
+                    .append("=")
+                    .append(URLEncoder.encode(entry.getValue(), UTF_8));
         }
-        return str;
+        return sb.toString();
     }
 
     public NetRequest request() {
@@ -38,38 +45,52 @@ public final class NetCall {
     public NetResponse execute() throws IOException {
         Proxy proxy = cl.getProxy();
         PasswordAuthentication auth = cl.getAuthenticator();
-        HttpURLConnection con = (HttpURLConnection) new URL(req.url()).openConnection(proxy != null ? proxy : Proxy.NO_PROXY);
+        HttpURLConnection connection = (HttpURLConnection) new URL(req.url()).openConnection(proxy != null ? proxy : Proxy.NO_PROXY);
         if (proxy != null && auth != null) {
+            // Set the proxy authentication header
             String authStr = "Basic " + Base64.encodeToString((auth.getUserName() + new String(auth.getPassword())).getBytes(), Base64.NO_WRAP);
-            con.setRequestProperty("Proxy-Connection", "Keep-Alive");
-            con.setRequestProperty("Proxy-Authorization", authStr);
+            connection.setRequestProperty("Proxy-Connection", "Keep-Alive");
+            connection.setRequestProperty("Proxy-Authorization", authStr);
         }
-        con.setConnectTimeout((int) cl.getTimeout());
-        con.setRequestMethod(req.getRequestMethod());
-        if (req.getRequestMethod().equals("POST")) {
-            con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+        connection.setConnectTimeout((int) cl.getTimeout());
+        connection.setRequestMethod(req.getRequestMethod());
+        if (req.getRequestMethod().equals(POST)) {
+            // Set the content type for POST requests
+            connection.setRequestProperty("Content-Type", FORM);
         }
         Map<String, String> params = req.getRequestParams();
         if (params != null) {
-            String strArgs = constructArgs(params);
-            con.setRequestProperty("Content-Length", String.valueOf(strArgs.getBytes(StandardCharsets.UTF_8).length));
-            con.setDoOutput(true);
-            con.getOutputStream().write(strArgs.getBytes(StandardCharsets.UTF_8));
-            con.getOutputStream().close();
+            // Write the request parameters to the output stream
+            writeParams(connection, params);
+        }
+        connection.connect();
+        InputStream input;
+        if (connection.getResponseCode() == 200) input = connection.getInputStream();
+        else input = connection.getErrorStream();
+        // Use try-with-resources to close the streams automatically
+        try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+            byte[] buffer = new byte[1024 * 1024];
+            int count;
+            while ((count = input.read(buffer)) != -1) output.write(buffer, 0, count);
+            input.close();
+            NetResponse response = new NetResponse(output.toByteArray());
+            response.setCode(connection.getResponseCode());
+            return response;
+        }
+    }
+
+    private void writeParams(HttpURLConnection connection, Map<String, String> params) throws IOException {
+        // Get the encoded arguments string
+        String args = constructArgs(params);
+        // Set the content length header
+        connection.setRequestProperty("Content-Length", String.valueOf(args.getBytes(StandardCharsets.UTF_8).length));
+        // Enable output mode
+        connection.setDoOutput(true);
+        // Write the arguments to the output stream
+        try (OutputStream output = connection.getOutputStream()) {
+            output.write(args.getBytes(StandardCharsets.UTF_8));
+            output.flush();
         }
-        con.connect();
-        InputStream in;
-        if (con.getResponseCode() == 200) in = con.getInputStream();
-        else in = con.getErrorStream();
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        byte[] buffer = new byte[1024 * 1024];
-        int c;
-        while ((c = in.read(buffer)) != -1) bos.write(buffer, 0, c);
-        in.close();
-        bos.close();
-        NetResponse r = new NetResponse(bos.toByteArray());
-        r.setCode(con.getResponseCode());
-        return r;
     }
 
     public void enqueue(NetCallback cb) {
@@ -82,12 +103,16 @@ public final class NetCall {
                 } catch (IOException e) {
                     cb.onFailure(NetCall.this, e);
                 }
+//                try {
+////                    interrupt();
                 try {
-                    interrupt();
                     join();
-                } catch (Exception e) {
-                    Log.e("NetCall", "Failed to interrupt and join thread", e);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
                 }
+//                } catch (Exception e) {
+//                    Log.e("NetCall", "Failed to interrupt and join thread", e);
+//                }
             }
         }.start();
     }

app/src/main/java/ru/vtosters/lite/net/NetResponse.java

@@ -8,11 +8,11 @@ public final class NetResponse {
     private final byte[] data;
     private int code;
 
-    NetResponse(byte[] data) {
+    public NetResponse(byte[] data) {
         this.data = data;
     }
 
-    void setCode(int code) {
+    public void setCode(int code) {
         this.code = code;
     }
 

app/src/main/java/ru/vtosters/lite/net/Request.java

@@ -51,7 +51,7 @@ public class Request {
                 httpURLConnection.setRequestProperty("Content-Type", mIsVTostersRequest ? "Content-Type" : "application/x-www-form-urlencoded");
                 BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream()));
 
-                StringBuffer stringBuffer = new StringBuffer();
+                StringBuilder stringBuffer = new StringBuilder();
                 while (true) {
                     String readLine = bufferedReader.readLine();
                     if (readLine != null) {

app/src/main/java/ru/vtosters/lite/ssfs/ImBanner.java

@@ -5,46 +5,63 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Optional;
+
 public class ImBanner {
     private static final String TAG = "ImBanner";
 
-    public static JSONObject convBar(JSONObject orig) throws JSONException {
-        var user_id = orig.getJSONObject("peer").getInt("id");
+    public static JSONObject convertToBanner(JSONObject original) {
+        String PEER = "peer";
+        String ID = "id";
+        String PICTURE = "picture";
+        String TEXT = "text";
+        String LINK = "link";
+        String LINK_TEXT = "link_text";
+        String NAME = "name";
+        String BUTTONS = "buttons";
+        String ICON = "icon";
 
-        if (!UsersList.hasBanner(user_id) || user_id == 0) {
+        Optional<JSONObject> user = Optional.ofNullable(original.optJSONObject(PEER));
+        int userId = user.map(u -> u.optInt(ID)).orElse(0);
+
+        if (userId == 0 || !UsersList.hasBanner(userId)) {
+            return null;
+        }
+
+        JSONObject banner = Handler.getBanner(userId);
+
+        if (banner == null) {
             return null;
         }
 
         try {
-            var jsonBanner = Handler.getBanner(user_id);
-            var pic = jsonBanner.optString("picture");
-            var text = jsonBanner.getString("text");
+            String picture = banner.optString(PICTURE);
+            String text = banner.getString(TEXT);
+            String link = banner.optString(LINK);
+            String linkText = banner.optString(LINK_TEXT);
 
-            var link = jsonBanner.optString("link");
-            var link_text = jsonBanner.optString("link_text");
+            boolean hasIcon = !picture.isEmpty();
+            boolean hasButton = !link.isEmpty();
+            boolean isPicture = picture.endsWith(".png") || picture.endsWith(".jpg") || picture.endsWith(".jpeg") || picture.endsWith(".webp");
 
-            var hasIcon = !pic.isEmpty();
-            var hasButton = !link.isEmpty();
-            var isPicture = pic.endsWith(".png") || pic.endsWith(".jpg") || pic.endsWith(".jpeg") || pic.endsWith(".webp");
+            JSONObject json = new JSONObject();
 
-            var json = new JSONObject();
+            JSONObject buttonJson = new JSONObject();
+            buttonJson.put("layout", "tertiary");
+            buttonJson.put("text", linkText);
+            buttonJson.put("type", "link");
+            buttonJson.put("link", link);
 
-            var buttonsJson = new JSONObject();
-            buttonsJson.put("layout", "tertiary");
-            buttonsJson.put("text", link_text);
-            buttonsJson.put("type", "link");
-            buttonsJson.put("link", link);
+            JSONArray buttons = new JSONArray(); // max 3 buttons in array
 
-            var buttons = new JSONArray(); // max 3 buttons in array
+            if (hasButton) buttons.put(buttonJson);
 
-            if (hasButton) buttons.put(buttonsJson);
-
-            json.put("name", "group_admin_welcome");
-            json.put("text", text);
-            json.put("buttons", buttons);
+            json.put(NAME, "group_admin_welcome");
+            json.put(TEXT, text);
+            json.put(BUTTONS, buttons);
 
             if (hasIcon && isPicture) {
-                json.put("icon", pic);
+                json.put(ICON, picture);
             }
 
             return json;

app/src/main/java/ru/vtosters/lite/ssfs/ProfileButtons.java

@@ -26,20 +26,20 @@ public class ProfileButtons {
                 newItem = orig.getJSONArray("buttons");
             }
 
-            if (!VTVerifications.haveDonateButton() && id == AccountManagerUtils.getUserId()) {
-                var map = new HashMap<>();
-                map.put("20", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/donate_icon/20.png");
-                map.put("40", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/donate_icon/40.png");
-                map.put("80", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/donate_icon/80.png");
-
-                newItem.put(generateJsonObject(
-                        AndroidUtils.getString(com.vtosters.lite.R.string.donate_to_vtl),
-                        "https://vk.com/vtosters_official",
-                        "2D81E0",
-                        "open_url",
-                        map
-                ));
-            }
+//            if (!VTVerifications.haveDonateButton() && id == AccountManagerUtils.getUserId()) {
+//                var map = new HashMap<>();
+//                map.put("20", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/donate_icon/20.png");
+//                map.put("40", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/donate_icon/40.png");
+//                map.put("80", "https://raw.githubusercontent.com/vtosters/lite/main/.github/images/donate_icon/80.png");
+//
+//                newItem.put(generateJsonObject(
+//                        AndroidUtils.getString(com.vtosters.lite.R.string.donate_to_vtl),
+//                        "https://vk.com/vtosters_official",
+//                        "2D81E0",
+//                        "open_url",
+//                        map
+//                ));
+//            }
 
             if (!orig.has("type") && AccountManagerUtils.isVKTester()) {
                 var map = new HashMap<>();

app/src/main/java/ru/vtosters/lite/ssfs/UsersList.java

@@ -8,6 +8,7 @@ import okhttp3.Response;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
@@ -17,6 +18,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import static ru.vtosters.hooks.other.Preferences.getBoolValue;
+
 public class UsersList {
     private static final String TAG = "UsersList";
     private static final List<Integer> descriptionsList = new ArrayList<>();
@@ -25,7 +28,7 @@ public class UsersList {
     public static void getUsersList() {
         var prefs = AndroidUtils.getGlobalContext().getSharedPreferences("vt_another_data", 0);
 
-        if ((!NetworkUtils.isNetworkConnected() || NetworkUtils.isInternetSlow()) && prefs.contains("ids")) {
+        if ((!NetworkUtils.isNetworkConnected() || NetworkUtils.isInternetSlow()) && prefs.contains("ids") || Preferences.serverFeaturesDisable()) {
             return;
         }
 

app/src/main/java/ru/vtosters/lite/tgs/TGPref.java

@@ -7,22 +7,7 @@ import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 
 public class TGPref {
     private static final SharedPreferences Prefs = PreferenceManager.getDefaultSharedPreferences(getGlobalContext());
-
-    private static final String CNCT_METHOD = "VTGS:CM";
     private static final String TG_BOTKEY = "VTGS:BKey";
-    private static final String TG_PROXYIP = "VTGS:PIP";
-    private static final String TG_PROXYPORT = "VTGS:PPT";
-    private static final String TG_PROXYPASS = "VTGS:PPS";
-    private static final String TG_PROXYUSER = "VTGS:PUS";
-    private static final String TG_PROXYUSEPASS = "VTGS:PUsePassword";
-
-    public static int getTGConnectMethod() {
-        return Integer.parseInt(Prefs.getString(CNCT_METHOD, "0"));
-    }
-
-    public static void setTGConnectMethod(int method) {
-        Prefs.edit().putString(CNCT_METHOD, String.valueOf(method)).apply();
-    }
 
     public static String getTGBotKey() {
         return Prefs.getString(TG_BOTKEY, null);
@@ -31,40 +16,4 @@ public class TGPref {
     public static void setTGBotKey(String key) {
         Prefs.edit().putString(TG_BOTKEY, key).apply();
     }
-
-    public static String getTGProxyIP() {
-        return Prefs.getString(TG_PROXYIP, null);
-    }
-
-    public static void setTGProxyIP(String ip) {
-        Prefs.edit().putString(TG_PROXYIP, ip).apply();
-    }
-
-    public static int getTGProxyPort() {
-        return Prefs.getInt(TG_PROXYPORT, 0);
-    }
-
-    public static void setTGProxyPort(int port) {
-        Prefs.edit().putInt(TG_PROXYPORT, port).apply();
-    }
-
-    public static String getTGProxyPass() {
-        return Prefs.getString(TG_PROXYPASS, "");
-    }
-
-    public static String getTGProxyUser() {
-        return Prefs.getString(TG_PROXYUSER, "");
-    }
-
-    public static void setTGProxyUserPass(String user, String pass) {
-        Prefs.edit().putString(TG_PROXYUSER, user).putString(TG_PROXYPASS, pass).apply();
-    }
-
-    public static boolean isTGProxyPassEnabled() {
-        return Prefs.getBoolean(TG_PROXYUSEPASS, false);
-    }
-
-    public static void setTGProxyPassEnabled(boolean en) {
-        Prefs.edit().putBoolean(TG_PROXYUSEPASS, en).apply();
-    }
 }

app/src/main/java/ru/vtosters/lite/tgs/TGRoot.java

@@ -2,11 +2,9 @@ package ru.vtosters.lite.tgs;
 
 import com.aefyr.tsg.g2.TelegramStickersPack;
 import com.vk.dto.stickers.StickerStockItem;
-import com.vtosters.lite.R;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import ru.vtosters.lite.utils.AndroidUtils;
 
 import java.util.Stack;
 
@@ -15,14 +13,6 @@ public class TGRoot {
     public static final int X = 976820000;
     public final static Stack<Integer> pendingStickers = new Stack<>();
 
-    public static String getSummary() {
-        return switch (TGPref.getTGConnectMethod()) {
-            case 0 -> AndroidUtils.getString(R.string.ctypedirect);
-            case 2 -> AndroidUtils.getString(R.string.ctypesocks);
-            default -> AndroidUtils.getString(R.string.ctypedisabled);
-        };
-    }
-
     public static StickerStockItem toStickerPack(TelegramStickersPack p) throws JSONException {
         JSONArray arr = new JSONArray();
 

app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java

@@ -143,8 +143,11 @@ public class ThemesCore {
         themedColors.put(R.attr.im_reply_separator, accentColor);
         themedColors.put(R.attr.im_text_name, accentColor);
 
-        outgoinging_msg = ThemesUtils.lighten(accentColor, 0.76f);
-        outgoinging_msg_highlight = ThemesUtils.lighten(accentColor, 0.5f);
+        float out = ThemesUtils.isMonetTheme() ? 0.85f : 0.76f;
+        float outhighlight = ThemesUtils.isMonetTheme() ? 0.75f : 0.5f;
+
+        outgoinging_msg = ThemesUtils.lighten(accentColor, out);
+        outgoinging_msg_highlight = ThemesUtils.lighten(accentColor, outhighlight);
 
         themedColors.put(R.attr.im_ic_send_msg, accentColor);
         themedColors.put(R.attr.im_bubble_wallpaper_outgoing, accentColor);
@@ -163,26 +166,25 @@ public class ThemesCore {
     }
 
     public static boolean hasThemedAttr(Context context, int attrID) {
-        if (ThemesUtils.isCustomAccentEnabled()) {
-            if (Preferences.getBoolValue("logColors", false)) {
-                try {
-                    Log.d(TAG, "Requesting color by attr " + context.getResources().getResourceName(attrID));
-                } catch (Exception ignored) {
-                }
+        if (Preferences.getBoolValue("logColors", false)) {
+            try {
+                Log.d(TAG, "Requesting color by attr " + context.getResources().getResourceName(attrID));
+            } catch (Exception ignored) {
             }
+        }
 
+        if (ThemesUtils.isMonetTheme() || ThemesManager.canApplyCustomAccent()) {
             if (isCachedAccents()) {
-                if (ThemesUtils.isDarkTheme()) {
-                    return (themedColors.get(attrID) != 0 && ACCENT_THEME_ONLY_DARK.get(attrID, true) && (
-                            ThemesUtils.isMilkshake() ?
-                                    ACCENT_THEME_ONLY_MILK_DARK.get(attrID, true) :
-                                    ACCENT_THEME_ONLY_NOMILK_DARK.get(attrID, true)));
-                } else {
-                    return (themedColors.get(attrID) != 0 && ACCENT_THEME_ONLY_LIGHT.get(attrID, true) && (
-                            ThemesUtils.isMilkshake() ?
-                                    ACCENT_THEME_ONLY_MILK_LIGHT.get(attrID, true) :
-                                    ACCENT_THEME_ONLY_NOMILK_LIGHT.get(attrID, true)));
-                }
+                boolean isDark = ThemesUtils.isDarkTheme();
+                boolean isMilkshake = ThemesUtils.isMilkshake();
+                SparseBooleanArray themeOnlyMap = isDark ? ACCENT_THEME_ONLY_DARK : ACCENT_THEME_ONLY_LIGHT;
+                SparseBooleanArray milkshakeMap = isDark ? ACCENT_THEME_ONLY_MILK_DARK : ACCENT_THEME_ONLY_MILK_LIGHT;
+                SparseBooleanArray noMilkshakeMap = isDark ? ACCENT_THEME_ONLY_NOMILK_DARK : ACCENT_THEME_ONLY_NOMILK_LIGHT;
+
+                return (themedColors.get(attrID) != 0 && themeOnlyMap.get(attrID, true) && (
+                        isMilkshake ?
+                                milkshakeMap.get(attrID, true) :
+                                noMilkshakeMap.get(attrID, true)));
             } else {
                 return themedColors.get(attrID) != 0;
             }
@@ -191,7 +193,6 @@ public class ThemesCore {
         }
     }
 
-
     public static void clear() {
         cachedAccents = false;
         themedColors.clear();

app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java

@@ -23,7 +23,7 @@ public class ThemesHacks {
     }
 
     public static int getHackedColor(@NonNull Context context, @ColorRes int color) {
-        if (ThemesUtils.isCustomAccentEnabled()) {
+        if (ThemesUtils.isMonetTheme() || ThemesManager.canApplyCustomAccent()) {
             if (Preferences.getBoolValue("logColors", false)) {
                 try {
                     Log.d("ThemesCore", "Requesting color by color " + context.getResources().getResourceName(color));

app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java

@@ -3,7 +3,6 @@ package ru.vtosters.lite.themes;
 import android.app.Application;
 import android.content.Context;
 import android.graphics.Color;
-import android.util.Log;
 import com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceFile;
 import com.vtosters.lite.R;
 import ru.vtosters.hooks.other.Preferences;
@@ -20,7 +19,7 @@ import java.util.zip.ZipOutputStream;
 
 public class ThemesManager {
 
-    private final static int[] ACCENT_COLORS = {
+    private static final int[] ACCENT_COLORS = {
             R.color.vk_sky_300,
             R.color.sky_300,
             R.color.viewer_retry_button_text_color,
@@ -96,7 +95,7 @@ public class ThemesManager {
             R.color.header_blue_opacity40
     };
     // modify it if "doNotCompress" in apktool.yml has been edited
-    private final static String[] DO_NOT_COMPRESS = {
+    private static final String[] DO_NOT_COMPRESS = {
             ".png",
             ".jpg",
             ".mp3",
@@ -119,19 +118,18 @@ public class ThemesManager {
             initPaths(app);
             validateModApk();
 
-            if (!Preferences.isNewBuild() && !ThemesUtils.isMonetTheme() && canApplyCustomAccent() && ThemesUtils.useNewColorEngine()) {
+            if (!Preferences.isNewBuild() && !ThemesUtils.isMonetTheme() && canApplyCustomAccent()) {
                 ResourcesLoader.init(app);
                 ResourcesLoader.load(app, modApk.getAbsolutePath(), false);
             }
         } catch (Exception e) {
-            Log.e("ThemesManager", e.getMessage());
+            e.printStackTrace();
         }
     }
 
     // validate modded apk before loading
-    private static void validateModApk()
-            throws IOException {
-        final var apk = new ZipFile(modApk);
+    private static void validateModApk() throws IOException {
+        var apk = new ZipFile(modApk);
         apk.close();
 
         validated = true;
@@ -153,24 +151,18 @@ public class ThemesManager {
         return validated && modApk.exists() && ThemesUtils.getReservedAccent() != Color.TRANSPARENT;
     }
 
-    public static void generateModApk(int accentColor)
-            throws Throwable {
-        try (
-                final var apk = new ZipFile(baseApkPath)
-        ) {
-            final var arscEntry = apk.getEntry("resources.arsc");
-            final var arscBis = new BufferedInputStream(apk.getInputStream(arscEntry));
-            final var arsc = BinaryResourceFile.fromInputStream(arscBis);
-            if (!ArscEditor.changeColors(arsc, ACCENT_COLORS, accentColor))
-                throw new IllegalStateException("Not all colors have been changed");
+    public static void generateModApk(int accentColor) throws Throwable {
+        try (var apk = new ZipFile(baseApkPath)) {
+            var arscEntry = apk.getEntry("resources.arsc");
+            var arscBis = new BufferedInputStream(apk.getInputStream(arscEntry));
+            var arsc = BinaryResourceFile.fromInputStream(arscBis);
+            ArscEditor.changeColors(arsc, ACCENT_COLORS, accentColor);
 
-            try (
-                    final var zos = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(modApk)))
-            ) {
-                final var arscBuff = arsc.toByteArray();
-                final var newArscEntry = new ZipEntry("resources.arsc");
+            try (var zos = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(modApk)))) {
+                var arscBuff = arsc.toByteArray();
+                var newArscEntry = new ZipEntry("resources.arsc");
 
-                final var crc = new CRC32();
+                var crc = new CRC32();
                 crc.update(arscBuff);
 
                 newArscEntry.setSize(arscBuff.length);
@@ -181,10 +173,10 @@ public class ThemesManager {
                 zos.write(arscBuff);
                 zos.closeEntry();
 
-                final var entries = apk.entries();
+                var entries = apk.entries();
                 while (entries.hasMoreElements()) {
-                    final var entry = entries.nextElement();
-                    final var name = entry.getName();
+                    var entry = entries.nextElement();
+                    var name = entry.getName();
 
                     if (!name.startsWith("res/") && !name.startsWith("assets/") || name.equals("resources.arsc"))
                         continue;
@@ -197,8 +189,8 @@ public class ThemesManager {
                         }
                     }
 
-                    final var entryBis = new BufferedInputStream(apk.getInputStream(entry));
-                    final var newEntry = new ZipEntry(name);
+                    var entryBis = new BufferedInputStream(apk.getInputStream(entry));
+                    var newEntry = new ZipEntry(name);
 
                     if (doNotCompress) {
                         newEntry.setMethod(ZipEntry.STORED);

app/src/main/java/ru/vtosters/lite/themes/ViewInjector.java

@@ -21,7 +21,7 @@ public class ViewInjector {
     }
 
     public static View inject(View view, int i, boolean z) {
-        if (ThemesUtils.isCustomAccentEnabled()) {
+        if (ThemesUtils.isMonetTheme()) {
             for (BaseHook hook : hooks) {
                 hook.inject(view, i, z);
             }

app/src/main/java/ru/vtosters/lite/themes/loaders/AssetManagerHelper.java

@@ -1,59 +1,42 @@
 package ru.vtosters.lite.themes.loaders;
 
+import android.annotation.SuppressLint;
 import android.content.res.AssetManager;
 import ru.vtosters.lite.utils.ReflectionUtils;
 
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 
+@SuppressLint("PrivateApi")
 public class AssetManagerHelper {
-
-
-    // methods
-    private final static Method getAssetPathMtd;
-    private final static Method getApkAssetsMtd;
-    private final static Method addAssetPathMtd;
-    private final static Method addAssetPathAsSharedLibraryMtd;
-    private final static Method addOverlayPathMtd;
-
-    static {
-        try {
-            getAssetPathMtd = ReflectionUtils.findMethod(Class.forName("android.content.res.ApkAssets"), "getAssetPath");
-            getApkAssetsMtd = ReflectionUtils.findMethod(AssetManager.class, "getApkAssets");
-            addAssetPathMtd = AssetManager.class.getMethod("addAssetPath", String.class);
-            addAssetPathAsSharedLibraryMtd = AssetManager.class.getMethod("addAssetPathAsSharedLibrary", String.class);
-            addOverlayPathMtd = AssetManager.class.getMethod("addOverlayPath", String.class);
-        } catch (ClassNotFoundException | NoSuchMethodException e) {
-            throw new RuntimeException();
-        }
-    }
-
-    public static String getApkPath(Object assetManager, String packagename)
-            throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-        Object[] apkAssetsArr = (Object[]) getAssetPathMtd.invoke(assetManager);
+    public static String getApkPath(Object assetManager, String packagename) throws InvocationTargetException, IllegalAccessException, ClassNotFoundException, NoSuchMethodException {
+        Object[] apkAssetsArr = (Object[]) ReflectionUtils.findMethod(Class.forName("android.content.res.ApkAssets"), "getAssetPath").invoke(assetManager);
         // By default, base apk is the last element of array if is not, for execution speed, we should iterate array from the end to the beginning
         for (int i = apkAssetsArr.length - 1; i >= 0; i--) {
-            final String pathname = (String) getApkAssetsMtd.invoke(apkAssetsArr[i]);
-            if (pathname.contains(packagename)) return pathname;
+            String pathname = (String) ReflectionUtils.findMethod(AssetManager.class, "getApkAssets").invoke(apkAssetsArr[i]);
+            if (pathname != null && pathname.contains(packagename)) return pathname;
         }
 
         throw new NullPointerException();
     }
 
     //region Uses for adding own assets or getting existing cookies
-    public static int addAssetPath(AssetManager manager, String path)
-            throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-        return (int) addAssetPathMtd.invoke(manager, path);
+    public static void addAssetPath(AssetManager manager, String path) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        manager.getClass().getMethod("addAssetPath", String.class).invoke(manager, path);
     }
 
-    public static int addAssetPathAsSharedLibrary(AssetManager manager, String path)
-            throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-        return (int) addAssetPathAsSharedLibraryMtd.invoke(manager, path);
+    public static int addAssetPathAsSharedLibrary(AssetManager manager, String path) {
+        try {
+            return (int) AssetManager.class.getMethod("addAssetPathAsSharedLibrary", String.class).invoke(manager, path);
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    public static int addOverlayPath(AssetManager manager, String path)
-            throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-        return (int) addOverlayPathMtd.invoke(manager, path);
+    public static int addOverlayPath(AssetManager manager, String path) {
+        try {
+            return (int) AssetManager.class.getMethod("addOverlayPath", String.class).invoke(manager, path);
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
     }
-    //endregion
 }

app/src/main/java/ru/vtosters/lite/themes/loaders/ResourcesLoader.java

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.themes.loaders;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.res.AssetManager;
@@ -14,16 +15,17 @@ import ru.vtosters.lite.utils.ReflectionUtils;
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+@SuppressLint("PrivateApi")
 public class ResourcesLoader {
 
     private static Collection<WeakReference<Resources>> sResourceReferences = null;
     private static Object sCurrentActivityThread = null;
-    private static AssetManager sAssetManager = null;
 
     // methods
     private static Method ensureStringBlocksMtd = null;
@@ -42,7 +44,7 @@ public class ResourcesLoader {
     static {
         try {
             // API version 8 has PackageInfo, 10 has LoadedApk. Needs to check 9
-            final Class<?> activityThreadClz = Class.forName("android.app.ActivityThread");
+            Class<?> activityThreadClz = Class.forName("android.app.ActivityThread");
             Class<?> loadedApkClz;
             try {
                 loadedApkClz = Class.forName("android.app.LoadedApk");
@@ -87,43 +89,40 @@ public class ResourcesLoader {
         }
     }
 
-    public static void init(Context context)
-            throws Exception {
+    public static void init(Context context) throws Exception {
         sCurrentActivityThread = ReflectionUtils.getActivityThread(context, null);
 
         //pre-N
         // Find the singleton instance of ResourcesManager
-        final Class<?> resourcesManagerClass = Class.forName("android.app.ResourcesManager");
-        final Method mGetInstance = ReflectionUtils.findMethod(resourcesManagerClass, "getInstance");
-        final Object resourcesManager = mGetInstance.invoke(null);
+        Class<?> resourcesManagerClass = Class.forName("android.app.ResourcesManager");
+        Method mGetInstance = ReflectionUtils.findMethod(resourcesManagerClass, "getInstance");
+        Object resourcesManager = mGetInstance.invoke(null);
         try {
             Field fMActiveResources = ReflectionUtils.findField(resourcesManagerClass, "mActiveResources");
-            final ArrayMap<?, WeakReference<Resources>> activeResources19 =
+            ArrayMap<?, WeakReference<Resources>> activeResources19 =
                     (ArrayMap<?, WeakReference<Resources>>) fMActiveResources.get(resourcesManager);
             sResourceReferences = activeResources19.values();
         } catch (NoSuchFieldException ignore) {
             // N moved the resources to mResourceReferences
-            final Field mResourceReferences = ReflectionUtils.findField(resourcesManagerClass, "mResourceReferences");
+            Field mResourceReferences = ReflectionUtils.findField(resourcesManagerClass, "mResourceReferences");
             sResourceReferences = (Collection<WeakReference<Resources>>) mResourceReferences.get(resourcesManager);
         }
     }
 
-    public static void load(Context context, String resPath, boolean reinject)
-            throws Exception {
-        final ApplicationInfo appInfo = context.getApplicationInfo();
+    public static void load(Context context, String resPath, boolean reinject) throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchFieldException, NoSuchMethodException {
+        ApplicationInfo appInfo = context.getApplicationInfo();
 
-        final Field[] packagesFlds = Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1
+        Field[] packagesFlds = Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1
                 ? new Field[]{packagesFld, resourcePackagesFld}
                 : new Field[]{packagesFld};
         for (var fld : packagesFlds) {
-            final var value = fld.get(sCurrentActivityThread);
+            var value = fld.get(sCurrentActivityThread);
 
-            for (var entry
-                    : ((Map<String, WeakReference<?>>) value).entrySet()) {
-                final var loadedApk = entry.getValue().get();
+            for (var entry : ((Map<String, WeakReference<?>>) value).entrySet()) {
+                var loadedApk = entry.getValue().get();
                 if (loadedApk == null) continue;
 
-                final var resDirPath = (String) resDirFld.get(loadedApk);
+                var resDirPath = (String) resDirFld.get(loadedApk);
                 if (appInfo.sourceDir.equals(resDirPath))
                     resDirFld.set(loadedApk, resPath);
             }
@@ -134,10 +133,10 @@ public class ResourcesLoader {
             return;
         }
 
-        sAssetManager = AssetManager.class.newInstance();
         // Create a new AssetManager instance and point it to the resources installed under
-        if (AssetManagerHelper.addAssetPath(sAssetManager, resPath) == 0)
-            throw new IllegalStateException("Could not create new AssetManager");
+        AssetManager sAssetManager = AssetManager.class.newInstance();
+
+        AssetManagerHelper.addAssetPath(sAssetManager, resPath);
 
         // Add SharedLibraries to AssetManager for resolve system resources not found issue
         // This influence SharedLibrary Package ID
@@ -157,7 +156,7 @@ public class ResourcesLoader {
             ensureStringBlocksMtd.invoke(sAssetManager);
         }
         for (var wr : sResourceReferences) {
-            final var resources = wr.get();
+            var resources = wr.get();
             if (resources == null) continue;
 
             // Set the AssetManager of the Resources instance to our brand new one
@@ -166,9 +165,9 @@ public class ResourcesLoader {
                 assetsFld.set(resources, sAssetManager);
             } catch (Throwable ignore) {
                 // N
-                final var resourceImpl = resourcesImplFld.get(resources);
+                var resourceImpl = resourcesImplFld.get(resources);
                 // for Huawei HwResourcesImpl
-                final Field implAssets = ReflectionUtils.findField(resourceImpl, "mAssets");
+                Field implAssets = ReflectionUtils.findField(resourceImpl, "mAssets");
                 implAssets.set(resourceImpl, sAssetManager);
             }
 
@@ -196,13 +195,13 @@ public class ResourcesLoader {
 
     private static void installResourceInsuranceHacks(Context context, String patchedResApkPath) {
         try {
-            final Object activityThread = ReflectionUtils.getActivityThread(context, null);
-            final Field mHField = ReflectionUtils.findField(activityThread, "mH");
-            final Handler mH = (Handler) mHField.get(activityThread);
-            final Field mCallbackField = ReflectionUtils.findField(Handler.class, "mCallback");
-            final Handler.Callback originCallback = (Handler.Callback) mCallbackField.get(mH);
+            Object activityThread = ReflectionUtils.getActivityThread(context, null);
+            Field mHField = ReflectionUtils.findField(activityThread, "mH");
+            Handler mH = (Handler) mHField.get(activityThread);
+            Field mCallbackField = ReflectionUtils.findField(Handler.class, "mCallback");
+            Handler.Callback originCallback = (Handler.Callback) mCallbackField.get(mH);
             if (!(originCallback instanceof ResourceInsuranceHandlerCallback)) {
-                final ResourceInsuranceHandlerCallback hackCallback = new ResourceInsuranceHandlerCallback(
+                ResourceInsuranceHandlerCallback hackCallback = new ResourceInsuranceHandlerCallback(
                         context, patchedResApkPath, originCallback, mH.getClass());
                 mCallbackField.set(mH, hackCallback);
             } else {
@@ -250,9 +249,9 @@ public class ResourcesLoader {
         Log.w("ResourcesLoader", "try to clear typedArray cache!");
         // Clear typedArray cache.
         try {
-            final Field typedArrayPoolField = ReflectionUtils.findField(Resources.class, "mTypedArrayPool");
-            final Object origTypedArrayPool = typedArrayPoolField.get(resources);
-            final Method acquireMethod = ReflectionUtils.findMethod(origTypedArrayPool, "acquire");
+            Field typedArrayPoolField = ReflectionUtils.findField(Resources.class, "mTypedArrayPool");
+            Object origTypedArrayPool = typedArrayPoolField.get(resources);
+            Method acquireMethod = ReflectionUtils.findMethod(origTypedArrayPool, "acquire");
             while (true) {
                 if (acquireMethod.invoke(origTypedArrayPool) == null) {
                     break;
@@ -268,9 +267,8 @@ public class ResourcesLoader {
                 applicationInfo.sharedLibraryFiles != null;
     }
 
-    private static final class ResourceInsuranceHandlerCallback implements Handler.Callback {
+    private static class ResourceInsuranceHandlerCallback implements Handler.Callback {
         private static final String LAUNCH_ACTIVITY_LIFECYCLE_ITEM_CLASSNAME = "android.app.servertransaction.LaunchActivityItem";
-
         private final Context mContext;
         private final String mPatchResApkPath;
         private final Handler.Callback mOriginalCallback;
@@ -319,48 +317,56 @@ public class ResourcesLoader {
         }
 
         @SuppressWarnings("unchecked")
-        private boolean hackMessage(Message msg) {
-            boolean shouldReInjectPatchedResources = false;
+        // A method to check if the message requires re-injecting patched resources
+        private boolean shouldReInjectPatchedResources(Message msg) {
             if (!isPatchedResModifiedAfterLastLoad(mPatchResApkPath)) {
-                shouldReInjectPatchedResources = false;
-            } else {
-                if (msg.what == LAUNCH_ACTIVITY || msg.what == RELAUNCH_ACTIVITY) {
-                    shouldReInjectPatchedResources = true;
-                } else if (msg.what == EXECUTE_TRANSACTION) {
-                    do {
-                        if (mSkipInterceptExecuteTransaction) {
-                            break;
-                        }
-                        final Object transaction = msg.obj;
-                        if (transaction == null) {
-                            Log.w("ResourcesLoader", "transaction is null, skip rest insurance logic.");
-                            break;
-                        }
-                        if (mGetCallbacksMethod == null) {
-                            try {
-                                mGetCallbacksMethod = ReflectionUtils.findMethod(transaction, "getCallbacks");
-                            } catch (Throwable ignored) {
-                                // Ignored.
-                            }
-                        }
-                        if (mGetCallbacksMethod == null) {
-                            Log.e("ResourcesLoader", "fail to find getLifecycleStateRequest method, skip rest insurance logic.");
-                            mSkipInterceptExecuteTransaction = true;
-                            break;
-                        }
-                        try {
-                            final List<Object> req = (List<Object>) mGetCallbacksMethod.invoke(transaction);
-                            if (req != null && req.size() > 0) {
-                                final Object cb = req.get(0);
-                                shouldReInjectPatchedResources = cb != null && cb.getClass().getName().equals(LAUNCH_ACTIVITY_LIFECYCLE_ITEM_CLASSNAME);
-                            }
-                        } catch (Throwable ignored) {
-                            Log.e("ResourcesLoader", "fail to call getLifecycleStateRequest method, skip rest insurance logic.");
-                        }
-                    } while (false);
+                return false;
+            }
+            if (msg.what == LAUNCH_ACTIVITY || msg.what == RELAUNCH_ACTIVITY) {
+                return true;
+            }
+            // If the message is executing a transaction, check the callbacks
+            if (msg.what == EXECUTE_TRANSACTION) {
+                // Skip the logic if the method is not found or an error occurs
+                if (mSkipInterceptExecuteTransaction) {
+                    return false;
+                }
+                // Get the transaction object from the message
+                Object transaction = msg.obj;
+                if (transaction == null) {
+                    Log.w("ResourcesLoader", "transaction is null, skip rest insurance logic.");
+                    return false;
+                }
+                // Get the getCallbacks method from the transaction class
+                if (mGetCallbacksMethod == null) {
+                    try {
+                        mGetCallbacksMethod = ReflectionUtils.findMethod(transaction, "getCallbacks");
+                    } catch (Throwable ignored) {
+                        // Ignored.
+                    }
+                }
+                if (mGetCallbacksMethod == null) {
+                    Log.e("ResourcesLoader", "fail to find getCallbacks method, skip rest insurance logic.");
+                    mSkipInterceptExecuteTransaction = true;
+                    return false;
+                }
+                try {
+                    List<Object> callbacks = (List<Object>) mGetCallbacksMethod.invoke(transaction);
+                    if (callbacks != null && !callbacks.isEmpty()) {
+                        Object cb = callbacks.get(0);
+                        return cb != null && cb.getClass().getName().equals(LAUNCH_ACTIVITY_LIFECYCLE_ITEM_CLASSNAME);
+                    }
+                } catch (Throwable ignored) {
+                    Log.e("ResourcesLoader", "fail to call getCallbacks method, skip rest insurance logic.");
                 }
             }
-            if (shouldReInjectPatchedResources) {
+            return false;
+        }
+
+        // A method to hack the message and re-inject patched resources if needed
+        @SuppressWarnings("unchecked")
+        private boolean hackMessage(Message msg) {
+            if (shouldReInjectPatchedResources(msg)) {
                 try {
                     load(mContext, mPatchResApkPath, true);
                 } catch (Throwable thr) {

app/src/main/java/ru/vtosters/lite/themes/palettes/PalettesManager.java

@@ -23,8 +23,8 @@ import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 
 public class PalettesManager {
 
-    private final static File PALETTES_DIR = new File(Environment.getExternalStorageDirectory(), "VTL/palettes");
-    private final static String ASSETS_DIR = "vtl_themes/palettes/";
+    private static final File PALETTES_DIR = new File(Environment.getExternalStorageDirectory(), "VTL/palettes");
+    private static final String ASSETS_DIR = "vtl_themes/palettes/";
 
     private static PalettesManager sInstance;
 
@@ -51,17 +51,17 @@ public class PalettesManager {
             return;
         }
 
-        final var palettes = PALETTES_DIR.listFiles((dir, name) -> name.endsWith(".json"));
+        var palettes = PALETTES_DIR.listFiles((dir, name) -> name.endsWith(".json"));
         if (palettes == null || palettes.length == 0)
             copyPaletteFromAssets();
         parsePalettes();
     }
 
-    private boolean copyPaletteFromAssets() {
+    private void copyPaletteFromAssets() {
         try {
-            final var manager = AndroidUtils.getGlobalContext().getAssets();
-            final var assets = manager.list(ASSETS_DIR);
-            if (assets == null || assets.length == 0) return false;
+            var manager = AndroidUtils.getGlobalContext().getAssets();
+            var assets = manager.list(ASSETS_DIR);
+            if (assets == null || assets.length == 0) return;
             for (var asset : assets) {
                 try {
                     IOUtils.copy(manager.open(ASSETS_DIR + asset), new File(PALETTES_DIR, asset));
@@ -69,11 +69,9 @@ public class PalettesManager {
                     e.printStackTrace();
                 }
             }
-            return true;
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return false;
     }
 
     private void parsePalettes() {

app/src/main/java/ru/vtosters/lite/themes/utils/ArscEditor.java

@@ -1,37 +1,38 @@
 package ru.vtosters.lite.themes.utils;
 
-import com.google.devrel.gmscore.tools.apk.arsc.*;
+import com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceFile;
+import com.google.devrel.gmscore.tools.apk.arsc.BinaryResourceValue;
+import com.google.devrel.gmscore.tools.apk.arsc.ResourceTableChunk;
 
 public class ArscEditor {
 
-    public static boolean changeColors(BinaryResourceFile arsc, int[] colorIds, int color /*int[] colors*/) {
-        int q = 0;
+    public static void changeColors(BinaryResourceFile arsc, int[] colorIds, int color) {
         for (var chunk : arsc.getChunks()) {
-            final var resourceTableChunk = (ResourceTableChunk) chunk;
-
-            for (PackageChunk packageChunk : resourceTableChunk.getPackages()) {
-                for (TypeSpecChunk typeSpecChunk : packageChunk.getTypeSpecChunks()) {
-                    for (TypeChunk typeChunk : packageChunk.getTypeChunks(typeSpecChunk.getId())) {
-                        if (!"color".equals(typeChunk.getTypeName())) continue;
-
-                        for (var entry : typeChunk.getEntries().entrySet()) {
-                            if (entry.getValue().isComplex()) continue;
-
-                            final var id = BinaryResourceIdentifier.create(packageChunk.getId(), typeSpecChunk.getId(), entry.getKey());
-
-                            for (int colorId : colorIds) {
-                                if (colorId != id.resId()) continue;
-
-                                final var value = entry.getValue();
-                                value.updateValue(new BinaryResourceValue(8, value.value().type(), color /*colors[i]*/));
-                                ++q;
+            var resTableChunk = (ResourceTableChunk) chunk;
+            for (var packageChunk : resTableChunk.getPackages()) {
+                for (var typeChunk : packageChunk.getTypeChunks("color")) {
+                    for (var entry : typeChunk.getEntries().entrySet()) {
+                        var value = entry.getValue();
+                        if (value.isComplex()) continue;
+                        var binValue = value.value();
+                        if (!isColorResourceValue(binValue)) continue;
+                        var resId = packageChunk.getId() << 24 | typeChunk.getId() << 16 | entry.getKey();
+                        for (var colodId : colorIds) {
+                            if (resId == colodId) {
+                                binValue.data = color;
+                                break;
                             }
                         }
                     }
                 }
             }
         }
+    }
 
-        return q == colorIds.length;
+    private static boolean isColorResourceValue(BinaryResourceValue value) {
+        return value.type == BinaryResourceValue.Type.INT_COLOR_ARGB8
+                || value.type == BinaryResourceValue.Type.INT_COLOR_RGB8
+                || value.type == BinaryResourceValue.Type.INT_COLOR_ARGB4
+                || value.type == BinaryResourceValue.Type.INT_COLOR_RGB4;
     }
 }

app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java

@@ -11,6 +11,7 @@ import android.widget.TextView;
 import com.vk.core.drawable.RecoloredDrawable;
 import ru.vtosters.hooks.other.ThemesUtils;
 import ru.vtosters.lite.themes.ColorReferences;
+import ru.vtosters.lite.themes.ThemesManager;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class RecolorUtils {
@@ -43,7 +44,7 @@ public class RecolorUtils {
     }
 
     public static int recolorHexColor(int i) {
-        if (!ThemesUtils.isCustomAccentEnabled()) return i;
+        if (!ThemesUtils.isMonetTheme() || !ThemesManager.canApplyCustomAccent()) return i;
         var accented = ColorReferences.isAccentedColor(i);
         var mutedaccented = ColorReferences.isMutedAccentedColor(i);
         return (accented || mutedaccented) ? (accented ? ThemesUtils.getAccentColor() : ThemesUtils.getMutedAccentColor()) : i;
@@ -57,7 +58,7 @@ public class RecolorUtils {
 
     @SuppressLint("UseCompatLoadingForColorStateLists")
     public static ColorStateList themeCSL(Context context, int color) {
-        if (!ThemesUtils.isCustomAccentEnabled()) {
+        if (!ThemesUtils.isMonetTheme()) {
             if (Build.VERSION.SDK_INT >= 23) {
                 return context.getColorStateList(color);
             } else {
@@ -83,7 +84,7 @@ public class RecolorUtils {
     } // Recolor ColorStateList
 
     public static ColorStateList themeCSL(ColorStateList csl) {
-        if (!ThemesUtils.isCustomAccentEnabled()) return csl;
+        if (!ThemesUtils.isMonetTheme()) return csl;
 
         try {
             int unsel = csl.getColorForState(new int[]{-android.R.attr.state_selected}, Color.BLACK);

app/src/main/java/ru/vtosters/lite/ui/PreferenceFragmentUtils.java

@@ -301,7 +301,7 @@ public class PreferenceFragmentUtils {
         return addPreference(screen, key, title, null, null, preference -> {
             LinearLayout linearLayout = new LinearLayout(screen.getContext());
 
-            final EditText editText = new EditText(screen.getContext());
+            EditText editText = new EditText(screen.getContext());
             editText.setText(PreferenceManager.getDefaultSharedPreferences(screen.getContext()).getString(key, ""));
             editText.setHint(title);
             editText.setTextColor(ThemesUtils.getTextAttr());

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

@@ -18,6 +18,7 @@ import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.LayoutUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -35,6 +36,7 @@ public class CategorizedAdapter<T> extends RecyclerView.Adapter<CategorizedAdapt
     private final List<T> mSelectedItems;
     private final List<T> mDisabledItems;
     private final List<T> mUnmovedItems;
+    private final List<T> mExceptions = new ArrayList<>();
     private final IViewHolderBinder mBinder;
 
     // Min and max counts
@@ -48,6 +50,12 @@ public class CategorizedAdapter<T> extends RecyclerView.Adapter<CategorizedAdapt
         this.mBinder = binder;
     }
 
+    @SafeVarargs
+    public final void setExceptions(T... exceptions) {
+        mExceptions.clear();
+        mExceptions.addAll(Arrays.asList(exceptions));
+    }
+
     public void setMinAndMaxCounts(int min, int max) {
         this.mMinSelectedItems = min;
         this.mMaxSelectedItems = max;
@@ -173,16 +181,25 @@ public class CategorizedAdapter<T> extends RecyclerView.Adapter<CategorizedAdapt
     public boolean onItemMove(int fromPosition, int toPosition) {
         if (toPosition == 0 || isUnmovedItem(toPosition))
             return false;
-
         switch (getTabType(fromPosition)) {
             case SELECTED_STATE -> {
-                if (getTabType(toPosition) == DISABLED_STATE
-                        && mSelectedItems.size() == mMinSelectedItems)
+                if ((getTabType(toPosition) == DISABLED_STATE
+                        && mSelectedItems.size() == mMinSelectedItems))
                     return false;
-                if (getItemViewType(toPosition) == CATEGORY_TITLE)
+                if (getItemViewType(toPosition) == CATEGORY_TITLE) {
+                    if (!mExceptions.isEmpty()) {
+                        boolean except = false;
+                        int q = 0;
+                        for (var ex : mExceptions) {
+                            var i = mSelectedItems.indexOf(ex);
+                            if (i == -1) continue;
+                            if (i + 1 == fromPosition) except = true;
+                            ++q;
+                        }
+                        if (except && q == 1) return false;
+                    }
                     mDisabledItems.add(0, mSelectedItems.remove(fromPosition - 1));
-                else
-                    Collections.swap(mSelectedItems, fromPosition - 1, toPosition - 1);
+                } else Collections.swap(mSelectedItems, fromPosition - 1, toPosition - 1);
             }
             case DISABLED_STATE -> {
                 if (getTabType(toPosition) == SELECTED_STATE
@@ -198,7 +215,6 @@ public class CategorizedAdapter<T> extends RecyclerView.Adapter<CategorizedAdapt
                     );
             }
         }
-
         notifyItemMoved(fromPosition, toPosition);
         return true;
     }
@@ -208,7 +224,6 @@ public class CategorizedAdapter<T> extends RecyclerView.Adapter<CategorizedAdapt
     }
 
     public static class CategorizedViewHolder extends RecyclerView.ViewHolder {
-
         private final LinearLayout mMovingItemContainer;
         private final ImageView mIcon;
         private final TextView mName;

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

@@ -18,7 +18,6 @@ import ru.vtosters.hooks.other.ThemesUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class MessagesPreviewAdapter extends RecyclerView.Adapter<MessagesPreviewAdapter.MessagePreviewViewHolder> {
-
     private final String[] mMessages;
 
     public MessagesPreviewAdapter(String... messages) {
@@ -35,9 +34,9 @@ public class MessagesPreviewAdapter extends RecyclerView.Adapter<MessagesPreview
     public MessagePreviewViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
         Context context = viewGroup.getContext();
 
-        final var inflater = LayoutInflater.from(context);
+        var inflater = LayoutInflater.from(context);
 
-        final var bubbleFluidLayout = (BubbleFluidLayout) inflater.inflate(R.layout.vkim_msg_list_item_msg_from_user, viewGroup, false);
+        var bubbleFluidLayout = (BubbleFluidLayout) inflater.inflate(R.layout.vkim_msg_list_item_msg_from_user, viewGroup, false);
         bubbleFluidLayout.setPadding(0, AndroidUtils.dp2px(4), 0, 0);
         bubbleFluidLayout.setGravity(viewType);
 
@@ -47,7 +46,7 @@ public class MessagesPreviewAdapter extends RecyclerView.Adapter<MessagesPreview
         bubbleFluidLayout.findViewById(R.id.status).setVisibility(View.GONE);
         bubbleFluidLayout.findViewById(R.id.status_space).setVisibility(View.GONE);
 
-        final var messageBubbleView = (MsgBubbleView) bubbleFluidLayout.findViewById(R.id.bubble);
+        var messageBubbleView = (MsgBubbleView) bubbleFluidLayout.findViewById(R.id.bubble);
         messageBubbleView.setContentPaddingLeft(AndroidUtils.dp2px(10));
         messageBubbleView.setContentPaddingTop(AndroidUtils.dp2px(4));
         messageBubbleView.setContentPaddingRight(AndroidUtils.dp2px(4));
@@ -59,10 +58,10 @@ public class MessagesPreviewAdapter extends RecyclerView.Adapter<MessagesPreview
         }
         bubbleFluidLayout.setLayoutDirection(viewType);
 
-        final var msgTextView = inflater.inflate(R.layout.vkim_msg_part_text, viewGroup, false);
+        var msgTextView = inflater.inflate(R.layout.vkim_msg_part_text, viewGroup, false);
         msgTextView.setId(R.id.msg_text);
 
-        final var msgBubbleView = (MsgBubbleView) bubbleFluidLayout.findViewById(R.id.bubble);
+        var msgBubbleView = (MsgBubbleView) bubbleFluidLayout.findViewById(R.id.bubble);
         msgBubbleView.setContentView(msgTextView);
 
         return new MessagePreviewViewHolder(bubbleFluidLayout);

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

@@ -1,6 +1,7 @@
 package ru.vtosters.lite.ui.adapters;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.net.Uri;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,6 +29,7 @@ import ru.vtosters.hooks.SwitchHook;
 import ru.vtosters.lite.tgs.TGPref;
 import ru.vtosters.lite.tgs.TGRoot;
 import ru.vtosters.lite.ui.components.IItemMovingListener;
+import ru.vtosters.lite.ui.fragments.VTSettings;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -138,7 +140,11 @@ public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.
             });
             mName.setText(pack.title);
             mSwitch.setChecked(pack.enabled);
-            mSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> sService.setPackEnabled(pack, isChecked, true));
+            mSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                sService.setPackEnabled(pack, isChecked, false);
+                buttonView.getContext().sendBroadcast(new Intent(VTSettings.ACTION_INVALIDATE_TGS_COUNT));
+            });
+
             mStickersCount.setText(pack.stickersCount + " " + mStickersCount.getContext().getString(R.string.stickerscount));
 
             SwitchHook.setSwitchCompatColors(mSwitch, mSwitch.getContext());

app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java

@@ -59,71 +59,7 @@ public class DockBarEditorManager {
                 : sInstance;
     }
 
-    private void init() {
-        if (vkme()) {
-            mSelectedTabs.add(getTabByTag("tab_settings"));
-            if (vkme_notifs()) {
-                if (milkshake()) {
-                    mSelectedTabs.add(getTabByTag("tab_feedback"));
-                } else {
-                    mSelectedTabs.add(getTabByTag("tab_friends"));
-                }
-            }
-            mSelectedTabs.add(getTabByTag("tab_messages"));
-            mSelectedTabs.add(getTabByTag("tab_profile"));
-            return;
-        }
-
-        checkOldConfig();
-
-        var selectedTabsTags = getPreferences()
-                .getString("dockbar_tabs",
-                        "tab_news,tab_superapps,tab_messages,tab_friends,tab_profile")
-                .split(",");
-        parseSelectedTabs(selectedTabsTags);
-    }
-
-    private void checkOldConfig() {
-        File config = new File(getGlobalContext().getFilesDir(), "dockbar.json");
-        if (config.exists()) config.deleteOnExit();
-    }
-
-    private void parseSelectedTabs(String[] selectedTabsTags) {
-        var allTags = new ArrayList<>(ALL_TAGS);
-
-        for (String tag : selectedTabsTags) {
-            mSelectedTabs.add(getTabByTag(tag));
-            allTags.remove(tag);
-        }
-
-        for (String tag : allTags) {
-            mDisabledTabs.add(getTabByTag(tag));
-        }
-    }
-
-    public void save() {
-        var sb = new StringBuilder();
-        for (DockBarTab tab : mSelectedTabs)
-            sb.append(tab.tag).append(",");
-        getPreferences().edit().putString("dockbar_tabs", sb.toString()).commit();
-    }
-
-    public void reset() {
-        Preferences.getPreferences()
-                .edit()
-                .putString("dockbar_tabs", "tab_news,tab_superapps,tab_messages,tab_friends,tab_profile")
-                .commit();
-    }
-
-    public List<DockBarTab> getSelectedTabs() {
-        return mSelectedTabs;
-    }
-
-    public List<DockBarTab> getDisabledTabs() {
-        return mDisabledTabs;
-    }
-
-    private DockBarTab getTabByTag(String tag) {
+    public static DockBarTab getTabByTag(String tag) {
         return switch (tag) {
             case "tab_news" -> DockBarTab.valuesOf(
                     "tab_news",
@@ -235,4 +171,68 @@ public class DockBarEditorManager {
                     useNewSettings());
         };
     }
+
+    private void init() {
+        if (vkme()) {
+            mSelectedTabs.add(getTabByTag("tab_settings"));
+            if (vkme_notifs()) {
+                if (milkshake()) {
+                    mSelectedTabs.add(getTabByTag("tab_feedback"));
+                } else {
+                    mSelectedTabs.add(getTabByTag("tab_friends"));
+                }
+            }
+            mSelectedTabs.add(getTabByTag("tab_messages"));
+            mSelectedTabs.add(getTabByTag("tab_profile"));
+            return;
+        }
+
+        checkOldConfig();
+
+        var selectedTabsTags = getPreferences()
+                .getString("dockbar_tabs",
+                        "tab_news,tab_superapps,tab_messages,tab_friends,tab_profile")
+                .split(",");
+        parseSelectedTabs(selectedTabsTags);
+    }
+
+    private void checkOldConfig() {
+        File config = new File(getGlobalContext().getFilesDir(), "dockbar.json");
+        if (config.exists()) config.deleteOnExit();
+    }
+
+    private void parseSelectedTabs(String[] selectedTabsTags) {
+        var allTags = new ArrayList<>(ALL_TAGS);
+
+        for (String tag : selectedTabsTags) {
+            mSelectedTabs.add(getTabByTag(tag));
+            allTags.remove(tag);
+        }
+
+        for (String tag : allTags) {
+            mDisabledTabs.add(getTabByTag(tag));
+        }
+    }
+
+    public void save() {
+        var sb = new StringBuilder();
+        for (DockBarTab tab : mSelectedTabs)
+            sb.append(tab.tag).append(",");
+        getPreferences().edit().putString("dockbar_tabs", sb.toString()).commit();
+    }
+
+    public void reset() {
+        Preferences.getPreferences()
+                .edit()
+                .putString("dockbar_tabs", "tab_news,tab_superapps,tab_messages,tab_friends,tab_profile")
+                .commit();
+    }
+
+    public List<DockBarTab> getSelectedTabs() {
+        return mSelectedTabs;
+    }
+
+    public List<DockBarTab> getDisabledTabs() {
+        return mDisabledTabs;
+    }
 }

app/src/main/java/ru/vtosters/lite/ui/components/IconManager.java

@@ -39,11 +39,11 @@ public class IconManager {
     );
 
     public static List<String> icons() {
-        return Preferences.hasVerification() && Preferences.isValidSignature() ? sIconsPlusNames : sIconsNames; // delete later sdk check
+        return sIconsPlusNames; // delete later sdk check
     }
 
     public static List<String> iconsValues() {
-        return Preferences.hasVerification() && Preferences.isValidSignature() ? sIconsPlus : sIcons; // delete later sdk check
+        return sIconsPlus; // delete later sdk check
     }
 
     public static void switchComponent(String icon, String appName) {
@@ -55,7 +55,7 @@ public class IconManager {
 
         Log.d("IconManager", "iconSwitcher: icon = " + icon + ", appname = " + appName);
 
-        List<String> iconsList = (Preferences.hasVerification() && Preferences.isValidSignature()) ? sIconsPlus : sIcons;
+        List<String> iconsList = sIconsPlus;
         List<String> labelsList = sLabels;
 
         // check if icon is exist

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

@@ -1,39 +0,0 @@
-package ru.vtosters.lite.ui.dialogs;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.PowerManager;
-import android.provider.Settings;
-import com.vk.core.dialogs.alert.VkAlertDialog;
-import com.vtosters.lite.R;
-import ru.vtosters.hooks.other.Preferences;
-import ru.vtosters.lite.deviceinfo.OEMDetector;
-
-public class DisableBattery {
-    public static void alert(Activity activity) {
-        if (!(OEMDetector.isOEM() && Build.VERSION.SDK_INT >= 23 && Preferences.getBoolValue("showDoze", true)))
-            return;
-        final String packName = activity.getPackageName();
-        final PowerManager manager = (PowerManager) activity.getSystemService(Context.POWER_SERVICE);
-        if (manager.isIgnoringBatteryOptimizations(packName)) return;
-        new VkAlertDialog.Builder(activity)
-                .setTitle(R.string.batteryissuetitle)
-                .setMessage(R.string.batteryissuesumm)
-                .setCancelable(false)
-                .setPositiveButton(R.string.batteryissuebtn1, (dialogInterface, i) -> {
-                    @SuppressLint("BatteryLife")
-                    var intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
-                            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            .setData(Uri.parse("package:" + packName));
-                    activity.startActivity(intent);
-                })
-                .setNeutralButton(R.string.batteryissuebtn2,
-                        (dialogInterface, i) -> Preferences.getPreferences().edit().putBoolean("showDoze", false).apply()
-                )
-                .show();
-    }
-}

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

@@ -1,9 +1,11 @@
 package ru.vtosters.lite.ui.dialogs;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 import com.vtosters.lite.R;
 import ru.vtosters.hooks.other.ThemesUtils;
 import ru.vtosters.lite.downloaders.OTADownloader;
@@ -16,22 +18,25 @@ public class OTADialog extends ModalBottomSheetWrapper<OTADialog> implements OTA
 
     private final OTAUtils mHelper;
 
-    public OTADialog(Activity activity) {
+    public OTADialog(Activity activity, boolean isManualCheck) {
         super(activity);
         mActivity = activity;
 
         mHelper = new OTAUtils(this);
-        mHelper.loadData();
+        mHelper.loadData(isManualCheck);
     }
 
     public static void checkUpdates(Activity activity) {
-        new OTADialog(activity);
+        new OTADialog(activity, false);
+    }
+
+    public static void checkUpdatesManual(Activity activity) {
+        new OTADialog(activity, true);
     }
 
     @Override
-    public void onUpdateApplied() {
+    public void onUpdateApplied(boolean isManualCheck) {
         mActivity.runOnUiThread(() -> {
-            // Toast.makeText(mActivity, "Обновления найдены", Toast.LENGTH_SHORT).show();
             setTitle(mActivity.getString(R.string.newversion) + " " + mHelper.getNewVersionName())
                     .setView(makeUpdateInfoView(mHelper.getUpdateDescription()))
                     .setPositiveButton(mActivity.getString(R.string.updateanddownload), () -> {
@@ -41,6 +46,7 @@ public class OTADialog extends ModalBottomSheetWrapper<OTADialog> implements OTA
         });
     }
 
+    @SuppressLint("SetTextI18n")
     private View makeUpdateInfoView(String changelog) {
         LinearLayout container = new LinearLayout(mActivity);
         TextView changelogView = new TextView(mActivity);
@@ -55,9 +61,18 @@ public class OTADialog extends ModalBottomSheetWrapper<OTADialog> implements OTA
     }
 
     @Override
-    public void onUpdateCanceled() {
-//        mActivity.runOnUiThread(() -> {
-//            // Toast.makeText(mActivity, "Обновлений не найдено", Toast.LENGTH_SHORT).show();
-//        });
+    public void onUpdateLatest(boolean isManualCheck) {
+        if (isManualCheck) {
+            mActivity.runOnUiThread(() -> {
+                Toast.makeText(mActivity, "У вас установлена последняя версия приложения", Toast.LENGTH_SHORT).show();
+            });
+        }
+    }
+
+    @Override
+    public void onUpdateError() {
+        mActivity.runOnUiThread(() -> {
+            Toast.makeText(mActivity, "Ошибка проверки обновления", Toast.LENGTH_SHORT).show();
+        });
     }
 }

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

@@ -1,108 +0,0 @@
-package ru.vtosters.lite.ui.dialogs;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-import android.util.Log;
-import com.vk.core.dialogs.alert.VkAlertDialog;
-import okhttp3.*;
-import org.json.JSONObject;
-import ru.vtosters.hooks.other.Preferences;
-import ru.vtosters.lite.di.singleton.VtOkHttpClient;
-import ru.vtosters.lite.utils.LifecycleUtils;
-
-import java.io.IOException;
-import java.util.Random;
-
-import static android.content.ContentValues.TAG;
-import static ru.vtosters.hooks.other.Preferences.getBoolValue;
-import static ru.vtosters.hooks.other.Preferences.hasVerification;
-
-public class ServerDialog {
-    private static final OkHttpClient client = VtOkHttpClient.getInstance();
-    public static Boolean showAlert;
-    private static String title;
-    private static String message;
-    private static String positiveButton;
-    private static String neutralButton;
-    private static String link;
-    private static String key;
-    private static Boolean cancelable;
-    private static Boolean isNotForVerified;
-
-    public static void sendRequest() {
-        if (getBoolValue("dialogrecomm", false)) return;
-
-        if (!getBoolValue("isRoamingState", false)) {
-            Request request = new Request.a()
-                    .b("https://vtosters.app/dialog.json")
-                    .a();
-
-            client.a(request).a(new Callback() {
-                @Override
-                public void a(Call call, IOException e) {
-                    Log.d(TAG, e.getMessage());
-                    showAlert = false;
-                }
-
-                @Override
-                public void a(Call call, Response response) {
-                    try {
-                        getResponse(response.a().g());
-                    } catch (Exception e) {
-                        showAlert = false;
-                    }
-                }
-            });
-        }
-    }
-
-    private static Boolean showForNotVerified() {
-        int random = new Random().nextInt(6);
-
-        if (isNotForVerified) {
-            return !hasVerification() && random != 0;
-        }
-
-        return true;
-    }
-
-    private static void getResponse(String body) throws Exception {
-        JSONObject jSONObject = new JSONObject(body);
-
-        if (jSONObject.getString("title").equals("")) {
-            showAlert = false;
-            return;
-        }
-
-        title = jSONObject.getString("title");
-        message = jSONObject.getString("message");
-        positiveButton = jSONObject.getString("positiveButton");
-        neutralButton = jSONObject.getString("neutralButton");
-        link = jSONObject.getString("link");
-        key = jSONObject.getString("key");
-        cancelable = jSONObject.getBoolean("cancelable");
-        isNotForVerified = jSONObject.getBoolean("isNotForVerified");
-
-        showAlert = true;
-
-        Activity activity = LifecycleUtils.getCurrentActivity();
-        if (getBoolValue(key, true) && showForNotVerified() && showAlert) {
-            activity.runOnUiThread(() -> {
-                new VkAlertDialog.Builder(activity)
-                        .setTitle(title)
-                        .setMessage(message)
-                        .setCancelable(cancelable)
-                        .setPositiveButton(positiveButton,
-                                (dialogInterface, i) -> Preferences.getPreferences().edit().putBoolean(key, false).apply())
-                        .setNeutralButton(neutralButton, (dialogInterface, i) -> {
-                            Preferences.getPreferences().edit().putBoolean(key, false).apply();
-                            Intent intent = new Intent(Intent.ACTION_VIEW)
-                                    .setData(Uri.parse(link));
-                            activity.startActivity(intent);
-                        })
-                        .show();
-            });
-        }
-    }
-}

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

@@ -3,7 +3,9 @@ package ru.vtosters.lite.ui.fragments;
 import android.os.Bundle;
 import androidx.preference.Preference;
 import com.vtosters.lite.R;
+import ru.vtosters.hooks.other.Preferences;
 
+import static ru.vtosters.hooks.other.Preferences.getBoolValue;
 import static ru.vtosters.hooks.other.Preferences.offline;
 
 public class ActivityFragment extends TrackedMaterialPreferenceToolbarFragment {
@@ -12,6 +14,7 @@ public class ActivityFragment extends TrackedMaterialPreferenceToolbarFragment {
         super.onCreate(bundle);
         addPreferencesFromResource(R.xml.preferences_activity);
         findPreference("setoffline").setEnabled(offline());
+        findPreference("onlinefixcategory").setVisible(!Preferences.serverFeaturesDisable());
     }
 
     @Override

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

@@ -1,21 +1,37 @@
 package ru.vtosters.lite.ui.fragments;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.WindowInsetsController;
+import android.webkit.WebView;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.Toast;
+import androidx.appcompat.view.ContextThemeWrapper;
+import b.h.g.m.FileUtils;
 import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vk.im.engine.ImEngine1;
+import com.vk.im.engine.ImEngineExt;
+import com.vk.im.ui.providers.audiomsg.ImAudioMsgPlayerProvider;
+import com.vk.im.ui.providers.audiomsg.PlayerActionSources;
+import com.vk.imageloader.VKImageLoader;
+import com.vk.media.player.cache.AutoPlayCacheHolder;
+import com.vk.mediastore.MediaStorage;
+import com.vk.stickers.Stickers;
+import com.vtosters.lite.im.ImEngineProvider;
+import ru.vtosters.hooks.SwitchHook;
 import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.hooks.other.ThemesUtils;
 import ru.vtosters.lite.ui.PreferenceFragmentUtils;
 import ru.vtosters.lite.ui.components.BackupManager;
-import ru.vtosters.lite.utils.AccountManagerUtils;
-import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.LifecycleUtils;
-import ru.vtosters.lite.utils.VKAccountDB;
+import ru.vtosters.lite.utils.*;
 
 import java.io.IOException;
 
@@ -58,6 +74,116 @@ public class DataSettingsFragment extends TrackedMaterialPreferenceToolbarFragme
             }
         }
 
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), AndroidUtils.getString("data"));
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "currcache",
+                getString(com.vtosters.lite.R.string.cache_size),
+                getString(com.vtosters.lite.R.string.cache_size_summ) + ": " + CacheUtils.humanReadableByteCountBin(IOUtils.getDirSize(AndroidUtils.getGlobalContext().getCacheDir())),
+                null,
+                preference -> {
+                    new VkAlertDialog.Builder(requireContext())
+                            .setTitle(getString(com.vtosters.lite.R.string.clear_all_cache))
+                            .setPositiveButton(requireContext().getString(com.vtosters.lite.R.string.yes), (dialogInterface, i) -> {
+                                new WebView(requireContext()).clearCache(true);
+                                VKImageLoader.e();
+                                ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
+                                ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
+                                FileUtils.l();
+                                AutoPlayCacheHolder.d.a();
+                                MediaStorage.a();
+                                IOUtils.deleteRecursive(AndroidUtils.getGlobalContext().getCacheDir());
+                                updateCacheSize();
+                            })
+                            .setNegativeButton(requireContext().getString(com.vtosters.lite.R.string.cancel), (dialogInterface, i) -> dialogInterface.dismiss())
+                            .show();
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                AndroidUtils.getString("clearcache_other_title"),
+                "",
+                null,
+                preference -> {
+                    new VkAlertDialog.Builder(getContext())
+                            .setTitle(requireContext().getString(com.vtosters.lite.R.string.select_which_clean))
+                            .setItems(AndroidUtils.getArray(com.vtosters.lite.R.array.cache_cleaner), (dialog, which) -> {
+                                switch (which) {
+                                    case 0 -> {
+                                        SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
+                                        prefs2.edit().clear().commit();
+                                        new WebView(requireContext()).clearCache(true);
+                                        VKImageLoader.e();
+                                        ImEngineProvider.b().a();
+                                        ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
+                                        ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
+                                        FileUtils.l();
+                                        Stickers.l.c();
+                                        ImEngineExt.a(ImEngine1.a());
+                                        AutoPlayCacheHolder.d.a();
+                                        MediaStorage.a();
+                                        IOUtils.deleteRecursive(AndroidUtils.getGlobalContext().getCacheDir());
+                                    }
+                                    case 1 -> {
+                                        SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
+                                        prefs2.edit().clear().commit();
+                                        Stickers.l.c();
+                                    }
+                                    case 2 -> {
+                                        VKImageLoader.e();
+                                        ImEngineExt.a(ImEngine1.a());
+                                    }
+                                    case 3 -> {
+                                        AutoPlayCacheHolder.d.a();
+                                        MediaStorage.a();
+                                    }
+                                    case 4 -> {
+                                        ImEngineProvider.b().a();
+                                        ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
+                                        ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
+                                    }
+                                    case 5 -> new WebView(requireContext()).clearCache(true);
+                                }
+                                Toast.makeText(getContext(), requireContext().getString(com.vtosters.lite.R.string.cache_cleaned), Toast.LENGTH_SHORT).show();
+                                updateCacheSize();
+                            })
+                            .show();
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "autoclearcache_btn",
+                AndroidUtils.getString("autoclearcache"),
+                "",
+                null,
+                preference -> {
+                    cacheAutoCleanDialog();
+                    return false;
+                }
+        );
+
+        var pref = Preferences.getPreferences().getString("autoclearcache", "Default");
+        switch (pref) {
+            case "Default" ->
+                    findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_disabled));
+            case "100mb" ->
+                    findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_100mb));
+            case "500mb" ->
+                    findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_500mb));
+            case "1gb" ->
+                    findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_1gb));
+            case "2gb" ->
+                    findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_2gb));
+            case "5gb" ->
+                    findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_5gb));
+        }
+
         PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), AndroidUtils.getString("accounts"));
 
         PreferenceFragmentUtils.addPreference(
@@ -175,6 +301,75 @@ public class DataSettingsFragment extends TrackedMaterialPreferenceToolbarFragme
                 }
         );
 
+        PreferenceFragmentUtils.addMaterialSwitchPreference(
+                getPreferenceScreen(),
+                "serverFeaturesDisable",
+                "Отключить всю работу с сервером",
+                "Отключает галочки и все дополнительные функции связанные с получением данных с сервера ВТостерс",
+                null,
+                false,
+                (preference, o) -> {
+                    Preferences.getPreferences().edit().putBoolean("serverFeaturesDisable", (boolean) o).apply();
+                    LifecycleUtils.restartApplicationWithTimer();
+                    return true;
+                }
+        );
+
         findPreference("analyticsDisabled").setVisible(Preferences.isValidSignature());
     }
+
+    private void updateCacheSize() {
+        findPreference("currcache").setSummary(getString(com.vtosters.lite.R.string.cache_size_summ) + ": " + CacheUtils.humanReadableByteCountBin(IOUtils.getDirSize(AndroidUtils.getGlobalContext().getCacheDir())));
+    }
+
+    @SuppressLint({"CommitPrefEdits", "SetTextI18n"})
+    private void cacheAutoCleanDialog() {
+        String[] cacheText = {null, "100 MB", "500 MB", "1 GB", "2 GB", "5 GB"};
+
+        var val = Preferences.getPreferences().getInt("autoclearcache_size", 0);
+        RadioGroup rg = new RadioGroup(getContext());
+
+        rg.setPadding(AndroidUtils.dp2px(18f), AndroidUtils.dp2px(12f), AndroidUtils.dp2px(18f), 0);
+
+        for (int item = 0; item <= 5; item++) {
+            RadioButton rb = new RadioButton(new ContextThemeWrapper(getContext(), com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
+            SwitchHook.setCompoundButton(rb);
+            rg.addView(rb);
+            rb.setId(item);
+            rb.setTextSize(TypedValue.COMPLEX_UNIT_PX, AndroidUtils.dp2px(14f));
+
+            var text = cacheText[item];
+            rb.setText(text != null ? text : AndroidUtils.getString("autoclearcachedisabled"));
+
+            rb.setTextColor(ThemesUtils.getTextAttr());
+            rb.setChecked(val == item);
+        }
+
+        new VkAlertDialog.Builder(getContext())
+                .setTitle(requireContext().getString(com.vtosters.lite.R.string.cache_clean_title))
+                .setMessage(requireContext().getString(com.vtosters.lite.R.string.cache_select_size))
+                .setCancelable(true)
+                .setNegativeButton(requireContext().getString(com.vtosters.lite.R.string.cancel), null)
+                .setView(rg)
+                .setPositiveButton(requireContext().getString(com.vtosters.lite.R.string.save), (dialog, which) -> {
+                    var sizes = new String[]{"Default", "100mb", "500mb", "1gb", "2gb", "5gb"};
+                    var id = rg.getCheckedRadioButtonId();
+                    Preferences.getPreferences().edit()
+                            .putInt("autoclearcache_size", id)
+                            .putString("autoclearcache", sizes[id])
+                            .apply();
+                })
+                .show();
+    }
+
+    @Override
+    public int T4() {
+        return com.vtosters.lite.R.string.data;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateCacheSize();
+    }
 }

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

@@ -82,6 +82,9 @@ public class DockBarEditorFragment extends BaseToolbarFragment {
             holder.bindMovingItem(tab.iconID, tab.titleID);
         });
         adapter.setMinAndMaxCounts(DockBarEditorManager.MIN_SELECTED_TABS, DockBarEditorManager.MAX_SELECTED_TABS);
+        adapter.setExceptions(
+                DockBarEditorManager.getTabByTag("tab_profile"),
+                DockBarEditorManager.getTabByTag("")/*settings*/);
 
         var recyclerView = new RecyclerView(requireContext());
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));

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

@@ -92,13 +92,6 @@ public class IconsFragment extends TrackedMaterialPreferenceToolbarFragment {
 
         this.addPreferencesFromResource(R.xml.empty);
 
-        if (!Preferences.hasVerification() && !Preferences.getBoolValue("dialogrecomm", false)) {
-            PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", requireContext().getString(R.string.icons_warning), requireContext().getString(R.string.icons_warning_info), R.drawable.ic_about_outline_28, preference -> {
-                getContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://vtosters.app/donate/")));
-                return false;
-            });
-        }
-
         PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.icons_title));
 
         for (var i = 0; i < IconManager.icons().size(); i++) {
@@ -128,37 +121,5 @@ public class IconsFragment extends TrackedMaterialPreferenceToolbarFragment {
                 return false;
             });
         }
-
-        if (!Preferences.hasVerification() && !Preferences.getBoolValue("dialogrecomm", false)) {
-            PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.unavailable_icons));
-
-            for (var i = 2; i < IconManager.sIconsPlusNames.size(); i++) {
-                if (IconManager.sIconsPlusNames.get(i) == null || IconManager.sIconsPlus.get(i) == null) return;
-
-                String iconname = IconManager.sIconsPlusNames.get(i);
-                String icon = IconManager.sIconsPlus.get(i);
-
-                int iconRes;
-
-                if (icon.equals("vt")) {
-                    iconRes = R.mipmap.vt_launcher_round;
-                } else if (icon.contains("standard")) {
-                    iconRes = R.mipmap.ic_launcher_round;
-                } else {
-                    iconRes = AndroidUtils.getIdentifier("ic_launcher_" + icon, "mipmap");
-                }
-
-                Drawable drawable = ResourcesCompat.getDrawable(getResources(), iconRes, null);
-
-                if (drawable == null) {
-                    drawable = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_bug_outline_28, null);
-                }
-
-                PreferenceFragmentUtils.addPreference(getPreferenceScreen(), icon, iconname, "", drawable, preference -> {
-                    AndroidUtils.sendToast(requireContext().getString(R.string.unavailable_icon_warning));
-                    return false;
-                });
-            }
-        }
     }
 }

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

@@ -1,6 +1,9 @@
 package ru.vtosters.lite.ui.fragments;
 
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
+import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vtosters.lite.R;
 
 public class InstallGMSFragment extends TrackedMaterialPreferenceToolbarFragment {
@@ -8,6 +11,24 @@ public class InstallGMSFragment extends TrackedMaterialPreferenceToolbarFragment
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         addPreferencesFromResource(R.xml.preferences_gms);
+
+        findPreference("microg").setOnPreferenceClickListener((preference) -> {
+            String[] items = {"Уменьшенный MicroG (ReVanced)", "Альтернативный MicroG (ReVanced)", "Полноценный MicroG (Замена GMS)"};
+
+            new VkAlertDialog.Builder(requireActivity()).setItems(items, (dialog, which) -> {
+                switch (which) {
+                    case 0 ->
+                            requireContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://github.com/TeamVanced/VancedMicroG/releases/latest/download/microg.apk")));
+                    case 1 ->
+                            requireContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://github.com/inotia00/mMicroG/releases/latest/download/microg.apk")));
+                    case 2 ->
+                            requireContext().startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://github.com/microg/GmsCore/releases")));
+                }
+                dismiss();
+            }).show();
+
+            return true;
+        });
     }
 
     @Override

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

@@ -34,7 +34,9 @@ public class InterfaceFragment extends TrackedMaterialPreferenceToolbarFragment
 
             return true;
         });
-        findPreference("superapp").setOnPreferenceClickListener(preference -> {
+        var superapp = findPreference("superapp");
+        superapp.setVisible(Preferences.milkshake());
+        superapp.setOnPreferenceClickListener(preference -> {
             LifecycleUtils.restartApplicationWithTimer();
 
             return true;
@@ -65,11 +67,20 @@ public class InterfaceFragment extends TrackedMaterialPreferenceToolbarFragment
             findPreference("showmenu").setVisible(false);
         }
 
+        var tablet = findPreference("disableForceTabletMode");
+        tablet.setVisible(AndroidUtils.isTablet());
+        tablet.setOnPreferenceClickListener(preference -> {
+            LifecycleUtils.restartApplicationWithTimer();
+            return true;
+        });
+
         findPreference("customrounding").setOnPreferenceClickListener(preference -> {
             RoundingSeekbarDialog.dialog(getContext());
             return true;
         });
 
+        findPreference("friendsblock").setVisible(Preferences.milkshake());
+
         if (Preferences.getPreferences().getInt("pic_rounding", 0) == 0) {
             findPreference("customrounding").setSummary(requireContext().getString(R.string.disabled));
         } else {

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

@@ -20,17 +20,18 @@ import okhttp3.Request;
 import org.json.JSONObject;
 import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.hooks.other.ThemesUtils;
+import ru.vtosters.lite.concurrent.VTExecutors;
 import ru.vtosters.lite.downloaders.AudioDownloader;
 import ru.vtosters.lite.downloaders.VideoDownloader;
 import ru.vtosters.lite.music.LastFMScrobbler;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
+import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.proxy.ProxyUtils;
 import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter;
 import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.LifecycleUtils;
+import ru.vtosters.lite.utils.SearchEngine;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -107,9 +108,9 @@ public class MediaFragment extends TrackedMaterialPreferenceToolbarFragment {
             findPreference("lastfm_enabled").setEnabled(false);
         }
 
-        findPreference("cached_tracks").setSummary(String.format(requireContext().getString(R.string.cached_tracks_counter), CacheDatabaseDelegate.getTrackCount()));
+        findPreference("cached_tracks").setSummary(String.format(requireContext().getString(R.string.cached_tracks_counter), MusicCacheImpl.getTracksCount()));
         findPreference("cached_tracks").setOnPreferenceClickListener(preference -> {
-            if (CacheDatabaseDelegate.getTrackCount() == 0) {
+            if (MusicCacheImpl.isEmpty()) {
                 AndroidUtils.sendToast(requireContext().getString(R.string.no_cache_error));
             } else {
                 delcache(requireContext());
@@ -122,6 +123,8 @@ public class MediaFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
+        findPreference("invertCachedTracks").setVisible(!MusicCacheImpl.isEmpty());
+
         if (!LibVKXClient.isVkxInstalled()) {
             findPreference("vkx_sett").setVisible(false);
         }
@@ -133,26 +136,26 @@ public class MediaFragment extends TrackedMaterialPreferenceToolbarFragment {
         });
 
         findPreference("select_photo_search_engine").setOnPreferenceClickListener(preference -> {
-            var deficon = ThemesUtils.recolorDrawable(AndroidUtils.getResources().getDrawable(R.drawable.ic_picture_outline_28));
-            var choiceicon = ThemesUtils.recolorDrawable(AndroidUtils.getResources().getDrawable(R.drawable.link_outline_28));
+            var items = new ImagineArrayAdapter.ImagineArrayAdapterItem[SearchEngine.values().length + 1];
+            items[0] = new ImagineArrayAdapter.ImagineArrayAdapterItem(
+                    ThemesUtils.recolorDrawable(AndroidUtils.getResources().getDrawable(R.drawable.link_outline_28)),
+                    AndroidUtils.getString("by_choice"));
+            for (int i = 0; i < SearchEngine.values().length; ++i) {
+                var engine = SearchEngine.values()[i];
+                items[i + 1] = engine.mIconRes != R.drawable.ic_picture_outline_28
+                        ? new ImagineArrayAdapter.ImagineArrayAdapterItem(engine.mIconRes, engine.mTitle)
+                        : new ImagineArrayAdapter.ImagineArrayAdapterItem(
+                        ThemesUtils.recolorDrawable(AndroidUtils.getResources().getDrawable(R.drawable.ic_picture_outline_28)),
+                        engine.mTitle);
+            }
 
-            var items = Arrays.asList(
-                    new ImagineArrayAdapter.ImagineArrayAdapterItem(choiceicon, AndroidUtils.getString("by_choice")),
-                    new ImagineArrayAdapter.ImagineArrayAdapterItem(R.drawable.yandex, "Yandex"),
-                    new ImagineArrayAdapter.ImagineArrayAdapterItem(R.drawable.google, "Google"),
-                    new ImagineArrayAdapter.ImagineArrayAdapterItem(R.drawable.microsoft, "Bing"),
-                    new ImagineArrayAdapter.ImagineArrayAdapterItem(deficon, "TraceMoe"),
-                    new ImagineArrayAdapter.ImagineArrayAdapterItem(deficon, "Ascii2d"),
-                    new ImagineArrayAdapter.ImagineArrayAdapterItem(deficon, "Saucenao")
-            );
-
-            var adapter = new ImagineArrayAdapter(requireContext(), items);
-            adapter.setSelected(Preferences.getPreferences().getInt("search_engine", 0));
+            var adapter = new ImagineArrayAdapter(requireContext(), Arrays.asList(items));
+            adapter.setSelected(SearchEngine.getDefaultSearchEngine() + 1);
 
             new VkAlertDialog.Builder(getActivity())
-                    .setAdapter(adapter, (dialog, which) -> {
-                        Preferences.getPreferences().edit().putInt("search_engine", which).apply();
-                        dialog.cancel();
+                    .setAdapter(adapter, (di, i) -> {
+                        SearchEngine.setDefaultSearchEngine(i != 0 ? i - 1 : -1);
+                        di.cancel();
                     })
                     .show();
             return true;
@@ -214,7 +217,7 @@ public class MediaFragment extends TrackedMaterialPreferenceToolbarFragment {
                 .setTitle(R.string.warning)
                 .setMessage(R.string.cached_tracks_remove_confirm)
                 .setPositiveButton(R.string.yes,
-                        (dialog, which) -> executor.submit(CacheDatabaseDelegate::clear))
+                        (dialog, which) -> executor.submit(MusicCacheImpl::clear))
                 .setNeutralButton(R.string.no,
                         (dialog, which) -> dialog.cancel())
                 .show();
@@ -239,32 +242,26 @@ public class MediaFragment extends TrackedMaterialPreferenceToolbarFragment {
     }
 
     public void deleteVideoHistory() {
-        Thread thread = new Thread(() -> {
+        VTExecutors.getIoExecutor().execute(() -> {
+            var request = new Request.a()
+                    .b("https://" + ProxyUtils.getApi() + "/method/" + "video.clearViewingHistoryRecords" + "?https=1" + "&access_token=" + AccountManagerUtils.getUserToken() + "&v=5.119")
+                    .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"))
+                    .a();
+
             try {
-                var request = new Request.a()
-                        .b("https://" + ProxyUtils.getApi() + "/method/" + "video.clearViewingHistoryRecords" + "?https=1" + "&access_token=" + AccountManagerUtils.getUserToken() + "&v=5.119")
-                        .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"))
-                        .a();
+                var response = new JSONObject(new OkHttpClient().a(request).execute().a().g());
 
-                try {
-                    var response = new JSONObject(new OkHttpClient().a(request).execute().a().g());
-
-                    if (response.optInt("response") == 1) {
-                        requireActivity().runOnUiThread(() -> AndroidUtils.sendToast(requireContext().getString(R.string.video_history_cleaned)));
-                    } else {
-                        requireActivity().runOnUiThread(() -> AndroidUtils.sendToast(requireContext().getString(R.string.delete_video_history_error)));
-                    }
-
-                    Log.d("VideoHistory", response.toString());
-                } catch (IOException e) {
-                    e.printStackTrace();
+                if (response.optInt("response") == 1) {
+                    requireActivity().runOnUiThread(() -> AndroidUtils.sendToast(requireContext().getString(R.string.video_history_cleaned)));
+                } else {
+                    requireActivity().runOnUiThread(() -> AndroidUtils.sendToast(requireContext().getString(R.string.delete_video_history_error)));
                 }
+
+                Log.d("VideoHistory", response.toString());
             } catch (Exception e) {
                 e.printStackTrace();
             }
         });
-
-        thread.start();
     }
 
     private void deleteVideoHistoryDialog(Context context) {

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

@@ -1,40 +1,23 @@
 package ru.vtosters.lite.ui.fragments;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.*;
 import android.os.Bundle;
-import android.util.TypedValue;
-import android.webkit.WebView;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
 import android.widget.Toast;
-import androidx.appcompat.view.ContextThemeWrapper;
-import b.h.g.m.FileUtils;
 import com.vk.auth.api.VKAccount;
-import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.util.ToastUtils;
-import com.vk.im.engine.ImEngine1;
-import com.vk.im.engine.ImEngineExt;
-import com.vk.im.ui.providers.audiomsg.ImAudioMsgPlayerProvider;
-import com.vk.im.ui.providers.audiomsg.PlayerActionSources;
-import com.vk.imageloader.VKImageLoader;
-import com.vk.media.player.cache.AutoPlayCacheHolder;
-import com.vk.mediastore.MediaStorage;
 import com.vk.pushes.PushSubscriber;
-import com.vk.stickers.Stickers;
 import com.vtosters.lite.R;
 import com.vtosters.lite.auth.VKAccountManager;
-import com.vtosters.lite.im.ImEngineProvider;
 import ru.vtosters.hooks.GmsHook;
-import ru.vtosters.hooks.SwitchHook;
 import ru.vtosters.hooks.other.Preferences;
-import ru.vtosters.hooks.other.ThemesUtils;
 import ru.vtosters.lite.deviceinfo.DeviceInfoCollector;
 import ru.vtosters.lite.ssfs.UsersList;
 import ru.vtosters.lite.ui.activities.VKAdminTokenActivity;
 import ru.vtosters.lite.utils.*;
 
+import static ru.vtosters.hooks.other.Preferences.getBoolValue;
+
 public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
     private static final int VK_ADMIN_TOKEN_REQUEST_CODE = 1;
 
@@ -84,7 +67,7 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
         findPreference("microgsettings").setOnPreferenceClickListener(preference -> {
             try {
                 Intent intent = new Intent(Intent.ACTION_MAIN);
-                intent.setComponent(new ComponentName("com.mgoogle.android.gms", "org.microg.gms.ui.SettingsActivity"));
+                intent.setComponent(new ComponentName((GmsHook.isFakeGms2Installed() ? "app.revanced.android.gms" : "com.mgoogle.android.gms"), "org.microg.gms.ui.SettingsActivity"));
                 startActivity(intent);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -111,11 +94,6 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("clearcache").setOnPreferenceClickListener(preference -> {
-            cacheCleanDialog();
-            return true;
-        });
-
         findPreference("copyownlink").setOnPreferenceClickListener(preference -> {
             copyText("https://vk.com/id" + AccountManagerUtils.getUserId());
             ToastUtils.a(requireContext().getString(R.string.link_copied));
@@ -127,18 +105,6 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("autoclearcache").setOnPreferenceClickListener(preference -> {
-            cacheAutoCleanDialog();
-            return true;
-        });
-
-        findPreference("datasettings").setOnPreferenceClickListener(preference -> {
-            NavigatorUtils.switchFragment(requireContext(), DataSettingsFragment.class);
-            return true;
-        });
-
-        findPreference("dialogrecomm").setVisible(!Preferences.hasVerification());
-
         findPreference("updateverifdata").setOnPreferenceClickListener(preference -> {
             UsersList.getUsersList();
             VTVerifications.load(requireContext());
@@ -146,18 +112,9 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        var pref = Preferences.getPreferences().getString("autoclearcache", "Default");
-        switch (pref) {
-            case "Default" ->
-                    findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_disabled));
-            case "100mb" ->
-                    findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_100mb));
-            case "500mb" ->
-                    findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_500mb));
-            case "1gb" -> findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_1gb));
-            case "2gb" -> findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_2gb));
-            case "5gb" -> findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_5gb));
-        }
+        findPreference("VT_Verification").setVisible(!Preferences.serverFeaturesDisable());
+        findPreference("VT_Fire").setVisible(!Preferences.serverFeaturesDisable());
+        findPreference("updateverifdata").setVisible(!Preferences.serverFeaturesDisable());
 
         var vkAdminTokenPref = findPreference("vk_admin_token");
         vkAdminTokenPref.setVisible(Preferences.getPreferences().getBoolean("new_music_downloading_way", false));
@@ -170,93 +127,6 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
         }
     }
 
-    @SuppressLint({"CommitPrefEdits", "SetTextI18n"})
-    private void cacheAutoCleanDialog() {
-        String[] cacheText = {null, "100 MB", "500 MB", "1 GB", "2 GB", "5 GB"};
-
-        var val = Preferences.getPreferences().getInt("autoclearcache_size", 0);
-        RadioGroup rg = new RadioGroup(getContext());
-
-        rg.setPadding(AndroidUtils.dp2px(18f), AndroidUtils.dp2px(12f), AndroidUtils.dp2px(18f), 0);
-
-        for (int item = 0; item <= 5; item++) {
-            RadioButton rb = new RadioButton(new ContextThemeWrapper(getContext(), com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
-            SwitchHook.setCompoundButton(rb);
-            rg.addView(rb);
-            rb.setId(item);
-            rb.setTextSize(TypedValue.COMPLEX_UNIT_PX, AndroidUtils.dp2px(14f));
-
-            var text = cacheText[item];
-            rb.setText(text != null ? text : AndroidUtils.getString("autoclearcachedisabled"));
-
-            rb.setTextColor(ThemesUtils.getTextAttr());
-            rb.setChecked(val == item);
-        }
-
-        new VkAlertDialog.Builder(getContext())
-                .setTitle(requireContext().getString(R.string.cache_clean_title))
-                .setMessage(requireContext().getString(R.string.cache_select_size))
-                .setCancelable(true)
-                .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 id = rg.getCheckedRadioButtonId();
-                    Preferences.getPreferences().edit()
-                            .putInt("autoclearcache_size", id)
-                            .putString("autoclearcache", sizes[id])
-                            .apply();
-                })
-                .show();
-    }
-
-    private void cacheCleanDialog() {
-        new VkAlertDialog.Builder(getContext())
-                .setTitle(requireContext().getString(R.string.select_which_clean))
-                .setItems(AndroidUtils.getArray(R.array.cache_cleaner), (dialog, which) -> {
-                    switch (which) {
-                        case 0 -> {
-                            SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
-                            prefs2.edit().clear().commit();
-                            clearWebViewCache();
-                            VKImageLoader.e();
-                            ImEngineProvider.b().a();
-                            ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
-                            ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
-                            FileUtils.l();
-                            Stickers.l.c();
-                            ImEngineExt.a(ImEngine1.a());
-                            AutoPlayCacheHolder.d.a();
-                            MediaStorage.a();
-                        }
-                        case 1 -> {
-                            SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
-                            prefs2.edit().clear().commit();
-                            Stickers.l.c();
-                        }
-                        case 2 -> {
-                            VKImageLoader.e();
-                            ImEngineExt.a(ImEngine1.a());
-                        }
-                        case 3 -> {
-                            AutoPlayCacheHolder.d.a();
-                            MediaStorage.a();
-                        }
-                        case 4 -> {
-                            ImEngineProvider.b().a();
-                            ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
-                            ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
-                        }
-                        case 5 -> clearWebViewCache();
-                    }
-                    Toast.makeText(getContext(), requireContext().getString(R.string.cache_cleaned), Toast.LENGTH_SHORT).show();
-                })
-                .show();
-    }
-
-    private void clearWebViewCache() {
-        new WebView(requireContext()).clearCache(true);
-    }
 
     private void copyText(String src) {
         var manager = (ClipboardManager) requireContext().getSystemService(Context.CLIPBOARD_SERVICE);