Fix crash (#1542)

libvkmedia.so armv7/arm64

app/build.gradle

@@ -91,8 +91,8 @@ task testClasses {
 }
 
 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'

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

@@ -36,8 +36,8 @@ public class TelegramStickersPack extends CustomStickersPack {
     public HashMap<String, List<Integer>> emojis = new HashMap<>();
 
     public TelegramStickersPack(String id) {
-        this.id=this.title=id;
-        this.hash=id.hashCode();
+        this.id = this.title = id;
+        this.hash = id.hashCode();
     }
 
     public JSONObject encodeEmojis() throws JSONException {

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

@@ -26,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;
@@ -48,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<>();
@@ -70,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);
 
@@ -103,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())
@@ -188,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);
@@ -221,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);
         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;
@@ -325,7 +306,7 @@ public class TelegramStickersService {
         }
     }
 
-    public void deletePack(final TelegramStickersPack pack) {
+    public void deletePack(TelegramStickersPack pack) {
         if (!ready) {
             queuedTasks.add(() -> deletePack(pack));
             return;
@@ -334,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);
@@ -355,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;
@@ -397,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/vtosters/lite/R.java

@@ -19664,6 +19664,35 @@ public final class R {
         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 int invertcached_summ = 0x7f121893; // 2131892371
+        public static final int invertcached_title = 0x7f121894; // 2131892372
+        public static final int microg_dialog1 = 0x7f121895; // 2131892373
+        public static final int microg_dialog2 = 0x7f121896; // 2131892374
+        public static final int microg_dialog3 = 0x7f121897; // 2131892375
+        public static final int serverFeaturesDisable = 0x7f121898; // 2131892376
+        public static final int serverFeaturesDisable_summ = 0x7f121899; // 2131892377
+        public static final int sett_autoupdates = 0x7f12189a; // 2131892378
+        public static final int sett_autoupdates_summ = 0x7f12189b; // 2131892379
+        public static final int sett_battery = 0x7f12189c; // 2131892380
+        public static final int sett_battery_summ1 = 0x7f12189d; // 2131892381
+        public static final int sett_battery_summ2 = 0x7f12189e; // 2131892382
+        public static final int sett_chats = 0x7f12189f; // 2131892383
+        public static final int sett_chats_summ = 0x7f1218a0; // 2131892384
+        public static final int sett_community = 0x7f1218a1; // 2131892385
+        public static final int sett_community_summ = 0x7f1218a2; // 2131892386
+        public static final int sett_missing_links = 0x7f1218a3; // 2131892387
+        public static final int sett_missing_links_summ = 0x7f1218a4; // 2131892388
+        public static final int sett_nogms_summ = 0x7f1218a5; // 2131892389
+        public static final int sett_notifs = 0x7f1218a6; // 2131892390
+        public static final int sett_notifs_summ = 0x7f1218a7; // 2131892391
+        public static final int sett_recommendations = 0x7f1218a8; // 2131892392
+        public static final int tgs_token_missing = 0x7f1218aa; // 2131892394
+        public static final int tgs_token_reset = 0x7f1218ab; // 2131892395
+        public static final int tgs_token_reset_dialog = 0x7f1218ac; // 2131892396
+        public static final int tgs_token_reset_menu = 0x7f1218ad; // 2131892397
+        public static final int update_err = 0x7f1218ae; // 2131892398
+        public static final int update_latest = 0x7f1218af; // 2131892399
+        public static final int APKTOOL_DUMMY_18a9 = 0x7f1218a9; // 2131892393
     }
 
     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/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/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/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) || getBoolValue("serverFeaturesDisable", false)) {
+        if (!getBoolValue("VT_Verification", true) || Preferences.serverFeaturesDisable()) {
             return false;
         }
 
@@ -32,7 +33,7 @@ public class VerificationsHook {
             return true;
         }
 
-        if (!getBoolValue("VT_Fire", true) || getBoolValue("serverFeaturesDisable", false)) {
+        if (!getBoolValue("VT_Fire", true) || Preferences.serverFeaturesDisable()) {
             return false;
         }
 

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

@@ -242,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);
     }
@@ -288,7 +292,7 @@ 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() {

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

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

@@ -1,6 +1,7 @@
 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;
@@ -17,7 +18,7 @@ public class MusicCacheImpl {
                 track.y1(),
                 track.I != null ? track.I.getId() + "" : "-1",
                 track.f,
-                track.g,
+                !TextUtils.isEmpty(track.g) ? track.g : "",
                 track.C,
                 track.I != null ? track.I.getTitle() : "",
                 track.K,

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

@@ -1,9 +1,15 @@
 package ru.vtosters.lite.music.converter.ts;
 
 import com.arthenica.ffmpegkit.FFmpegKit;
+import com.vk.dto.music.Artist;
 import com.vk.dto.music.MusicTrack;
+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.text.Normalizer;
+import java.util.stream.Collectors;
 
 public class FFMpeg {
 
@@ -13,47 +19,26 @@ public class FFMpeg {
      * @param track Track to be converted
      * @return True if success, else false
      */
-    public static void convert(File in, String out, MusicTrack track) throws Throwable {
+    public static void convert(File in, String out, MusicTrack track) {
         // convert .ts file to .mp3 file via ffmpeg
         var cmd = " -y -i \"" + in.getAbsolutePath() + '"'
                 + " -map 0 -dn"
                 + " -loglevel error"
                 + " -hide_banner"
                 + " -write_id3v2 1"
-//                +" -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())+'"'
+                + setMetadata(track)
                 + " -c copy \"" + out + '"';
         var ses = FFmpegKit.execute(cmd);
         if (ses.getReturnCode().isValueCancel()) throw new RuntimeException(ses.getLogsAsString());
     }
 
-    private static String normalizeMetadata(String in) {
-        return in.replace('"', '‟');
+    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 copyAssets()
-//    throws IOException
-//    {
-//        try
-//        {
-//            for (var filename:AndroidUtils.getGlobalContext().getAssets().list("ffmpeg"))
-//                if(filename.endsWith(".so"))
-//                    IOUtils.writeToFile(
-//                        new File(AndroidUtils.getGlobalContext().getFilesDir(),filename),
-//                        IOUtils.readFully(AndroidUtils.getGlobalContext().getAssets().open("ffmpeg"+File.separator+filename)));
-//        }
-//        catch(IOException e)
-//        { throw e; }
-//    }
-//
-//    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/downloader/M3UDownloader.java

@@ -48,25 +48,23 @@ public class M3UDownloader
         var resultMp3 = getResultMp3File(outDir, cache, track);
         try {
             CompletableFuture.allOf(createFutures(baseUri, segments, progress, callback, track))
-                    .thenRun(() ->
-                    {
-                        if (cache)
+                    .thenRun(() -> {
+                        if (cache) {
                             try {
                                 ThumbnailDownloader.downloadThumbnails(track);
                             } catch (IOException e) {
                                 throw new RuntimeException("Failed to download thumbs", e);
                             }
+                        }
                     })
-                    .thenRun(() ->
-                    {
+                    .thenRun(() -> {
                         try {
                             TSMerger.merge(getTsesDir(track), resultTs);
                         } catch (Throwable e) {
                             throw new RuntimeException("Failed to merge ts files", e);
                         }
                     })
-                    .thenRun(() ->
-                    {
+                    .thenRun(() -> {
                         try {
                             FFMpeg.convert(resultTs, resultMp3.getAbsolutePath(), track);
                         } catch (Throwable e) {
@@ -74,12 +72,18 @@ public class M3UDownloader
                         }
                     })
                     .thenRun(() -> callback.onProgress(10 + Math.round(80.0f * progress.addAndGet(1) / segments.size())))
-                    .thenRun(() -> MusicCacheImpl.addTrack(track))
+                    .thenRun(() -> {
+                        if (cache) {
+                            MusicCacheImpl.addTrack(track);
+                        }
+                    })
                     .whenComplete((unused, tr) -> {
                         if (tr != null) {
                             IOUtils.deleteRecursive(MusicCacheStorageUtils.getTrackDirById(track.y1()));
                             callback.onFailure();
-                        } else callback.onSuccess();
+                        } else {
+                            callback.onSuccess();
+                        }
                         IOUtils.deleteRecursive(getTsesDir(track));
                     })
                     .join();
@@ -132,7 +136,7 @@ public class M3UDownloader
     }
 
     public static String getTitle(MusicTrack track) {
-        return track.f + (!TextUtils.isEmpty(track.g) ? +'(' + track.g + ')' : null);
+        return track.f + (!TextUtils.isEmpty(track.g) ? + '(' + track.g + ')' : "");
     }
 
     static File getTsesDir(MusicTrack track) {

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/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;
@@ -27,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") || getBoolValue("serverFeaturesDisable", false)) {
+        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/ui/dialogs/OTADialog.java

@@ -64,7 +64,7 @@ public class OTADialog extends ModalBottomSheetWrapper<OTADialog> implements OTA
     public void onUpdateLatest(boolean isManualCheck) {
         if (isManualCheck) {
             mActivity.runOnUiThread(() -> {
-                Toast.makeText(mActivity, "У вас установлена последняя версия приложения", Toast.LENGTH_SHORT).show();
+                Toast.makeText(mActivity, AndroidUtils.getString("update_latest"), Toast.LENGTH_SHORT).show();
             });
         }
     }
@@ -72,7 +72,7 @@ public class OTADialog extends ModalBottomSheetWrapper<OTADialog> implements OTA
     @Override
     public void onUpdateError() {
         mActivity.runOnUiThread(() -> {
-            Toast.makeText(mActivity, "Ошибка проверки обновления", Toast.LENGTH_SHORT).show();
+            Toast.makeText(mActivity, AndroidUtils.getString("update_err"), Toast.LENGTH_SHORT).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

@@ -304,8 +304,8 @@ public class DataSettingsFragment extends TrackedMaterialPreferenceToolbarFragme
         PreferenceFragmentUtils.addMaterialSwitchPreference(
                 getPreferenceScreen(),
                 "serverFeaturesDisable",
-                "Отключить всю работу с сервером",
-                "Отключает галочки и все дополнительные функции связанные с получением данных с сервера ВТостерс",
+                AndroidUtils.getString("serverFeaturesDisable"),
+                AndroidUtils.getString("serverFeaturesDisable_summ"),
                 null,
                 false,
                 (preference, o) -> {

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

@@ -5,6 +5,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vtosters.lite.R;
+import ru.vtosters.lite.utils.AndroidUtils;
 
 public class InstallGMSFragment extends TrackedMaterialPreferenceToolbarFragment {
     @Override
@@ -13,7 +14,7 @@ public class InstallGMSFragment extends TrackedMaterialPreferenceToolbarFragment
         addPreferencesFromResource(R.xml.preferences_gms);
 
         findPreference("microg").setOnPreferenceClickListener((preference) -> {
-            String[] items = {"Уменьшенный MicroG (ReVanced)", "Альтернативный MicroG (ReVanced)", "Полноценный MicroG (Замена GMS)"};
+            String[] items = {AndroidUtils.getString("microg_dialog1"), AndroidUtils.getString("microg_dialog2"), AndroidUtils.getString("microg_dialog3")};
 
             new VkAlertDialog.Builder(requireActivity()).setItems(items, (dialog, which) -> {
                 switch (which) {

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

@@ -67,6 +67,13 @@ 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;

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

@@ -112,9 +112,9 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("VT_Verification").setVisible(!getBoolValue("serverFeaturesDisable", false));
-        findPreference("VT_Fire").setVisible(!getBoolValue("serverFeaturesDisable", false));
-        findPreference("updateverifdata").setVisible(!getBoolValue("serverFeaturesDisable", false));
+        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));

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

@@ -147,7 +147,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
                         getPreferenceScreen(),
                         "",
                         requireContext().getString(R.string.vtssfs),
-                        getSSFSsumm(),
+                        "",
                         R.drawable.ic_link_circle_outline_28,
                         preference -> {
                             VKUIwrapper.setLink(Utils.getVKUILink());
@@ -196,14 +196,14 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
         }
 
         if ((isLinksUnverified || isDozingAvailable || areNotificationsDisabled || isGMSNotInstalled) && !Preferences.getBoolValue("dialogrecomm", false)) {
-            PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), "Рекомендации");
+            PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), AndroidUtils.getString("sett_recommendations"));
 
             if (isGMSNotInstalled) {
                 PreferenceFragmentUtils.addPreference(
                         getPreferenceScreen(),
                         "",
                         requireContext().getString(R.string.installgms),
-                        "Отсутствие этих сервисов приводит к поломке фоновых уведомлений и проблемам работы компонентов приложения",
+                        AndroidUtils.getString("sett_nogms_summ"),
                         RecolorUtils.recolorDrawable(R.drawable.ic_logo_google_28, ThemesUtils.getColor(R.color.red)),
                         preference -> {
                             NavigatorUtils.switchFragment(requireContext(), InstallGMSFragment.class);
@@ -216,8 +216,8 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
                 PreferenceFragmentUtils.addPreference(
                         getPreferenceScreen(),
                         "",
-                        "Не выбраны ссылки для открытия приложением",
-                        "Это помешает открытию внешних ссылок для их открытия с помощью этого приложения\n\nВ некоторых случаях необходимо отключить открытие ссылок официальным приложениям ВКонтакте",
+                        AndroidUtils.getString("sett_missing_links"),
+                        AndroidUtils.getString("sett_missing_links_summ"),
                         RecolorUtils.recolorDrawable(R.drawable.ic_linked_outline_28, ThemesUtils.getColor(R.color.red)),
                         preference -> {
                             try {
@@ -240,8 +240,8 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
                 PreferenceFragmentUtils.addPreference(
                         getPreferenceScreen(),
                         "",
-                        "Отключите экономию батареи",
-                        "Экономия батареи мешает получению фоновых сообщений, уведомлений и работе музыки" + (OEMDetector.isMIUI() ? "\n\nДля устройств Xiaomi необходимо вручную включить в настройках системы пункт Автозапуск данному приложению" : ""),
+                        AndroidUtils.getString("sett_battery"),
+                        AndroidUtils.getString("sett_battery_summ1") + (OEMDetector.isMIUI() ? AndroidUtils.getString("sett_battery_summ2") : ""),
                         RecolorUtils.recolorDrawable(R.drawable.ic_filter_outline_28, ThemesUtils.getColor(R.color.red)),
                         preference -> {
                             @SuppressLint("BatteryLife")
@@ -258,8 +258,8 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
                 PreferenceFragmentUtils.addPreference(
                         getPreferenceScreen(),
                         "",
-                        "Включите уведомления",
-                        "Без включенных уведомлений не получится получать сообщения и многое другое",
+                        AndroidUtils.getString("sett_notifs"),
+                        AndroidUtils.getString("sett_notifs_summ"),
                         RecolorUtils.recolorDrawable(R.drawable.ic_notifications_outline_28, ThemesUtils.getColor(R.color.red)),
                         preference -> {
                             @SuppressLint("BatteryLife")
@@ -616,8 +616,8 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
         PreferenceFragmentUtils.addPreference(
                 getPreferenceScreen(),
                 "",
-                "Наши чаты",
-                "Активные чаты по обсуждению модификации и многому другому",
+                AndroidUtils.getString("sett_chats"),
+                AndroidUtils.getString("sett_chats_summ"),
                 R.drawable.ic_message_outline_28,
                 preference -> {
                     var args = new Bundle();
@@ -635,8 +635,8 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
         PreferenceFragmentUtils.addPreference(
                 getPreferenceScreen(),
                 "",
-                "Наши сообщества",
-                "Самая свежая информация об обновлениях и не только!",
+                AndroidUtils.getString("sett_community"),
+                AndroidUtils.getString("sett_community_summ"),
                 R.drawable.users_3_outline_28,
                 preference -> {
                     var args = new Bundle();
@@ -689,6 +689,19 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
                         return false;
                     }
             );
+
+            PreferenceFragmentUtils.addMaterialSwitchPreference(
+                    getPreferenceScreen(),
+                    "autoupdates",
+                    AndroidUtils.getString("sett_autoupdates"),
+                    AndroidUtils.getString("sett_autoupdates_summ"),
+                    R.drawable.ic_history_outline_28,
+                    true,
+                    (preference, o) -> {
+                        Preferences.getPreferences().edit().putBoolean("autoupdates", (boolean) o).apply();
+                        return true;
+                    }
+            );
         }
     }
 

app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java

@@ -28,21 +28,16 @@ import ru.vtosters.lite.ui.adapters.StickerPackAdapter;
 import ru.vtosters.lite.ui.components.StickerTouchHelperCallback;
 import ru.vtosters.lite.ui.fragments.BaseToolbarFragment;
 import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.NavigatorUtils;
 
 import java.io.File;
 
 public class StickersFragment extends BaseToolbarFragment {
-    public final static String ACTION_RELOAD = "com.vtosters.lite.action.RELOAD_TGS_LIST";
-
-    final static int TYPE_DIRECT = 0;
-    final static int TYPE_SOCKS = 2;
-
+    public static String ACTION_RELOAD = "com.vtosters.lite.action.RELOAD_TGS_LIST";
     TelegramStickersGrabber mGrabber;
     StickerPackAdapter mAdapter;
     boolean movePending = false;
     int from, to;
-    final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+    BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @SuppressLint("NotifyDataSetChanged")
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -59,13 +54,28 @@ public class StickersFragment extends BaseToolbarFragment {
         }
     };
 
+    private static void resetToken(Context ctx) {
+        if (TGPref.getTGBotKey() == null) AndroidUtils.sendToast(AndroidUtils.getString("tgs_token_missing"));
+        new VkAlertDialog.Builder(ctx)
+                .setTitle(AndroidUtils.getString("tgs_token_reset_dialog"))
+                .setNegativeButton(R.string.cancel, (dialog, which) -> {
+                    dialog.cancel();
+                })
+                .setPositiveButton(R.string.ok, (dialog, which) -> {
+                    TGPref.setTGBotKey(null);
+                    AndroidUtils.sendToast(AndroidUtils.getString("tgs_token_reset"));
+                })
+                .show();
+    }
+
     @Override
     protected void onCreateMenu(Menu menu) {
         menu.add(0, 0, 0, "")
                 .setIcon(ThemesUtils.recolorDrawable(requireContext().getDrawable(R.drawable.ic_add_outline_28)))
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         menu.add(0, 1, 0, "")
-                .setIcon(R.drawable.ic_settings_outline_28)
+                .setIcon(ThemesUtils.recolorDrawable(requireContext().getDrawable(R.drawable.ic_refresh_outline_28)))
+                .setTitle(AndroidUtils.getString("tgs_token_reset_menu"))
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         super.onCreateMenu(menu);
     }
@@ -74,16 +84,11 @@ public class StickersFragment extends BaseToolbarFragment {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case 0 -> addTgsPack();
-            case 1 -> openMenu(null);
+            case 1 -> resetToken(requireContext());
         }
         return true;
     }
 
-    private void openMenu(String toast) {
-        if (toast != null) Toast.makeText(requireContext(), toast, Toast.LENGTH_SHORT).show();
-        NavigatorUtils.switchFragment(requireContext(), StickersPreferencesFragment.class);
-    }
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -96,14 +101,14 @@ public class StickersFragment extends BaseToolbarFragment {
     public View onCreateContent(@NonNull LayoutInflater inflater, @Nullable Bundle bundle) {
         setTitle(R.string.vtltgs);
 
-        final var container = new FrameLayout(requireContext());
-        final var recycler = new RecyclerView(requireContext());
+        var container = new FrameLayout(requireContext());
+        var recycler = new RecyclerView(requireContext());
 
         mAdapter = new StickerPackAdapter();
         recycler.setAdapter(mAdapter);
 
-        final var callback = new StickerTouchHelperCallback(mAdapter);
-        final var touchHelper = new ItemTouchHelper(callback);
+        var callback = new StickerTouchHelperCallback(mAdapter);
+        var touchHelper = new ItemTouchHelper(callback);
         touchHelper.attachToRecyclerView(recycler);
 
         recycler.setLayoutManager(new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL));
@@ -124,80 +129,50 @@ public class StickersFragment extends BaseToolbarFragment {
     }
 
     private void addTgsPack() {
-        final var method = TGPref.getTGConnectMethod();
-        if (method != -1) {
-            initGrabber();
-            switch (method) {
-                case TYPE_SOCKS -> {
-                    if (TGPref.getTGProxyIP() == null) openMenu(requireContext().getString(R.string.stickersproxy1));
-                }
-                case TYPE_DIRECT -> {
-                    initGrabber();
-                    final Runnable lambda = () ->
+        initGrabber();
+        Runnable lambda = () -> {
+            var container = new LinearLayout(requireContext());
+
+            var input = new EditText(requireContext());
+            var inputLP = new ViewGroup.MarginLayoutParams(-1, -2);
+            inputLP.setMargins(
+                    AndroidUtils.dp2px(24.f),
+                    0,
+                    AndroidUtils.dp2px(24.f),
+                    0);
+            container.addView(input, inputLP);
+
+            new VkAlertDialog.Builder(requireContext())
+                    .setTitle(R.string.stickershelp1)
+                    //  .setMessage(R.string.stickershelp2)
+                    .setView(container)
+                    .setPositiveButton(android.R.string.ok, (dialog, which) ->
                     {
-                        final var container = new LinearLayout(requireContext());
+                        var packId = input.getText().toString();
+                        if (packId.startsWith("https://"))
+                            packId = packId.substring(packId.lastIndexOf('/') + 1);
+                        TelegramStickersService.getInstance(requireContext())
+                                .requestPackDownload(
+                                        packId,
+                                        new File(requireContext().getFilesDir(), "VT-Stickers/" + packId));
+                    })
+                    .setNeutralButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
+                    .show();
+        };
 
-                        final var input = new EditText(requireContext());
-                        final var inputLP = new ViewGroup.MarginLayoutParams(-1, -2);
-                        inputLP.setMargins(
-                                AndroidUtils.dp2px(24.f),
-                                0,
-                                AndroidUtils.dp2px(24.f),
-                                0);
-                        container.addView(input, inputLP);
-
-                        new VkAlertDialog.Builder(requireContext())
-                                .setTitle(R.string.stickershelp1)
-                                //  .setMessage(R.string.stickershelp2)
-                                .setView(container)
-                                .setPositiveButton(android.R.string.ok, (dialog, which) ->
-                                {
-                                    var packId = input.getText().toString();
-                                    if (packId.startsWith("https://"))
-                                        packId = packId.substring(packId.lastIndexOf('/') + 1);
-                                    TelegramStickersService.getInstance(requireContext())
-                                            .requestPackDownload(
-                                                    packId,
-                                                    new File(requireContext().getFilesDir(), "VT-Stickers/" + packId));
-                                })
-                                .setNeutralButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
-                                .show();
-                    };
-
-                    if (TGPref.getTGBotKey() == null) enterBotKey(() -> checkApiKey(lambda));
-                    else checkApiKey(lambda);
-                }
-            }
-        } else openMenu(requireContext().getString(R.string.stickersconnection));
+        if (TGPref.getTGBotKey() == null) enterBotKey(() -> checkApiKey(lambda));
+        else checkApiKey(lambda);
     }
 
     private void initGrabber() {
-        switch (TGPref.getTGConnectMethod()) {
-            case TYPE_DIRECT -> {
-                TelegramStickersGrabber.USE_PROXY = false;
-                mGrabber.resetProxy();
-            }
-            case TYPE_SOCKS -> {
-                if (TGPref.getTGProxyIP() == null) break;
-                TelegramStickersGrabber.USE_PROXY = true;
-                TelegramStickersGrabber.PROXY_IP = TGPref.getTGProxyIP();
-                TelegramStickersGrabber.PROXY_PORT = TGPref.getTGProxyPort();
-                if (TGPref.isTGProxyPassEnabled()) {
-                    TelegramStickersGrabber.HAS_PASS = true;
-                    TelegramStickersGrabber.PROXY_USER = TGPref.getTGProxyUser();
-                    TelegramStickersGrabber.PROXY_PASS = TGPref.getTGProxyPass();
-                }
-                mGrabber.enableProxy();
-            }
-        }
         TelegramStickersGrabber.updateURLs();
     }
 
     private void enterBotKey(Runnable callback) {
-        final var container = new LinearLayout(requireContext());
+        var container = new LinearLayout(requireContext());
 
-        final var input = new EditText(requireContext());
-        final var inputLP = new ViewGroup.MarginLayoutParams(-1, -2);
+        var input = new EditText(requireContext());
+        var inputLP = new ViewGroup.MarginLayoutParams(-1, -2);
         inputLP.setMargins(
                 AndroidUtils.dp2px(24.f),
                 0,
@@ -222,7 +197,7 @@ public class StickersFragment extends BaseToolbarFragment {
                                         .setMessage(requireContext().getString(R.string.stickersapi9) +
                                                 requireContext().getString(R.string.stickersapi10))
                                         .setNeutralButton(AndroidUtils.getString("open_bot"), (dl, i) -> {
-                                            final var intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://t.me/botfather"))
+                                            var intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://t.me/botfather"))
                                                     .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                                             requireActivity().startActivity(intent);
                                         })
@@ -235,7 +210,7 @@ public class StickersFragment extends BaseToolbarFragment {
     private void checkApiKey(Runnable callback) {
         mGrabber.setBotApiKey(TGPref.getTGBotKey());
 
-        final var dialog = new ProgressDialog(requireContext());
+        var dialog = new ProgressDialog(requireContext());
         dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
         dialog.setMessage(requireContext().getString(R.string.stickersapi1));
         dialog.show();

app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersPreferencesFragment.java

@@ -1,87 +0,0 @@
-package ru.vtosters.lite.ui.fragments.tgstickers;
-
-import android.os.Bundle;
-import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
-import com.vk.core.util.ToastUtils;
-import com.vtosters.lite.R;
-import ru.vtosters.lite.tgs.TGPref;
-import ru.vtosters.lite.tgs.TGRoot;
-import ru.vtosters.lite.ui.PreferenceFragmentUtils;
-import ru.vtosters.lite.ui.fragments.TrackedMaterialPreferenceToolbarFragment;
-
-public class StickersPreferencesFragment extends TrackedMaterialPreferenceToolbarFragment {
-
-    @Override
-    public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-
-        int vtosterXml = R.xml.empty;
-        addPreferencesFromResource(vtosterXml);
-
-        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.sprefsstickers));
-        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", R.string.sprefsdelkey, 0, 0, preference -> {
-            TGPref.setTGBotKey(null);
-            ToastUtils.a(requireContext().getString(R.string.sprefsdelkey2));
-            return false;
-        });
-
-        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), requireContext().getString(R.string.sprefsnetwork));
-        PreferenceFragmentUtils.addListPreference(getPreferenceScreen(), "VTGS:CM", "0", requireContext().getString(R.string.sprefsctype), new CharSequence[]{
-                requireContext().getString(R.string.ctypedirect), requireContext().getString(R.string.ctypesocks)
-        }, new String[]{
-                "0", "2"
-        });
-
-        findPreference("VTGS:CM").setTitle(TGRoot.getSummary());
-
-        findPreference("VTGS:CM").setOnPreferenceChangeListener((preference, o) -> {
-            String newData = (String) o;
-            TGPref.setTGConnectMethod(Integer.parseInt(newData));
-            TelegramStickersGrabber.updateURLs();
-            preference.setTitle(TGRoot.getSummary());
-            return true;
-        });
-
-        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), R.string.ssocks);
-
-        PreferenceFragmentUtils.addEditTextPreference(getPreferenceScreen(), "tg_proxy_host", R.string.ssockshost, (preference, o) -> {
-            TGPref.setTGProxyIP(o);
-            return true;
-        });
-        PreferenceFragmentUtils.addEditTextPreference(getPreferenceScreen(), "tg_proxy_port", R.string.ssocksport, (preference, o) -> {
-            try {
-                TGPref.setTGProxyPort(Integer.parseInt(o));
-                return true;
-            } catch (Exception e) {
-                ToastUtils.a(requireContext().getString(R.string.ssockswport));
-                return false;
-            }
-        });
-        PreferenceFragmentUtils.addMaterialSwitchPreference(getPreferenceScreen(), "tg_proxy_auth", requireContext().getString(R.string.ssocksauth), "", 0, false, (preference, o) -> {
-            boolean value = (boolean) o;
-
-            findPreference("tg_proxy_login").setEnabled(value);
-            findPreference("tg_proxy_pass").setEnabled(value);
-
-            TGPref.setTGProxyPassEnabled(value);
-            return true;
-        });
-        PreferenceFragmentUtils.addEditTextPreference(getPreferenceScreen(), "tg_proxy_login", R.string.ssockslogin, (preference, o) -> {
-            TGPref.setTGProxyUserPass(o, TGPref.getTGProxyPass());
-            return true;
-        });
-        PreferenceFragmentUtils.addEditTextPreference(getPreferenceScreen(), "tg_proxy_pass", R.string.ssockspass, (preference, o) -> {
-            TGPref.setTGProxyUserPass(TGPref.getTGProxyUser(), o);
-            return true;
-        });
-
-        findPreference("tg_proxy_login").setEnabled(TGPref.isTGProxyPassEnabled());
-        findPreference("tg_proxy_pass").setEnabled(TGPref.isTGProxyPassEnabled());
-    }
-
-    @Override
-    public int T4() {
-        return R.string.vtltgs;
-    }
-}
-

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

@@ -12,13 +12,14 @@ import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationManagerCompat;
-import com.vk.core.util.Screen;
 import com.vk.core.util.ToastUtils;
 import com.vtosters.lite.general.fragments.WebViewFragment;
+import ru.vtosters.hooks.other.Preferences;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -32,6 +33,12 @@ import java.util.Random;
 
 public class AndroidUtils {
     private static final String ALLOWED_CHARACTERS = "0123456789qwertyuiopasdfghjklzxcvbnm";
+    public enum ScreenSize {
+        small,
+        normal,
+        large,
+        xlarge
+    }
 
     public static boolean isDebuggable() {
         return 0 != (AndroidUtils.getGlobalContext().getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE);
@@ -44,7 +51,8 @@ public class AndroidUtils {
     }
 
     public static boolean isTablet() {
-        return Screen.l(getGlobalContext());
+        String string = getGlobalContext().getResources().getString(b.h.g.d.screen_size);
+        return TextUtils.equals(string, ScreenSize.large.name()) || TextUtils.equals(string, ScreenSize.xlarge.name());
     }
 
     @NonNull

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

@@ -52,7 +52,7 @@ public class LifecycleUtils {
     }
 
     public static Activity getCurrentActivity() {
-        return activities.size() > 0 ? activities.get(activities.size() - 1) : new MainActivity();
+        return !activities.isEmpty() ? activities.get(activities.size() - 1) : new MainActivity();
     }
 
     public static void restartApplication() {

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

@@ -3,6 +3,7 @@ package ru.vtosters.lite.utils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
 
 import static ru.vtosters.lite.foaf.FoafBase.getBypassedOnlineInfo;
 
@@ -13,7 +14,7 @@ public class OnlineBypass {
             return json;
         }
         var onlineinfo = json.optJSONObject("online_info");
-        if (onlineinfo != null && !onlineinfo.optBoolean("visible")) {
+        if (onlineinfo != null && !onlineinfo.optBoolean("visible") && !Preferences.serverFeaturesDisable()) {
             var bypassed = getBypassedOnlineInfo(id);
             if (bypassed.optInt("last_seen", 0) != 0) {
                 json.remove("online_info");
@@ -37,7 +38,7 @@ public class OnlineBypass {
     }
 
     public static JSONArray setOnlineInfoUsers(JSONArray profiles) throws JSONException {
-        if (profiles == null || profiles.length() == 0) return profiles;
+        if (profiles == null || profiles.length() == 0 || Preferences.serverFeaturesDisable()) return profiles;
         StringBuilder sb = new StringBuilder();
         var curVkId = AccountManagerUtils.getUserId();
         for (int i = 0; i < profiles.length(); i++) {
@@ -51,7 +52,7 @@ public class OnlineBypass {
             sb.append(",");
         }
         var ids = sb.toString();
-        if (ids.length() > 0) {
+        if (!ids.isEmpty()) {
             ids = ids.substring(0, ids.length() - 1);
         } else {
             return profiles;

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

@@ -7,6 +7,7 @@ import okhttp3.*;
 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 java.io.IOException;
@@ -31,7 +32,7 @@ public class VTVerifications {
             return;
         }
 
-        if ((!NetworkUtils.isNetworkConnected() && NetworkUtils.isInternetSlow() || getBoolValue("isRoamingState", false)) && prefs.contains("ids") || getBoolValue("serverFeaturesDisable", false)) {
+        if ((!NetworkUtils.isNetworkConnected() && NetworkUtils.isInternetSlow() || getBoolValue("isRoamingState", false)) && prefs.contains("ids") || Preferences.serverFeaturesDisable()) {
             parseJson(prefs.getString("ids", "[]"));
             Log.d("VTVerifications", "load from memory. Roaming or Network issues");
             isLoaded = true;

smali/apktool.yml

@@ -25,5 +25,5 @@ usesFramework:
   tag: null
 version: 2.6.0
 versionInfo:
-  versionCode: '4838'
+  versionCode: '4839'
   versionName: 5.56.1

smali/res/values-be/strings.xml

@@ -6097,7 +6097,7 @@
     <string name="BGStickerssum">Для ўключэння/адключэння вам неабходна ачысціць кэш прыкладання</string>
     <string name="addinf">дадатковая інфармацыя</string>
     <string name="copyid">Скапіяваць ID</string>
-    <string name="vtssfs">VT Функцыі</string>
+    <string name="vtssfs">Серверныя функцыі</string>
     <string name="vticon">Іконка дадатку</string>
     <string name="vticonbtn">Выкарыстоўваць арыгінальную іконку</string>
     <string name="vticonsummary">Выкарыстанне арыгінальнай назвы і іконкі дадатку як у афіцыйнага кліента VK</string>
@@ -6311,7 +6311,7 @@
     <string name="friendsblock_title">Схаваць сяброў</string>
     <string name="friendsblock_summ">Схаваць блок рэкамендацый сяброў у сябрах</string>
     <string name="onlineformatter_title">Пашыраны анлайн</string>
-    <string name="onlineformatter_summ">Паказваць з якога прыкладання/кліента чалавек у анлайне</string>
+    <string name="onlineformatter_summ">Паказваць з якога прыкладання/кліента чалавек у анлайне\n\nНапрыклад: Онлайн З дапамогай Kate Mobile</string>
     <string name="voices_vtl">Галасавыя паведамленні</string>
     <string name="disable_voice_listening_summ">Функцыя дазваляе не адпраўляць статут праслухоўвання галасавых
         паведамленняў чалавека вамі
@@ -7034,4 +7034,34 @@
 
     <string name="invertcached_title">Інвертаваць cпіс</string>
     <string name="invertcached_summ">Інвертаваць cпіс кэшаваных трэкаў</string>
+
+    <string name="sett_recommendations">Рэкамендацыі</string>
+    <string name="sett_nogms_summ">Адсутнасць гэтых сэрвісаў прыводзіць да паломкі фонавых апавяшчэнняў і праблемах працы кампанентаў прыкладання</string>
+    <string name="sett_missing_links">Не абраныя спасылкі для адкрыцця дадаткам</string>
+    <string name="sett_missing_links_summ">Гэта перашкодзіць адкрыццю знешніх спасылак для іх адкрыцця з дапамогай гэтага прыкладання\n\nБ некаторых выпадках неабходна адключыць адкрыццё спасылак афіцыйным прыкладанням ВКонтакте</string>
+    <string name="sett_battery">Адключыце эканомію батарэі</string>
+    <string name="sett_battery_summ1">Эканомія батарэі перашкаджае атрыманню фонавых паведамленняў, апавяшчэнняў і працы музыкі</string>
+    <string name="sett_battery_summ2">\n\nДля прылад Xiaomi неабходна ўручную ўключыць у наладах сістэмы пункт Аўтазапуск дадзеным дадаткам</string>
+    <string name="sett_notifs">Уключыце апавяшчэння</string>
+    <string name="sett_notifs_summ">Без уключаных апавяшчэнняў не атрымаецца атрымліваць паведамленні і многае іншае</string>
+    <string name="sett_chats">Нашы чаты</string>
+    <string name="sett_chats_summ">Актыўныя чаты па абмеркаванні мадыфікацыі і шмат чаму іншаму</string>
+    <string name="sett_community">Наша група</string>
+    <string name="sett_community_summ">Самая свежая інфармацыя аб абнаўленнях і не толькі</string>
+    <string name="sett_autoupdates">Аўтаматычнае абнаўленне</string>
+    <string name="sett_autoupdates_summ">Атрымліваць апавяшчэнне аб выхадзе новай версіі прыкладання</string>
+
+    <string name="update_latest">У вас ўстаноўлена АПОШНЯЯ версія прыкладання</string>
+    <string name="update_err">Памылка праверкі абнаўлення</string>
+    <string name="serverFeaturesDisable">Адключыць усю працу з серверам</string>
+    <string name="serverFeaturesDisable_summ">Адключае верыфікацыі і ўсе дадатковыя функцыі звязаныя з атрыманнем дадзеных з сервера ВТостерс</string>
+
+    <string name="tgs_token_missing">Токен адсутнічае</string>
+    <string name="tgs_token_reset_dialog">Скінуць токен бота?</string>
+    <string name="tgs_token_reset">Токен бота скінуты</string>
+    <string name="tgs_token_reset_menu">Скінуць токен бота</string>
+
+    <string name="microg_dialog1">Паменшаны MicroG (ReVanced)</string>
+    <string name="microg_dialog2">Альтэрнатыўны MicroG (ReVanced)</string>
+    <string name="microg_dialog3">Паўнавартасны MicroG (Замена GMS)</string>
 </resources>

smali/res/values-ru/strings.xml

@@ -5446,7 +5446,7 @@
     <string name="BGStickerssum">Для включения/отключения вам необходимо очистить кеш приложения</string>
     <string name="addinf">Дополнительная информация</string>
     <string name="copyid">Скопировать айди</string>
-    <string name="vtssfs">VT Функции</string>
+    <string name="vtssfs">Серверные функции</string>
     <string name="vticon">Иконка приложения</string>
     <string name="vticonbtn">Использовать оригинальную иконку</string>
     <string name="vticonsummary">Использование оригинального названия и иконки приложения как у официального клиента ВК</string>
@@ -5640,7 +5640,7 @@
     <string name="friendsblock_title">Скрыть друзей</string>
     <string name="friendsblock_summ">Скрыть блок рекомендаций друзей в друзьях</string>
     <string name="onlineformatter_title">Расширенный онлайн</string>
-    <string name="onlineformatter_summ">Показывать с какого приложения/клиента человек в онлайне</string>
+    <string name="onlineformatter_summ">Показывать с какого приложения/клиента человек в онлайне\n\nНапример: Онлайн с помощью Kate Mobile</string>
     <string name="voices_vtl">Голосовые сообщения</string>
     <string name="disable_voice_listening_summ">Функция позволяет не отправлять статус прослушивания голосовых сообщений человека вами</string>
     <string name="listen_v_title">Отключить статус прослушивания</string>
@@ -6417,4 +6417,34 @@
 
     <string name="invertcached_title">Инвертировать список</string>
     <string name="invertcached_summ">Инвертировать список кешированных треков</string>
+
+    <string name="sett_recommendations">Рекомендации</string>
+    <string name="sett_nogms_summ">Отсутствие этих сервисов приводит к поломке фоновых уведомлений и проблемам работы компонентов приложения</string>
+    <string name="sett_missing_links">Не выбраны ссылки для открытия приложением</string>
+    <string name="sett_missing_links_summ">Это помешает открытию внешних ссылок для их открытия с помощью этого приложения\n\nВ некоторых случаях необходимо отключить открытие ссылок официальным приложениям ВКонтакте</string>
+    <string name="sett_battery">Отключите экономию батареи</string>
+    <string name="sett_battery_summ1">Экономия батареи мешает получению фоновых сообщений, уведомлений и работе музыки</string>
+    <string name="sett_battery_summ2">\n\nДля устройств Xiaomi необходимо вручную включить в настройках системы пункт Автозапуск данному приложению</string>
+    <string name="sett_notifs">Включите уведомления</string>
+    <string name="sett_notifs_summ">Без включенных уведомлений не получится получать сообщения и многое другое</string>
+    <string name="sett_chats">Наши чаты</string>
+    <string name="sett_chats_summ">Активные чаты по обсуждению модификации и многому другому</string>
+    <string name="sett_community">Наши сообщества</string>
+    <string name="sett_community_summ">Самая свежая информация об обновлениях и не только</string>
+    <string name="sett_autoupdates">Автоматическое обновление</string>
+    <string name="sett_autoupdates_summ">Получать уведомление о выходе новой версии приложения</string>
+
+    <string name="update_latest">У вас установлена последняя версия приложения</string>
+    <string name="update_err">Ошибка проверки обновления</string>
+    <string name="serverFeaturesDisable">Отключить всю работу с сервером</string>
+    <string name="serverFeaturesDisable_summ">Отключает галочки и все дополнительные функции связанные с получением данных с сервера ВТостерс</string>
+
+    <string name="tgs_token_missing">Токен отсутствует</string>
+    <string name="tgs_token_reset_dialog">Сбросить токен бота?</string>
+    <string name="tgs_token_reset">Токен бота сброшен</string>
+    <string name="tgs_token_reset_menu">Сбросить токен бота</string>
+
+    <string name="microg_dialog1">Уменьшенный MicroG (ReVanced)</string>
+    <string name="microg_dialog2">Альтернативный MicroG (ReVanced)</string>
+    <string name="microg_dialog3">Полноценный MicroG (Замена GMS)</string>
 </resources>

smali/res/values-uk/strings.xml

@@ -5373,7 +5373,7 @@
     <string name="BGStickerssum">Для увімкнення/вимкнення вам необхідно очистити кеш додатка</string>
     <string name="addinf">додаткова інформація</string>
     <string name="copyid">Копіювати ID</string>
-    <string name="vtssfs">VT Функції</string>
+    <string name="vtssfs">Серверні функції</string>
     <string name="vticon">Іконка додатку</string>
     <string name="vticonbtn">Використовувати оригінальну іконку</string>
     <string name="vticonsummary">Використання оригінальної назви та іконки додатку як у офіційного клієнта ВК</string>
@@ -5567,7 +5567,7 @@
     <string name="friendsblock_title">Приховати друзів</string>
     <string name="friendsblock_summ">Приховати блок рекомендацій друзів у друзях</string>
     <string name="onlineformatter_title">Розширений онлайн</string>
-    <string name="onlineformatter_summ">Показувати з якого додатка/клієнта людина в онлайні</string>
+    <string name="onlineformatter_summ">Показувати з якого додатка/клієнта людина в онлайні\n\nНаприклад: Онлайн за допомогою Kate Mobile</string>
     <string name="voices_vtl">Голосові повідомлення</string>
     <string name="disable_voice_listening_summ">Функція дозволяє не надсилати статус прослуховування голосових повідомлень вами</string>
     <string name="listen_v_title">Вимкнути статус прослуховування</string>
@@ -6342,4 +6342,34 @@
 
     <string name="invertcached_title">Інвертувати список</string>
     <string name="invertcached_summ">Інвертувати список кешованих треків</string>
+
+    <string name="sett_recommendations">Рекомендації</string>
+    <string name="sett_nogms_summ">Відсутність цих сервісів призводить до поломки фонових сповіщень і проблем роботи компонентів застосунку</string>
+    <string name="sett_missing_links">Не вибрані посилання для відкриття додатком</string>
+    <string name="sett_missing_links_summ">Це завадить відкриттю зовнішніх посилань для їхнього відкриття за допомогою цього застосунку\n\пУ деяких випадках необхідно відключити відкриття посилань офіційним застосункам ВКонтакте</string>
+    <string name="sett_battery">Відключіть економію батареї</string>
+    <string name="sett_battery_summ1">Економія батареї заважає отриманню фонових повідомлень, сповіщень та роботі музики</string>
+    <string name="sett_battery_summ2">\n\nДля пристроїв Xiaomi необхідно вручну увімкнути в налаштуваннях системи пункт Автозапуск цього додатка</string>
+    <string name="sett_notifs">Увімкніть сповіщення</string>
+    <string name="sett_notifs_summ">Без увімкнених сповіщень не вдасться отримувати повідомлення та багато іншого</string>
+    <string name="sett_chats">Наші чати</string>
+    <string name="sett_chats_summ">Активні чати з обговорення модифікації та багато чого іншого</string>
+    <string name="sett_community">Наші спільноти</string>
+    <string name="sett_community_summ">Найсвіжіша інформація про оновлення і не тільки</string>
+    <string name="sett_autoupdates">Автоматичне оновлення</string>
+    <string name="sett_autoupdates_summ">Отримувати повідомлення про вихід нової версії застосунку</string>
+
+    <string name="update_latest">Вас встановлена остання версія програми</string>
+    <string name="update_err">Помилка перевірки оновлення</string>
+    <string name="serverFeaturesDisable">Відключити всю роботу з сервером</string>
+    <string name="serverFeaturesDisable_summ">Відключає галочки і всі додаткові функції, пов\'язані з отриманням даних з сервера ВТостерс</string>
+
+    <string name="tgs_token_missing">Токен відсутній</string>
+    <string name="tgs_token_reset_dialog">Відкинути токен бота?</string>
+    <string name="tgs_token_reset">Токен бота скинуто</string>
+    <string name="tgs_token_reset_menu">Скинути токен бота</string>
+
+    <string name="microg_dialog1">Зменшений MicroG (ReVanced)</string>
+    <string name="microg_dialog2">Альтернативний MicroG (ReVanced)</string>
+    <string name="microg_dialog3">Повноцінний MicroG (Заміна GMS)</string>
 </resources>

smali/res/values/strings.xml

@@ -5580,7 +5580,7 @@ Does not affect vk.cc links"</string>
     <string name="BGStickerssum">You need to clear the application cache after toggling this option</string>
     <string name="addinf">Additional information</string>
     <string name="copyid">Copy ID</string>
-    <string name="vtssfs">VT Features</string>
+    <string name="vtssfs">Server features</string>
     <string name="vticon">App Icon</string>
     <string name="vticonbtn">Use original icon</string>
     <string name="vticonsummary">The original name and icon of VK</string>
@@ -5615,7 +5615,7 @@ Warning! It can cause long downloads of user lists if there are a lot of users i
     <string name="ctypesocks">Socks</string>
     <string name="dnr">Do not read</string>
     <string name="dns">Disable status of viewing</string>
-    <string name="dnw">Do not write</string>
+    <string name="dnw">Do not type</string>
     <string name="docknumbers">Counters in dockbar</string>
     <string name="docknumberssum">"Disabling doesn't work in the tablet interface"</string>
     <string name="dockbar_tab_titles">Show dockbar item titles</string>
@@ -5774,7 +5774,7 @@ You need to restart the application to apply proxy settings"</string>
     <string name="friendsblock_title">Hide friends</string>
     <string name="friendsblock_summ">Hide the block of recommendations of friends in friends section</string>
     <string name="onlineformatter_title">Extended online indicator</string>
-    <string name="onlineformatter_summ">Show what app/device a person is online from</string>
+    <string name="onlineformatter_summ">Show what app/device a person is online from\n\nFor example: Online using Kate Mobile</string>
     <string name="voices_vtl">Voice messages</string>
     <string name="disable_voice_listening_summ">The function allows you not to send the status of listening to the person\'s voice messages by you</string>
     <string name="listen_v_title">Disable listening status</string>
@@ -5879,7 +5879,7 @@ May look like a fake leaving the online"</string>
 
     <string name="activity_what_is_it">What is it?</string>
     <string name="activity_dnr_summary">Function lets you don\'t send read message status</string>
-    <string name="activity_dnw_summary">Function lets you don\'t send write message status</string>
+    <string name="activity_dnw_summary">Function lets you don\'t send type message status</string>
     <string name="activity_dns_summary">Function lets you don\'t send read stories status</string>
 
     <string name="activity_dnr_visual">Visually may not work correctly (locally read), but companion will see that it wasn\'t read.</string>
@@ -6555,4 +6555,33 @@ May look like a fake leaving the online"</string>
 
     <string name="invertcached_title">Invert list</string>
     <string name="invertcached_summ">Invert cached track list</string>
+
+    <string name="sett_recommendations">Recommendations</string>
+    <string name="sett_nogms_summ">Missing these services causes background notifications to break and application components to have problems working</string>
+    <string name="sett_missing_links">There is no links selected to be opened by the application</string>
+    <string name="sett_missing_links_summ">This will prevent external links from being opened by this app to open them\n\nIn some cases it is necessary to disable the opening of links to official VKontakte applications</string>
+    <string name="sett_battery">Turn off power management</string>
+    <string name="sett_battery_summ1">Battery savings prevents background messages, notifications and music from functioning properly</string>
+    <string name="sett_battery_summ2">\n\nFor Xiaomi devices, you need to manually enable Autorun to this application in the system settings</string>
+    <string name="sett_notifs">Turn on notifications</string>
+    <string name="sett_notifs_summ">Without notifications enabled, you won\'t be able to receive messages and many others things</string>
+    <string name="sett_chats">Our chats</string>
+    <string name="sett_chats_summ">Live chats to discuss modification and more</string>
+    <string name="sett_community">Our communities</string>
+    <string name="sett_community_summ">Latest information about updates and more</string>
+    <string name="sett_autoupdates">Autoupdate</string>
+    <string name="sett_autoupdates_summ">Receive notification when a new version of the application is released</string>
+    <string name="update_latest">You have the latest version of the app installed</string>
+    <string name="update_err">Error checking for updates</string>
+    <string name="serverFeaturesDisable">Disable all server processing</string>
+    <string name="serverFeaturesDisable_summ">Disables verifications and all additional functions related to receiving data from the VTosters server</string>
+
+    <string name="tgs_token_missing">Token is missing</string>
+    <string name="tgs_token_reset_dialog">Reset the bot token?</string>
+    <string name="tgs_token_reset">The bot token has been reset</string>
+    <string name="tgs_token_reset_menu">Reset the bot token</string>
+
+    <string name="microg_dialog1">Reduced MicroG (ReVanced)</string>
+    <string name="microg_dialog2">Alternate MicroG (ReVanced)</string>
+    <string name="microg_dialog3">Full MicroG (GMS Replacement)</string>
 </resources>

smali/res/xml/preferences_activity.xml

@@ -92,7 +92,7 @@
                 android:key="listen_v"
                 android:title="@string/listen_v_title"/>
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/vkme_online_vtl">
+    <PreferenceCategory android:title="@string/vkme_online_vtl" android:key="onlinefixcategory">
         <com.vtosters.lite.ui.MaterialSwitchPreference
                 android:defaultValue="false"
                 android:key="onlinefix"

smali/res/xml/preferences_interface.xml

@@ -94,6 +94,11 @@
                 android:key="pollresults"
                 android:summary="@string/pollresults_summ"
                 android:title="@string/pollresults_title"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="false"
+                android:key="disableForceTabletMode"
+                android:summary="Отключает интерфейс для планшетов и возвращает докбар"
+                android:title="Отключить режим планшета"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
                 android:defaultValue="false"
                 android:key="friendsblock"

smali/res/xml/preferences_media.xml

@@ -45,6 +45,11 @@
                 android:entryValues="@array/musicdefcatalog"
                 android:key="musicdefcatalog"
                 android:title="@string/musicdefcatalog_title"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="false"
+                android:key="setMetaData"
+                android:summary="Сохранять id3v2 теги для песен для MP3 (Экспериментально)"
+                android:title="Сохранять метадату песен"/>
         <Preference
                 android:key="audio_download"
                 android:title="@string/audio_download_title"/>

smali/smali/com/facebook/FacebookSdk.smali

@@ -354,6 +354,16 @@
 .method static a(Landroid/content/Context;Ljava/lang/String;)V
     .locals 11
 
+    const-string v0, "hideDeviceInfo"
+
+    sget-object v1, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
+
+    invoke-static {v0, v1}, Lru/vtosters/hooks/other/Preferences;->getBoolValue(Ljava/lang/String;Ljava/lang/Boolean;)Z
+
+    move-result v0
+    
+    if-nez v0, :cond_1
+
     if-eqz p0, :cond_0
 
     if-eqz p1, :cond_0

smali/smali_classes2/com/vk/core/util/Screen.smali

@@ -1088,31 +1088,10 @@
         .end annotation
     .end param
 
-    .line 1
-    invoke-static {p0}, Lcom/vk/core/util/Screen;->f(Landroid/content/Context;)Lcom/vk/core/util/Screen$ScreenSize;
-
-    move-result-object p0
-
-    invoke-virtual {p0}, Ljava/lang/Enum;->ordinal()I
+    invoke-static {}, Lru/vtosters/hooks/TabletHook;->hook()Z
 
     move-result p0
 
-    sget-object v0, Lcom/vk/core/util/Screen$ScreenSize;->normal:Lcom/vk/core/util/Screen$ScreenSize;
-
-    invoke-virtual {v0}, Ljava/lang/Enum;->ordinal()I
-
-    move-result v0
-
-    if-le p0, v0, :cond_0
-
-    const/4 p0, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p0, 0x0
-
-    :goto_0
     return p0
 .end method
 

smali/smali_classes4/com/vtosters/lite/api/execute/GetFullCommunity.smali

@@ -35,7 +35,7 @@
 
     const-string v0, "func_v"
 
-    const/16 v1, 0x1b
+    const/16 v1, 0x25
 
     .line 3
     invoke-virtual {p0, v0, v1}, Lcom/vk/api/base/ApiRequest;->b(Ljava/lang/String;I)Lcom/vk/api/base/ApiRequest;