updated todo in msgdl

- fix group links

.gitignore

@@ -29,3 +29,4 @@ smali2/build/resources.zip
 smali/build/resources.zip
 smali/assets/version.properties
 *.keystore
+gradle.properties

README.md

@@ -10,7 +10,7 @@
     <a href="https://t.me/s/vtosters">
         <img src="https://img.shields.io/badge/-Telegram-blue?style=for-the-badge&logo=telegram&color=2AABEE"/>
     </a>
-    <a href="https://vk.com/vtosters_official">
+    <a href="https://vk.ru/vtosters_official">
         <img src="https://img.shields.io/badge/-VK-blue?style=for-the-badge&logo=vk&color=0077FF"/>
     </a>
     <a href="https://discord.gg/j9CAt3uYXj">
@@ -133,7 +133,7 @@
 
 `android:debuggable="false"` ➝ `android:debuggable="true"`
 
-Настройки, необходимые для **отладки** вне Android Studio, находятся по этой ссылке: [vk.com/vt/debug](https://vk.com/vt/debug)
+Настройки, необходимые для **отладки** вне Android Studio, находятся по этой ссылке: [vk.ru/vt/debug](https://vk.ru/vt/debug)
 
 * Для дополнительной отладки ответов и логов необходимо включить **[Режим разработчика]**
 
@@ -145,7 +145,7 @@
 
 Сразу после нажатия на запись приложение начнет записывать **все ваши действия** по пути `/Download/VK/logs/com.vtosters.lite/`
 
-При следующем открытии приложения оно автоматически сохранит логи и отправит вам в [**Документы** ВК](https://vk.com/docs), откуда вы можете скачать архив логов и работать с ними.
+При следующем открытии приложения оно автоматически сохранит логи и отправит вам в [**Документы** ВК](https://vk.ru/docs), откуда вы можете скачать архив логов и работать с ними.
 
 ## Разработка
 

app/build.gradle

@@ -69,16 +69,15 @@ task exportDex {
 
 android {
     compileSdkVersion 32
-    buildToolsVersion '32.0.0'
+    buildToolsVersion '33.0.0'
 
     defaultConfig {
         applicationId "ru.vtosters.lite.utils.lite"
-        minSdkVersion 21
+        minSdk 22
         targetSdkVersion 32
         versionCode 1
         versionName "1.0"
-
+        multiDexEnabled false
-        multiDexEnabled true
     }
 
     compileOptions {
@@ -89,7 +88,6 @@ android {
 }
 
 dependencies {
-    implementation "androidx.multidex:multidex:2.0.1"
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.preference:preference:1.2.0'

app/libs/classes3-dex2jar.jar.REMOVED.git-id

@@ -1 +0,0 @@
-5df53281cbfd1b6caf676bd10d2a403361a2904b

app/src/main/java/com/vk/core/util/DownloadUtils.java

@@ -1,5 +1,6 @@
 package com.vk.core.util;
 
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.Preferences.getDownloadsDir;
 import static ru.vtosters.lite.utils.Preferences.getMusicDir;
 import static ru.vtosters.lite.utils.Preferences.getPhotosDir;
@@ -12,6 +13,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteException;
+import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
@@ -22,6 +24,7 @@ import com.vk.core.concurrent.VkExecutors;
 import com.vk.imageloader.VKImageLoader;
 import com.vk.log.L;
 import com.vk.metrics.eventtracking.VkTracker;
+import com.vtosters.lite.MainActivity;
 import com.vtosters.lite.R;
 
 import java.io.File;
@@ -51,7 +54,7 @@ public class DownloadUtils {
             ToastUtils.a(context.getString(R.string.error) + " [" + e2.getMessage() + "]");
         }
     }
-
+    
     private static void b(final Context context, String str, String str2, boolean z) {
         if (TextUtils.isEmpty(str2)) {
             return;
@@ -59,10 +62,12 @@ public class DownloadUtils {
 
         String file = a(str, str2);
         File b2;
+        boolean pic = false;
         boolean c2 = MediaUtils.c(MediaUtils.b(str2));
 
         if (file.endsWith(".jpg") || file.endsWith(".png") || file.endsWith(".jpeg")) {
             b2 = new File(getPhotosDir(), file);
+            pic = true;
         } else if (file.endsWith(".mp3") || file.endsWith(".wav") || file.endsWith(".ogg") || file.endsWith(".aac") || file.endsWith(".flac") || file.endsWith(".m4a")) {
             b2 = new File(getMusicDir(), file);
         } else if (file.endsWith(".mp4") || file.endsWith(".mkv") || file.endsWith(".avi") || file.endsWith(".flv") || file.endsWith(".wmv") || file.endsWith(".mov") || file.endsWith(".3gp")) {
@@ -83,14 +88,16 @@ public class DownloadUtils {
                     if (b2.exists()) {
                         VkExecutors.x.a().execute(() -> ToastUtils.a(context.getString(R.string.file_saved, b2.getAbsoluteFile())));
                     }
+
                 } catch (Exception e2) {
                     L.a(e2);
                 }
+
                 CameraUtils.a(context, b2, null);
                 return;
             }
         }
-        
+
         DownloadManager.Request request = new DownloadManager.Request(Uri.parse(str2));
         request.setDestinationUri(Uri.fromFile(b2));
         request.setMimeType(FileUtils.f(new File(str)));
@@ -103,6 +110,9 @@ public class DownloadUtils {
         }
         try {
             long enqueue = a2.enqueue(request);
+            if (pic) {
+                CameraUtils.a(context, b2, null);
+            }
             if (!z) {
                 return;
             }

app/src/main/java/com/vk/im/ui/components/common/DialogAction.java

@@ -35,5 +35,6 @@ public enum DialogAction {
     pinmsg,
     unpinmsg,
     ENCRYPT_SETT,
-    ENCRYPT
+    ENCRYPT,
+    DOWNLOAD
 }

app/src/main/java/com/vk/im/ui/components/common/DialogActionsHelper.java

@@ -81,6 +81,7 @@ public final class DialogActionsHelper {
             CollectionExt.a(arrayList, DialogAction.NOTIFICATIONS_OFF, dialog.b(b2));
             return arrayList;
         }
+
         return new ArrayList<>();
     }
 

app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java

@@ -6,18 +6,23 @@ import static com.vk.im.engine.h.im_ic_more_vertical;
 import static com.vk.im.engine.h.im_ic_pinned_msg_hide;
 import static com.vk.im.engine.h.im_ic_pinned_msg_show;
 import static com.vk.im.engine.h.im_ic_write_msg;
+import static com.vk.im.ui.c.im_ic_chat_settings;
 import static com.vk.im.ui.c.im_ic_keyboard;
 import static ru.vtosters.lite.dnr.DNRModule.hookDNR;
 import static ru.vtosters.lite.dnr.DNRModule.hookDNT;
 import static ru.vtosters.lite.dnr.DNRModule.isDnrEnabledFor;
 import static ru.vtosters.lite.dnr.DNRModule.isDntEnabledFor;
 import static ru.vtosters.lite.encryption.EncryptProvider.decryptMessage;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
 import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
+import static ru.vtosters.lite.utils.Preferences.getDownloadsDir;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.os.Environment;
 import android.util.Log;
 
 import com.vk.core.network.Network;
@@ -33,6 +38,7 @@ import com.vk.im.ui.components.common.MsgAction;
 import com.vk.im.ui.components.viewcontrollers.popup.DelegateMsg;
 import com.vk.im.ui.views.dialog_actions.DialogActionsListView;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -41,6 +47,7 @@ import java.util.List;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import ru.vtosters.lite.downloaders.MessagesDownloader;
 import ru.vtosters.lite.encryption.EncryptProvider;
 import ru.vtosters.lite.encryption.base.IMProcessor;
 import ru.vtosters.lite.hooks.CryptImHook;
@@ -49,7 +56,13 @@ import ru.vtosters.lite.utils.AndroidUtils;
 
 public class DNRInjector {
     public static void inject(Dialog dialog, List<DialogAction> list) {
-        int peerId = dialog.getId();
+        int peerId = 0;
+
+        if (dialog != null) {
+            peerId = dialog.getId();
+        }
+
+        list.add(DialogAction.DOWNLOAD);
 
         list.add(DialogAction.pinmsg);
         list.add(DialogAction.unpinmsg);
@@ -74,6 +87,8 @@ public class DNRInjector {
     }
 
     public static LinkedHashMap<DialogAction, Integer> injectToHashMap(LinkedHashMap<DialogAction, Integer> hashMap) {
+        hashMap.put(DialogAction.DOWNLOAD, getIdentifier("download_dl", "string"));
+
         hashMap.put(DialogAction.DNR_ON, getIdentifier("DNR_ON", "string"));
         hashMap.put(DialogAction.DNR_OFF, getIdentifier("DNR_OFF", "string"));
         hashMap.put(DialogAction.DNT_ON, getIdentifier("DNT_ON", "string"));
@@ -90,6 +105,7 @@ public class DNRInjector {
     @SuppressLint("ResourceType")
     public static List<Object> injectToList(List<Object> actions) {
         var list = new ArrayList<>(actions);
+        list.add(new DialogActionsListView.b.a(DialogAction.DOWNLOAD, 1, getIdentifier("im_ic_msgdl", "attr"), getIdentifier("download_dl", "string"))); // DialogAction, Int, Icon, String
 
         list.add(new DialogActionsListView.b.a(DialogAction.DNR_ON, 2, im_ic_pinned_msg_hide, getIdentifier("DNR_ON", "string"))); // DialogAction, Int, Icon, String
         list.add(new DialogActionsListView.b.a(DialogAction.DNR_OFF, 2, im_ic_pinned_msg_show, getIdentifier("DNR_OFF", "string"))); // DialogAction, Int, Icon, String
@@ -111,8 +127,14 @@ public class DNRInjector {
         ImEngine1.a().a(new OnDialogUpdateEvent(null, map));
     }
 
-    public static List<DialogAction> injectToListAccess(List<DialogAction> actions, Dialog dialog, ProfilesSimpleInfo profilesSimpleInfo) {
+    public static List<DialogAction> injectToListAccess(List<DialogAction> actions, Dialog dialog) {
-        var peerId = dialog.getId();
+        int peerId = 0;
+
+        if (dialog != null) {
+            peerId = dialog.getId();
+        }
+
+        actions.add(DialogAction.DOWNLOAD);
 
         if (isDnrEnabledFor(peerId)) {
             actions.add(DialogAction.DNR_OFF);
@@ -137,13 +159,28 @@ public class DNRInjector {
     }
 
     public static boolean onClickHeader(DialogAction action, Dialog dialog) {
-        var id = dialog.getId();
+        int peerId = 0;
+
+        if (dialog != null) {
+            peerId = dialog.getId();
+        }
 
         if (action == DialogAction.MARK_AS_READ) {
             DNRModule.hookRead(dialog);
             forceInvalidateDialogActions(dialog);
         }
 
+        if (action == DialogAction.DOWNLOAD) {
+            File out = new File(Environment.getExternalStoragePublicDirectory(getDownloadsDir().getName()), "dialog-" + peerId + ".html");
+            try {
+                new MessagesDownloader().downloadDialog(peerId, new MessagesDownloader.HtmlDialogDownloaderFormatProvider(), out);
+            } catch (Exception e) {
+                sendToast(getString("download_dl_error"));
+                e.printStackTrace();
+            }
+            return true;
+        }
+
         if (action == DialogAction.DNR_ON) {
             setDnr(dialog, true);
             forceInvalidateDialogActions(dialog);
@@ -165,10 +202,10 @@ public class DNRInjector {
         }
 
         if (action == DialogAction.ENCRYPT_SETT) {
-            CryptImHook.hookPref(id);
+            CryptImHook.hookPref(peerId);
             return true;
         } else if (action == DialogAction.ENCRYPT) {
-            CryptImHook.hook(id, dialog);
+            CryptImHook.hook(peerId, dialog);
             return true;
         }
 
@@ -176,12 +213,26 @@ public class DNRInjector {
     }
 
     public static boolean onClick(Dialog dialog, DialogAction action) {
-        var id = dialog.getId();
+        int peerId = 0;
+
+        if (dialog != null) {
+            peerId = dialog.getId();
+        }
 
         if (action == DialogAction.MARK_AS_READ) {
             DNRModule.hookRead(dialog);
         }
 
+        if (action == DialogAction.DOWNLOAD) {
+            File out = new File(Environment.getExternalStoragePublicDirectory(getDownloadsDir().getPath()), peerId + "-dialog.html");
+            try {
+                new MessagesDownloader().downloadDialog(peerId, new MessagesDownloader.HtmlDialogDownloaderFormatProvider(), out);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return true;
+        }
+
         if (action == DialogAction.DNR_ON) {
             setDnr(dialog, true);
             return true;
@@ -199,18 +250,18 @@ public class DNRInjector {
         }
 
         if (action == DialogAction.pinmsg) {
-            pinnedMsg(id, true);
+            pinnedMsg(peerId, true);
             return true;
         } else if (action == DialogAction.unpinmsg) {
-            pinnedMsg(id, false);
+            pinnedMsg(peerId, false);
             return true;
         }
 
         if (action == DialogAction.ENCRYPT_SETT) {
-            CryptImHook.hookPref(id);
+            CryptImHook.hookPref(peerId);
             return true;
         } else if (action == DialogAction.ENCRYPT) {
-            CryptImHook.hook(id, dialog);
+            CryptImHook.hook(peerId, dialog);
             return true;
         }
 
@@ -248,13 +299,13 @@ public class DNRInjector {
 
         if (action == MsgAction.valueOf("TRANSLATE")) {
             if (isTextExist && isReplyExist) {
-                Translate.showTranslatedText(context, text + "\n\n" + AndroidUtils.getString("translator_reply") + "\n" + reply);
+                Translate.showTranslatedText(context, text + "\n\n" + getString("translator_reply") + "\n" + reply);
             } else if (isReplyExist) {
-                Translate.showTranslatedText(context, AndroidUtils.getString("translator_reply") + "\n" + reply);
+                Translate.showTranslatedText(context, getString("translator_reply") + "\n" + reply);
             } else if (isTextExist) {
                 Translate.showTranslatedText(context, text);
             } else {
-                sendToast(AndroidUtils.getString("translator_no_text"));
+                sendToast(getString("translator_no_text"));
             }
         }
 
@@ -265,7 +316,7 @@ public class DNRInjector {
         Thread thread = new Thread(() -> {
             try {
                 var request = new Request.a()
-                        .b("https://api.vk.com/method/" + (needToBePinned ? "messages.pinConversation" : "messages.unpinConversation") + "?peer_id=" + dialogid + "&access_token=" + getUserToken() + "&v=5.119")
+                        .b("https://" + getApi() + "/method/" + (needToBePinned ? "messages.pinConversation" : "messages.unpinConversation") + "?peer_id=" + dialogid + "&access_token=" + getUserToken() + "&v=5.119")
                         .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"))
                         .a();
 
@@ -282,15 +333,27 @@ public class DNRInjector {
 
         thread.start();
 
-        sendToast(AndroidUtils.getString("pin_dialog") + " " + (needToBePinned ? AndroidUtils.getString("dialog_pinned") : AndroidUtils.getString("dialog_unpinned")));
+        sendToast(getString("pin_dialog") + " " + getString(needToBePinned ? "dialog_pinned" : "dialog_unpinned"));
     }
 
     public static void setDnr(Dialog dialog, boolean value) {
-        hookDNR(dialog.getId());
+        int peerId = 0;
+
+        if (dialog != null) {
+            peerId = dialog.getId();
+        }
+
+        hookDNR(peerId);
     }
 
     public static void setDnt(Dialog dialog, boolean value) {
-        hookDNT(dialog.getId());
+        int peerId = 0;
+
+        if (dialog != null) {
+            peerId = dialog.getId();
+        }
+
+        hookDNT(peerId);
     }
 }
 

app/src/main/java/ru/vtosters/lite/dnr/DNRModule.java

@@ -2,7 +2,7 @@ package ru.vtosters.lite.dnr;
 
 import static ru.vtosters.lite.net.Request.makeRequest;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
-import static ru.vtosters.lite.utils.ProxyUtils.getApi;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 
 import android.util.Log;
 

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

@@ -1,5 +1,7 @@
 package ru.vtosters.lite.downloaders;
 
+import static ru.vtosters.lite.utils.Preferences.getMusicDir;
+
 import android.os.Environment;
 import android.util.Log;
 
@@ -35,7 +37,7 @@ public class AudioDownloader {
             return;
         }
 
-        var musicPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).getAbsolutePath();
+        var musicPath = getMusicDir().getAbsolutePath();
         var musicDir = new File(musicPath);
         if (!musicDir.exists()) {
             if (musicDir.mkdirs()) {

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

@@ -0,0 +1,549 @@
+package ru.vtosters.lite.downloaders;
+import static ru.vtosters.lite.encryption.EncryptProvider.decryptMessage;
+import static ru.vtosters.lite.net.Request.makeRequest;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+import static ru.vtosters.lite.utils.AndroidUtils.getResources;
+
+import android.util.SparseArray;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+public class MessagesDownloader{
+    private static SimpleDateFormat sdformat;
+
+    private static SparseArray<MiniUser> usersArray;
+
+    public static String formatTime(long now){
+        return sdformat.format(new Date(now));
+    }
+
+    public static String join(CharSequence delimiter, Iterable<? extends CharSequence> elements){
+        Objects.requireNonNull(delimiter);
+        Objects.requireNonNull(elements);
+
+        StringBuilder builder = new StringBuilder();
+
+        for (CharSequence cs : elements) {
+            builder.append(cs).append(delimiter);
+        }
+
+        return builder.toString();
+    }
+
+    public void downloadDialog(int peer_id, DialogDownloaderFormatProvider format, File out) throws Exception{
+        sdformat = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss", getResources().getConfiguration().locale);
+
+        FileOutputStream fos = new FileOutputStream(out);
+
+        // fix TODO with conversation name (API method messages.getConversationsById)
+        fos.write(format.provideDocumentStart("TODO", formatTime(System.currentTimeMillis())).getBytes(StandardCharsets.UTF_8));
+
+        fetchDialogInfo(peer_id, 0, ((users, messages) -> {
+            try {
+                fos.write(format.provideHeader("TODO", formatTime(System.currentTimeMillis())).getBytes(StandardCharsets.UTF_8));
+                for (MiniMsg msg : messages) {
+                    fos.write(format.provideMessage(msg, users.get(msg.fromId)).getBytes(StandardCharsets.UTF_8));
+                }
+                fos.write(format.provideDocumentEnd().getBytes(StandardCharsets.UTF_8));
+                fos.close();
+                Toast.makeText(getGlobalContext(), "Сохранено как " + out.getAbsolutePath(), Toast.LENGTH_SHORT).show();
+            } catch (IOException | JSONException e) {
+                e.printStackTrace();
+            }
+        }));
+    }
+
+    public void fetchDialogInfo(int peer_id, int offset, FetchListener fl){
+        makeRequest("https://" + getApi() + "/method/messages.getHistory?extended=1&v=5.140&offset=" + offset + "&count=200&peer_id=" + peer_id + "&access_token=" + getUserToken(),
+                response -> {
+                    try {
+                        JSONObject mainJson = new JSONObject(response);
+                        JSONObject obj = mainJson.getJSONObject("response");
+
+                        SparseArray<MiniUser> users = new SparseArray<>();
+                        parseUsers(users, obj.optJSONArray("profiles"), false);
+                        parseUsers(users, obj.optJSONArray("groups"), true);
+
+                        List<MiniMsg> msgs = parseMessages(obj.getJSONArray("items"));
+
+                        usersArray = users;
+
+                        fl.onReceive(users, msgs);
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                });
+    }
+
+    private List<MiniMsg> parseMessages(JSONArray jsonArray) throws JSONException{
+        ArrayList<MiniMsg> thing = new ArrayList<>();
+
+        for (int i = 0; i < jsonArray.length(); i++) {
+            MiniMsg msg = new MiniMsg(jsonArray.getJSONObject(i));
+            thing.add(msg);
+        }
+
+        return thing;
+    }
+
+    private void parseUsers(SparseArray<MiniUser> array, @Nullable JSONArray jsonArray, boolean groups) throws JSONException{
+        if (jsonArray == null) return;
+
+        for (int i = 0; i < jsonArray.length(); i++) {
+            MiniUser user = new MiniUser(jsonArray.getJSONObject(i), groups);
+            array.put(groups ? -user.id : user.id, user);
+        }
+    }
+
+    interface FetchListener{
+        void onReceive(SparseArray<MiniUser> users, List<MiniMsg> messages);
+    }
+
+    static class MiniUser{
+        public String firstName;
+        public String lastName;
+        public boolean isGroup;
+        int id;
+        String photo100;
+
+        public MiniUser(JSONObject obj, boolean is_group) throws JSONException {
+            id = obj.getInt("id");
+            firstName = obj.optString("first_name", obj.optString("name"));
+            lastName = obj.optString("last_name", "");
+            photo100 = obj.getString("photo_100");
+            isGroup = is_group;
+        }
+    }
+
+    static class MiniMsg{
+        long date;
+        int fromId;
+        int id; // message id
+        String text;
+        List<JSONObject> attachments;
+        List<JSONObject> fwd_messages;
+        JSONObject reply_message; // one reply
+        JSONObject chat_action;
+        JSONObject geo;
+
+        public MiniMsg(JSONObject obj) throws JSONException{
+            date = obj.getLong("date") * 1000;
+            fromId = obj.getInt("from_id");
+            id = obj.getInt("id");
+            text = decryptMessage(obj.getString("text"), obj.getInt("peer_id"));
+            reply_message = obj.optJSONObject("reply_message");
+            chat_action = obj.optJSONObject("action");
+            geo = obj.optJSONObject("geo");
+
+            attachments = new ArrayList<>();
+            fwd_messages = new ArrayList<>();
+
+            JSONArray arr = obj.optJSONArray("attachments");
+            if (arr != null)
+                for (int i = 0; i < arr.length(); i++) attachments.add(arr.getJSONObject(i));
+
+            JSONArray fwdArr = obj.optJSONArray("fwd_messages");
+            if (fwdArr != null)
+                for (int i = 0; i < fwdArr.length(); i++) fwd_messages.add(fwdArr.getJSONObject(i));
+        }
+    }
+
+    // This class defines everything which is needed to create an output file
+    abstract static class DialogDownloaderFormatProvider{
+        // Internal, for JSON/HTML
+        abstract String provideDocumentStart(String dialogName, String date);
+
+        abstract String provideDocumentEnd();
+
+        abstract String provideHeader(String dialogName, String date);
+
+        abstract String provideMessage(MiniMsg message, MiniUser user) throws JSONException;
+    }
+
+    public static class HtmlDialogDownloaderFormatProvider extends DialogDownloaderFormatProvider{
+        @Override
+        String provideDocumentStart(String dialogName, String date){
+            String style = ".vtex-milk-msg {\n" +
+                    "    border-radius: 8px;\n" +
+                    "    padding: 24px;\n" +
+                    "    background: white;\n" +
+                    "    margin: 16px;\n" +
+                    "    box-shadow: 0 4px 8px 0 rgba(0,0,0,0.07);\n" +
+                    "    word-wrap: break-word;\n" +
+                    "}\n" +
+                    "\n" +
+                    ".vtex-milk-msgcont br {\n" +
+                    "    display: none;\n" +
+                    "}\n" +
+                    "\n" +
+                    ".vtex-milk-msg p {\n" +
+                    "    margin: 0;\n" +
+                    "}\n" +
+                    "\n" +
+                    ".vtex-milk-msg.vtex-milk-msg-out {\n" +
+                    "    background: #ADD3FF;\n" +
+                    "}\n" +
+                    "\n" +
+                    "p.msg-attaches {\n" +
+                    "    margin-top: 8px;\n" +
+                    "    font-style: italic;\n" +
+                    "}\n" +
+                    "p.chat-action {\n" +
+                    "    font-style: italic;\n" +
+                    "}\n" +
+                    "\n" +
+                    ".vtex-milk-header {\n" +
+                    "    border-radius: 8px;\n" +
+                    "    padding: 24px;\n" +
+                    "    background: white;\n" +
+                    "    margin: 16px;\n" +
+                    "    box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);\n" +
+                    "}\n" +
+                    "\n" +
+                    "h4.vtex-milk-header-txt {\n" +
+                    "    margin: 0;\n" +
+                    "}\n" +
+                    "\n" +
+                    "h5.vtex-milk-header-sub {\n" +
+                    "    margin: 0;\n" +
+                    "    padding-top: 8px;\n" +
+                    "}\n" +
+                    "\n" +
+                    "a.msg-attach-link {\n" +
+                    "    color: #5181B8;\n" +
+                    "    text-decoration: none;\n" +
+                    "}\n" +
+                    "\n" +
+                    ".msg-from a {\n" +
+                    "    color: #5181B8;\n" +
+                    "    text-decoration: none;\n" +
+                    "}\n" +
+                    "\n" +
+                    ".msg-from-date {\n" +
+                    "    color: rgba(0, 0, 0, 0.75);\n" +
+                    "}\n" +
+                    "\n" +
+                    "body {\n" +
+                    "    font-family: Roboto, system-ui, sans-serif;\n" +
+                    "}\n" +
+                    "\n" +
+                    ".msg-body {\n" +
+                    "    padding-top: 4px;\n" +
+                    "}\n" +
+                    ".msg-reply {\n" +
+                    "   border-left: 3px solid #7aa7f6;\n" +
+                    "   margin-top: 5px;\n" +
+                    "   padding-left: 3px;\n" +
+                    "}\n\n" +
+                    ".msg-reply p {\n" +
+                    "   padding-left: 5px;\n" +
+                    "}\n\n" +
+                    ".msg-reply p.reply-header {\n" +
+                    "   color: #5181B8;\n" +
+                    "}\n\n" +
+                    ".msg-reply p.reply-content {\n" +
+                    "   color: #000000;\n" +
+                    "}\n" +
+                    "\n" +
+                    "";
+
+            return "<html><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><meta charset=\"utf-8\"><title>Экспорт из VTLite</title><style>" + style + "</style></head><body>";
+        }
+
+        @Override
+        String provideDocumentEnd(){
+            return "</div></body></html>";
+        }
+
+        @Override
+        String provideHeader(String dialogName, String date){
+            return "<div class=\"vtex-milk-header\"><h4 class=\"vtex-milk-header-txt\">VTLite</h4><h5 class=\"vtex-milk-header-sub\">Экспорт истории чата (" + date + ")</h5></div><div class=\"vtex-milk-msgcont\">";
+        }
+
+        @Override
+        String provideMessage(MiniMsg message, MiniUser user) throws JSONException{
+            String isOut = (user.id == getUserId()) ? " vtex-milk-msg-out" : "";
+            String geoPosition = "";
+            if (message.geo != null) {
+                var coordinates = message.geo.optJSONObject("coordinates");
+                if (coordinates != null) {
+                    var latitude = coordinates.optDouble("latitude");
+                    var longitude = coordinates.optDouble("longitude");
+                    var ll = longitude + "," + latitude;
+                    geoPosition = "<a href=\"https://yandex.ru/maps/?ll=" + ll + "&mode=search&sll=" + ll + "&text=" + latitude + "," + longitude + "&z=12\">" +
+                            "<img src=\"https://static-maps.yandex.ru/1.x/?ll=" + longitude + "," + latitude + "&z=12&l=map&size=300,200&pt=" + ll + ",vkgrm\"/>" +
+                            "</a>";
+                }
+            }
+            String chatAction = (message.chat_action != null) ? getHtmlForChatAction(message.chat_action) : "";
+            String attaches = (message.attachments.size() > 0) ? "<p class=\"msg-attaches\">Вложения: " + getHtmlForAttach(message.attachments) + "</p>" : "";
+            String reply = (message.reply_message != null) ? provideReply(message.reply_message) : "";
+            String fwdMessages = (message.fwd_messages.size() > 0) ? provideForwardMessages(message.fwd_messages) : "";
+            String userLink = (user.isGroup ? "club" : "id") + user.id;
+
+            return "<div class=\"vtex-milk-msg" + isOut + "\" id=\"" + message.id + "\">" +
+                        "<p class=\"msg-from\">от <a href=\"https://vk.ru/" + userLink + "\">" + user.firstName + " " + user.lastName + "</a> <span class=\"msg-from-date\">" + formatTime(message.date) + "</span></p>" + // TODO photo100
+                        "<p class=\"msg-body\">" + mentionsReplace(message.text) + "</p>" +
+                        geoPosition +
+                        chatAction +
+                        attaches +
+                        reply +
+                        fwdMessages +
+                    "</div>";
+        }
+
+        private String provideReply(JSONObject replyMessage) {
+            var messageId = replyMessage.optInt("id");
+            var userId = replyMessage.optInt("from_id");
+            var peerId = replyMessage.optInt("peer_id");
+            var text = mentionsReplace(decryptMessage(replyMessage.optString("text"), peerId));
+            var fwdMessages = replyMessage.optJSONArray("fwd_messages");
+
+            var user = usersArray.get(userId);
+
+            if (text.isEmpty()) {
+                if (fwdMessages != null) {
+                    var length = fwdMessages.length();
+                    if (length > 0) text = length + " " + pluralMsg(length);
+                } else text = "Вложение";
+            }
+
+            return "<a href=\"#" + messageId + "\" class=\"msg-attach-link\">" +
+                        "<div class=\"msg-reply\">" +
+                            "<p class=\"reply-header\">Пересланное сообщение</p>" +
+                            "<p class=\"reply-content\">" + user.firstName + " " + user.lastName + ": " + text + "</p>" +
+                        "</div>" +
+                    "</a>";
+        }
+
+        private String provideForwardMessages(List<JSONObject> fwd_messages) throws JSONException {
+            StringBuilder fwdmsgs = new StringBuilder("<div class=\"msg-reply\">");
+
+            for (JSONObject fwd_message : fwd_messages) {
+
+                if (fwd_message == null) continue;
+
+                List<JSONObject> attaches = new ArrayList<>();
+
+                JSONArray arr = fwd_message.optJSONArray("attachments");
+                if (arr != null) {
+                    for (int i = 0; i < arr.length(); i++) {
+                        try {
+                            attaches.add(arr.getJSONObject(i));
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+
+                List<JSONObject> fwdsMsg = new ArrayList<>();
+
+                JSONArray fwd_msgs = fwd_message.optJSONArray("fwd_messages");
+                if (fwd_msgs != null) {
+                    for (int i = 0; i < fwd_msgs.length(); i++) {
+                        try {
+                            fwdsMsg.add(fwd_msgs.getJSONObject(i));
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+
+                JSONObject reply_message = fwd_message.optJSONObject("reply_message");
+
+                var attachesHtml = (attaches.size() > 0) ? "Вложения: " + getHtmlForAttach(attaches) : "";
+                var replyHtml = (reply_message != null) ? provideReply(reply_message) : "";
+                var fwdsHtml = (fwdsMsg.size() > 0) ? provideForwardMessages(fwdsMsg) : ""; // recursion XD :>
+
+                var userId = fwd_message.optInt("from_id");
+                var peerId = fwd_message.optInt("peer_id");
+                var text = mentionsReplace(decryptMessage(fwd_message.optString("text"), peerId));
+
+                var userLink = ((userId < 0) ? "club" : "id") + Math.abs(userId);
+
+                fwdmsgs.append("<p class=\"reply-content\"><a class=\"msg-attach-link\" href=\"https://vk.ru/").append(userLink).append("\">@").append(userLink).append("</a>: ").append(text).append(attachesHtml).append(replyHtml).append(fwdsHtml);
+            }
+
+            return fwdmsgs.append("</div>").toString();
+        }
+
+        private String mentionsReplace(String text) {
+            var matcher = Pattern.compile("\\[((?:club|id|public)\\d+)\\|([^]]+)\\]").matcher(text);
+
+            return matcher.replaceAll("<a class=\"msg-attach-link\" href=\"https://vk.ru/$1\">$2</a>");
+        }
+
+        private String pluralMsg(int count) {
+            String[] plurals = {"сообщение", "сообщения", "сообщений"};
+
+            var hundredModulo = count % 100;
+            var tenModulo = count % 10;
+
+            if (hundredModulo > 10 && hundredModulo < 20) return plurals[2];
+            else if (tenModulo > 1 && tenModulo < 5) return plurals[1];
+            else if (tenModulo == 1) return plurals[0];
+
+            return plurals[2];
+        }
+
+        private String getHtmlForChatAction(JSONObject action) {
+            var type = action.optString("type");
+
+            StringBuilder htmlAction = new StringBuilder("<p class=\"chat-action\">");
+
+            switch(type) {
+                case "chat_photo_update":
+                    htmlAction.append("Обновил фотографию беседы");
+                    break;
+                case "chat_photo_remove":
+                    htmlAction.append("Удалил фотографию беседы");
+                    break;
+                case "chat_create":
+                    var name = action.optString("text");
+                    htmlAction.append("Создал беседу").append((!name.isEmpty()) ? " с названием \"" + name + "\"" : "");
+                    break;
+                case "chat_title_update":
+                    var newName = action.optString("text");
+                    htmlAction.append("Сменил название беседы").append((!newName.isEmpty()) ? " на \"" + newName : "\"");
+                    break;
+                case "chat_invite_user":
+                    var newUserId = action.optInt("member_id");
+                    htmlAction.append("Добавил ").append((newUserId > 0) ? "пользователя" : "группу");
+                    if (newUserId != 0) {
+                        var userLink = ((newUserId < 0) ? "club" : "id") + Math.abs(newUserId);
+                        htmlAction.append(" <a href=\"https://vk.ru/").append(userLink).append("\" class=\"msg-attach-link\">@").append(userLink).append("</a>");
+                    }
+                    break;
+                case "chat_kick_user":
+                    var removedUserId = action.optInt("member_id");
+                    htmlAction.append("Исключил ").append((removedUserId > 0) ? "пользователя" : "группу");
+                    if (removedUserId != 0) {
+                        var userLink = ((removedUserId < 0) ? "club" : "id") + Math.abs(removedUserId);
+                        htmlAction.append(" <a href=\"https://vk.ru/").append(userLink).append("\" class=\"msg-attach-link\">@").append(userLink).append("</a>");
+                    }
+                    break;
+                case "chat_pin_message":
+                    var message = action.optString("message");
+                    htmlAction.append("Закрепил сообщение").append((!message.isEmpty()) ? (" с текстом: \"" + message + "\"") : "");
+                    break;
+                case "chat_unpin_message":
+                    htmlAction.append("Открепил сообщение");
+                    break;
+                case "chat_invite_user_by_link":
+                    htmlAction.append("Вступил в беседу по ссылке");
+                    break;
+                case "chat_screenshot":
+                    htmlAction.append("Сделал скриншот беседы");
+                    break;
+                case "custom":
+                    htmlAction.append(action.optString("message"));
+                    break;
+                default:
+                    htmlAction.append("Действие не поддерживается (").append(type).append(")");
+                    break;
+            }
+
+            return htmlAction.append("</p>").toString();
+        }
+
+        /*
+        TODO:
+        1) poll (опросы)
+        2) mini_app (поделиться миниаппом)
+        3) audio_playlist (плейлист песен)
+        4) story (история)
+        5) wall_reply (комментарий на стене)
+        6) podcast (подкаст)
+        7) gift (подарок)
+         */
+
+        private String getHtmlForAttach(List<JSONObject> attaches) throws JSONException{
+            StringBuilder rs = new StringBuilder();
+
+            for (JSONObject attach : attaches) {
+                String type = attach.getString("type");
+                JSONObject item = attach.optJSONObject(type);
+
+                if (item == null) continue;
+
+                switch(type) {
+                    case "photo":
+                        var sizes = item.getJSONArray("sizes");
+                        rs.append("<a href=\"").append(sizes.getJSONObject(sizes.length() - 1).getString("url")).append("\" class=\"msg-attach-link\">фотография</a>");
+                        break;
+                    case "doc":
+                        rs.append("<a href=\"").append(item.getString("url")).append("\" class=\"msg-attach-link\">документ</a>");
+                        break;
+                    case "link":
+                        rs.append("<a href=\"").append(item.getString("url")).append("\" class=\"msg-attach-link\">ссылка</a>");
+                        break;
+                    case "wall":
+                        rs.append("<a href=\"https://vk.ru/wall").append(item.optString("to_id", item.optString("owner_id"))).append("_").append(item.getString("id")).append("\" class=\"msg-attach-link\">запись на стене</a>");
+                        break;
+                    case "sticker":
+                        rs.append("<img style=\"width:128px;height:128px;\" src=\"").append(item.getJSONArray("images").getJSONObject(1).getString("url")).append("\"/>");
+                        break;
+                    case "audio_message":
+                        rs.append("<a href=\"").append(item.optString("link_mp3")).append("\" class=\"msg-attach-link\">голосовое сообщение</a>");
+                        break;
+                    case "audio":
+                        rs.append("аудиозапись (").append(item.optString("artist")).append(" — ").append(item.optString("title")).append(")");
+                        break;
+                    case "video":
+                        rs.append("видеозапись ( ").append(getVideoHtml(item.optJSONObject("files"))).append(")");
+                        break;
+                    default:
+                        rs.append("не поддерживается (").append(type).append(")");
+                        break;
+                }
+
+                rs.append(" ");
+            }
+
+            return rs.toString();
+        }
+    }
+
+    private static String getVideoHtml(JSONObject files) throws JSONException {
+
+        if (files == null) return "ссылки отсутствуют";
+
+        Iterator< ? > keys = files.keys();
+        StringBuilder videoHtml = new StringBuilder();
+
+        int qualityIndex = 0;
+        String[] quality = {"144", "240", "360", "480", "720", "1080", "1440", "2160"};
+
+        while (keys.hasNext()) {
+            String key = (String) keys.next();
+            if (key.equals("mp4_" + quality[qualityIndex])) {
+                videoHtml.append("<a class=\"msg-attach-link\" href=\"").append(files.get(key)).append("\">").append(quality[qualityIndex]).append("p</a>").append(" ");
+
+                if (qualityIndex == 7) break;
+                ++qualityIndex;
+            }
+        }
+
+        return videoHtml.toString();
+    }
+}

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

@@ -11,6 +11,8 @@ import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Environment;
 
+import com.vk.core.dialogs.alert.VkAlertDialog;
+
 import java.io.File;
 
 import b.h.g.m.FileUtils;
@@ -56,16 +58,31 @@ public class OTADownloader {
 
     public static void downloadBuild(String url) {
         var context = AndroidUtils.getGlobalContext();
-        var uri = Uri.parse(url);
+        try {
+            var uri = Uri.parse(url);
 
-        context.registerReceiver(callback, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+            context.registerReceiver(callback, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
 
-        var request = new DownloadManager.Request(uri);
+            var request = new DownloadManager.Request(uri);
-        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-        request.setTitle("VTLite.apk");
+            request.setTitle("VTLite.apk");
-        request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "VTLite.apk");
+            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "VTLite.apk");
 
-        var manager = (DownloadManager) AndroidUtils.getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE);
+            var manager = (DownloadManager) AndroidUtils.getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE);
-        manager.enqueue(request);
+            manager.enqueue(request);
+        } catch (Exception e) {
+            e.printStackTrace();
+            VkAlertDialog.Builder alertDialog = new VkAlertDialog.Builder(context);
+            alertDialog.setTitle(AndroidUtils.getString("update_error"));
+            alertDialog.setMessage(AndroidUtils.getString("update_error_text"));
+            alertDialog.setPositiveButton(AndroidUtils.getString("no"), (dialog, which) -> {
+                dialog.cancel();
+            });
+            alertDialog.setNeutralButton(AndroidUtils.getString("yes"), (dialog, which) -> {
+                context.startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://github.com/vtosters/lite/releases/latest/download/VTLite.apk")));
+            });
+            var alert = alertDialog.create();
+            alert.show();
+        }
     }
 }

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

@@ -12,6 +12,7 @@ import android.os.Environment;
 import com.vk.dto.common.ImageSize;
 import com.vk.dto.stories.model.StoryEntry;
 
+import java.io.File;
 import java.util.List;
 
 public class StoryDownloader {
@@ -23,8 +24,9 @@ public class StoryDownloader {
                 String url = imageSizes.get(imageSizes.size() - 1).url;
                 DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
                 request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-                request.setTitle("photo" + story.E.a);
+                request.setTitle("photo" + story.E.a + ".jpg");
-                request.setDestinationInExternalPublicDir(getPhotosDir().getAbsolutePath(), "/Stories/photo" + story.E.a + ".jpg");
+                request.setDestinationInExternalPublicDir(getPhotosDir().getName(), "photo" + story.E.a + ".jpg");
+                request.allowScanningByMediaScanner();
                 ((DownloadManager) getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
                 return;
             }

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

@@ -1,6 +1,7 @@
 package ru.vtosters.lite.downloaders;
 
 import static ru.vtosters.lite.net.Request.makeRequest;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
@@ -15,6 +16,7 @@ import android.net.Uri;
 import android.os.Environment;
 import android.widget.Toast;
 
+import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.dialogs.bottomsheet.MenuBottomSheetAction;
 import com.vk.core.util.ToastUtils;
 import com.vk.dto.common.VideoFile;
@@ -106,30 +108,32 @@ public class VideoDownloader {
             DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
             request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
             request.setTitle(videoFile.toString());
-            request.setDestinationInExternalPublicDir(getVideosDir().getAbsolutePath(), videoFile + ".mp4");
+            request.allowScanningByMediaScanner();
+            request.setDestinationInExternalPublicDir(getVideosDir().getName(), videoFile + ".mp4");
             ((DownloadManager) getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
             return;
         }
 
-        var builder = new AlertDialog.Builder(context);
+        var builder = new VkAlertDialog.Builder(context);
         builder.setItems(max, ((dialog, which) -> {
             var url = urls.get(which);
             DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
             request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
             request.setTitle(videoFile.toString());
-            request.setDestinationInExternalPublicDir(getVideosDir().getAbsolutePath(), videoFile + ".mp4");
+            request.allowScanningByMediaScanner();
+            request.setDestinationInExternalPublicDir(getVideosDir().getName(), videoFile + ".mp4");
             ((DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
         }));
         builder.show();
     }
 
     public static void parseVideoLink(String url, Context ctx) {
-        if (url.contains("vk.com/story")) {
+        if (url.contains("vk.ru/story") || url.contains("vk.com/story")) {
             ToastUtils.a(AndroidUtils.getString("video_dl_stories_not_supported"));
             return;
         }
 
-        if (!url.contains("vk.com/video")) {
+        if (!url.contains("vk.ru/video") || !url.contains("vk.com/video")) {
             ToastUtils.a(AndroidUtils.getString("video_dl_wrong_link"));
             return;
         }
@@ -141,7 +145,7 @@ public class VideoDownloader {
         progressDialog.setMessage(AndroidUtils.getString("video_dl_progress"));
         progressDialog.show();
 
-        makeRequest("https://" + "api.vk.com" + "/method/video.get?owner_id=" + ownerId + "&videos=" + videoId + "&v=5.99&access_token=" + getUserToken(),
+        makeRequest("https://" + getApi() + "/method/video.get?owner_id=" + ownerId + "&videos=" + videoId + "&v=5.99&access_token=" + getUserToken(),
                 response -> {
                     progressDialog.cancel();
 

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

@@ -8,6 +8,7 @@ import android.util.Pair;
 
 import com.vk.im.engine.models.messages.Msg;
 import com.vk.im.engine.models.messages.MsgFromUser;
+import com.vk.im.ui.components.msg_list.MsgListComponent;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -51,6 +52,48 @@ public class EncryptProvider {
     public static int getPeerId(Msg msg) {
         return msg.v1();
     }
+    
+    // For message editing
+    public static String decryptMessage(MsgFromUser msg, boolean showEmoji) {
+        var decryptedMessage = decryptMessage(getBody(msg), getPeerId(msg));
+        if (!showEmoji && !decryptedMessage.equals(injectOwnTextAll(getBody(msg)))) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", "");
+        return decryptedMessage;
+    }
+
+    public static String decryptMessage(String msg, MsgListComponent list) {
+        var peerid = list.G().getId();
+        var decryptedMessage = decryptMessage(msg, peerid);
+        if (!decryptedMessage.equals(injectOwnTextAll(msg))) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", "");
+        return decryptedMessage;
+    }
+
+    public static CharSequence decryptMessage(CharSequence msg, int peerid) {
+        return decryptMessage(msg.toString(), peerid);
+    }
+
+    public static CharSequence decryptMessage(Msg msg, CharSequence orig) {
+        if (msg instanceof MsgFromUser) {
+            var decrypted = decryptMessage(((MsgFromUser) msg).f(), msg.v1());
+
+            if (decrypted.contains("\uD83D\uDD12")) {
+                return decrypted;
+            }
+
+        }
+
+        return orig;
+    }
+
+    public static String decryptMessages(String msgBody, int peer, boolean showEmoji) {
+        return (String) decryptMessage(msgBody, peer, showEmoji);
+    }
+
+    // For MentionsFormatter that requires CharSequence
+    public static CharSequence decryptMessage(String msgBody, int peer, boolean showEmoji) {
+        var decryptedMessage = decryptMessage(msgBody, peer);
+        if (!showEmoji && !decryptedMessage.equals(injectOwnTextAll(msgBody))) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", "");
+        return decryptedMessage;
+    }
 
     // This will run through EVERY single processor available.
     public static String decryptMessage(MsgFromUser msg) {

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

@@ -5,8 +5,8 @@ import static android.widget.Toast.makeText;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getString;
-import static ru.vtosters.lite.utils.ProxyUtils.apiproxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.isApiProxyEnabled;
-import static ru.vtosters.lite.utils.ProxyUtils.getApi;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
@@ -18,6 +18,9 @@ import androidx.exifinterface.media.ExifInterface;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.network.Network;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -32,11 +35,13 @@ import java.util.regex.Pattern;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import ru.vtosters.lite.net.Request;
+import ru.vtosters.lite.utils.AccountManagerUtils;
 
 public class FoafBase {
     private static final Pattern FOAF_REGEX = Pattern.compile("<ya:created dc:date=\"(.+?)\"\\/>");
     private static final Pattern FOAF_REGEX_LAST_SEEN = Pattern.compile("<ya:lastLoggedIn dc:date=\"(.*)(((\\+|-)\\d\\d):(\\d\\d))\"\\/>");
     private static final Pattern FOAF_REGEX_LOGIN = Pattern.compile("<ya:created dc:date=\"(.+?)\"\\/>");
+    private static final String API_VKNEXT = "https://api.vtosters.app/v1/getBypassedOnlineInfo?json=1&ids=";
     private static final OkHttpClient client = new OkHttpClient();
 
     public static long getLastSeen(long origtime, int id) throws ParseException, IOException {
@@ -65,15 +70,57 @@ public class FoafBase {
         return sdf.parse(sdf.format(date)).getTime() / 1000;
     }
 
+
+    public static JSONObject getBypassedOnlineInfo(int id) throws JSONException {
+        var request = new okhttp3.Request.a()
+                .b(API_VKNEXT + Integer.toString(id))
+                .a();
+
+        String response = null;
+
+        var dummy = new JSONObject();
+        dummy.put("last_seen", 0);
+
+        try {
+            response = client.a(request).execute().a().g();
+            var online_info = new JSONObject(response).optJSONObject("response").optJSONObject(Integer.toString(id));
+            return online_info == null ? dummy : online_info;
+        } catch (Exception e) {
+            Log.e("GetBypassedOnlineInfo", e.getMessage());
+            return dummy;
+        }
+    }
+
+    public static JSONObject getBypassedOnlineInfo(String ids) throws JSONException {
+
+
+        var request = new okhttp3.Request.a()
+                .b(API_VKNEXT + ids)
+                .a();
+
+        String response = null;
+
+        var dummy = new JSONObject();
+
+        try {
+            response = client.a(request).execute().a().g();
+            var online_info = new JSONObject(response).optJSONObject("response");
+            return online_info == null ? dummy : online_info;
+        } catch (Exception e) {
+            Log.e("GetBypassedOnlineInfo1", e.getMessage());
+            return dummy;
+        }
+    }
+
     private static String getLink(int i) {
         String str;
         StringBuilder sb;
-        if (apiproxy()) {
+        if (isApiProxyEnabled()) {
             sb = new StringBuilder();
-            str = "https://" + getApi() + "/_/vk.com/foaf.php?id=";
+            str = "https://" + getApi() + "/_/vk.ru/foaf.php?id=";
         } else {
             sb = new StringBuilder();
-            str = "https://vk.com/foaf.php?id=";
+            str = "https://vk.ru/foaf.php?id=";
         }
         sb.append(str);
         sb.append(i);
@@ -107,7 +154,7 @@ public class FoafBase {
         }
     }
 
-    private static long daysPassedFromFoafDate(String str) {
+    private static long daysPassedFromFoafDate(String str) { 
         try {
             @SuppressLint("SimpleDateFormat")
             Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(str.split(" ")[1]);

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

@@ -4,6 +4,7 @@ import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
 import static ru.vtosters.lite.utils.AndroidUtils.getString;
 import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 import static ru.vtosters.lite.utils.LifecycleUtils.getCurrentActivity;
+import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
 import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
 
 import android.content.Context;
@@ -19,6 +20,7 @@ import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.im.engine.models.dialogs.Dialog;
 
 import java.util.List;
+import java.util.Objects;
 
 import ru.vtosters.lite.encryption.EncryptProvider;
 import ru.vtosters.lite.encryption.base.IMProcessor;
@@ -78,6 +80,8 @@ public class CryptImHook{
 
     public static void hookPref(int peerId){
         IMProcessor enabled = null;
+        String key = null;
+
         for (IMProcessor processor : EncryptProvider.processors) {
             if (processor.isUsedToEncrypt(peerId)) {
                 enabled = processor;
@@ -89,6 +93,14 @@ public class CryptImHook{
             return;
         }
 
+        if (Objects.requireNonNull(enabled).getEncryptionKeyFor(peerId) != null) {
+            key = enabled.getEncryptionKeyFor(peerId);
+        }
+
+        if (key.equals("VTAesDefault")) {
+            key = null;
+        }
+
         Context ctx = getCurrentActivity();
 
         LinearLayout linearLayout = new LinearLayout(ctx);
@@ -102,9 +114,10 @@ public class CryptImHook{
         ViewGroup.MarginLayoutParams margin = ((ViewGroup.MarginLayoutParams) editText.getLayoutParams());
         margin.setMargins(dp2px(24f), 0, dp2px(24f), 0);
         editText.setLayoutParams(margin);
+        editText.setText(key == null ? "" : key);
 
         IMProcessor finalEnabled = enabled;
-        new AlertDialog.Builder(ctx)
+        new AlertDialog.Builder(ctx, getAlertStyle())
                 .setTitle(getString("encryption_enter_key"))
                 .setMessage(String.format(getString("encryption_current_algorithm_title"), enabled.getUIName()))
                 .setView(linearLayout)

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

@@ -1,6 +1,12 @@
 package ru.vtosters.lite.hooks;
+import static ru.vtosters.lite.utils.AndroidUtils.MD5;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.Build;
+import android.provider.Settings;
 import android.util.Log;
 
 import java.util.Random;
@@ -13,27 +19,30 @@ public class DeviceInfoHook{
     }
 
     public static String getDeviceId(String input) {
-        Log.d("DeviceInfoHook", "getDeviceId: " + input);
+        return findDeviceId() + ":" + getDeviceId();
-        Log.d("DeviceInfoHook", "getDeviceId shuffled: " + shuffle(input));
-        if (getBoolValue("hideDeviceInfo", true)) return shuffle(input);
-        return input;
     }
 
-    public static String shuffle(String string) {
+    public static String getDeviceId() {
-        StringBuilder sb = new StringBuilder(string.length());
+        String sb2 = Build.PRODUCT +
-        double rnd;
+                Build.BOARD +
-        for (char c: string.toCharArray()) {
+                Build.BOOTLOADER +
-            rnd = Math.random();
+                Build.BRAND +
-            if (rnd < 0.34)
+                Build.DEVICE +
-                sb.append(c);
+                Build.DISPLAY +
-            else if (rnd < 0.67)
+                Build.FINGERPRINT +
-                sb.insert(sb.length() / 2, c);
+                Build.HARDWARE +
-            else
+                Build.HOST +
-                sb.insert(0, c);
+                Build.ID +
+                Build.MANUFACTURER +
+                Build.MODEL +
+                Build.PRODUCT +
+                Build.TAGS;
 
-            sb.append(new Random().nextInt(10));
+        return MD5(sb2);
-            sb.deleteCharAt(0);
+    }
-        }
+
-        return sb.toString();
+    @SuppressLint("HardwareIds")
+    private static String findDeviceId() {
+        return Settings.Secure.getString(getGlobalContext().getContentResolver(), "android_id");
     }
 }

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

@@ -35,6 +35,7 @@ import com.vk.core.fragments.FragmentImpl;
 import com.vk.core.util.StringUtils;
 import com.vk.navigation.right.RightMenu;
 import com.vtosters.lite.MenuCountersState;
+import com.vtosters.lite.fragments.ProfileFragment;
 import com.vtosters.lite.ui.bottomnavigation.BottomNavigationMenuView;
 import com.vtosters.lite.ui.bottomnavigation.BottomNavigationView;
 
@@ -208,6 +209,7 @@ public class DockBarInjector {
                 val = MenuCountersState.n();
                 break;
             case tab_feedback:
+            case tab_news:
                 if (milkshake())
                     val = MenuCountersState.k();
                 break;
@@ -286,7 +288,7 @@ public class DockBarInjector {
     }
 
     public static Class<?> interceptClick(int id, RightMenu rightMenu) {
-        if (id == tab_menu) {
+        if (id == tab_menu && rightMenu != null) {
             rightMenu.a();
         }
 
@@ -294,6 +296,7 @@ public class DockBarInjector {
             if (id == tab.id)
                 return tab.fragmentClass;
         }
+
         for (DockBarTab tab : sManager.getDisabledTabs()) {
             if (id == tab.id)
                 return tab.fragmentClass;

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

@@ -1,9 +1,11 @@
 package ru.vtosters.lite.hooks;
 
-import static ru.vtosters.lite.foaf.FoafBase.getLastSeen;
+import static ru.vtosters.lite.foaf.FoafBase.getBypassedOnlineInfo;
+import static ru.vtosters.lite.hooks.OnlineFormatterHook.onlineHookProfiles;
 import static ru.vtosters.lite.hooks.DateHook.getLocale;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.proxy.ProxyUtils.getStatic;
 import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs;
-import static ru.vtosters.lite.utils.Base64Utils.decode;
 import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.checkCaption;
 import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.checkCopyright;
 import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isBadNews;
@@ -74,7 +76,7 @@ public class JsonInjectors {
 
     public static JSONObject donateRecomm() throws JSONException {
         var title = AndroidUtils.getString("donate_to_vtl");
-        var link = "https://vk.com/vtosters_official";
+        var link = "https://vk.ru/vtosters_official";
         var text_color = "2D81E0";
 
         var json = new JSONObject();
@@ -116,7 +118,7 @@ public class JsonInjectors {
     public static JSONObject vktesters(int id) throws JSONException {
         var title = AndroidUtils.getString("tester_profile");
         var text_color = "2D81E0";
-        var link = "https://static.vk.com/bugs?lang=" + LangUtils.a() + "#/reporter" + id;
+        var link = "https://" + getStatic() + "/bugs?lang=" + LangUtils.a() + "#/reporter" + id;
 
         var json = new JSONObject();
         var icons = new JSONArray();
@@ -162,23 +164,16 @@ public class JsonInjectors {
         var link = "https://vtosters.app"; // can be null
         var linktitle = "Test button"; // can be null
 
-        // "{\"layout\":\"tertiary\",\"text\":\"" + linktitle + "\",\"type\":\"link\",\"link\":\"" + link + "\"}";
-        var buttons = decode("eyJsYXlvdXQiOiJ0ZXJ0aWFyeSIsInRleHQiOiI=") + linktitle + decode("IiwidHlwZSI6ImxpbmsiLCJsaW5rIjoi") + link + decode("In0=");
-        // ,"icon":" + pic + "
-        var icon = decode("LCJpY29uIjoi") + pic + decode("Ig==");
-
         var hasIcon = !pic.isEmpty();
-        var hasButton = !buttons.isEmpty();
+        var hasButton = !link.isEmpty();
-        var isPicture = pic.endsWith(".png") || pic.endsWith(".jpg") || pic.endsWith(".jpeg") || pic.endsWith(".webp");
 
-        if (!isPicture) hasIcon = false;
+        var isPicture = pic.endsWith(".png") || pic.endsWith(".jpg") || pic.endsWith(".jpeg") || pic.endsWith(".webp");
-        if (!hasIcon) icon = "";
-        if (!hasButton) buttons = "";
 
         if (isVerified(peerid)) text = AndroidUtils.getString("i_bought") + " VTosters Premium";
         if (isPrometheus(peerid)) text = AndroidUtils.getString("i_bought") + " VTosters Premium Gold Prime Pro Plus";
         if (isDeveloper(peerid)) text = AndroidUtils.getString("i_created_poop");
-        if (!isVerified(peerid) || text.equals("")) {
+
+        if (!isVerified(peerid) || text.equals("") || peerid == AccountManagerUtils.getUserId() || peerid == 0) {
             if (getBoolValue("convBarRecomm", false)) {
                 return null;
             } else {
@@ -186,14 +181,27 @@ public class JsonInjectors {
             }
         }
 
-        if (!dev()) return orig.optJSONObject("conversation_bar");
+        if (!dev()) return orig.optJSONObject("conversation_bar"); // for devs only
 
-        // JSONObject("{\"name\":\"group_admin_welcome\",\"text\":\"" + textverif + "\",\"buttons\":[],\"icon\":\"" + pic + "\"}");
+        var json = new JSONObject();
-        return new JSONObject(decode("eyJuYW1lIjoiZ3JvdXBfYWRtaW5fd2VsY29tZSIsInRleHQiOiI=")
+
-                + text + decode("IiwiYnV0dG9ucyI6Ww==")
+        var buttonsJson = new JSONObject();
-                + buttons + decode("XQ==")
+        buttonsJson.put("layout", "tertiary");
-                + icon
+        buttonsJson.put("text", linktitle);
-                + decode("fQ=="));
+        buttonsJson.put("type", "link");
+        buttonsJson.put("link", link);
+
+        var buttonsjson = new JSONArray(); // max 3 buttons in array
+        if (hasButton) buttonsjson.put(buttonsJson);
+
+        json.put("name", "group_admin_welcome");
+        json.put("text", text);
+        json.put("buttons", buttonsjson);
+        if (hasIcon && isPicture) {
+            json.put("icon", pic);
+        }
+
+        return json;
     }
 
     public static JSONObject menu(JSONObject orig) throws JSONException {
@@ -271,29 +279,82 @@ public class JsonInjectors {
 
     public static JSONObject setOnlineInfo(JSONObject json) throws ParseException, IOException, JSONException {
         var id = json.optInt("id");
+        if (id == AccountManagerUtils.getUserId()) {
+            return json;
+        }
         var onlineinfo = json.optJSONObject("online_info");
-        var time = getLastSeen(0L, id);
+        if (onlineinfo != null && !onlineinfo.optBoolean("visible")) {
+            var bypassed = getBypassedOnlineInfo(id);
+            if (bypassed.optInt("last_seen", 0) != 0) {
+                json.remove("online_info");
 
-        if (time != 0L && onlineinfo != null && !onlineinfo.optBoolean("is_online") && id != AccountManagerUtils.getUserId()) {
+                var online_info = new JSONObject()
-            json.remove("online_info");
+                        .put("visible", true)
+                        .put("last_seen", bypassed.optInt("last_seen"))
+                        .put("is_online", bypassed.optBoolean("is_online"))
+                        .put("app_id", bypassed.optInt("app_id"))
+                        .put("is_mobile", bypassed.optBoolean("is_mobile"));
 
-            var online_info = new JSONObject()
+                var last_seen = new JSONObject()
-                    .put("visible", true)
+                        .put("platform", bypassed.optInt("platform"))
-                    .put("last_seen", time)
+                        .put("time", bypassed.optInt("last_seen"));
-                    .put("is_online", false)
-                    .put("app_id", 0)
-                    .put("is_mobile", false);
 
-            var last_seen = new JSONObject()
+                json.put("last_seen", last_seen).put("online_info", online_info);
-                    .put("platform", 4)
+            }
-                    .put("time", time);
-
-            json.put("last_seen", last_seen).put("online_info", online_info);
         }
 
         return json;
     }
 
+    public static JSONArray setOnlineInfoUsers(JSONArray profiles) throws ParseException, IOException, JSONException {
+        if (profiles == null || profiles.length() == 0) return profiles;
+        StringBuilder sb = new StringBuilder();
+        var curVkId = AccountManagerUtils.getUserId();
+        for (int i=0; i < profiles.length(); i++) {
+            JSONObject profile = profiles.getJSONObject(i);
+            int id = profile.optInt("id", -1);
+            JSONObject onlinfo = profile.optJSONObject("online_info");
+            if (id == curVkId || id < 0 || onlinfo == null || onlinfo.optBoolean("visible")) {
+                continue;
+            }
+            sb.append(id);
+            sb.append(",");
+        }
+        var ids = sb.toString();
+        if (ids.length() > 0) {
+            ids = ids.substring(0, ids.length() - 1);
+        } else {
+            return profiles;
+        }
+
+        JSONObject bypassedObj = getBypassedOnlineInfo(ids);
+        for (int i=0; i < profiles.length(); i++) {
+            JSONObject profile = profiles.getJSONObject(i);
+            int id = profile.optInt("id");
+            JSONObject bypassed = bypassedObj.optJSONObject(Integer.toString(id));
+            if (bypassed == null) {
+                continue;
+            }
+            profile.remove("online_info");
+
+            var online_info = new JSONObject()
+                    .put("visible", true)
+                    .put("last_seen", bypassed.optInt("last_seen"))
+                    .put("is_online", bypassed.optBoolean("is_online"))
+                    .put("app_id", bypassed.optInt("app_id"))
+                    .put("is_mobile", bypassed.optBoolean("is_mobile"));
+
+            var last_seen = new JSONObject()
+                    .put("platform", bypassed.optInt("platform"))
+                    .put("time", bypassed.optInt("last_seen"));
+
+            profile.put("last_seen", last_seen).put("online_info", online_info);
+        }
+
+        return profiles;
+    }
+
+
     public static JSONObject storiesads(JSONObject json, boolean isDeleteFix) throws JSONException {
         if (!adsstories()) {
             return json;
@@ -374,6 +435,30 @@ public class JsonInjectors {
         return false;
     }
 
+    public static Boolean isWhitelistedFilters(JSONObject list) throws JSONException {
+        var id = String.valueOf(list.optInt("owner_id"));
+
+        if (id.equals("0")) {
+            id = String.valueOf(list.optInt("source_id"));
+        }
+
+        var whitelist = AndroidUtils.getDefaultPrefs().getStringSet("whitelisted_filters_groups", Collections.synchronizedSet(new LinkedHashSet<>()));
+
+        return whitelist.contains(id);
+    }
+
+    public static Boolean isWhitelistedAd(JSONObject list) throws JSONException {
+        var id = String.valueOf(list.optInt("owner_id"));
+
+        if (id.equals("0")) {
+            id = String.valueOf(list.optInt("source_id"));
+        }
+
+        var whitelist = AndroidUtils.getDefaultPrefs().getStringSet("whitelisted_ad_groups", Collections.synchronizedSet(new LinkedHashSet<>()));
+
+        return whitelist.contains(id);
+    }
+
     public static JSONArray newsfeedlist(JSONArray items) throws JSONException {
         var selectedItems = getDefaultPrefs().getString("news_feed_selected_items", "");
         var filtersSet = getDefaultPrefs().getStringSet("news_feed_items_set", null);
@@ -445,31 +530,31 @@ public class JsonInjectors {
                 continue;
             }
 
-            if (adsgroup() && list.optInt("marked_as_ads") == 1) {
+            if (adsgroup() && list.optInt("marked_as_ads") == 1 && !isWhitelistedAd(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: marked_as_ads is true");
                 continue;
             }
 
-            if (isBadNews(list.optString("text"))) {
+            if (isBadNews(list.optString("text")) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: text filters");
                 continue;
             }
 
-            if (checkCopyright(list)) {
+            if (checkCopyright(list) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: copyright filters");
                 continue;
             }
 
-            if (checkCaption(list)) {
+            if (checkCaption(list) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: caption filters");
                 continue;
             }
 
-            if (NewsFeedFiltersUtils.injectFiltersReposts(list)) {
+            if (NewsFeedFiltersUtils.injectFiltersReposts(list) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: repost ad");
                 continue;
@@ -506,7 +591,7 @@ public class JsonInjectors {
                 }
             }
 
-            var playlists = fetchCatalogId("https://vk.com/audio?section=my_playlists");
+            var playlists = fetchCatalogId("https://vk.ru/audio?section=my_playlists");
             if (playlists != null) {
                 var catalogarr = playlists.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
 
@@ -519,7 +604,7 @@ public class JsonInjectors {
                 oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
             }
 
-            var albums = fetchCatalogId("https://vk.com/audio?section=albums");
+            var albums = fetchCatalogId("https://vk.ru/audio?section=albums");
             if (albums != null) {
                 var catalogarr = albums.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
 
@@ -532,7 +617,7 @@ public class JsonInjectors {
                 oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
             }
 
-            var recent = fetchCatalogId("https://vk.com/audio?section=recent");
+            var recent = fetchCatalogId("https://vk.ru/audio?section=recent");
             if (recent != null) {
                 var catalogarr = recent.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
 
@@ -568,7 +653,7 @@ public class JsonInjectors {
         if (section == null) return null;
 
         var request = new Request.a()
-                .b("https://api.vk.com/method/catalog.getAudio"
+                .b("https://" + getApi() + "/method/catalog.getAudio"
                         + "?v=5.119"
                         + "&https=1"
                         + "&need_blocks=1"
@@ -592,7 +677,7 @@ public class JsonInjectors {
 
     public static JSONObject fetchCatalogPodcast() {
         var request = new Request.a()
-                .b("https://api.vk.com/method/catalog.getPodcasts"
+                .b("https://" + getApi() + "/method/catalog.getPodcasts"
                         + "?v=5.119"
                         + "&https=1"
                         + "&need_blocks=1"
@@ -612,8 +697,8 @@ public class JsonInjectors {
         return null;
     }
 
-    public static JSONObject friends(JSONObject json) throws JSONException {
+    public static JSONObject friends(JSONObject json) throws JSONException, ParseException, IOException {
-        JSONObject catalog = json;
+        JSONObject catalog = onlineHookProfiles(json);
         boolean sectionexecute = true;
         boolean hasBirthday = false;
 

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

@@ -1,6 +1,7 @@
 package ru.vtosters.lite.hooks;
 
 import static java.lang.Long.MAX_VALUE;
+import static ru.vtosters.lite.utils.AndroidUtils.*;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.checkCaption;
 import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.checkCopyright;
@@ -19,17 +20,24 @@ import static ru.vtosters.lite.utils.Preferences.adsslider;
 import static ru.vtosters.lite.utils.Preferences.authorsrecomm;
 import static ru.vtosters.lite.utils.Preferences.friendsrecomm;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+import static ru.vtosters.lite.utils.Preferences.milkshake;
 import static ru.vtosters.lite.utils.Preferences.vkme;
 
 import com.vk.core.preference.Preference;
+import com.vtosters.lite.api.ExtendedCommunityProfile;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 
+import ru.vtosters.lite.utils.AccountManagerUtils;
+import ru.vtosters.lite.utils.AndroidUtils;
+
 public class NewsfeedHook {
     public static boolean injectFilters(JSONObject obj) throws JSONException {
         if (getBoolValue("newadblock", true)) return true;
@@ -101,16 +109,57 @@ public class NewsfeedHook {
         return params.toArray(new String[0]);
     }
 
+    public static boolean isWhitelistedFilter(ExtendedCommunityProfile eup) {
+        return getDefaultPrefs().getStringSet("whitelisted_filters_groups", Collections.synchronizedSet(new LinkedHashSet<>())).contains(String.valueOf(AccountManagerUtils.getUserID(eup)));
+    }
+
+    public static boolean isWhitelistedAd(ExtendedCommunityProfile eup) {
+        return getDefaultPrefs().getStringSet("whitelisted_ad_groups", Collections.synchronizedSet(new LinkedHashSet<>())).contains(String.valueOf(AccountManagerUtils.getUserID(eup)));
+    }
+
+    public static void setWhitelistedFilter(ExtendedCommunityProfile eup, boolean needWhitelist) {
+        var mutableAdsSet = Collections.synchronizedSet(new LinkedHashSet<String>());
+        var id = String.valueOf(AccountManagerUtils.getUserID(eup));
+
+        mutableAdsSet.addAll(getDefaultPrefs().getStringSet("whitelisted_filters_groups", mutableAdsSet));
+
+        if (needWhitelist) {
+            mutableAdsSet.add(id);
+        } else {
+            mutableAdsSet.remove(id);
+        }
+
+        getDefaultPrefs().edit().putStringSet("whitelisted_filters_groups", mutableAdsSet).apply();
+    }
+
+    public static void setWhitelistedAd(ExtendedCommunityProfile eup, boolean needWhitelist) {
+        var mutableAdsSet = Collections.synchronizedSet(new LinkedHashSet<String>());
+        var id = String.valueOf(AccountManagerUtils.getUserID(eup));
+
+        mutableAdsSet.addAll(getDefaultPrefs().getStringSet("whitelisted_ad_groups", mutableAdsSet));
+
+        if (needWhitelist) {
+            mutableAdsSet.add(id);
+        } else {
+            mutableAdsSet.remove(id);
+        }
+
+        getDefaultPrefs().edit().putStringSet("whitelisted_ad_groups", mutableAdsSet).apply();
+    }
+
     public static void adsParams(HashSet<String> hashSet) {
-        if (ads() || adsslider()) {
+        if (ads()) {
             hashSet.add("ads_disabled");
+            hashSet.add("ads_app_slider");
             return;
         }
 
         hashSet.add("ads_app");
         hashSet.add("ads_site");
         hashSet.add("ads_post");
-        hashSet.add("ads_app_slider");
+        if (adsslider()) {
+            hashSet.add("ads_app_slider");
+        }
         hashSet.add("ads_site_slider");
         hashSet.add("ads_app_video");
         hashSet.add("ads_post_pretty_cards");

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

@@ -1,6 +1,7 @@
 package ru.vtosters.lite.hooks;
 
 import static ru.vtosters.lite.hooks.JsonInjectors.setOnlineInfo;
+import static ru.vtosters.lite.hooks.JsonInjectors.setOnlineInfoUsers;
 import static ru.vtosters.lite.net.Request.makeRequest;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 import static ru.vtosters.lite.utils.AndroidUtils.getString;
@@ -8,7 +9,9 @@ import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 import static ru.vtosters.lite.utils.Preferences.dev;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.Preferences.getPrefsFromFile;
-import static ru.vtosters.lite.utils.ProxyUtils.getApi;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+
+import android.util.Log;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -120,7 +123,7 @@ public class OnlineFormatterHook {
             case 5632485:
                 return "SpaceVK";
             case 6287487:
-                return "vk.com";
+                return "vk.ru";
             case 4542624:
                 return "Black VK";
             case 3917910:
@@ -167,14 +170,66 @@ public class OnlineFormatterHook {
         return getString("custom_online") + " " + appname;
     }
 
-    public static JSONObject onlineHook(JSONObject json, boolean isGlobalHook) throws ParseException, IOException, JSONException {
+    public static JSONObject onlineHook(JSONObject json) throws ParseException, IOException, JSONException {
-        if (!getBoolValue("onlinefix", false)) return json;
+        if (getBoolValue("onlinefix", false)) setOnlineInfo(json);
 
-        if (isGlobalHook && !getBoolValue("globalUsersOnline", false)) {
+        return json;
-            return json;
+    }
+
+    public static JSONArray onlineHookList(JSONArray jsonArr) throws ParseException, IOException, JSONException {
+        if (!getBoolValue("onlinefix", false)) return jsonArr;
+
+        try {
+            setOnlineInfoUsers(jsonArr);
+        } catch (Exception e) {
+            Log.e("onlineHookProfiles", e.getMessage());
         }
 
-        setOnlineInfo(json);
+        return jsonArr;
+    }
+
+    public static JSONObject onlineHookProfiles(JSONObject json) throws ParseException, IOException, JSONException {
+        if (!getBoolValue("onlinefix", false)) return json;
+
+        try {
+            setOnlineInfoUsers(json.optJSONArray("profiles"));
+        } catch (Exception e) {
+            Log.e("onlineHookProfiles", e.getMessage());
+        }
+        return json;
+    }
+
+    public static JSONObject onlineHookItems(JSONObject json) throws ParseException, IOException, JSONException {
+        if (!getBoolValue("onlinefix", false)) return json;
+
+        try {
+            setOnlineInfoUsers(json.optJSONArray("items"));
+        } catch (Exception e) {
+            Log.e("onlineHookItems", e.getMessage());
+        }
+        return json;
+    }
+
+    public static JSONObject onlineHookRequestsAndRecommendations(JSONObject json) throws ParseException, IOException, JSONException {
+        if (!getBoolValue("onlinefix", false)) return json;
+
+        try {
+            setOnlineInfoUsers(json.optJSONObject("read_requests").optJSONArray("items"));
+        } catch (Exception e) {
+            Log.e("onlineHookItems", e.getMessage());
+        }
+
+        try {
+            setOnlineInfoUsers(json.optJSONObject("recommendations").optJSONArray("items"));
+        } catch (Exception e) {
+            Log.e("onlineHookItems", e.getMessage());
+        }
+
+        try {
+            setOnlineInfoUsers(json.optJSONArray("profiles"));
+        } catch (Exception e) {
+            Log.e("onlineHookItems", e.getMessage());
+        }
         return json;
     }
 }

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

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.hooks;
 
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 
@@ -15,10 +16,15 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+
 import com.vk.core.dialogs.actionspopup.ActionsPopup;
 import com.vk.core.drawable.RecoloredDrawable;
+import com.vk.core.util.ToastUtils;
 import com.vk.dto.common.AttachmentWithMedia;
+import com.vk.dto.common.ImageSize;
 import com.vtosters.lite.R;
+import com.vtosters.lite.attachments.DocumentAttachment;
 import com.vtosters.lite.attachments.PhotoAttachment;
 
 import org.json.JSONException;
@@ -26,6 +32,7 @@ import org.json.JSONObject;
 
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.util.List;
 
 import okhttp3.Call;
 import okhttp3.Callback;
@@ -36,18 +43,17 @@ import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.ThemesUtils;
 
 public class PhotoViewer {
-
     static OkHttpClient client = new OkHttpClient();
 
     public static boolean interceptClick(AttachmentWithMedia attachment, MenuItem item, View view) {
         if (item.getItemId() == AndroidUtils.getIdentifier("search_photo", "id")) {
-            searchPhoto(getUrlFromAttachment((PhotoAttachment) attachment));
+            searchPhoto(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
             return true;
         } else if (item.getItemId() == AndroidUtils.getIdentifier("copy_photo_url", "id")) {
-            copyPhotoUrl(getUrlFromAttachment((PhotoAttachment) attachment));
+            copyPhotoUrl(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
             return true;
         } else if (item.getItemId() == AndroidUtils.getIdentifier("open_original_photo", "id")) {
-            openUrl(getUrlFromAttachment((PhotoAttachment) attachment));
+            openUrl(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
             return true;
         }
         return true;
@@ -61,7 +67,19 @@ public class PhotoViewer {
                         : new RecoloredDrawable(AndroidUtils.getGlobalContext().getDrawable(R.drawable.ic_menu_search_outline_28), ThemesUtils.getAccentColor()),
                 false,
                 () -> {
-                    searchPhoto(getUrlFromAttachment((PhotoAttachment) attachment));
+                    if (attachment instanceof PhotoAttachment) {
+                        searchPhoto(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
+                    } else if (attachment instanceof DocumentAttachment) {
+                        var documentAttachment = (DocumentAttachment) attachment;
+                        if (documentAttachment.J != null)
+                            try {
+                                searchPhoto(getUrlFromDocumentAttachment(documentAttachment));
+                            } catch (Exception e) {
+                                ToastUtils.a(getString("photo_get_error"));
+                            }
+                        else
+                            ToastUtils.a(getString("photo_get_error"));
+                    }
                     return null;
                 }
         );
@@ -71,7 +89,19 @@ public class PhotoViewer {
                         : new RecoloredDrawable(AndroidUtils.getGlobalContext().getDrawable(R.drawable.ic_copy_outline_28), Color.WHITE),
                 false,
                 () -> {
-                    copyPhotoUrl(getUrlFromAttachment((PhotoAttachment) attachment));
+                    if (attachment instanceof PhotoAttachment) {
+                        copyPhotoUrl(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
+                    } else if (attachment instanceof DocumentAttachment) {
+                        var documentAttachment = (DocumentAttachment) attachment;
+                        if (documentAttachment.J != null)
+                            try {
+                                copyPhotoUrl(getUrlFromDocumentAttachment(documentAttachment));
+                            } catch (Exception e) {
+                                ToastUtils.a(getString("photo_get_error"));
+                            }
+                        else
+                            ToastUtils.a(getString("photo_get_error"));
+                    }
                     return null;
                 }
         );
@@ -82,14 +112,39 @@ public class PhotoViewer {
                         ThemesUtils.getAccentColor()),
                 false,
                 () -> {
-                    openUrl(getUrlFromAttachment((PhotoAttachment) attachment));
+                    if (attachment instanceof PhotoAttachment) {
+                        openUrl(getUrlFromPhotoAttachment((PhotoAttachment) attachment));
+                    } else if (attachment instanceof DocumentAttachment) {
+                        var documentAttachment = (DocumentAttachment) attachment;
+                        if (documentAttachment.J != null)
+                            try {
+                                openUrl(getUrlFromDocumentAttachment(documentAttachment));
+                            } catch (Exception e) {
+                                ToastUtils.a(getString("photo_get_error"));
+                            }
+                        else
+                            ToastUtils.a(getString("photo_get_error"));
+                    }
                     return null;
                 }
         );
     }
 
-    private static String getUrlFromAttachment(PhotoAttachment attachment) {
+    private static String getUrlFromDocumentAttachment(DocumentAttachment attachment) {
+        List<ImageSize> imageSizes = null;
+        if (attachment.J != null) {
+            imageSizes = attachment.J.t1();
+        }
+        return getUrlFromImageSizeList(imageSizes != null ? imageSizes : null);
+    }
+
+    private static String getUrlFromPhotoAttachment(PhotoAttachment attachment) {
         var imageSizes = attachment.D.Q.t1();
+        return getUrlFromImageSizeList(imageSizes);
+    }
+
+    @Nullable
+    private static String getUrlFromImageSizeList(List<ImageSize> imageSizes) {
         if (imageSizes.isEmpty())
             return null;
         var max = imageSizes.get(0);

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

@@ -1,11 +1,11 @@
 package ru.vtosters.lite.hooks;
 
+import static ru.vtosters.lite.proxy.ProxyUtils.isVikaProxyEnabled;
 import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
-import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication;
-import static ru.vtosters.lite.utils.ProxyUtils.apiproxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.isRandomProxyEnabled;
-import static ru.vtosters.lite.utils.ProxyUtils.isZaboronaEnabled;
+import static ru.vtosters.lite.proxy.ProxyUtils.isZaboronaEnabled;
 import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
 import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
 import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
@@ -14,7 +14,6 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.RadioButton;
@@ -41,40 +40,56 @@ public class ProxyHook {
         RadioGroup rg = new RadioGroup(ctx);
 
         RadioButton rgDefault = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
-        RadioButton rgProxy = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
+        RadioButton rgZaborona = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
+        RadioButton rgRandomProxy = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
+        RadioButton rgVika = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
 
         rg.addView(rgDefault);
-        rg.addView(rgProxy);
+        rg.addView(rgZaborona);
+        rg.addView(rgVika);
+        rg.addView(rgRandomProxy);
 
         rgDefault.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
-        rgProxy.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
+        rgZaborona.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
+        rgRandomProxy.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
+        rgVika.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
 
         rg.setPadding(dp2px(18f), dp2px(12f), dp2px(18f), 0);
 
         rgDefault.setText(AndroidUtils.getString("proxy_disable"));
         rgDefault.setTextColor(getTextAttr());
 
-        rgProxy.setText(AndroidUtils.getString("proxy_enable") + " (Zaborona)");
+        rgZaborona.setText(AndroidUtils.getString("proxy_enable") + " (Zaborona)");
-        rgProxy.setTextColor(getTextAttr());
+        rgZaborona.setTextColor(getTextAttr());
 
-        rgProxy.setChecked(isZaboronaEnabled());
+        rgRandomProxy.setText(AndroidUtils.getString("proxy_enable") + " (Random Proxy)");
-        rgDefault.setChecked(!isZaboronaEnabled());
+        rgRandomProxy.setTextColor(getTextAttr());
+
+        rgVika.setText(AndroidUtils.getString("proxy_enable") + " (Vika)");
+        rgVika.setTextColor(getTextAttr());
+
+        rgZaborona.setChecked(isZaboronaEnabled());
+        rgDefault.setChecked(!isZaboronaEnabled() && !isRandomProxyEnabled() && !isVikaProxyEnabled());
+        rgRandomProxy.setChecked(isRandomProxyEnabled());
+        rgVika.setChecked(isVikaProxyEnabled());
 
         AlertDialog.Builder builder = new AlertDialog.Builder(ctx, getAlertStyle());
         builder.setTitle(AndroidUtils.getString("vtlproxy"));
         builder.setMessage(AndroidUtils.getString("proxy_warning"));
         builder.setView(rg);
         builder.setPositiveButton(AndroidUtils.getString("vtl_confirm"), ((dialog, which) -> { // Применить
-            if (rgProxy.isChecked()) {
+            if (rgZaborona.isChecked()) {
                 edit().putString("proxy", "zaborona").commit();
                 restartApplication();
+            } else if (rgRandomProxy.isChecked()) {
+                edit().putString("proxy", "randomproxy").commit();
+                restartApplication();
+            } else if (rgVika.isChecked()) {
+                edit().putString("proxy", "vika").commit();
+                restartApplication();
             } else {
-                if (isZaboronaEnabled()) {
-                    edit().putString("proxy", "noproxy").commit();
-                    restartApplication();
-                }
-
                 edit().putString("proxy", "noproxy").commit();
+                restartApplication();
             }
         }));
 
@@ -91,47 +106,4 @@ public class ProxyHook {
         alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(getAccentColor());
         alert.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(getAccentColor());
     }
-
-    public static String linkReplacer(String link) {
-        var vkapi = "api.vk.com";
-        var oauth = "oauth.vk.com";
-        var vkstatic = "static.vk.com";
-
-        var proxyapi = getPrefsValue("proxyapi");
-        var proxyoauth = getPrefsValue("proxyoauth");
-        var proxystatic = getPrefsValue("proxystatic");
-
-        if (!apiproxy() || link.isEmpty()) {
-            return link;
-        }
-
-        if (proxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()) {
-            Log.d("VTLite", "Proxy is not set" + " " + proxyapi + " " + proxyoauth + " " + proxystatic);
-            return link;
-        }
-
-        if (link.contains(vkapi)) {
-            return link.replace(proxyapi, vkapi);
-        }
-
-        if (link.contains(oauth)) {
-            return link.replace(proxyoauth, oauth);
-        }
-
-        if (link.contains(vkstatic)) {
-            return link.replace(proxystatic, vkstatic);
-        }
-
-        return link;
-    }
-
-    public static String getAwayPhpCom() {
-        var proxyapi = getPrefsValue("proxyapi");
-
-        if (apiproxy() & !proxyapi.isEmpty()) {
-            return proxyapi;
-        }
-
-        return "m.vk.com";
-    }
 }

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

@@ -0,0 +1,25 @@
+package ru.vtosters.lite.hooks;
+
+import static ru.vtosters.lite.encryption.EncryptProvider.decryptMessage;
+
+import com.vk.im.engine.models.ProfilesSimpleInfo;
+import com.vk.im.engine.models.messages.MsgFromUser;
+import com.vk.im.engine.models.messages.NestedMsg;
+import com.vk.im.ui.views.ReplyView;
+
+public class ReplyMsgHook {
+    public static void injectWithDecrypt(ReplyView replyView, MsgFromUser msgFromUser, ProfilesSimpleInfo profilesSimpleInfo, boolean someBool) {
+        msgFromUser.d(decryptMessage(msgFromUser)); // set new value of text in MsgFromUser class
+        replyView.a(msgFromUser, profilesSimpleInfo, someBool);
+    }
+
+    public static void injectWithDecrypt(ReplyView replyView, NestedMsg nestedMsg, ProfilesSimpleInfo profilesSimpleInfo, boolean someBool) {
+        nestedMsg.d(decryptMessage(nestedMsg.f(), nestedMsg.t1())); // set new value of text in NestedMsg class
+        replyView.a(nestedMsg, profilesSimpleInfo, someBool);
+    }
+
+    public static void injectWithDecrypt(ReplyView replyView, NestedMsg nestedMsg, ProfilesSimpleInfo profilesSimpleInfo, boolean someBool, int i) {
+        if ((i & 4) != 0) someBool = false;
+        injectWithDecrypt(replyView, nestedMsg, profilesSimpleInfo, someBool);
+    }
+}

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

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.music;
 
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.Preferences.getMusicDir;
 
 import android.app.DownloadManager;
@@ -28,7 +29,7 @@ import ru.vtosters.lite.utils.AndroidUtils;
 
 public class MP3Downloader {
 
-    private static final String URL_FORMAT = "https://api.vk.com/method/audio.getById?v=5.131&access_token=%s&audios=%s&copyright=https://vtosters.app/";
+    private static final String URL_FORMAT = "https://" + getApi() + "/method/audio.getById?v=5.131&access_token=%s&audios=%s&copyright=https://vtosters.app/";
     private static final OkHttpClient client = new OkHttpClient();
 
     public static void execute(MusicTrack track) {

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

@@ -0,0 +1,30 @@
+package ru.vtosters.lite.proxy;
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+
+public class GithubList{
+    private static final OkHttpClient mClient = new OkHttpClient();
+
+    public static ArrayList<String> getProxy(String url, String proxyname) throws IOException{
+        Request link = new Request.a()
+                .b(url)
+                .a();
+
+        var response = mClient.a(link).execute().a().g();
+
+        if (!response.contains(":")) {
+            Log.d(proxyname, "No proxy found");
+            return null;
+        }
+
+        Log.d(proxyname, response);
+
+        return new ArrayList<>(Arrays.asList(response.split("\n")));
+    }
+}

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

@@ -0,0 +1,151 @@
+package ru.vtosters.lite.proxy;
+
+import static java.lang.System.clearProperty;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
+import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import ru.vtosters.lite.proxy.http.CustomHttp;
+import ru.vtosters.lite.proxy.https.CustomHttps;
+import ru.vtosters.lite.proxy.socks.CustomSocks;
+import ru.vtosters.lite.proxy.socks.Zaborona;
+
+public class ProxyUtils{
+    public static String getApi(){
+        var proxyapi = getPrefsValue("proxyapi");
+
+        if (isApiProxyEnabled() & !proxyapi.isEmpty()) {
+            return proxyapi;
+        }
+
+        return "api.vk.ru";
+    }
+
+    public static String getOauth(){
+        var oauth = getPrefsValue("proxyoauth");
+
+        if (isApiProxyEnabled() & !oauth.isEmpty()) {
+            return oauth;
+        }
+
+        return "oauth.vk.ru";
+    }
+
+    public static String getStatic(){
+        var oauth = getPrefsValue("proxystatic");
+
+        if (isApiProxyEnabled() & !oauth.isEmpty()) {
+            return oauth;
+        }
+
+        return "static.vk.ru";
+    }
+
+    public static Boolean isZaboronaEnabled(){
+        return getPrefsValue("proxy").equals("zaborona");
+    }
+
+    public static Boolean isRandomProxyEnabled(){
+        return getPrefsValue("proxy").equals("randomproxy");
+    }
+
+    public static Boolean isApiProxyEnabled(){
+        return getPrefsValue("proxy").equals("apiproxy") || getPrefsValue("proxy").equals("vika");
+    }
+
+    public static Boolean isVikaProxyEnabled(){
+        return getPrefsValue("proxy").equals("vika");
+    }
+
+    public static void forceProxyApplying(){
+        Log.d("Proxy", "Setting proxy...");
+        try {
+            var context = getGlobalContext().getApplicationContext();
+            Class<?> applicationClass = Class.forName("android.app.Application");
+            @SuppressLint("DiscouragedPrivateApi") @SuppressWarnings("JavaReflectionMemberAccess")
+            Field mLoadedApkField = applicationClass.getDeclaredField("mLoadedApk");
+            mLoadedApkField.setAccessible(true);
+            Object mLoadedApkObject = mLoadedApkField.get(context);
+
+            @SuppressLint("PrivateApi")
+            Class<?> loadedApkClass = Class.forName("android.app.LoadedApk");
+            @SuppressLint("DiscouragedPrivateApi") Field mReceiversField = loadedApkClass.getDeclaredField("mReceivers");
+            mReceiversField.setAccessible(true);
+            ArrayMap<?, ?> receivers = (ArrayMap<?, ?>) mReceiversField.get(mLoadedApkObject);
+            if (receivers != null) {
+                for (Object receiverMap : receivers.values()) {
+                    for (Object receiver : ((ArrayMap<?, ?>) receiverMap).keySet()) {
+                        Class<?> receiverClass = receiver.getClass();
+
+                        if (receiverClass.getName().contains("ProxyChangeListener")) {
+                            Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
+                            Intent intent = new Intent(android.net.Proxy.PROXY_CHANGE_ACTION);
+                            onReceiveMethod.invoke(receiver, context, intent);
+                        } else {
+                            for (Field field : receiverClass.getDeclaredFields()) {
+                                if (field.getType().getName().contains("ProxyChangeListener")) {
+                                    Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
+                                    Intent intent = new Intent(android.net.Proxy.PROXY_CHANGE_ACTION);
+                                    onReceiveMethod.invoke(receiver, context, intent);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            Log.d("Proxy", "Setting proxy successful!");
+        } catch (Exception e) {
+            Log.d("Proxy", "Setting proxy failed!");
+        }
+    }
+
+    public static boolean hasProxy(String list){
+        return list.contains(":"); // proxy format: ip:port
+    }
+
+    public static void setProxy() throws IOException{
+        switch(getPrefsValue("proxy")) {
+            case "zaborona":
+                Zaborona.loadProxy();
+                break;
+            case "randomproxy":
+                RandomProxy.loadProxy();
+                break;
+            case "socks":
+                CustomSocks.loadProxy();
+                break;
+            case "http":
+                CustomHttp.loadProxy();
+                break;
+            case "https":
+                CustomHttps.loadProxy();
+                break;
+            default:
+                resetProxy();
+                break;
+        }
+    }
+
+    public static void resetProxy(){
+        clearProperty("https.proxyHost");
+        clearProperty("https.proxyPort");
+        clearProperty("https.proxyUser");
+        clearProperty("https.proxyPassword");
+        clearProperty("http.proxyHost");
+        clearProperty("http.proxyPort");
+        clearProperty("http.proxyUser");
+        clearProperty("http.proxyPassword");
+        clearProperty("socksProxyHost");
+        clearProperty("socksPortHost");
+    } // Reset all proxies
+}

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

@@ -0,0 +1,84 @@
+package ru.vtosters.lite.proxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.proxy.ProxyUtils.resetProxy;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
+import static ru.vtosters.lite.utils.Preferences.preferences;
+
+import java.io.IOException;
+
+import ru.vtosters.lite.proxy.socks.Hookzof;
+import ru.vtosters.lite.proxy.socks.Jetkai;
+import ru.vtosters.lite.proxy.socks.Roosterkid;
+import ru.vtosters.lite.proxy.socks.TheSpeedX;
+
+public class RandomProxy{
+    public static String type = preferences.getString("random_type", "none");
+    public static String host = preferences.getString("random_host", "");
+    public static boolean showProxyResult = false;
+
+    public static void loadProxy() throws IOException{
+        if (host.isEmpty()) {
+            getProxy();
+            loadProxy();
+            return;
+        }
+
+        switch(type) {
+            case "socks":
+                System.setProperty("socksProxyHost", host.split(":")[0]);
+                System.setProperty("socksProxyPort", host.split(":")[1]);
+                break;
+            case "http":
+                System.setProperty("http.proxyHost", host.split(":")[0]);
+                System.setProperty("http.proxyPort", host.split(":")[1]);
+                break;
+            case "https":
+                System.setProperty("https.proxyHost", host.split(":")[0]);
+                System.setProperty("https.proxyPort", host.split(":")[1]);
+                break;
+        }
+    }
+
+    public static void setupNewProxy() throws IOException{
+        edit().putString("random_type", "none").putString("random_host", "").commit();
+
+        resetProxy();
+        forceProxyApplying();
+
+        showProxyResult = true;
+        getProxy();
+        edit().putString("proxy", "randomproxy").commit();
+    }
+
+    public static void getProxy() throws IOException{
+        var random = new java.util.Random();
+        var randomInt = random.nextInt(7);
+        switch(randomInt) {
+            case 0:
+                Hookzof.loadProxy();
+                break;
+            case 1:
+                TheSpeedX.loadProxy();
+                break;
+            case 2:
+                Jetkai.loadProxy();
+                break;
+            case 3:
+                Roosterkid.loadProxy();
+                break;
+            case 4:
+                ru.vtosters.lite.proxy.http.Jetkai.loadProxy();
+                break;
+            case 5:
+                ru.vtosters.lite.proxy.http.TheSpeedX.loadProxy();
+                break;
+            case 6:
+                ru.vtosters.lite.proxy.https.Jetkai.loadProxy();
+                break;
+            case 7:
+                ru.vtosters.lite.proxy.https.Roosterkid.loadProxy();
+                break;
+        }
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/api/ApiProxy.java

@@ -0,0 +1,84 @@
+package ru.vtosters.lite.proxy.api;
+import static ru.vtosters.lite.proxy.ProxyUtils.isApiProxyEnabled;
+import static ru.vtosters.lite.proxy.ProxyUtils.isVikaProxyEnabled;
+import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+
+import android.util.Log;
+
+public class ApiProxy{
+    public static String linkReplacer(String link){
+        var vkapi = "api.vk.ru";
+        var oauth = "oauth.vk.ru";
+        var vkstatic = "static.vk.ru";
+        var vkapiold = "api.vk.com";
+        var oauthold = "oauth.vk.com";
+        var vkstaticold = "static.vk.com";
+
+        var proxyapi = getPrefsValue("proxyapi");
+        var proxyoauth = getPrefsValue("proxyoauth");
+        var proxystatic = getPrefsValue("proxystatic");
+
+        if (isVikaProxyEnabled()) {
+            proxyapi = VikaMobile.getApiHost();
+            proxyoauth = VikaMobile.getOauthHost();
+            proxystatic = VikaMobile.getStaticHost();
+        }
+
+        if ((!isApiProxyEnabled() || !isVikaProxyEnabled()) || link.isEmpty()) {
+            return link;
+        }
+
+        if (proxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()) {
+            Log.d("VTLite", "Proxy is not set" + " " + proxyapi + " " + proxyoauth + " " + proxystatic);
+            return link;
+        }
+
+        if (link.contains(vkapi)) {
+            return link.replaceAll(vkapi, proxyapi);
+        }
+
+        if (link.contains(oauth)) {
+            return link.replaceAll(oauth, proxyoauth);
+        }
+
+        if (link.contains(vkstatic)) {
+            return link.replaceAll(vkstatic, proxystatic);
+        }
+
+        if (link.contains(vkapiold)) {
+            return link.replaceAll(vkapiold, proxyapi);
+        }
+
+        if (link.contains(oauthold)) {
+            return link.replaceAll(vkapiold, proxyoauth);
+        }
+
+        if (link.contains(vkstaticold)) {
+            return link.replaceAll(vkapiold, proxystatic);
+        }
+
+        return link;
+    }
+
+    public static String staticFix(String str) {
+        var string = getPrefsValue("proxystatic");
+
+        if (isVikaProxyEnabled()) {
+            string = VikaMobile.getStaticHost();
+        }
+
+        if ((isApiProxyEnabled() || isVikaProxyEnabled()) && string.isEmpty()) return str;
+
+        return str.replaceAll(string, "static.vk.ru");
+    }
+
+    public static String getAwayPhpCom(){
+        var proxyapi = getPrefsValue("proxyapi");
+
+        if ((isApiProxyEnabled() || isVikaProxyEnabled()) & !proxyapi.isEmpty()) {
+            return proxyapi;
+        }
+
+        return "m.vk.ru";
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/api/VikaMobile.java

@@ -0,0 +1,20 @@
+package ru.vtosters.lite.proxy.api;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+
+public class VikaMobile{
+    public static String getApiHost(){
+        return isAlternativeHost() ? "vk-api-proxy.vikamobile.ru" : "vk-api-proxy.symbian.live";
+    }
+
+    public static String getOauthHost(){
+        return isAlternativeHost() ? "vk-oauth-proxy.vikamobile.ru" : "vk-oauth-proxy.symbian.live";
+    }
+
+    public static String getStaticHost(){
+        return isAlternativeHost() ? "vk-static-proxy.vikamobile.ru" : "vk-static-proxy.symbian.live";
+    }
+
+    public static Boolean isAlternativeHost(){
+        return getBoolValue("altervika", false);
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/http/CustomHttp.java

@@ -0,0 +1,33 @@
+package ru.vtosters.lite.proxy.http;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+
+public class CustomHttp{
+    public static void loadProxy(){
+        System.setProperty("http.proxyHost", proxyHostHTTP());
+        System.setProperty("http.proxyPort", proxyPortHTTP());
+        System.setProperty("http.proxyUser", proxyUserHTTP());
+        System.setProperty("http.proxyPassword", proxyPassHTTP());
+        forceProxyApplying();
+    }
+
+    private static String proxyHostHTTP(){
+        var string = getPrefsValue("proxyHostHTTP");
+        return string.isEmpty() ? "192.168.0.1" : string;
+    }
+
+    private static String proxyPortHTTP(){
+        var string = getPrefsValue("proxyPortHTTP");
+        return string.isEmpty() ? "8888" : string;
+    }
+
+    private static String proxyUserHTTP(){
+        var string = getPrefsValue("proxyUserHTTP");
+        return string.isEmpty() ? "" : string;
+    }
+
+    private static String proxyPassHTTP(){
+        var string = getPrefsValue("proxyPassHTTP");
+        return string.isEmpty() ? "" : string;
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/http/Jetkai.java

@@ -0,0 +1,48 @@
+package ru.vtosters.lite.proxy.http;
+import static ru.vtosters.lite.proxy.GithubList.getProxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.proxy.ProxyUtils.hasProxy;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import ru.vtosters.lite.proxy.RandomProxy;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class Jetkai{
+    private static final String TAG = "Jetkai_Http";
+
+    public static void loadProxy() throws IOException{
+        ArrayList<String> proxyList = getProxy("https://raw.githubusercontent.com/jetkai/proxy-list/main/online-proxies/txt/proxies-http.txt", TAG);
+
+        if (proxyList == null) {
+            Log.d(TAG, "No proxy found");
+            return;
+        }
+
+        String proxy = proxyList.get(new java.util.Random().nextInt(proxyList.size()));
+
+        if (!hasProxy(proxy)) {
+            Log.d(TAG, "No proxy port found");
+            return;
+        }
+
+        Log.d(TAG, "Setting proxy: " + proxy.split(":")[0] + ":" + proxy.split(":")[1]);
+
+        if (RandomProxy.showProxyResult) {
+            AndroidUtils.sendToast(getString("proxy_setup_success") + " " + proxy);
+            RandomProxy.showProxyResult = false;
+            RandomProxy.showProxyResult = false;
+        }
+        
+        edit().putString("random_type", "http").putString("random_host", proxy).commit();
+
+        System.setProperty("http.proxyHost", proxy.split(":")[0]);
+        System.setProperty("http.proxyPort", proxy.split(":")[1]);
+        forceProxyApplying();
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/http/TheSpeedX.java

@@ -0,0 +1,47 @@
+package ru.vtosters.lite.proxy.http;
+import static ru.vtosters.lite.proxy.GithubList.getProxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.proxy.ProxyUtils.hasProxy;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import ru.vtosters.lite.proxy.RandomProxy;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class TheSpeedX{
+    private static final String TAG = "TheSpeedX_Http";
+
+    public static void loadProxy() throws IOException{
+        ArrayList<String> proxyList = getProxy("https://raw.githubusercontent.com/TheSpeedX/PROXY-List/master/http.txt", TAG);
+
+        if (proxyList == null) {
+            Log.d(TAG, "No proxy found");
+            return;
+        }
+
+        String proxy = proxyList.get(new java.util.Random().nextInt(proxyList.size()));
+
+        if (!hasProxy(proxy)) {
+            Log.d(TAG, "No proxy port found");
+            return;
+        }
+
+        Log.d(TAG, "Setting proxy: " + proxy.split(":")[0] + ":" + proxy.split(":")[1]);
+
+        if (RandomProxy.showProxyResult) {
+            AndroidUtils.sendToast(getString("proxy_setup_success") + " " + proxy);
+            RandomProxy.showProxyResult = false;
+        }
+        
+        edit().putString("random_type", "http").putString("random_host", proxy).commit();
+
+        System.setProperty("http.proxyHost", proxy.split(":")[0]);
+        System.setProperty("http.proxyPort", proxy.split(":")[1]);
+        forceProxyApplying();
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/https/CustomHttps.java

@@ -0,0 +1,33 @@
+package ru.vtosters.lite.proxy.https;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+
+public class CustomHttps{
+    public static void loadProxy(){
+        System.setProperty("https.proxyHost", proxyHostHTTPS());
+        System.setProperty("https.proxyPort", proxyPortHTTPS());
+        System.setProperty("https.proxyUser", proxyUserHTTPS());
+        System.setProperty("https.proxyPassword", proxyPassHTTPS());
+        forceProxyApplying();
+    }
+
+    private static String proxyHostHTTPS(){
+        var string = getPrefsValue("proxyHostHTTPS");
+        return string.isEmpty() ? "192.168.0.1" : string;
+    }
+
+    private static String proxyPortHTTPS(){
+        var string = getPrefsValue("proxyPortHTTPS");
+        return string.isEmpty() ? "8888" : string;
+    }
+
+    private static String proxyUserHTTPS(){
+        var string = getPrefsValue("proxyUserHTTPS");
+        return string.isEmpty() ? "" : string;
+    }
+
+    private static String proxyPassHTTPS(){
+        String string = getPrefsValue("proxyPassHTTPS");
+        return string.isEmpty() ? "" : string;
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/https/Jetkai.java

@@ -0,0 +1,47 @@
+package ru.vtosters.lite.proxy.https;
+import static ru.vtosters.lite.proxy.GithubList.getProxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.proxy.ProxyUtils.hasProxy;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import ru.vtosters.lite.proxy.RandomProxy;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class Jetkai{
+    private static final String TAG = "Jetkai_Https";
+
+    public static void loadProxy() throws IOException{
+        ArrayList<String> proxyList = getProxy("https://raw.githubusercontent.com/jetkai/proxy-list/main/online-proxies/txt/proxies-https.txt", TAG);
+
+        if (proxyList == null) {
+            Log.d(TAG, "No proxy found");
+            return;
+        }
+
+        String proxy = proxyList.get(new java.util.Random().nextInt(proxyList.size()));
+
+        if (!hasProxy(proxy)) {
+            Log.d(TAG, "No proxy port found");
+            return;
+        }
+
+        Log.d(TAG, "Setting proxy: " + proxy.split(":")[0] + ":" + proxy.split(":")[1]);
+
+        if (RandomProxy.showProxyResult) {
+            AndroidUtils.sendToast(getString("proxy_setup_success") + " " + proxy);
+            RandomProxy.showProxyResult = false;
+        }
+        
+        edit().putString("random_type", "https").putString("random_host", proxy).commit();
+
+        System.setProperty("https.proxyHost", proxy.split(":")[0]);
+        System.setProperty("https.proxyPort", proxy.split(":")[1]);
+        forceProxyApplying();
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/https/Roosterkid.java

@@ -0,0 +1,48 @@
+package ru.vtosters.lite.proxy.https;
+import static ru.vtosters.lite.proxy.GithubList.getProxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.proxy.ProxyUtils.hasProxy;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import ru.vtosters.lite.proxy.RandomProxy;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class Roosterkid{
+    private static final String TAG = "Roosterkid_Https";
+
+    public static void loadProxy() throws IOException{
+        ArrayList<String> proxyList = getProxy("https://raw.githubusercontent.com/roosterkid/openproxylist/main/HTTPS_RAW.txt", TAG);
+
+        if (proxyList == null) {
+            Log.d(TAG, "No proxy found");
+            return;
+        }
+
+        String proxy = proxyList.get(new java.util.Random().nextInt(proxyList.size()));
+
+        if (!hasProxy(proxy)) {
+            Log.d(TAG, "No proxy port found");
+            return;
+        }
+
+        Log.d(TAG, "Setting proxy: " + proxy.split(":")[0] + ":" + proxy.split(":")[1]);
+
+        if (RandomProxy.showProxyResult) {
+            AndroidUtils.sendToast(getString("proxy_setup_success") + " " + proxy);
+            RandomProxy.showProxyResult = false;
+        }
+        
+        edit().putString("random_type", "https").putString("random_host", proxy).commit();
+
+        System.setProperty("https.proxyHost", proxy.split(":")[0]);
+        System.setProperty("https.proxyPort", proxy.split(":")[1]);
+        forceProxyApplying();
+    }
+}
+

app/src/main/java/ru/vtosters/lite/proxy/socks/CustomSocks.java

@@ -0,0 +1,21 @@
+package ru.vtosters.lite.proxy.socks;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+
+public class CustomSocks{
+    public static void loadProxy(){
+        System.setProperty("socksProxyHost", proxyHostSocks());
+        System.setProperty("socksProxyPort", proxyPortSocks());
+        forceProxyApplying();
+    }
+
+    private static String proxyHostSocks(){
+        var string = getPrefsValue("proxyHostSocks");
+        return string.isEmpty() ? "192.168.0.1" : string;
+    }
+
+    private static String proxyPortSocks(){
+        var string = getPrefsValue("proxyPortSocks");
+        return string.isEmpty() ? "8888" : string;
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/socks/Hookzof.java

@@ -0,0 +1,47 @@
+package ru.vtosters.lite.proxy.socks;
+import static ru.vtosters.lite.proxy.GithubList.getProxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.proxy.ProxyUtils.hasProxy;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import ru.vtosters.lite.proxy.RandomProxy;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class Hookzof{
+    private static final String TAG = "Hookzof_Socks";
+
+    public static void loadProxy() throws IOException{
+        ArrayList<String> proxyList = getProxy("https://raw.githubusercontent.com/hookzof/socks5_list/master/proxy.txt", TAG);
+
+        if (proxyList == null) {
+            Log.d(TAG, "No proxy found");
+            return;
+        }
+
+        String proxy = proxyList.get(new java.util.Random().nextInt(proxyList.size()));
+
+        if (!hasProxy(proxy)) {
+            Log.d(TAG, "No proxy port found");
+            return;
+        }
+
+        Log.d(TAG, "Setting proxy: " + proxy.split(":")[0] + ":" + proxy.split(":")[1]);
+
+        if (RandomProxy.showProxyResult) {
+            AndroidUtils.sendToast(getString("proxy_setup_success") + " " + proxy);
+            RandomProxy.showProxyResult = false;
+        }
+        
+        edit().putString("random_type", "socks").putString("random_host", proxy).commit();
+
+        System.setProperty("socksProxyHost", proxy.split(":")[0]);
+        System.setProperty("socksProxyPort", proxy.split(":")[1]);
+        forceProxyApplying();
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/socks/Jetkai.java

@@ -0,0 +1,47 @@
+package ru.vtosters.lite.proxy.socks;
+import static ru.vtosters.lite.proxy.GithubList.getProxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.proxy.ProxyUtils.hasProxy;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import ru.vtosters.lite.proxy.RandomProxy;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class Jetkai{
+    private static final String TAG = "Jetkai_Socks";
+
+    public static void loadProxy() throws IOException{
+        ArrayList<String> proxyList = getProxy("https://raw.githubusercontent.com/jetkai/proxy-list/main/online-proxies/txt/proxies-socks5.txt", TAG);
+
+        if (proxyList == null) {
+            Log.d(TAG, "No proxy found");
+            return;
+        }
+
+        String proxy = proxyList.get(new java.util.Random().nextInt(proxyList.size()));
+
+        if (!hasProxy(proxy)) {
+            Log.d(TAG, "No proxy port found");
+            return;
+        }
+
+        Log.d(TAG, "Setting proxy: " + proxy.split(":")[0] + ":" + proxy.split(":")[1]);
+
+        if (RandomProxy.showProxyResult) {
+            AndroidUtils.sendToast(getString("proxy_setup_success") + " " + proxy);
+            RandomProxy.showProxyResult = false;
+        }
+        
+        edit().putString("random_type", "socks").putString("random_host", proxy).commit();
+
+        System.setProperty("socksProxyHost", proxy.split(":")[0]);
+        System.setProperty("socksProxyPort", proxy.split(":")[1]);
+        forceProxyApplying();
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/socks/Roosterkid.java

@@ -0,0 +1,47 @@
+package ru.vtosters.lite.proxy.socks;
+import static ru.vtosters.lite.proxy.GithubList.getProxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.proxy.ProxyUtils.hasProxy;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import ru.vtosters.lite.proxy.RandomProxy;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class Roosterkid{
+    private static final String TAG = "Roosterkid_Socks";
+
+    public static void loadProxy() throws IOException{
+        ArrayList<String> proxyList = getProxy("https://raw.githubusercontent.com/roosterkid/openproxylist/main/SOCKS5_RAW.txt", TAG);
+
+        if (proxyList == null) {
+            Log.d(TAG, "No proxy found");
+            return;
+        }
+
+        String proxy = proxyList.get(new java.util.Random().nextInt(proxyList.size()));
+
+        if (!hasProxy(proxy)) {
+            Log.d(TAG, "No proxy port found");
+            return;
+        }
+
+        Log.d(TAG, "Setting proxy: " + proxy.split(":")[0] + ":" + proxy.split(":")[1]);
+
+        if (RandomProxy.showProxyResult) {
+            AndroidUtils.sendToast(getString("proxy_setup_success") + " " + proxy);
+            RandomProxy.showProxyResult = false;
+        }
+        
+        edit().putString("random_type", "socks").putString("random_host", proxy).commit();
+
+        System.setProperty("socksProxyHost", proxy.split(":")[0]);
+        System.setProperty("socksProxyPort", proxy.split(":")[1]);
+        forceProxyApplying();
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/socks/TheSpeedX.java

@@ -0,0 +1,47 @@
+package ru.vtosters.lite.proxy.socks;
+import static ru.vtosters.lite.proxy.GithubList.getProxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+import static ru.vtosters.lite.proxy.ProxyUtils.hasProxy;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import ru.vtosters.lite.proxy.RandomProxy;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class TheSpeedX{
+    private static final String TAG = "TheSpeedX_Socks";
+
+    public static void loadProxy() throws IOException{
+        ArrayList<String> proxyList = getProxy("https://raw.githubusercontent.com/TheSpeedX/PROXY-List/master/socks5.txt", TAG);
+
+        if (proxyList == null) {
+            Log.d(TAG, "No proxy found");
+            return;
+        }
+
+        String proxy = proxyList.get(new java.util.Random().nextInt(proxyList.size()));
+
+        if (!hasProxy(proxy)) {
+            Log.d(TAG, "No proxy port found");
+            return;
+        }
+
+        Log.d(TAG, "Setting proxy: " + proxy.split(":")[0] + ":" + proxy.split(":")[1]);
+
+        if (RandomProxy.showProxyResult) {
+            AndroidUtils.sendToast(getString("proxy_setup_success") + " " + proxy);
+            RandomProxy.showProxyResult = false;
+        }
+        
+        edit().putString("random_type", "socks").putString("random_host", proxy).commit();
+
+        System.setProperty("socksProxyHost", proxy.split(":")[0]);
+        System.setProperty("socksProxyPort", proxy.split(":")[1]);
+        forceProxyApplying();
+    }
+}

app/src/main/java/ru/vtosters/lite/proxy/socks/Zaborona.java

@@ -0,0 +1,10 @@
+package ru.vtosters.lite.proxy.socks;
+import static ru.vtosters.lite.proxy.ProxyUtils.forceProxyApplying;
+
+public class Zaborona{
+    public static void loadProxy(){
+        System.setProperty("socksProxyHost", "socks.zaboronahelp.pp.ua");
+        System.setProperty("socksProxyPort", "1488");
+        forceProxyApplying();
+    }
+}

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

@@ -1,5 +1,7 @@
 package ru.vtosters.lite.ui.activities;
 
+import static ru.vtosters.lite.proxy.ProxyUtils.getOauth;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
@@ -20,7 +22,7 @@ import ru.vtosters.lite.utils.LayoutUtils;
 
 public class VKAdminTokenActivity extends AppCompatActivity {
 
-    private static final String URL = "https://oauth.vk.com/authorize?client_id=6121396&scope=1073737727&redirect_uri=https://oauth.vk.com/blank.html&display=page&response_type=token&revoke=1";
+    private static final String URL = "https://" + getOauth() +"/authorize?client_id=6121396&scope=1073737727&redirect_uri=https://oauth.vk.ru/blank.html&display=page&response_type=token&revoke=1";
 
     @Override
     protected void onCreate(@Nullable Bundle bundle) {
@@ -37,7 +39,7 @@ public class VKAdminTokenActivity extends AppCompatActivity {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
                 var url = request.getUrl().toString();
-                if (url.startsWith("https://oauth.vk.com/auth_redirect?")) {
+                if (url.startsWith("https://" + getOauth() + "/auth_redirect?")) {
                     var redirectUri = Uri.parse(URLDecoder.decode(url));
                     var authorizeUrl = redirectUri.getQueryParameter("authorize_url");
                     var accessToken = authorizeUrl.substring(authorizeUrl.indexOf("=") + 1, authorizeUrl.indexOf("&"));

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

@@ -49,7 +49,6 @@ import ru.vtosters.lite.ui.items.DockBarTab;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class DockBarEditorManager {
-
     public static final int MIN_SELECTED_TABS = 3;
     public static final int MAX_SELECTED_TABS = 9;
 
@@ -98,17 +97,15 @@ public class DockBarEditorManager {
     private void parseSelectedTabs(String[] selectedTabsTags) {
         List<String> allTags = new ArrayList<>(Arrays.asList("tab_news", "tab_superapps", "tab_messages", "tab_feedback", "tab_profile",
                 "tab_friends", "tab_groups", "tab_photos", "tab_audios", "tab_videos", "tab_lives", "tab_games", "tab_liked",
-                "tab_fave", "tab_documents", "tab_payments", "tab_vk_apps", "tab_settings", "tab_menu"));
+                "tab_fave", "tab_documents", "tab_payments", "tab_vk_apps", "tab_settings"));
+
         for (String tag : selectedTabsTags) {
             mSelectedTabs.add(getTabByTag(tag));
             allTags.remove(tag);
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+
-            allTags.forEach(tag -> mDisabledTabs.add(getTabByTag(tag)));
+        for (String tag : allTags) {
-        } else {
+            mDisabledTabs.add(getTabByTag(tag));
-            for (String tag : allTags) {
-                mDisabledTabs.add(getTabByTag(tag));
-            }
         }
     }
 
@@ -263,13 +260,6 @@ public class DockBarEditorManager {
                         R.string.menu_apps,
                         R.id.menu_vk_apps,
                         AppsFragment.class);
-            case "tab_menu":
-                return DockBarTab.valuesOf(
-                        "tab_menu",
-                        milkshake() ? R.drawable.ic_user_circle_outline_28 : R.drawable.ic_menu_more_outline_28,
-                        milkshake() ? R.string.profile : R.string.menu,
-                        R.id.tab_menu,
-                        milkshake() ? ProfileFragment.class : MenuFragment.class);
             case "tab_settings":
             default:
                 return DockBarTab.valuesOf(

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

@@ -22,7 +22,7 @@ public class NewsfeedListManager {
         var list = new ArrayList<VBListItem>();
 
         if (filtersSet.size() == 0) {
-            sendToast(AndroidUtils.getString("newsfeed_update_feed"));
+            sendToast(AndroidUtils.getString("newsfeed_list_update_feed"));
             return;
         }
 
@@ -55,8 +55,7 @@ public class NewsfeedListManager {
     }
 
     public static void resetHideItems() {
-        getDefaultPrefs().edit()
+        getDefaultPrefs().edit().remove("news_feed_selected_items").remove("news_feed_items_set")
-                .putString("news_feed_selected_items", "")
                 .apply();
         sendToast(AndroidUtils.getString("newsfeed_list_hidden_reseted"));
     }

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

@@ -19,7 +19,7 @@ public class InstallGMS {
     public static void alert(final Activity activity) {
         if (!isGmsInstalled()) {
             VkAlertDialog.Builder builder = new VkAlertDialog.Builder(activity);
-            builder.setTitle(getString("debug_warning"));
+            builder.setTitle(getString("warning"));
             builder.setMessage(getString("gmsissuesumm"));
             builder.setCancelable(false);
             builder.setPositiveButton(getString("gmsissuebtn1"), (dialogInterface, i) -> edit().putBoolean("showAlertGms", false).apply());

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

@@ -19,7 +19,7 @@ public class Start {
             activity.requestPermissions(new String[]{"android.permission.WRITE_EXTERNAL_STORAGE"}, 228);
         }
         VkAlertDialog.Builder builder = new VkAlertDialog.Builder(activity);
-        builder.setTitle(getString("debug_warning"));
+        builder.setTitle(getString("warning"));
         builder.setMessage(getWelcome());
         builder.setCancelable(false);
         // android.content.DialogInterface.OnClickListener

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

@@ -1,5 +1,7 @@
 package ru.vtosters.lite.ui.dialogs;
 
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.proxy.ProxyUtils.isApiProxyEnabled;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getString;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
@@ -15,7 +17,7 @@ import ru.vtosters.lite.ui.fragments.VKUIwrapper;
 public class VKIDProtection {
     public static void alert(final Activity activity) {
         VkAlertDialog.Builder builder = new VkAlertDialog.Builder(activity);
-        builder.setTitle(getString("debug_warning"));
+        builder.setTitle(getString("warning"));
         builder.setMessage(getString("vkidsumm"));
         builder.setCancelable(false);
         // android.content.DialogInterface.OnClickListener
@@ -23,7 +25,7 @@ public class VKIDProtection {
         // android.content.DialogInterface.OnClickListener
         builder.setNeutralButton(getString("vkiddisable"), (dialogInterface, i) -> {
             edit().putBoolean("showAlertVkId", false).apply();
-            VKUIwrapper.setLink("https://id.vk.com/account");
+            VKUIwrapper.setLink((isApiProxyEnabled() ? "https://id.vk.ru/account" : "https://" + getApi() + "/_/id.vk.ru/account"));
             Intent a2 = new Navigator(VKUIwrapper.class).b(activity);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             activity.startActivity(a2);

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

@@ -1,9 +1,14 @@
 package ru.vtosters.lite.ui.fragments;
 
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
+import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 import static ru.vtosters.lite.utils.Preferences.copyright_post;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 
 import android.content.Context;
 import android.content.Intent;
@@ -12,6 +17,7 @@ import android.text.TextUtils;
 
 import androidx.preference.Preference;
 
+import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.navigation.Navigator;
 import com.vk.newsfeed.NewsfeedSettingsFragment;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
@@ -34,6 +40,20 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
         findPreference("spamfilters").setSummary(count(getPrefsValue("spamfilters")));
         findPreference("sourcenamefilter").setSummary(count(getPrefsValue("sourcenamefilter")));
         findPreference("linkfilter").setSummary(count(getPrefsValue("linkfilter")));
+
+        findPreference("whitelisted_ad_groups").setSummary(countSet("whitelisted_ad_groups"));
+        findPreference("whitelisted_filters_groups").setSummary(countSet("whitelisted_filters_groups"));
+
+        findPreference("whitelisted_ad_groups").setOnPreferenceClickListener(preference -> {
+            remdialog("whitelisted_ad_groups", getContext());
+            return true;
+        });
+
+        findPreference("whitelisted_filters_groups").setOnPreferenceClickListener(preference -> {
+            remdialog("whitelisted_filters_groups", getContext());
+            return true;
+        });
+
         findPreference("newsfeedlistmanager").setOnPreferenceClickListener(preference -> {
             NewsfeedListManager.callEditorPopup(getActivity());
             return true;
@@ -59,6 +79,38 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
         }
     }
 
+    private void remdialog(String key, Context context) {
+        VkAlertDialog.Builder builder = new VkAlertDialog.Builder(context);
+        builder.setTitle(AndroidUtils.getString("warning"));
+        builder.setMessage(AndroidUtils.getString("delete_elements_confirm"));
+        builder.setCancelable(false);
+        builder.setPositiveButton(AndroidUtils.getString("yes"), (dialogInterface, i) -> {
+            edit().remove(key).apply();
+            sendToast(AndroidUtils.getString("elements_deleted_success"));
+        });
+        builder.setNegativeButton(AndroidUtils.getString("cancel"), (dialogInterface, i) -> dialogInterface.dismiss());
+        builder.show();
+    }
+
+    private String countSet(String key) {
+        var set = getDefaultPrefs().getStringSet(key, null);
+        StringBuilder str = new StringBuilder();
+        if (set != null) {
+            for (var s : set) {
+                str.append(s).append(", ");
+            }
+        }
+
+        var count = str.toString().split(", ").length;
+
+        if (count < 1 || (str.length() == 0)) {
+            return AndroidUtils.getString("feed_no_elements");
+        } else {
+            return String.format(AndroidUtils.getString("feed_elements_count"), count);
+        }
+    }
+
+
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         findPreference("cringecopyright").setEnabled(!copyright_post());

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

@@ -15,7 +15,6 @@ import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.Preferences.hasVerification;
 import static ru.vtosters.lite.utils.Preferences.preferences;
-import static ru.vtosters.lite.utils.ProxyUtils.isZaboronaEnabled;
 import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
 import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
 import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
@@ -42,6 +41,9 @@ import ru.vtosters.lite.utils.AndroidUtils;
 public class IconsFragment extends MaterialPreferenceToolbarFragment {
     @SuppressLint("SetTextI18n")
     public static void callSelectDialog(Context ctx, String appicon) {
+        var defname = preferences.getString("appname", "vt");
+        var deficon = preferences.getString("selectedicon", "vt");
+
         RadioGroup rg = new RadioGroup(ctx);
 
         RadioButton rgDefault = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
@@ -67,17 +69,14 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
         rgVKontakte.setText(AndroidUtils.getString("app_name_alter"));
         rgVKontakte.setTextColor(getTextAttr());
 
-        rgVKontakte.setChecked(isZaboronaEnabled());
+        rgVKontakte.setChecked(defname.contains("vkontakte"));
-        rgVK.setChecked(isZaboronaEnabled());
+        rgVK.setChecked(defname.contains("standard"));
-        rgDefault.setChecked(!isZaboronaEnabled());
+        rgDefault.setChecked(defname.contains("vt") || defname.isEmpty());
 
         AlertDialog.Builder builder = new AlertDialog.Builder(ctx, getAlertStyle());
         builder.setTitle(AndroidUtils.getString("app_name_select_title"));
         builder.setView(rg);
         builder.setPositiveButton(AndroidUtils.getString("vtl_confirm"), ((dialog, which) -> {
-            var defname = preferences.getString("appname", "vt");
-            var deficon = preferences.getString("selectedicon", "vt");
-
             if (rgDefault.isChecked()) {
                 edit().putString("appname", "vt").commit();
                 edit().putString("selectedicon", appicon).commit();

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

@@ -1,6 +1,7 @@
 package ru.vtosters.lite.ui.fragments;
 
 import static ru.vtosters.lite.music.Scrobbler.isLoggedIn;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
@@ -68,8 +69,6 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
                 var prefs = getPreferences();
                 var editor = prefs.edit();
                 var actualPath = FileUriUtils.getFullPathFromTreeUri(path, getContext());
-                Log.d("MediaFragment", "onActivityResult: " + actualPath);
-                Log.d("MediaFragment", "onActivityResult: " + requestCode);
                 switch (requestCode) {
                     case REQUEST_CODE_SET_DOWNLOAD_DIRECTORY:
                         editor.putString("downloads_directory", actualPath);
@@ -246,7 +245,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
         Thread thread = new Thread(() -> {
             try {
                 var request = new Request.a()
-                        .b("https://api.vk.com/method/" + "video.clearViewingHistoryRecords" + "?https=1" + "&access_token=" + getUserToken() + "&v=5.187")
+                        .b("https://" + getApi() + "/method/" + "video.clearViewingHistoryRecords" + "?https=1" + "&access_token=" + getUserToken() + "&v=5.187")
                         .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"))
                         .a();
 

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

@@ -1,15 +1,31 @@
 package ru.vtosters.lite.ui.fragments;
 
+import static ru.vtosters.lite.proxy.RandomProxy.setupNewProxy;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
+import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 
 import android.os.Bundle;
 
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
+import java.io.IOException;
+
+import ru.vtosters.lite.proxy.RandomProxy;
+import ru.vtosters.lite.utils.AndroidUtils;
+
 public class ProxySettingsFragment extends MaterialPreferenceToolbarFragment {
     @Override
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         addPreferencesFromResource(getIdentifier("preferences_proxy", "xml"));
+        findPreference("random_proxy").setOnPreferenceClickListener(preference -> {
+            try {
+                setupNewProxy();
+            } catch (IOException e) {
+                sendToast(AndroidUtils.getString("get_proxy_error"));
+            }
+            return true;
+        });
     }
 }

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

@@ -14,7 +14,7 @@ public class VKPayFragment extends FragmentImpl {
     }
 
     public void start() {
-        VKUIwrapper.setLink("https://vk.com/vkpay");
+        VKUIwrapper.setLink("https://vk.ru/vkpay");
         Intent a2 = new Navigator(VKUIwrapper.class).b(getActivity());
         a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(a2);

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

@@ -183,7 +183,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         }
 
         if (!isGmsInstalled()) {
-            addPreference(this, "", AndroidUtils.getString("installgms"), "", "ic_warning_24", preference -> {
+            addPreference(this, "", AndroidUtils.getString("installgms"), "", "ic_about_outline_28", preference -> {
                 Context context = getContext();
                 Intent a2 = new Navigator(InstallGMSFragment.class).b(context);
                 a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -330,7 +330,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
                 });
             }
         } else {
-            addPreference(this, "", AndroidUtils.getString("debug_warning"), AndroidUtils.getString("vkme_mode_info"), "ic_about_outline_28", preference -> false);
+            addPreference(this, "", AndroidUtils.getString("warning"), AndroidUtils.getString("vkme_mode_info"), "ic_about_outline_28", preference -> false);
         }
 
         addPreference(this, "", AndroidUtils.getString("vtlmedia"), mediasumm, "ic_media_outline_28", preference -> {

app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java

@@ -1,7 +1,10 @@
 package ru.vtosters.lite.ui.vkui;
 
 import static ru.vtosters.lite.foaf.FoafBase.loadAndShow;
+import static ru.vtosters.lite.hooks.NewsfeedHook.setWhitelistedAd;
+import static ru.vtosters.lite.hooks.NewsfeedHook.setWhitelistedFilter;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserID;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
 import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 
 import android.content.ClipData;
@@ -24,7 +27,7 @@ import java.util.Objects;
 
 import kotlin.Unit;
 import kotlin.jvm.b.Functions;
-import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.hooks.NewsfeedHook;
 import ru.vtosters.lite.utils.RenameTool;
 
 public class MenuBuilder {
@@ -55,18 +58,17 @@ public class MenuBuilder {
         try {
             final ExtendedUserProfile eup = (ExtendedUserProfile) pfambObject.get(mb);
             final Context ctx = ((View) Objects.requireNonNull(apView.get(builder))).getContext();
-
+            addItem(builder, getString("menu_copy_id"), () -> {
-            addItem(builder, AndroidUtils.getString("menu_copy_id"), () -> {
                 copy(ctx, String.valueOf(getUserID(eup)));
                 return Unit.a;
             });
 
-            addItem(builder, AndroidUtils.getString("menu_addon_info"), () -> {
+            addItem(builder, getString("menu_addon_info"), () -> {
                 loadAndShow(ctx, getUserID(eup));
                 return Unit.a;
             });
 
-            addItem(builder, AndroidUtils.getString("menu_change_name"), () -> {
+            addItem(builder, getString("menu_change_name"), () -> {
                 RenameTool.createDialog(eup, ctx);
                 return Unit.a;
             });
@@ -80,17 +82,31 @@ public class MenuBuilder {
         try {
             final ExtendedCommunityProfile ecp = (ExtendedCommunityProfile) cfambObject.get(mb);
             final Context ctx = ((View) apView.get(builder)).getContext();
+            final boolean isPageWhitelistedFilter = NewsfeedHook.isWhitelistedFilter(ecp);
+            final boolean isPageWhitelistedAds = NewsfeedHook.isWhitelistedAd(ecp);
 
-            addItem(builder, AndroidUtils.getString("menu_copy_id"), () -> {
+            addItem(builder, getString("menu_copy_id"), () -> {
                 copy(ctx, String.valueOf(getUserID(ecp)));
                 return Unit.a;
             });
 
-            addItem(builder, AndroidUtils.getString("menu_change_name"), () -> {
+            addItem(builder, getString("menu_change_name"), () -> {
                 RenameTool.createDialogGroup(ecp, ctx);
                 return Unit.a;
             });
 
+            addItem(builder, getString(isPageWhitelistedFilter ? "remove_from_filter_whitelist" : "add_to_filter_whitelist"), () -> {
+                setWhitelistedFilter(ecp, !isPageWhitelistedFilter);
+                sendToast(getString(isPageWhitelistedFilter ? "removed_from_whitelist_success" : "added_to_whitelist_success"));
+                return Unit.a;
+            });
+
+            addItem(builder, getString(isPageWhitelistedAds ? "remove_from_ads_whitelist" : "add_to_ads_whitelist"), () -> {
+                setWhitelistedAd(ecp, !isPageWhitelistedAds);
+                sendToast(getString(isPageWhitelistedAds ? "removed_from_whitelist_success" : "added_to_whitelist_success"));
+                return Unit.a;
+            });
+
         } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
@@ -101,7 +117,7 @@ public class MenuBuilder {
         ClipData clip = ClipData.newPlainText("MBH-ST", txt);
         clipboard.setPrimaryClip(clip);
 
-        sendToast(AndroidUtils.getString("menu_copied"));
+        sendToast(getString("menu_copied"));
     }
 
     public static void addItem(final ActionsPopup.b builder, final String title, final Functions onClick) throws InvocationTargetException, IllegalAccessException {

app/src/main/java/ru/vtosters/lite/ui/wallpapers/ImageFilters.java

@@ -2,6 +2,7 @@ package ru.vtosters.lite.ui.wallpapers;
 
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 import static ru.vtosters.lite.utils.AndroidUtils.getResources;
+import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -130,19 +131,27 @@ public class ImageFilters {
     }
 
     private static void darken(Bitmap bm) {
-        Canvas canvas = new Canvas(bm);
+        try {
-        Paint p = new Paint(Color.RED);
+            Canvas canvas = new Canvas(bm);
-        ColorFilter filter = new LightingColorFilter(0xFF7F7F7F, 0x00000000);    // darken
+            Paint p = new Paint(Color.RED);
-        p.setColorFilter(filter);
+            ColorFilter filter = new LightingColorFilter(0xFF7F7F7F, 0x00000000);    // darken
-        canvas.drawBitmap(bm, new Matrix(), p);
+            p.setColorFilter(filter);
+            canvas.drawBitmap(bm, new Matrix(), p);
+        } catch (Exception e) {
+            sendToast("Ошибка при работе затемнения обоев");
+        }
     }
 
     private static void lighten(Bitmap bm) {
-        Canvas canvas = new Canvas(bm);
+        try {
-        Paint p = new Paint(Color.RED);
+            Canvas canvas = new Canvas(bm);
-        ColorFilter filter = new LightingColorFilter(0xFFFFFFFF, 0x00222222); // lighten
+            Paint p = new Paint(Color.RED);
-        p.setColorFilter(filter);
+            ColorFilter filter = new LightingColorFilter(0xFFFFFFFF, 0x00222222); // lighten
-        canvas.drawBitmap(bm, new Matrix(), p);
+            p.setColorFilter(filter);
+            canvas.drawBitmap(bm, new Matrix(), p);
+        } catch (Exception e) {
+            sendToast("Ошибка при работе осветления обоев");
+        }
     }
 
     public static Bitmap applyInvertEffect(Bitmap src) {

app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java

@@ -158,6 +158,14 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
             });
         }
 
+        PreferencesUtil.addMaterialSwitchPreference(this, "compresswp", "Сжимать обои", "Значительно ускоряет открытие чатов", null, true, (preference, o) -> {
+            boolean value = (boolean) o;
+            edit().putBoolean("compresswp", value).commit();
+            requestUpdateWallpaper();
+            mWPPreviewPref.redraw();
+            return true;
+        });
+
         ListPreference blur = (ListPreference) findPreference("msg_blur_radius");
         ListPreference dim = (ListPreference) findPreference("msg_dim");
         ListPreference mosaic = (ListPreference) findPreference("msg_mosaic");

app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpapersHooks.java

@@ -8,15 +8,25 @@ import static ru.vtosters.lite.ui.wallpapers.ImageFilters.getMonochrome;
 import static ru.vtosters.lite.ui.wallpapers.ImageFilters.getMosaic;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
+import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.Preferences.hasVerification;
 
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 
 import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 public class WallpapersHooks {
     private static File mWallpaperFile;
@@ -28,18 +38,69 @@ public class WallpapersHooks {
         return mWallpaperFile == null ? mWallpaperFile = new File(getGlobalContext().getFilesDir(), "wallpaper.png") : mWallpaperFile;
     }
 
+    private static Boolean eligibleWallpaperFile(File file) {
+        if (file.length() >= 6291456) {
+            sendToast("Размер файла превышает лимит 6 MB");
+            removeWallpaper();
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public static File compress(File file){
+        try {
+            BitmapFactory.Options o = new BitmapFactory.Options();
+            o.inJustDecodeBounds = true;
+            o.inSampleSize = 6;
+
+            FileInputStream inputStream = new FileInputStream(file);
+            BitmapFactory.decodeStream(inputStream, null, o);
+            inputStream.close();
+
+            final int REQUIRED_SIZE=200;
+
+            int scale = 1;
+            while(o.outWidth / scale / 2 >= REQUIRED_SIZE && o.outHeight / scale / 2 >= REQUIRED_SIZE) {
+                scale *= 2;
+            }
+
+            BitmapFactory.Options o2 = new BitmapFactory.Options();
+            o2.inSampleSize = scale;
+            inputStream = new FileInputStream(file);
+
+            Bitmap selectedBitmap = BitmapFactory.decodeStream(inputStream, null, o2);
+            inputStream.close();
+
+            File outPutFile = File.createTempFile("wallpaper_temp","image");
+            FileOutputStream outputStream = new FileOutputStream(outPutFile);
+            selectedBitmap.compress(Bitmap.CompressFormat.PNG, 85 , outputStream);
+
+            return outPutFile;
+        } catch (Exception e) {
+            Log.d("Wallpapers", e.getMessage());
+            return null;
+        }
+    }
+
     public static void setBg(View view) {
         if (getWallpaper() != null) {
             ((ImageView) view).setImageDrawable(getWallpaper()); // set picture to background
             return;
         }
 
-        ((ImageView) view).setColorFilter(im_bg_chat); // set default bg color
+        view.setBackgroundColor(ThemesUtils.getColorFromAttr(im_bg_chat)); // set default bg color
     }
 
     public static String getWallpaperUrl() {
-        if (getWallpaperFile().exists())
+        if (getWallpaperFile().exists() && eligibleWallpaperFile(getWallpaperFile()))
-            return getWallpaperFile().getAbsolutePath();
+            if (compress(getWallpaperFile()) == null) {
+                return "default";
+            } else if (getBoolValue("compresswp", true)){
+                return compress(getWallpaperFile()).getAbsolutePath();
+            } else {
+                return getWallpaperFile().getAbsolutePath();
+            }
         else
             return "default";
     }

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

@@ -25,6 +25,7 @@ import b.h.g.m.FileUtils;
 public class CacheUtils {
     private static CacheUtils sInstance = new CacheUtils();
     public long size = 0;
+    public static boolean needToDelete = false;
 
     public static CacheUtils getInstance() {
         if (sInstance == null)
@@ -55,7 +56,7 @@ public class CacheUtils {
     public void autoCleaningCache() {
         size = IOUtils.getDirSize(getGlobalContext().getCacheDir());
 
-        if (size >= getSizeForDelete()) {
+        if (size >= getSizeForDelete() && needToDelete) {
             if (dev()) sendToast(AndroidUtils.getString("cache_cleaned"));
             VKImageLoader.e();
             ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);

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

@@ -5,10 +5,11 @@ import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+import static ru.vtosters.lite.utils.CacheUtils.*;
 import static ru.vtosters.lite.utils.CacheUtils.getInstance;
 import static ru.vtosters.lite.utils.DeletedMessagesHandler.reloadMessagesList;
 import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.setupFilters;
-import static ru.vtosters.lite.utils.ProxyUtils.setProxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.setProxy;
 import static ru.vtosters.lite.utils.SignatureChecker.validateAppSignature;
 import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
 import static ru.vtosters.lite.utils.VTVerifications.isPrometheus;
@@ -152,10 +153,6 @@ public class Preferences {
         return getBoolValue("calls", false);
     }
 
-    public static boolean globalUsersOnline() {
-        return getBoolValue("globalUsersOnline", false);
-    }
-
     public static boolean dev() {
         return getBoolValue("dev", false);
     }
@@ -366,16 +363,22 @@ public class Preferences {
     public static long getSizeForDelete() {
         switch (getPrefsValue("clearcache")) {
             case "100mb":
+                needToDelete = true;
                 return 104857600L;
             case "500mb":
+                needToDelete = true;
                 return 524288000L;
             case "1gb":
+                needToDelete = true;
                 return 1073741824L;
             case "2gb":
+                needToDelete = true;
                 return 2147483648L;
             case "5gb":
+                needToDelete = true;
                 return 5368709120L;
             default:
+                needToDelete = false;
                 return MAX_VALUE;
         }
     }

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

@@ -1,170 +0,0 @@
-package ru.vtosters.lite.utils;
-
-import static java.lang.System.clearProperty;
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
-import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.Intent;
-import android.util.ArrayMap;
-import android.util.Log;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-public class ProxyUtils {
-    public static String getApi() {
-        var proxyapi = getPrefsValue("proxyapi");
-
-        if (apiproxy() & !proxyapi.isEmpty()) {
-            return proxyapi;
-        }
-
-        return "api.vk.com";
-    }
-
-    public static Boolean isZaboronaEnabled() {
-        return getPrefsValue("proxy").equals("zaborona");
-    }
-
-    public static void setProxyRefl() {
-        Log.d("Proxy", "Setting proxy...");
-        try {
-            var context = getGlobalContext().getApplicationContext();
-            Class<?> applicationClass = Class.forName("android.app.Application");
-            @SuppressLint("DiscouragedPrivateApi") @SuppressWarnings("JavaReflectionMemberAccess")
-            Field mLoadedApkField = applicationClass.getDeclaredField("mLoadedApk");
-            mLoadedApkField.setAccessible(true);
-            Object mLoadedApkObject = mLoadedApkField.get(context);
-
-            @SuppressLint("PrivateApi")
-            Class<?> loadedApkClass = Class.forName("android.app.LoadedApk");
-            @SuppressLint("DiscouragedPrivateApi") Field mReceiversField = loadedApkClass.getDeclaredField("mReceivers");
-            mReceiversField.setAccessible(true);
-            ArrayMap<?, ?> receivers = (ArrayMap<?, ?>) mReceiversField.get(mLoadedApkObject);
-            for (Object receiverMap : receivers.values()) {
-                for (Object receiver : ((ArrayMap<?, ?>) receiverMap).keySet()) {
-                    Class<?> receiverClass = receiver.getClass();
-
-                    if (receiverClass.getName().contains("ProxyChangeListener")) {
-                        Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
-                        Intent intent = new Intent(android.net.Proxy.PROXY_CHANGE_ACTION);
-                        onReceiveMethod.invoke(receiver, context, intent);
-                    } else {
-                        for (Field field : receiverClass.getDeclaredFields()) {
-                            if (field.getType().getName().contains("ProxyChangeListener")) {
-                                Method onReceiveMethod = receiverClass.getDeclaredMethod("onReceive", Context.class, Intent.class);
-                                Intent intent = new Intent(android.net.Proxy.PROXY_CHANGE_ACTION);
-                                onReceiveMethod.invoke(receiver, context, intent);
-                            }
-                        }
-                    }
-                }
-            }
-
-            Log.d("Proxy", "Setting proxy successful!");
-        } catch (Exception e) {
-            Log.d("Proxy", "Setting proxy failed!");
-        }
-    }
-
-    public static void setProxy() {
-        switch (getPrefsValue("proxy")) {
-            case "zaborona":
-                System.setProperty("socksProxyHost", "socks.zaboronahelp.pp.ua");
-                System.setProperty("socksProxyPort", "1488");
-                setProxyRefl();
-                break;
-            case "socks":
-                System.setProperty("socksProxyHost", proxyHostSocks());
-                System.setProperty("socksProxyPort", proxyPortSocks());
-                setProxyRefl();
-                break;
-            case "http":
-                System.setProperty("http.proxyHost", proxyHostHTTP());
-                System.setProperty("http.proxyPort", proxyPortHTTP());
-                System.setProperty("http.proxyUser", proxyUserHTTP());
-                System.setProperty("http.proxyPassword", proxyPassHTTP());
-                setProxyRefl();
-                break;
-            case "https":
-                System.setProperty("https.proxyHost", proxyHostHTTPS());
-                System.setProperty("https.proxyPort", proxyPortHTTPS());
-                System.setProperty("https.proxyUser", proxyUserHTTPS());
-                System.setProperty("https.proxyPassword", proxyPassHTTPS());
-                setProxyRefl();
-                break;
-            default:
-                resetProxy();
-                break;
-        }
-    }
-
-    public static void resetProxy() {
-        clearProperty("https.proxyHost");
-        clearProperty("https.proxyPort");
-        clearProperty("https.proxyUser");
-        clearProperty("https.proxyPassword");
-        clearProperty("http.proxyHost");
-        clearProperty("http.proxyPort");
-        clearProperty("http.proxyUser");
-        clearProperty("http.proxyPassword");
-        clearProperty("socksProxyHost");
-        clearProperty("socksPortHost");
-    } // Reset all proxies
-
-    private static String proxyHostHTTP() {
-        var string = getPrefsValue("proxyHostHTTP");
-        return string.isEmpty() ? "192.168.0.1" : string;
-    }
-
-    private static String proxyHostHTTPS() {
-        var string = getPrefsValue("proxyHostHTTPS");
-        return string.isEmpty() ? "192.168.0.1" : string;
-    }
-
-    private static String proxyHostSocks() {
-        var string = getPrefsValue("proxyHostSocks");
-        return string.isEmpty() ? "192.168.0.1" : string;
-    }
-
-    private static String proxyPortHTTP() {
-        var string = getPrefsValue("proxyPortHTTP");
-        return string.isEmpty() ? "8888" : string;
-    }
-
-    private static String proxyPortHTTPS() {
-        var string = getPrefsValue("proxyPortHTTPS");
-        return string.isEmpty() ? "8888" : string;
-    }
-
-    private static String proxyPortSocks() {
-        var string = getPrefsValue("proxyPortSocks");
-        return string.isEmpty() ? "8888" : string;
-    }
-
-    private static String proxyUserHTTP() {
-        var string = getPrefsValue("proxyUserHTTP");
-        return string.isEmpty() ? "" : string;
-    }
-
-    private static String proxyUserHTTPS() {
-        var string = getPrefsValue("proxyUserHTTPS");
-        return string.isEmpty() ? "" : string;
-    }
-
-    private static String proxyPassHTTP() {
-        var string = getPrefsValue("proxyPassHTTP");
-        return string.isEmpty() ? "" : string;
-    }
-
-    private static String proxyPassHTTPS() {
-        String string = getPrefsValue("proxyPassHTTPS");
-        return string.isEmpty() ? "" : string;
-    }
-
-    public static boolean apiproxy() {
-        return getPrefsValue("proxy").equals("apiproxy");
-    }
-}

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

@@ -5,7 +5,7 @@ import static ru.vtosters.lite.utils.About.getBuildNumber;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.dev;
 import static ru.vtosters.lite.utils.Preferences.vksans;
-import static ru.vtosters.lite.utils.ProxyUtils.apiproxy;
+import static ru.vtosters.lite.proxy.ProxyUtils.isApiProxyEnabled;
 import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
 
 public class SSFSUtils {
@@ -39,7 +39,7 @@ public class SSFSUtils {
     }
 
     public static String getUserProxy() {
-        return apiproxy() ? "1" : "0";
+        return isApiProxyEnabled() ? "1" : "0";
     }
 
     public static String isVKSansEnabled() {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Apr 22 13:33:27 MSK 2022
+#Tue Aug 16 21:49:57 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

smali/AndroidManifest.xml

@@ -960,6 +960,17 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
+                <data
+                    android:host="vk.ru"
+                    android:pathPattern="/.*"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
                     android:host="vk.com"
                     android:pathPattern="/.*"
@@ -971,28 +982,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
-                    android:host="vkontakte.ru"
-                    android:pathPattern="/.*"
-                    android:scheme="http" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="new.vk.com"
-                    android:pathPattern="/.*"
-                    android:scheme="http" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
                 <data
                     android:host="vk.com"
                     android:pathPattern="/.*"
@@ -1007,6 +996,28 @@
                 <data
                     android:host="vkontakte.ru"
                     android:pathPattern="/.*"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="new.vk.ru"
+                    android:pathPattern="/.*"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="vk.ru"
+                    android:pathPattern="/.*"
                     android:scheme="https" />
             </intent-filter>
             <intent-filter>
@@ -1016,7 +1027,18 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="new.vk.com"
+                    android:host="vkontakte.ru"
+                    android:pathPattern="/.*"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="new.vk.ru"
                     android:pathPattern="/.*"
                     android:scheme="https" />
             </intent-filter>
@@ -1107,6 +1129,30 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+                <data
+                    android:host="m.vk.ru"
+                    android:pathPattern="/.*"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+                <data
+                    android:host="m.vk.ru"
+                    android:pathPattern="/.*"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
                 <action android:name="android.nfc.action.NDEF_DISCOVERED" />
                 <data
                     android:host="m.vk.com"
@@ -1132,7 +1178,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="m.vk.com"
+                    android:host="m.vk.ru"
                     android:pathPattern="/restore"
                     android:scheme="http" />
             </intent-filter>
@@ -1143,7 +1189,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="m.vk.com"
+                    android:host="m.vk.ru"
                     android:pathPattern="/restore"
                     android:scheme="https" />
             </intent-filter>

smali/assets/CopyrightAds.txt

@@ -1,6 +1,7 @@
 appscent
 //t.me/
 vk.com
+vk.ru
 apps-cent
 app-cent
 appcent

smali/assets/wiki_template_article.htm

@@ -394,12 +394,12 @@ function showPhotosBox(url, id, num, link){
   <div class="wk_text" style="max-width: 604px">
     <div class="header">
       <div style="float: left;">
-            <a href="https://vk.com/club{GROUP_ID}">
+            <a href="https://vk.ru/club{GROUP_ID}">
               <img src="{GROUP_PHOTO}" width="50" height="50" border="0"/>
             </a>
           </div>
             <div class="headGroupName">
-              <a href="https://vk.com/club{GROUP_ID}">{GROUP_NAME}</a>
+              <a href="https://vk.ru/club{GROUP_ID}">{GROUP_NAME}</a>
             </div>
             <div class="headOrigLink">
               {L_PREVIEW} <a href="http://{ORIG_URL}">{ORIG_URL}</a>
@@ -412,7 +412,7 @@ function showPhotosBox(url, id, num, link){
     <div class="footer">
       {L_SOURCE} <a href="http://{ORIG_URL}">{ORIG_URL}</a><br/>
       {DATE} - {VIEWS}<br/>
-      <a href="https://vk.com/id{PROFILE_ID}">{L_GO_TO_GROUP}</a>
+      <a href="https://vk.ru/id{PROFILE_ID}">{L_GO_TO_GROUP}</a>
     </div>
   </div>
 </body>