100% fix crash on start

fixes #745

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.ru/vtosters_official">
+    <a href="https://vk.com/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">
@@ -55,6 +55,7 @@
 * Лента
   * Блокировка рекламы в ленте
   * Блокировка постов через фильтры
+  	* Возможность добавлять в вайтлист фильтров группы, чтобы в них не удалялись посты
   * Возможность отключить рекомендации от ВК
 * Редактор докбара
 * Редактор элементов Superapp
@@ -68,8 +69,7 @@
   * Результаты опросов без участия
   * Возможность указывать папку для загрузки фото/видео/музыки/всего
   * Интеграция с <a href="https://www.last.fm/">LAST.FM</a> (а также возможность скробблинга)
-  * Новый раздел музыки
-  * Возможность скачивать видео
+  * Возможность скачивать видео, очищать историю просмотра видео
   * Возможность найти фотографию через поисковые системы
   * Интеграция с <a href="https://vkx.app/">VK X</a>
 * Сообщения
@@ -77,18 +77,20 @@
   * Возможность выключения кнопки записи голосовых сообщений
   * Возможность скрыть блок рекомендаций в сообщениях
   * Режим **VK Me**
-  * Возможность вернуть вкладку уведомлений
+  * Возможность вернуть вкладку уведомлений для режима VK Me
   * Встроенный переводчик текста для сообщений
   	* Возможность выбрать язык перевода
-  	* Автоматический перевод ваших сообщений на выбранный язык
+  	* Автоматический перевод ваших сообщений на выбранный язык	
   * Альтернативный дизайн эмодзи меню
   * Возможность использовать системные эмодзи
+  * Возможнсть использовать Enter с аппаратной клавиатуры
 * Активность
   * Возможность видеть удаленные сообщения
   * Функционал, позволяющий оставаться в «оффлайне» (принудительный оффлайн/не отправлять статус онлайна и т.п.)
   * Нечиталка/неписалка для ЛС/бесед/ботов/групп
   * Возможность отключить информацию о том, что вы просмотрели историю/прослушали голосовое сообщение
   * Возможность видеть онлайн пользователей, если у вас скрыт онлайн через VK Messenger
+  * Возможность сохранять настройки бесшумных сообщений/сообщений-бомбочек
   * Отключить уведомление о том, что вы сделали скриншот в беседе
   * Отключение редиректа через away.php
   * Отключение отправки метрики
@@ -115,6 +117,7 @@
   * Возможность скрыть блок рекомендаций друзей в разделе «Друзья»
   * Возможность скрыть подписи в настройках
 * Прокси
+  * Поддержка сторонних прокси, таких как: Zaborona, VikaMobile, рандомные прокси и прочие
   * Возможность использовать **HTTP/HTTPS/SOCKS** прокси, менять домены **API/OAuth/Static**
 * Другое
   * Очистка кеша приложения (**всё/стикеры/изображения/видео/сообщения/WebView**)
@@ -133,7 +136,7 @@
 
 `android:debuggable="false"` ➝ `android:debuggable="true"`
 
-Настройки, необходимые для **отладки** вне Android Studio, находятся по этой ссылке: [vk.ru/vt/debug](https://vk.ru/vt/debug)
+Настройки, необходимые для **отладки** вне Android Studio, находятся по этой ссылке: [vk.com/vt/debug](https://vk.com/vt/debug)
 
 * Для дополнительной отладки ответов и логов необходимо включить **[Режим разработчика]**
 
@@ -145,7 +148,7 @@
 
 Сразу после нажатия на запись приложение начнет записывать **все ваши действия** по пути `/Download/VK/logs/com.vtosters.lite/`
 
-При следующем открытии приложения оно автоматически сохранит логи и отправит вам в [**Документы** ВК](https://vk.ru/docs), откуда вы можете скачать архив логов и работать с ними.
+При следующем открытии приложения оно автоматически сохранит логи и отправит вам в [**Документы** ВК](https://vk.com/docs), откуда вы можете скачать архив логов и работать с ними.
 
 ## Разработка
 

app/build.gradle

@@ -77,10 +77,11 @@ android {
         targetSdkVersion 32
         versionCode 1
         versionName "1.0"
-        multiDexEnabled false
+        multiDexEnabled true
     }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
@@ -88,8 +89,9 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    implementation 'net.sourceforge.streamsupport:streamsupport-minifuture:1.7.4'
     implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.preference:preference:1.2.0'
     implementation fileTree(dir: 'libs', include: ['*.aar'])
     compileOnly fileTree(dir: 'libs', include: ['*.jar'])

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

@@ -54,7 +54,13 @@ public class LibVKXClient {
         return getInstance().runOnService(action);
     }
 
-    public static void lambdaplay(List<MusicTrack> list, MusicTrack musicTrack, ILibVkxService iLibVkxService) {
+    public static void lambdaplay(List<MusicTrack> list, MusicTrack musicTrack, ILibVkxService iLibVkxService, MusicPlaybackLaunchContext playerRefer) {
+        var playbackContext = "";
+
+        if (playerRefer != null) {
+            playbackContext = playerRefer.v0();
+        }
+
         int indexOf = list.indexOf(musicTrack);
         var ids = new ArrayList<String>();
         for (var track : list) {
@@ -65,12 +71,16 @@ public class LibVKXClient {
         }
 
         try {
-            iLibVkxService.play(ids, indexOf, "");
+            iLibVkxService.play(ids, indexOf, playbackContext);
         } catch (RemoteException e) {
             e.printStackTrace();
         }
     }
 
+    public static void lambdaplay(List<MusicTrack> list, MusicTrack musicTrack, ILibVkxService iLibVkxService){
+        lambdaplay(list, musicTrack, iLibVkxService, null);
+    }
+
     private static String asId(MusicTrack musicTrack) {
         String str = musicTrack.e + "_" + musicTrack.d;
         if (musicTrack.O == null || musicTrack.O.equals("")) {

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

@@ -1,11 +1,5 @@
 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;
-import static ru.vtosters.lite.utils.Preferences.getVideosDir;
-
 import android.annotation.SuppressLint;
 import android.app.DownloadManager;
 import android.content.ActivityNotFoundException;
@@ -13,8 +7,8 @@ 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.os.Environment;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -24,10 +18,11 @@ 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;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.HashSet;
@@ -55,52 +50,61 @@ public class DownloadUtils {
         }
     }
     
-    private static void b(final Context context, String str, String str2, boolean z) {
-        if (TextUtils.isEmpty(str2)) {
+    private static void b(final Context context, String str, String uri, boolean z) {
+        if (TextUtils.isEmpty(uri)) {
             return;
         }
 
-        String file = a(str, str2);
-        File b2;
-        boolean pic = false;
-        boolean c2 = MediaUtils.c(MediaUtils.b(str2));
+        String fileName = a(str, uri);
+        File file;
 
-        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")) {
-            b2 = new File(getVideosDir(), file);
+        Log.v("DownloadUtils", "download: filename = " + fileName + " | str = " + str + "| str2 = " + uri);
+
+        if (fileName.endsWith(".jpg") || fileName.endsWith(".png") || fileName.endsWith(".jpeg")) {
+            file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath(), fileName);
+        } else if (fileName.endsWith(".mp3") || fileName.endsWith(".wav") || fileName.endsWith(".ogg") || fileName.endsWith(".aac") || fileName.endsWith(".flac") || fileName.endsWith(".m4a")) {
+            file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).getAbsolutePath(), fileName);
+        } else if (fileName.endsWith(".mp4") || fileName.endsWith(".mkv") || fileName.endsWith(".avi") || fileName.endsWith(".flv") || fileName.endsWith(".wmv") || fileName.endsWith(".mov") || fileName.endsWith(".3gp")) {
+            file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES).getAbsolutePath(), fileName);
         } else {
-            b2 = new File(getDownloadsDir(), file);
+            file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath(), fileName);
         }
 
-        if (c2) {
-            EncodedImage c3 = VKImageLoader.c(Uri.parse(str2));
-            final InputStream h = c3 == null ? null : c3.h();
+        boolean isImage = MediaUtils.c(FileUtils.f(file));
+
+        if (isImage) {
+            EncodedImage encodedImage = VKImageLoader.c(Uri.parse(uri));
+            final InputStream h = encodedImage == null ? null : encodedImage.h();
             if (h != null) {
                 try {
-                    if (b2.getParentFile() != null) {
-                        b2.createNewFile();
+                    if (file.getParentFile() != null) {
+                        file.createNewFile();
                     }
-
-                    if (b2.exists()) {
-                        VkExecutors.x.a().execute(() -> ToastUtils.a(context.getString(R.string.file_saved, b2.getAbsoluteFile())));
+                    if (file.exists()) {
+                        VkExecutors.x.e().execute(() -> {
+                            try {
+                                FileUtils.b.a(h, new FileOutputStream(file), h.available(), null);
+                                ToastUtils.a(context.getString(R.string.file_saved, file.getAbsoluteFile()));
+                            } catch (IOException e) {
+                                ToastUtils.a(context.getString(R.string.error) + " [" + e.getMessage() + "]");
+                                e.printStackTrace();
+                            }
+                        });
                     }
 
                 } catch (Exception e2) {
                     L.a(e2);
                 }
 
-                CameraUtils.a(context, b2, null);
+                CameraUtils.a(context, file, null);
                 return;
             }
         }
 
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(str2));
-        request.setDestinationUri(Uri.fromFile(b2));
-        request.setMimeType(FileUtils.f(new File(str)));
+        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(uri));
+        var mimeType = FileUtils.f(file);
+        request.setDestinationUri(Uri.fromFile(file));
+        request.setMimeType(mimeType);
         request.setNotificationVisibility(1);
         request.allowScanningByMediaScanner();
         request.setTitle(str);
@@ -110,9 +114,6 @@ public class DownloadUtils {
         }
         try {
             long enqueue = a2.enqueue(request);
-            if (pic) {
-                CameraUtils.a(context, b2, null);
-            }
             if (!z) {
                 return;
             }
@@ -192,10 +193,12 @@ public class DownloadUtils {
                     }
                     Intent intent = new Intent("android.intent.action.VIEW");
                     intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                    String f2 = FileUtils.f(file);
-                    if (!TextUtils.isEmpty(f2)) {
+                    var mimeType = FileUtils.f(file);
+                    var uri = FileUtils.uriFromFile(file);
+                    Log.d("DownloadUtils", "openFile: " + file.getAbsolutePath() + "| mimetype " + mimeType + "| uri " + uri);
+                    if (!TextUtils.isEmpty(mimeType)) {
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        intent.setDataAndType(FileUtils.uriFromFile(file), f2);
+                        intent.setDataAndType(uri, mimeType);
                         context.startActivity(intent);
                         return true;
                     }
@@ -216,9 +219,13 @@ public class DownloadUtils {
 
     private static boolean a(Context context, File file) {
         if (file != null && file.exists()) {
+            var mimeType = FileUtils.f(file);
+            var uri = FileUtils.uriFromFile(file);
+
             Intent intent = new Intent("android.intent.action.VIEW");
-            intent.setDataAndType(Uri.parse(file.getAbsolutePath()), "application/*");
+            intent.setDataAndType(uri, mimeType);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            Log.d("DownloadUtils", "openFile: " + file.getAbsolutePath() + "| mimetype " + mimeType + "| uri " + uri);
             try {
                 context.startActivity(intent);
                 return true;

app/src/main/java/com/vk/sharing/view/TargetImageView.java

@@ -11,7 +11,6 @@ import android.graphics.BitmapShader;
 import android.graphics.Canvas;
 import android.graphics.LinearGradient;
 import android.graphics.Paint;
-import android.graphics.Path;
 import android.graphics.PorterDuff;
 import android.graphics.RectF;
 import android.graphics.Shader;
@@ -36,8 +35,6 @@ import com.vtosters.lite.a0;
 
 import java.util.Arrays;
 
-import ru.vtosters.lite.utils.AndroidUtils;
-
 @UiThread
 public class TargetImageView extends VKMultiImageView {
     private static final int I = Screen.a(2);

app/src/main/java/com/vk/stories/view/StoryCircleImageView.java

@@ -1,7 +1,5 @@
 package com.vk.stories.view;
 
-import static ru.vtosters.lite.utils.ThemesUtils.getColor2;
-
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -29,7 +27,6 @@ import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import com.facebook.u.b.a.PipelineDraweeControllerBuilder;
 import com.facebook.x.g.CloseableImage;
-import com.vk.core.drawable.BorderDrawable;
 import com.vk.core.ui.themes.Themable;
 import com.vk.core.ui.themes.VKThemeHelper;
 import com.vk.core.util.DrawableUtils;
@@ -50,8 +47,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 
-import ru.vtosters.lite.utils.AndroidUtils;
-
 public class StoryCircleImageView extends BorderedCircleImageView implements Themable{
     private static final HashSet<Integer> B0 = new HashSet<>();
     private final PipelineDraweeControllerBuilder f0;

app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java

@@ -1,6 +1,6 @@
 package com.vtosters.lite.ui.bottomnavigation;
 
-import static ru.vtosters.lite.utils.Preferences.*;
+import static ru.vtosters.lite.utils.Preferences.vkme;
 import static ru.vtosters.lite.utils.ThemesUtils.getCSTDock;
 
 import android.annotation.SuppressLint;
@@ -31,7 +31,6 @@ import com.vk.core.ui.themes.VKThemeHelper;
 import com.vtosters.lite.R;
 
 import me.grishka.appkit.utils.V;
-import ru.vtosters.lite.utils.Preferences;
 
 public class BottomNavigationItemView extends FrameLayout implements MenuView.ItemView {
     private final TextView mSmallLabel;

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

@@ -5,8 +5,6 @@ import static com.vk.im.engine.h.im_ic_edit_msg;
 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;
@@ -17,8 +15,8 @@ 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.isTablet;
 import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
-import static ru.vtosters.lite.utils.Preferences.getDownloadsDir;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -29,7 +27,6 @@ import com.vk.core.network.Network;
 import com.vk.im.engine.ImEngine1;
 import com.vk.im.engine.events.OnDialogUpdateEvent;
 import com.vk.im.engine.models.EntityIntMap;
-import com.vk.im.engine.models.ProfilesSimpleInfo;
 import com.vk.im.engine.models.dialogs.Dialog;
 import com.vk.im.engine.models.messages.Msg;
 import com.vk.im.engine.models.messages.MsgFromUser;
@@ -52,14 +49,21 @@ import ru.vtosters.lite.encryption.EncryptProvider;
 import ru.vtosters.lite.encryption.base.IMProcessor;
 import ru.vtosters.lite.hooks.CryptImHook;
 import ru.vtosters.lite.ui.dialogs.Translate;
-import ru.vtosters.lite.utils.AndroidUtils;
 
 public class DNRInjector {
     public static void inject(Dialog dialog, List<DialogAction> list) {
         int peerId = 0;
 
         if (dialog != null) {
-            peerId = dialog.getId();
+            try {
+                peerId = dialog.getId();
+            } catch (Exception e){
+                Log.d("DialoggetId", "null");
+            }
+        }
+
+        if (peerId == 0) {
+            return;
         }
 
         list.add(DialogAction.DOWNLOAD);
@@ -113,8 +117,10 @@ public class DNRInjector {
         list.add(new DialogActionsListView.b.a(DialogAction.DNT_ON, 2, im_ic_edit_msg, getIdentifier("DNT_ON", "string"))); // DialogAction, Int, Icon, String
         list.add(new DialogActionsListView.b.a(DialogAction.DNT_OFF, 2, im_ic_edit_msg, getIdentifier("DNT_OFF", "string"))); // DialogAction, Int, Icon, String
 
-        list.add(new DialogActionsListView.b.a(DialogAction.ENCRYPT, 3, im_ic_keyboard, getIdentifier("encryption", "string"))); // DialogAction, Int, Icon, String
-        list.add(new DialogActionsListView.b.a(DialogAction.ENCRYPT_SETT, 3, im_ic_more_vertical, getIdentifier("encryption_sett", "string"))); // DialogAction, Int, Icon, String
+        if (!isTablet()) {
+            list.add(new DialogActionsListView.b.a(DialogAction.ENCRYPT, 3, im_ic_keyboard, getIdentifier("encryption", "string"))); // DialogAction, Int, Icon, String
+            list.add(new DialogActionsListView.b.a(DialogAction.ENCRYPT_SETT, 3, im_ic_more_vertical, getIdentifier("encryption_sett", "string"))); // DialogAction, Int, Icon, String
+        }
 
         list.add(new DialogActionsListView.b.a(DialogAction.MARK_AS_READ, 4, im_ic_done, getIdentifier("vkim_dialogs_list_option_mark_as_read", "string"))); // DialogAction, Int, Icon, String
 
@@ -131,7 +137,15 @@ public class DNRInjector {
         int peerId = 0;
 
         if (dialog != null) {
-            peerId = dialog.getId();
+            try {
+                peerId = dialog.getId();
+            } catch (Exception e){
+                Log.d("DialoggetId", "null");
+            }
+        }
+
+        if (peerId == 0) {
+            return actions;
         }
 
         actions.add(DialogAction.DOWNLOAD);
@@ -162,7 +176,15 @@ public class DNRInjector {
         int peerId = 0;
 
         if (dialog != null) {
-            peerId = dialog.getId();
+            try {
+                peerId = dialog.getId();
+            } catch (Exception e){
+                Log.d("DialoggetId", "null");
+            }
+        }
+
+        if (peerId == 0) {
+            return true;
         }
 
         if (action == DialogAction.MARK_AS_READ) {
@@ -171,7 +193,7 @@ public class DNRInjector {
         }
 
         if (action == DialogAction.DOWNLOAD) {
-            File out = new File(Environment.getExternalStoragePublicDirectory(getDownloadsDir().getName()), "dialog-" + peerId + ".html");
+            File out = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "dialog-" + peerId + ".html");
             try {
                 new MessagesDownloader().downloadDialog(peerId, new MessagesDownloader.HtmlDialogDownloaderFormatProvider(), out);
             } catch (Exception e) {
@@ -216,7 +238,15 @@ public class DNRInjector {
         int peerId = 0;
 
         if (dialog != null) {
-            peerId = dialog.getId();
+            try {
+                peerId = dialog.getId();
+            } catch (Exception e){
+                Log.d("DialoggetId", "null");
+            }
+        }
+
+        if (peerId == 0) {
+            return true;
         }
 
         if (action == DialogAction.MARK_AS_READ) {
@@ -224,7 +254,7 @@ public class DNRInjector {
         }
 
         if (action == DialogAction.DOWNLOAD) {
-            File out = new File(Environment.getExternalStoragePublicDirectory(getDownloadsDir().getPath()), peerId + "-dialog.html");
+            File out = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), peerId + "-dialog.html");
             try {
                 new MessagesDownloader().downloadDialog(peerId, new MessagesDownloader.HtmlDialogDownloaderFormatProvider(), out);
             } catch (Exception e) {
@@ -275,37 +305,40 @@ public class DNRInjector {
     }
 
     public static boolean onClickMsg(Context context, MsgAction action, Msg msg) {
-        var text = ((MsgFromUser) msg).f();
         var peerId = msg.v1();
-        var fullMsg = ((MsgFromUser) msg).j2(); // text + reply
-        var reply = fullMsg.substring(text.length() + 1);
 
         if (action == MsgAction.valueOf("READTO")) {
             DNRModule.hookReadStartMsgTo(msg);
             return true;
         }
 
-        var isTextExist = !text.isEmpty() && !text.equals(" ");
-        var isReplyExist = !reply.isEmpty() && !reply.equals(" ");
+        if (msg instanceof MsgFromUser){
+            var text = ((MsgFromUser) msg).f();
+            var fullMsg = ((MsgFromUser) msg).j2(); // text + reply
+            var reply = fullMsg.substring(text.length() + 1);
+
+            var isTextExist = !text.isEmpty() && !text.equals(" ");
+            var isReplyExist = !reply.isEmpty() && !reply.equals(" ");
 
 
-        if (isReplyExist) {
-            reply = decryptMessage(reply, peerId);
-        }
+            if (isReplyExist) {
+                reply = decryptMessage(reply, peerId);
+            }
 
-        if (isTextExist) {
-            text = decryptMessage(text, peerId);
-        }
+            if (isTextExist) {
+                text = decryptMessage(text, peerId);
+            }
 
-        if (action == MsgAction.valueOf("TRANSLATE")) {
-            if (isTextExist && isReplyExist) {
-                Translate.showTranslatedText(context, text + "\n\n" + getString("translator_reply") + "\n" + reply);
-            } else if (isReplyExist) {
-                Translate.showTranslatedText(context, getString("translator_reply") + "\n" + reply);
-            } else if (isTextExist) {
-                Translate.showTranslatedText(context, text);
-            } else {
-                sendToast(getString("translator_no_text"));
+            if (action == MsgAction.valueOf("TRANSLATE")) {
+                if (isTextExist && isReplyExist) {
+                    Translate.showTranslatedText(context, text + "\n\n" + getString("translator_reply") + "\n" + reply);
+                } else if (isReplyExist) {
+                    Translate.showTranslatedText(context, getString("translator_reply") + "\n" + reply);
+                } else if (isTextExist) {
+                    Translate.showTranslatedText(context, text);
+                } else {
+                    sendToast(getString("translator_no_text"));
+                }
             }
         }
 

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

@@ -1,8 +1,8 @@
 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.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 
 import android.util.Log;
 

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

@@ -1,7 +1,5 @@
 package ru.vtosters.lite.downloaders;
 
-import static ru.vtosters.lite.utils.Preferences.getMusicDir;
-
 import android.os.Environment;
 import android.util.Log;
 
@@ -37,7 +35,7 @@ public class AudioDownloader {
             return;
         }
 
-        var musicPath = getMusicDir().getAbsolutePath();
+        var musicPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).getAbsolutePath();
         var musicDir = new File(musicPath);
         if (!musicDir.exists()) {
             if (musicDir.mkdirs()) {
@@ -52,18 +50,30 @@ public class AudioDownloader {
         var downloadPath = musicPath + File.separator + tempId;
 
         var notification = buildDownloadNotification(track, tempId);
+
+
         downloadM3U8(track, downloadPath, new Callback() {
+            long startTime = 0;
+            long elapsedTime = 0;
+
             @Override
             public void onProgress(int progress) {
-                notification.setProgress(100, progress, false);
-                notificationManager.notify(tempId, notification.build());
+                if (elapsedTime > 1000) {
+                    notification.setProgress(100, progress, false);
+                    notificationManager.notify(tempId, notification.build());
+
+                    startTime = System.currentTimeMillis();
+                    elapsedTime = 0;
+                } else {
+                    elapsedTime = System.currentTimeMillis() - startTime;
+                }
             }
 
             @Override
             public void onSuccess() {
                 try {
                     var fileName = track.toString();
-                    var success = FFMpeg.convert(downloadPath, musicPath + File.separator + fileName + ".mp3");
+                    var success = FFMpeg.convert(downloadPath, musicPath + File.separator + fileName + ".mp3", track);
                     if (success) {
                         notification
                                 .setContentText(AndroidUtils.getString("player_download_finished"))

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

@@ -33,6 +33,8 @@ public class MessagesDownloader{
 
     private static SparseArray<MiniUser> usersArray;
 
+    private static final String VK_DOMAIN = "vk.com";
+
     public static String formatTime(long now){
         return sdformat.format(new Date(now));
     }
@@ -264,6 +266,13 @@ public class MessagesDownloader{
                     ".msg-reply p.reply-content {\n" +
                     "   color: #000000;\n" +
                     "}\n" +
+                    ".vtex-milk-msg.poll {\n" +
+                    "   width: 45%;\n" +
+                    "   background: linear-gradient(to bottom right, #707c8c, #4d5565);\n" +
+                    "   font-style: normal;" +
+                    "}\n" +
+                    ".vtex-milk-msg.poll p { color: white; }\n" +
+                    ".vtex-milk-msg.poll hr { border-top: 1px; background: #ffffff; }\n" +
                     "\n" +
                     "";
 
@@ -283,6 +292,7 @@ public class MessagesDownloader{
         @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");
@@ -295,6 +305,7 @@ public class MessagesDownloader{
                             "</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) : "";
@@ -302,7 +313,7 @@ public class MessagesDownloader{
             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-from\">от <a href=\"https://" + VK_DOMAIN + "/" + 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 +
@@ -381,7 +392,7 @@ public class MessagesDownloader{
 
                 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);
+                fwdmsgs.append("<p class=\"reply-content\"><a class=\"msg-attach-link\" href=\"https://" + VK_DOMAIN + "/").append(userLink).append("\">@").append(userLink).append("</a>: ").append(text).append(attachesHtml).append(replyHtml).append(fwdsHtml);
             }
 
             return fwdmsgs.append("</div>").toString();
@@ -390,7 +401,7 @@ public class MessagesDownloader{
         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>");
+            return matcher.replaceAll("<a class=\"msg-attach-link\" href=\"https://" + VK_DOMAIN + "/$1\">$2</a>");
         }
 
         private String pluralMsg(int count) {
@@ -431,7 +442,7 @@ public class MessagesDownloader{
                     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>");
+                        htmlAction.append(" <a href=\"https://" + VK_DOMAIN + "/").append(userLink).append("\" class=\"msg-attach-link\">@").append(userLink).append("</a>");
                     }
                     break;
                 case "chat_kick_user":
@@ -439,7 +450,7 @@ public class MessagesDownloader{
                     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>");
+                        htmlAction.append(" <a href=\"https://" + VK_DOMAIN + "/").append(userLink).append("\" class=\"msg-attach-link\">@").append(userLink).append("</a>");
                     }
                     break;
                 case "chat_pin_message":
@@ -466,17 +477,6 @@ public class MessagesDownloader{
             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();
 
@@ -486,7 +486,7 @@ public class MessagesDownloader{
 
                 if (item == null) continue;
 
-                switch(type) {
+                switch(type) { // market_album is not supported
                     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>");
@@ -498,7 +498,7 @@ public class MessagesDownloader{
                         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>");
+                        rs.append("<a href=\"https://" + VK_DOMAIN + "/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("\"/>");
@@ -512,6 +512,43 @@ public class MessagesDownloader{
                     case "video":
                         rs.append("видеозапись ( ").append(getVideoHtml(item.optJSONObject("files"))).append(")");
                         break;
+                    case "wall_reply":
+                        var link = "https://" + VK_DOMAIN + "/wall" + item.optString("owner_id") + "_" + item.optString("post_id") + "?reply=" + item.optString("id");
+                        rs.append("<a class=\"msg-attach-link\" href=\"").append(link).append("\">комментарий на стене</a>");
+                        break;
+                    case "story":
+                        var story_link = "https://" + VK_DOMAIN + "/story" + item.optString("owner_id") + "_" + item.optString("id");
+                        rs.append("<a class=\"msg-attach-link\" href=\"").append(story_link).append("\">история</a>");
+                        break;
+                    case "podcast":
+                        var podcast_link = "https://" + VK_DOMAIN + "/podcast" + item.optString("owner_id") + "_" + item.optString("id");
+                        rs.append("<a class=\"msg-attach-link\" href=\"").append(podcast_link).append("\">подкаст</a>");
+                        break;
+                    case "gift":
+                        rs.append("<img src=\"").append(item.optString("thumb_96")).append("\"/>");
+                        break;
+                    case "mini_app":
+                        var app = item.optJSONObject("app");
+
+                        if (app != null) {
+                            var miniapp_link = "https://" + VK_DOMAIN + "/app" + app.optString("id");
+                            rs.append("<a class=\"msg-attach-link\" href=\"").append(miniapp_link).append("\">мини-приложение</a>");
+                            break;
+                        }
+
+                        rs.append("ошибка");
+                        break;
+                    case "audio_playlist":
+                        var playlist_link = "https://" + VK_DOMAIN + "/music/album/" + item.optString("owner_id") + "_" + item.optString("id") + "_" + item.optString("access_key");
+                        rs.append("<a class=\"msg-attach-link\" href=\"").append(playlist_link).append("\">плейлист (").append(item.optString("title")).append(")</a>");
+                        break;
+                    case "poll":
+                        rs.append((item.optBoolean("anonymous") ? "анонимный" : "публичный")).append(" опрос ").append(getPollHtml(item));
+                        break;
+                    case "market":
+                        var market_item_link = "https://" + VK_DOMAIN + "/market" + item.optString("owner_id") + "_" + item.optString("id");
+                        rs.append("<a class=\"msg-attach-link\" href=\"").append(market_item_link).append("\">товар</a>");
+                        break;
                     default:
                         rs.append("не поддерживается (").append(type).append(")");
                         break;
@@ -524,8 +561,26 @@ public class MessagesDownloader{
         }
     }
 
-    private static String getVideoHtml(JSONObject files) throws JSONException {
+    private static String getPollHtml(JSONObject poll) throws JSONException {
+        StringBuilder pollHtml = new StringBuilder(
+            "<div class=\"vtex-milk-msg poll\">" +
+                    "<p style=\"text-align:center;\">" + poll.optString("question") + "</p>"
+        );
 
+        var answers = poll.optJSONArray("answers");
+
+        for (int i = 0; i < answers.length(); i++) {
+            var jsonObject = answers.optJSONObject(i);
+            if (jsonObject != null)
+                pollHtml.append("<hr><p>").append(jsonObject.optString("text")).append(" · ").append(jsonObject.optString("votes")).append(" (").append(jsonObject.optString("rate")).append("%)</p>");
+        }
+
+        pollHtml.append("<hr><p style=\"text-align:center;\">Проголосовало ").append(poll.optString("votes")).append(" чел.</p>");
+
+        return pollHtml.append("</div>").toString();
+    }
+
+    private static String getVideoHtml(JSONObject files) throws JSONException {
         if (files == null) return "ссылки отсутствуют";
 
         Iterator< ? > keys = files.keys();
@@ -539,7 +594,7 @@ public class MessagesDownloader{
             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;
+                if (qualityIndex == quality.length - 1) break;
                 ++qualityIndex;
             }
         }

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

@@ -2,7 +2,6 @@ package ru.vtosters.lite.downloaders;
 
 import static ru.vtosters.lite.downloaders.VideoDownloader.downloadVideo;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
-import static ru.vtosters.lite.utils.Preferences.getPhotosDir;
 
 import android.app.DownloadManager;
 import android.content.Context;
@@ -12,7 +11,6 @@ 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 {
@@ -25,7 +23,7 @@ public class StoryDownloader {
                 DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
                 request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
                 request.setTitle("photo" + story.E.a + ".jpg");
-                request.setDestinationInExternalPublicDir(getPhotosDir().getName(), "photo" + story.E.a + ".jpg");
+                request.setDestinationInExternalPublicDir(Environment.DIRECTORY_PICTURES, "photo" + story.E.a + ".jpg");
                 request.allowScanningByMediaScanner();
                 ((DownloadManager) getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
                 return;

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

@@ -6,9 +6,7 @@ import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 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.Preferences.getVideosDir;
 
-import android.app.AlertDialog;
 import android.app.DownloadManager;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -109,7 +107,7 @@ public class VideoDownloader {
             request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
             request.setTitle(videoFile.toString());
             request.allowScanningByMediaScanner();
-            request.setDestinationInExternalPublicDir(getVideosDir().getName(), videoFile + ".mp4");
+            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_MOVIES, videoFile + ".mp4");
             ((DownloadManager) getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
             return;
         }
@@ -121,19 +119,19 @@ public class VideoDownloader {
             request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
             request.setTitle(videoFile.toString());
             request.allowScanningByMediaScanner();
-            request.setDestinationInExternalPublicDir(getVideosDir().getName(), videoFile + ".mp4");
+            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_MOVIES, videoFile + ".mp4");
             ((DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
         }));
         builder.show();
     }
 
     public static void parseVideoLink(String url, Context ctx) {
-        if (url.contains("vk.ru/story") || url.contains("vk.com/story")) {
+        if (url.contains("vk.com/story") || url.contains("vk.com/story")) {
             ToastUtils.a(AndroidUtils.getString("video_dl_stories_not_supported"));
             return;
         }
 
-        if (!url.contains("vk.ru/video") || !url.contains("vk.com/video")) {
+        if (!url.contains("vk.com/video") || !url.contains("vk.com/video")) {
             ToastUtils.a(AndroidUtils.getString("video_dl_wrong_link"));
             return;
         }

app/src/main/java/ru/vtosters/lite/feature/discover/DiscoverTemplates.java

@@ -0,0 +1,19 @@
+package ru.vtosters.lite.feature.discover;
+
+import com.vk.dto.discover.DiscoverItem;
+
+import java.util.ArrayList;
+
+public class DiscoverTemplates {
+    public static ArrayList<String> getTemplates() {
+        var templates = DiscoverItem.Template.values();
+        var arrayList = new ArrayList<String>();
+
+        for (var template : templates) {
+            if (template != DiscoverItem.Template.GRID_MEDIA) {
+                arrayList.add(template.b());
+            }
+        }
+        return arrayList;
+    }
+}

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

@@ -0,0 +1,15 @@
+package ru.vtosters.lite.feature.music;
+
+import android.content.Context;
+
+import com.vk.music.fragment.MusicFragment;
+
+public class MusicArtistSelectorHook {
+    public static void navigateToSearch(Context context, String artist) {
+        var fr = new MusicFragment.f();
+        fr.a(artist);
+
+        // navigate
+        fr.a(context);
+    }
+}

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

@@ -2,19 +2,17 @@ package ru.vtosters.lite.foaf;
 
 import static android.widget.Toast.LENGTH_SHORT;
 import static android.widget.Toast.makeText;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.proxy.ProxyUtils.isAnyProxyEnabled;
 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.proxy.ProxyUtils.isApiProxyEnabled;
-import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.util.Log;
 
-import androidx.exifinterface.media.ExifInterface;
-
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.network.Network;
 
@@ -35,7 +33,6 @@ 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=\"(.+?)\"\\/>");
@@ -115,12 +112,12 @@ public class FoafBase {
     private static String getLink(int i) {
         String str;
         StringBuilder sb;
-        if (isApiProxyEnabled()) {
+        if (isAnyProxyEnabled()) {
             sb = new StringBuilder();
-            str = "https://" + getApi() + "/_/vk.ru/foaf.php?id=";
+            str = "https://" + getApi() + "/_/vk.com/foaf.php?id=";
         } else {
             sb = new StringBuilder();
-            str = "https://vk.ru/foaf.php?id=";
+            str = "https://vk.com/foaf.php?id=";
         }
         sb.append(str);
         sb.append(i);
@@ -166,7 +163,7 @@ public class FoafBase {
     }
 
     private static String getNormalHumanDate(String str) {
-        String[] split = str.split(ExifInterface.GPS_DIRECTION_TRUE);
+        String[] split = str.split("T");
         return split[1].split("\\+")[0] + " " + split[0];
     }
 }

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

@@ -0,0 +1,358 @@
+package ru.vtosters.lite.hooks;
+
+import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.checkCaption;
+import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.checkCopyright;
+import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isBadNews;
+import static ru.vtosters.lite.utils.Preferences.ads;
+import static ru.vtosters.lite.utils.Preferences.adsgroup;
+import static ru.vtosters.lite.utils.Preferences.adsstories;
+import static ru.vtosters.lite.utils.Preferences.authorsrecomm;
+import static ru.vtosters.lite.utils.Preferences.dev;
+import static ru.vtosters.lite.utils.Preferences.friendsrecomm;
+import static ru.vtosters.lite.utils.Preferences.postsrecomm;
+
+import android.util.Log;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+
+import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.NewsFeedFiltersUtils;
+
+public class AdBlockHook {
+    public static Boolean discoverAdBlock(JSONObject jsonObject) {
+        if (jsonObject == null) return true;
+
+        try {
+            var type = jsonObject.optString("type");
+            var post = jsonObject.optJSONObject("post");
+
+            if (jsonObject.optString("template").contains("ads") || jsonObject.has("ads")) {
+                if (dev())
+                    Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: ads");
+                return false;
+            }
+
+            if (isAds(post, type)) {
+                return false;
+            }
+
+            if (authorsrecomm() && (type.equals("authors_rec")
+                    || type.startsWith("recommended_") && (type.endsWith("audios")
+                    || type.endsWith("artists")
+                    || type.endsWith("playlists")
+                    || type.endsWith("groups")))) {
+                if (dev())
+                    Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: authorsrecomm");
+                return false;
+            }
+
+            if (postsrecomm() && (type.equals("inline_user_rec") || type.equals("live_recommended"))) {
+                if (dev())
+                    Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: postsrecomm");
+                return false;
+            }
+
+            if (friendsrecomm() && (type.equals("user_rec") || type.equals("friends_recomm"))) {
+                if (dev())
+                    Log.d("NewsfeedAdBlockV2", "Removed post " + (post != null ? post.optInt("post_id") : 0) + " from discover, Reason: friendsrecomm");
+                return false;
+            }
+
+            if (adsgroup() && (post != null ? post.optInt("marked_as_ads") : 0) == 1 && !isWhitelistedAd(post)) {
+                if (dev())
+                    Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: marked_as_ads is true");
+                return false;
+            }
+
+            if (post != null) {
+                if (isBadNews(post.optString("text")) && !isWhitelistedFilters(post)) {
+                    if (dev())
+                        Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: text filters");
+                    return false;
+                }
+
+                if (checkCopyright(post) && !isWhitelistedFilters(post)) {
+                    if (dev())
+                        Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: copyright filters");
+                    return false;
+                }
+
+                if (checkCaption(post) && !isWhitelistedFilters(post)) {
+                    if (dev())
+                        Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: caption filters");
+                    return false;
+                }
+
+                if (NewsFeedFiltersUtils.injectFiltersReposts(post) && !isWhitelistedFilters(post)) {
+                    if (dev())
+                        Log.d("NewsfeedAdBlockV2", "Removed post " + post.optInt("post_id") + " from discover, Reason: repost ad");
+                    return false;
+                }
+            }
+        } catch (Exception e) {
+            Log.d("NewsfeedAdBlockV2", "discover: " + e.getMessage());
+        }
+
+        return true;
+    }
+
+    public static JSONObject discoverInject(JSONObject json) throws JSONException {
+        var items = json.optJSONArray("items");
+        var newObj = new JSONArray();
+
+//        newObj.put(discoverObj()); // template injection
+
+        for (int i = 0; i < (items != null ? items.length() : 0); i++) {
+            try {
+                var curr = items.getJSONObject(i);
+                if (!curr.optString("template").contains("info") && discoverAdBlock(curr)) {
+                    newObj.put(items.optJSONObject(i));
+                }
+            } catch (Exception e) {
+                Log.d("NewsfeedAdBlockV2", "discover: " + e);
+            }
+        }
+
+        json.put("items", newObj);
+
+        return json;
+    }
+
+    public static JSONObject discoverObj() throws JSONException {
+        var mainjson = new JSONObject();
+
+        var info = new JSONObject();
+        info.put("title", "Test Injection");
+        info.put("text_color", "#ffffff");
+        info.put("description", "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat");
+
+        var image = new JSONArray();
+        var imageQuality1 = new JSONObject();
+        imageQuality1.put("url", "https://w7.pngwing.com/pngs/505/1021/png-transparent-konata-izumi-lucky-star-desktop-anime-anime-blue-mammal-face.png");
+        imageQuality1.put("width", 72); // 72, 108, 144, 216, 288
+        imageQuality1.put("height", 72); // 72, 108, 144, 216, 288
+        image.put(imageQuality1);
+
+        var background = new JSONArray();
+        var backgroundQuality1 = new JSONObject();
+        backgroundQuality1.put("url", "https://2ch.life/vg/arch/2022-08-22/src/38524739/16440606579870.jpg");
+        backgroundQuality1.put("width", 344); // 344, 516, 680, 1032, 1376
+        backgroundQuality1.put("height", 215); // 215, 323, 426, 645, 860
+        background.put(backgroundQuality1);
+
+        info.put("image", image);
+        info.put("background", background);
+
+        mainjson.put("info", info);
+        mainjson.put("track_code", "info_banner_donut_catalog");
+        mainjson.put("template", "info");
+
+        var action = new JSONObject();
+        action.put("type", "open_url");
+        action.put("url", "vk.com/vtosters_official");
+        action.put("target", "internal");
+
+        mainjson.put("action", action);
+
+        return mainjson;
+    }
+
+    public static JSONArray feedInject(JSONArray items) {
+        if (items.length() == 0) return items;
+
+        try {
+            var newItems = new JSONArray();
+
+            for (int j = 0; j < items.length(); j++) {
+                var list = items.optJSONObject(j);
+
+                if (list == null) continue;
+
+                var type = list.optString("type");
+
+                if (isAds(list, type)) {
+                    continue;
+                }
+
+                if (authorsrecomm() && (type.equals("authors_rec")
+                        || type.startsWith("recommended_") && (type.endsWith("audios")
+                        || type.endsWith("artists")
+                        || type.endsWith("playlists")
+                        || type.endsWith("groups")))) {
+                    if (dev())
+                        Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: authorsrecomm");
+                    continue;
+                }
+
+                if (postsrecomm() && (type.equals("inline_user_rec") || type.equals("live_recommended"))) {
+                    if (dev())
+                        Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: postsrecomm");
+                    continue;
+                }
+
+                if (friendsrecomm() && (type.equals("user_rec") || type.equals("friends_recomm"))) {
+                    if (dev())
+                        Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: friendsrecomm");
+                    continue;
+                }
+
+                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")) && !isWhitelistedFilters(list)) {
+                    if (dev())
+                        Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: text filters");
+                    continue;
+                }
+
+                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) && !isWhitelistedFilters(list)) {
+                    if (dev())
+                        Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: caption filters");
+                    continue;
+                }
+
+                if (NewsFeedFiltersUtils.injectFiltersReposts(list) && !isWhitelistedFilters(list)) {
+                    if (dev())
+                        Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: repost ad");
+                    continue;
+                }
+
+                newItems.put(list);
+            }
+
+            return newItems;
+        } catch (Exception e) {
+            Log.d("NewsfeedAdBlockV2", e.getMessage());
+        }
+
+        return items;
+    }
+
+
+    public static JSONObject storiesads(JSONObject json, boolean isDeleteFix) throws JSONException {
+        if (!adsstories()) {
+            return json;
+        }
+
+        if (json.has("ads")) {
+            var ad = json.optJSONObject("ads");
+            if (isDeleteFix) {
+                if (ad != null) {
+                    ad.optJSONObject("settings")
+                            .put("stories_interval", 0)
+                            .put("authors_interval", 0)
+                            .put("time_interval", 0)
+                            .put("stories_init", 0)
+                            .put("authors_init", 0)
+                            .put("time_init", 0);
+                }
+                if (dev()) Log.d("StoriesAds", "Set ads settings at zero values");
+            } else {
+                json.remove("ads");
+                if (dev()) Log.d("StoriesAds", "Removed ads block");
+            }
+        }
+
+        if (!json.has("items")) return json;
+
+        var items = json.optJSONArray("items");
+        if (items != null) {
+            for (int i = 0; i < items.length(); i++) {
+                var item = items.optJSONObject(i);
+                if (item != null) {
+                    parseStoriesItem(item);
+                }
+            }
+        }
+
+        return json;
+    }
+
+    private static void parseStoriesItem(JSONObject item) throws JSONException {
+        var stories = item.optJSONArray("stories");
+        var newStories = new JSONArray();
+
+        if (stories == null) return;
+
+        for (int j = 0; j < stories.length(); j++) {
+            var story = stories.optJSONObject(j);
+
+            if (!story.optBoolean("is_ads") && !story.optBoolean("is_promo")) {
+                newStories.put(story);
+            } else {
+                if (dev())
+                    Log.d("StoriesAds", "Fetched ad, owner id " + story.optString("owner_id") + ", caption " + story.optString("caption"));
+            }
+        }
+
+        item.put("stories", newStories);
+    }
+
+    public static Boolean isAds(JSONObject list, String type) throws JSONException {
+        if (list == null || type == null || !ads()) return false;
+
+        if (list.has("ads")
+                || type.equals("ads")
+                || type.equals("carousel")
+                || type.equals("html5_ad")
+                || type.equals("ads_easy_promote")) {
+            if (dev())
+                Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: ads");
+            return true;
+        }
+
+        if (type.equals("promo_button")
+                || type.equals("app_widget")
+                || type.equals("app_video")
+                || type.equals("app_slider")
+                || type.equals("tags_suggestions")) {
+            if (dev())
+                Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: promo");
+            return true;
+        }
+
+        return false;
+    }
+
+    public static Boolean isWhitelistedFilters(JSONObject list) {
+        var id = String.valueOf(list.optInt("owner_id"));
+
+        if (id.equals("0")) {
+            id = String.valueOf(list.optInt("source_id"));
+        }
+
+        if (id.equals("-189659924")){
+            return true;
+        }
+
+        var whitelist = AndroidUtils.getDefaultPrefs().getStringSet("whitelisted_filters_groups", Collections.synchronizedSet(new LinkedHashSet<>()));
+
+        return whitelist.contains(id);
+    }
+
+    public static Boolean isWhitelistedAd(JSONObject list) {
+        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);
+    }
+}

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

@@ -4,13 +4,10 @@ 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;
-
 public class DeviceInfoHook{
     public static String getDeviceInfo(String input) {
         Log.d("DeviceInfoHook", "getDeviceInfo: " + input);

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

@@ -35,7 +35,6 @@ 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;
 
@@ -209,7 +208,6 @@ public class DockBarInjector {
                 val = MenuCountersState.n();
                 break;
             case tab_feedback:
-            case tab_news:
                 if (milkshake())
                     val = MenuCountersState.k();
                 break;

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

@@ -1,25 +1,16 @@
 package ru.vtosters.lite.hooks;
 
 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.hooks.OnlineFormatterHook.onlineHookProfiles;
 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.NewsFeedFiltersUtils.checkCaption;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.checkCopyright;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isBadNews;
-import static ru.vtosters.lite.utils.Preferences.ads;
-import static ru.vtosters.lite.utils.Preferences.adsgroup;
-import static ru.vtosters.lite.utils.Preferences.adsstories;
-import static ru.vtosters.lite.utils.Preferences.authorsrecomm;
 import static ru.vtosters.lite.utils.Preferences.dev;
 import static ru.vtosters.lite.utils.Preferences.friendsblock;
-import static ru.vtosters.lite.utils.Preferences.friendsrecomm;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.Preferences.hasVerification;
 import static ru.vtosters.lite.utils.Preferences.podcastcatalog;
-import static ru.vtosters.lite.utils.Preferences.postsrecomm;
 import static ru.vtosters.lite.utils.VTVerifications.isDeveloper;
 import static ru.vtosters.lite.utils.VTVerifications.isPrometheus;
 import static ru.vtosters.lite.utils.VTVerifications.isVerified;
@@ -47,7 +38,6 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.NewsFeedFiltersUtils;
 
 public class JsonInjectors {
     private static final OkHttpClient mClient = new OkHttpClient();
@@ -76,7 +66,7 @@ public class JsonInjectors {
 
     public static JSONObject donateRecomm() throws JSONException {
         var title = AndroidUtils.getString("donate_to_vtl");
-        var link = "https://vk.ru/vtosters_official";
+        var link = "https://vk.com/vtosters_official";
         var text_color = "2D81E0";
 
         var json = new JSONObject();
@@ -246,30 +236,12 @@ public class JsonInjectors {
     }
 
     public static JSONObject musiclink(JSONObject json) {
-        var oldItems = json.optJSONArray("links");
-        var section = json.optJSONObject("section");
-        var linksblock = section.optJSONArray("blocks");
-        var newBlock = new JSONArray();
+        var links = json.optJSONArray("links");
 
-        if (oldItems != null) {
-            if (oldItems.optJSONObject(0).optString("url").contains("?section=recent")) {
+        if (links != null) {
+            if (links.optJSONObject(0).optString("url").contains("?section=recent")) {
                 json.remove("links");
 
-                for (int i = 0; i < linksblock.length(); i++) {
-                    var item = linksblock.optJSONObject(i);
-                    var datatype = item.optString("data_type");
-                    var layname = item.optJSONObject("layout").optString("name");
-                    if (!datatype.equals("links") && !layname.equals("separator")) {
-                        newBlock.put(item);
-                    }
-                }
-
-                try {
-                    section.putOpt("blocks", newBlock);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-
                 if (dev()) Log.d("VKMusic", "Removed links buttons");
             }
         }
@@ -277,7 +249,7 @@ public class JsonInjectors {
         return json;
     }
 
-    public static JSONObject setOnlineInfo(JSONObject json) throws ParseException, IOException, JSONException {
+    public static JSONObject setOnlineInfo(JSONObject json) throws JSONException {
         var id = json.optInt("id");
         if (id == AccountManagerUtils.getUserId()) {
             return json;
@@ -306,7 +278,7 @@ public class JsonInjectors {
         return json;
     }
 
-    public static JSONArray setOnlineInfoUsers(JSONArray profiles) throws ParseException, IOException, JSONException {
+    public static JSONArray setOnlineInfoUsers(JSONArray profiles) throws JSONException {
         if (profiles == null || profiles.length() == 0) return profiles;
         StringBuilder sb = new StringBuilder();
         var curVkId = AccountManagerUtils.getUserId();
@@ -354,111 +326,6 @@ public class JsonInjectors {
         return profiles;
     }
 
-
-    public static JSONObject storiesads(JSONObject json, boolean isDeleteFix) throws JSONException {
-        if (!adsstories()) {
-            return json;
-        }
-
-        if (json.has("ads")) {
-            if (isDeleteFix) {
-                json.optJSONObject("ads").optJSONObject("settings")
-                        .put("stories_interval", 0)
-                        .put("authors_interval", 0)
-                        .put("time_interval", 0)
-                        .put("stories_init", 0)
-                        .put("authors_init", 0)
-                        .put("time_init", 0);
-                if (dev()) Log.d("StoriesAds", "Set ads settings at zero values");
-            } else {
-                json.remove("ads");
-                if (dev()) Log.d("StoriesAds", "Removed ads block");
-            }
-        }
-
-        if (!json.has("items")) return json;
-
-        var items = json.optJSONArray("items");
-        for (int i = 0; i < items.length(); i++) {
-            var item = items.optJSONObject(i);
-            if (item != null) {
-                parseStoriesItem(item);
-            }
-        }
-
-        return json;
-    }
-
-    private static void parseStoriesItem(JSONObject item) throws JSONException {
-        var stories = item.optJSONArray("stories");
-        var newStories = new JSONArray();
-
-        if (stories == null) return;
-
-        for (int j = 0; j < stories.length(); j++) {
-            var story = stories.optJSONObject(j);
-
-            if (!story.optBoolean("is_ads") && !story.optBoolean("is_promo")) {
-                newStories.put(story);
-            } else {
-                if (dev())
-                    Log.d("StoriesAds", "Fetched ad, owner id " + story.optString("owner_id") + ", caption " + story.optString("caption"));
-            }
-        }
-
-        item.put("stories", newStories);
-    }
-
-    public static Boolean isAds(JSONObject list, String type) throws JSONException {
-        if (list == null || type == null || !ads()) return false;
-
-        if (list.has("ads")
-                || type.equals("ads")
-                || type.equals("carousel")
-                || type.equals("html5_ad")
-                || type.equals("ads_easy_promote")) {
-            if (dev())
-                Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: ads");
-            return true;
-        }
-
-        if (type.equals("promo_button")
-                || type.equals("app_widget")
-                || type.equals("app_video")
-                || type.equals("app_slider")
-                || type.equals("tags_suggestions")) {
-            if (dev())
-                Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: promo");
-            return true;
-        }
-
-        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);
@@ -496,76 +363,6 @@ public class JsonInjectors {
         return items;
     }
 
-    public static JSONArray newsfeedadtest(JSONArray items) throws JSONException {
-        if (!getBoolValue("newadblock", true)) return items;
-        var newItems = new JSONArray();
-
-        for (int j = 0; j < items.length(); j++) {
-            var list = items.optJSONObject(j);
-            var type = list.optString("type");
-
-            if (isAds(list, type)) {
-                continue;
-            }
-
-            if (authorsrecomm() && (type.equals("authors_rec")
-                    || type.startsWith("recommended_") && (type.endsWith("audios")
-                    || type.endsWith("artists")
-                    || type.endsWith("playlists")
-                    || type.endsWith("groups")))) {
-                if (dev())
-                    Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: authorsrecomm");
-                continue;
-            }
-
-            if (postsrecomm() && (type.equals("inline_user_rec") || type.equals("live_recommended"))) {
-                if (dev())
-                    Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: postsrecomm");
-                continue;
-            }
-
-            if (friendsrecomm() && (type.equals("user_rec") || type.equals("friends_recomm"))) {
-                if (dev())
-                    Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: friendsrecomm");
-                continue;
-            }
-
-            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")) && !isWhitelistedFilters(list)) {
-                if (dev())
-                    Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: text filters");
-                continue;
-            }
-
-            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) && !isWhitelistedFilters(list)) {
-                if (dev())
-                    Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: caption filters");
-                continue;
-            }
-
-            if (NewsFeedFiltersUtils.injectFiltersReposts(list) && !isWhitelistedFilters(list)) {
-                if (dev())
-                    Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: repost ad");
-                continue;
-            }
-
-            newItems.put(list);
-        }
-
-        return newItems;
-    }
-
     public static JSONObject music(JSONObject json) throws JSONException {
         var catalog = json.optJSONObject("catalog");
 
@@ -591,7 +388,7 @@ public class JsonInjectors {
                 }
             }
 
-            var playlists = fetchCatalogId("https://vk.ru/audio?section=my_playlists");
+            var playlists = fetchCatalogId("https://vk.com/audio?section=my_playlists");
             if (playlists != null) {
                 var catalogarr = playlists.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
 
@@ -604,7 +401,7 @@ public class JsonInjectors {
                 oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
             }
 
-            var albums = fetchCatalogId("https://vk.ru/audio?section=albums");
+            var albums = fetchCatalogId("https://vk.com/audio?section=albums");
             if (albums != null) {
                 var catalogarr = albums.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
 
@@ -617,7 +414,7 @@ public class JsonInjectors {
                 oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
             }
 
-            var recent = fetchCatalogId("https://vk.ru/audio?section=recent");
+            var recent = fetchCatalogId("https://vk.com/audio?section=recent");
             if (recent != null) {
                 var catalogarr = recent.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
 
@@ -650,7 +447,7 @@ public class JsonInjectors {
     }
 
     public static JSONObject fetchCatalogId(String section) {
-        if (section == null) return null;
+        if (section.isEmpty()) return null;
 
         var request = new Request.a()
                 .b("https://" + getApi() + "/method/catalog.getAudio"
@@ -763,10 +560,7 @@ public class JsonInjectors {
         return json;
     }
 
-
     public static boolean haveDonateButton() {
-        int randomshower = new Random().nextInt(6);
-
-        return hasVerification() || randomshower != 1;
+        return hasVerification() || new Random().nextInt(6) != 1;
     }
 }

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

@@ -2,7 +2,7 @@ package ru.vtosters.lite.hooks;
 
 import static ru.vtosters.lite.ui.dialogs.ServerDialog.sendRequest;
 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.Preferences.checkupdates;
 import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
 import static ru.vtosters.lite.utils.ThemesUtils.setNeededTheme;
@@ -11,21 +11,26 @@ import android.app.Activity;
 import android.os.Build;
 import android.preference.PreferenceManager;
 
+import com.vk.core.concurrent.VkExecutors;
+
 import ru.vtosters.lite.downloaders.notifications.NotificationChannels;
 import ru.vtosters.lite.ui.dialogs.DisableBattery;
 import ru.vtosters.lite.ui.dialogs.InstallGMS;
 import ru.vtosters.lite.ui.dialogs.OTADialog;
 import ru.vtosters.lite.ui.dialogs.ServerDialog;
 import ru.vtosters.lite.ui.dialogs.Start;
+import ru.vtosters.lite.utils.DeletedMessagesHandler;
 
+/**
+ * @
+ */
 public class MainActivityInjector {
-
     public static void inject(Activity activity) {
         setNeededTheme(activity);
         ServerDialog.activity = activity;
         sendRequest();
         if (checkupdates()) OTADialog.checkUpdates(activity);
-        reloadMessagesList();
+        VkExecutors.x.f().a(DeletedMessagesHandler::reloadMessagesList); // ioScheduler
         Start.alert(activity);
         InstallGMS.alert(activity);
         DisableBattery.alert(activity);
@@ -33,7 +38,14 @@ public class MainActivityInjector {
                 .edit()
                 .putBoolean("isdark", isDarkTheme())
                 .commit();
-        getInstance().autoCleaningCache();
+
+
+        VkExecutors.x.q().a(() -> {
+            getInstance().autoCleaningCache();
+        }); // slowTasksScheduler
+
+        setupFilters();
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationChannels.createChannels();
         }

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

@@ -7,16 +7,17 @@ import static ru.vtosters.lite.utils.Preferences.autoalltranslate;
 import static ru.vtosters.lite.utils.Preferences.autotranslate;
 import static ru.vtosters.lite.utils.Preferences.savemsgsett;
 
+import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
 
 import com.vk.api.internal.MethodCall;
 
-import ru.vtosters.lite.translators.BaseTranslator;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.ArrayList;
+import java.util.regex.Pattern;
+
+import ru.vtosters.lite.translators.BaseTranslator;
+import ru.vtosters.lite.utils.LifecycleUtils;
 
 public class MessagesHook {
     public static String injectOwnText(String oldText) {
@@ -73,6 +74,14 @@ public class MessagesHook {
         });
     }
 
+    public static Context fixCTX(Context ctx) {
+        if (ctx == null){
+            return LifecycleUtils.getCurrentActivity();
+        } else {
+            return ctx;
+        }
+    }
+
     public static void injRequest(MethodCall.a req) {
         var time = expireTime();
 

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

@@ -1,34 +1,22 @@
 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.getDefaultPrefs;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.checkCaption;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.checkCopyright;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.injectFiltersReposts;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isAds;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isAuthorRecommendations;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isBadNews;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isFriendsRecommendations;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isGroupAds;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isMusicBlock;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isNewsBlock;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isPostRecommendations;
-import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.isRecomsGroup;
 import static ru.vtosters.lite.utils.Preferences.ads;
 import static ru.vtosters.lite.utils.Preferences.adsslider;
 import static ru.vtosters.lite.utils.Preferences.authorsrecomm;
 import static ru.vtosters.lite.utils.Preferences.friendsrecomm;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
-import static ru.vtosters.lite.utils.Preferences.milkshake;
 import static ru.vtosters.lite.utils.Preferences.vkme;
 
+import android.content.Context;
+import android.os.PowerManager;
+
 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;
@@ -36,36 +24,8 @@ 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;
-
-        var optString = obj.optString("type", "");
-        if (isAds(optString) || isAuthorRecommendations(optString) || isPostRecommendations(optString) || isFriendsRecommendations(optString) || isRecomsGroup(optString) || isMusicBlock(optString) || isNewsBlock(optString)) {
-            return false;
-        }
-        optString = obj.optString("post_type", "");
-        if (isAds(optString) || isAuthorRecommendations(optString) || isPostRecommendations(optString) || isFriendsRecommendations(optString) || isMusicBlock(optString) || isNewsBlock(optString)) {
-            return false;
-        }
-        optString = obj.optString("filters", "");
-        if (isAds(optString) || isAuthorRecommendations(optString) || isPostRecommendations(optString) || isFriendsRecommendations(optString)) {
-            return false;
-        }
-
-        if (checkCopyright(obj)) return false;
-
-        if (isBadNews(obj.optString("text", ""))) return false;
-
-        if (checkCaption(obj)) return false;
-
-        if (isGroupAds(obj)) return false;
-
-        return !injectFiltersReposts(obj);
-    } // inject our filters to newsfeed, getpost and discover
-
     public static long getUpdateNewsfeed(boolean refresh_timeout) {
         if (vkme()) {
             return MAX_VALUE;
@@ -93,7 +53,7 @@ public class NewsfeedHook {
         params.add("photo");
         params.add("photo_tag");
 
-        if (!friendsrecomm()) {
+        if (!friendsrecomm() && !getBoolValue("donotgetads", false)) {
             params.add("friends_recomm");
         }
 
@@ -102,7 +62,7 @@ public class NewsfeedHook {
             params.add("promo_button");
         }
 
-        if (!authorsrecomm()) {
+        if (!authorsrecomm() && !getBoolValue("donotgetads", false)) {
             params.add("authors_rec");
         }
 
@@ -150,14 +110,15 @@ public class NewsfeedHook {
     public static void adsParams(HashSet<String> hashSet) {
         if (ads()) {
             hashSet.add("ads_disabled");
-            hashSet.add("ads_app_slider");
-            return;
+            if (getBoolValue("donotgetads", false)) {
+                return;
+            }
         }
 
         hashSet.add("ads_app");
         hashSet.add("ads_site");
         hashSet.add("ads_post");
-        if (adsslider()) {
+        if (!adsslider()) {
             hashSet.add("ads_app_slider");
         }
         hashSet.add("ads_site_slider");
@@ -165,4 +126,10 @@ public class NewsfeedHook {
         hashSet.add("ads_post_pretty_cards");
         hashSet.add("ads_post_snippet_video");
     }
+
+    public static boolean isPowerSaveMode() {
+        var pw = (PowerManager) getGlobalContext().getSystemService(Context.POWER_SERVICE);
+
+        return !getBoolValue("force_disable_psm", false) && pw.isPowerSaveMode();
+    }
 }

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

@@ -3,13 +3,13 @@ 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.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 import static ru.vtosters.lite.utils.AndroidUtils.getString;
 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.proxy.ProxyUtils.getApi;
 
 import android.util.Log;
 
@@ -123,13 +123,19 @@ public class OnlineFormatterHook {
             case 5632485:
                 return "SpaceVK";
             case 6287487:
-                return "vk.ru";
+                return "vk.com";
             case 4542624:
                 return "Black VK";
             case 3917910:
                 return "Miranda NG (bridge)";
             case 8043814:
                 return "Quise";
+            case 7221936:
+                return "Вечный Online";
+            case 6892935:
+                return "VK Helper";
+            case 6248661:
+                return "MemeVoices for VK";
             default:
                 return getAppNameFromOnline(appid);
         }

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

@@ -1,8 +1,8 @@
 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;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
 
 import android.annotation.SuppressLint;
 import android.content.ClipData;

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.isRandomProxyEnabled;
 import static ru.vtosters.lite.proxy.ProxyUtils.isVikaProxyEnabled;
+import static ru.vtosters.lite.proxy.ProxyUtils.isZaboronaEnabled;
 import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication;
-import static ru.vtosters.lite.proxy.ProxyUtils.isRandomProxyEnabled;
-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;
@@ -45,8 +45,8 @@ public class ProxyHook {
         RadioButton rgVika = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
 
         rg.addView(rgDefault);
-        rg.addView(rgZaborona);
         rg.addView(rgVika);
+        rg.addView(rgZaborona);
         rg.addView(rgRandomProxy);
 
         rgDefault.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
@@ -62,10 +62,10 @@ public class ProxyHook {
         rgZaborona.setText(AndroidUtils.getString("proxy_enable") + " (Zaborona)");
         rgZaborona.setTextColor(getTextAttr());
 
-        rgRandomProxy.setText(AndroidUtils.getString("proxy_enable") + " (Random Proxy)");
+        rgRandomProxy.setText(AndroidUtils.getString("proxy_enable") + " (Random Socks Proxy)");
         rgRandomProxy.setTextColor(getTextAttr());
 
-        rgVika.setText(AndroidUtils.getString("proxy_enable") + " (Vika)");
+        rgVika.setText(AndroidUtils.getString("proxy_enable") + " (Vika Mobile)");
         rgVika.setTextColor(getTextAttr());
 
         rgZaborona.setChecked(isZaboronaEnabled());

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

@@ -8,9 +8,9 @@ import com.vk.api.internal.MethodCall;
 import java.util.LinkedHashMap;
 
 public class RequestDumper{
-    public static void addParams(MethodCall.a paramslist, String method, LinkedHashMap params, String apiver) {
+    public static void addParams(MethodCall.a paramslist, String method, LinkedHashMap<String, String> params, String apiver) {
         if (method.contains("execute.getGiftByStickerId") ) {
-            apiver = "5.187";
+            apiver = "5.186";
         }
 
         if (dev()) {

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

@@ -6,16 +6,14 @@ import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.Preferences.milkshake;
 import static ru.vtosters.lite.utils.Preferences.superapp;
 import static ru.vtosters.lite.utils.Preferences.useNewSettings;
-import static ru.vtosters.lite.utils.Preferences.videonewcatalog;
 import static ru.vtosters.lite.utils.Preferences.vkme;
 
 import com.vk.apps.AppsFragment;
-import com.vk.discover.ThemedFeedFragment;
+import com.vk.discover.DiscoverFragment;
 import com.vk.fave.fragments.FaveTabFragment;
 import com.vk.menu.MenuFragment;
 import com.vk.menu.SearchMenuFragment;
 import com.vk.music.fragment.MusicCatalogFragment1;
-import com.vk.music.fragment.MusicFragment;
 import com.vk.newsfeed.HomeFragment;
 import com.vk.newsfeed.NewsfeedFragment;
 import com.vk.notifications.NotificationsContainerFragment;
@@ -47,19 +45,19 @@ public class StartFragmentHook {
             case "groups":
                 return milkshake() ? CommunitiesCatalogFragment.class : GroupsFragment1.class;
             case "music":
-                return getBoolValue("musicnewcatalog", true) ? MusicCatalogFragment1.class : MusicFragment.class;
+                return MusicCatalogFragment1.class;
             case "friends":
                 return FriendsFragment.class;
             case "photos":
                 return PhotosFragment.class;
             case "videos":
-                return videonewcatalog() ? VideoCatalogFragment.class : VideosFragment.class;
+                return VideoCatalogFragment.class;
             case "settings":
                 return useNewSettings();
             case "apps":
                 return AppsFragment.class;
             case "discover":
-                return ThemedFeedFragment.class;
+                return DiscoverFragment.class;
             case "notifications":
                 return NotificationsContainerFragment.class;
             case "money":

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

@@ -4,7 +4,6 @@ import static ru.vtosters.lite.utils.Preferences.feedcache;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.Preferences.milkshake;
 import static ru.vtosters.lite.utils.Preferences.miniapps;
-import static ru.vtosters.lite.utils.Preferences.musicnewcatalog;
 import static ru.vtosters.lite.utils.Preferences.postsredesign;
 import static ru.vtosters.lite.utils.Preferences.superapp;
 
@@ -133,8 +132,6 @@ public class TogglesHook {
             case FEATURE_MILKSHAKE_FORCE_DISABLED:
             case FEATURE_MILKSHAKE_ACTIVATION_DISABLED:
                 return !milkshake();
-            case FEATURE_MUSIC_NEW_CATALOG:
-                return musicnewcatalog();
             case AB_NEWS_VIDEO_LAYOUT_TEXT:
             case FEATURE_COMPACT_REPOST:
             case EXPERIMENT_NEWS_VIDEO_LAYOUT_TEXT:

app/src/main/java/ru/vtosters/lite/hooks/ui/MusicBottomSheetHook.java

@@ -0,0 +1,52 @@
+package ru.vtosters.lite.hooks.ui;
+
+import android.util.Log;
+
+import com.vk.dto.music.MusicTrack;
+import com.vk.dto.music.Playlist;
+import com.vk.music.bottomsheets.a.MusicAction;
+import com.vk.music.common.MusicPlaybackLaunchContext;
+import com.vtosters.lite.R;
+
+import java.util.ArrayList;
+
+import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
+import bruhcollective.itaysonlab.libvkx.client.LibVKXClientImpl;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class MusicBottomSheetHook {
+    public static ArrayList<MusicAction> hook(ArrayList<MusicAction> actions) {
+        if (LibVKXClient.isVkxInstalled()) {
+            actions.add(getPlayInVKXAction());
+        }
+        return actions;
+    }
+
+    public static boolean tryPlayInVKX(int actionId, MusicTrack track, MusicPlaybackLaunchContext context, Playlist playlist) {
+        if (actionId != AndroidUtils.getIdentifier("play_in_vkx", "id")) {
+            return false;
+        }
+
+        var trackList = new ArrayList<MusicTrack>();
+
+        if (playlist != null) {
+            trackList.addAll(playlist.R);
+        } else {
+            trackList.add(track);
+        }
+
+        LibVKXClientImpl.LibVKXAction action = iLibVkxService -> LibVKXClient.lambdaplay(trackList, track, iLibVkxService, context);
+        return LibVKXClient.getInstance().runOnService(action);
+    }
+
+    private static MusicAction getPlayInVKXAction() {
+        return new MusicAction(
+                AndroidUtils.getIdentifier("play_in_vkx", "id"),
+                R.drawable.ic_music_24,
+                AndroidUtils.getIdentifier("play_in_vkx", "string"),
+                R.color.caption_gray,
+                R.string.music_talkback_empty,
+                false
+        );
+    }
+}

app/src/main/java/ru/vtosters/lite/hooks/ui/SystemThemeChangerHook.java

@@ -0,0 +1,31 @@
+package ru.vtosters.lite.hooks.ui;
+
+import android.content.res.Configuration;
+
+import ru.vtosters.lite.utils.Preferences;
+import ru.vtosters.lite.utils.ThemesUtils;
+
+public class SystemThemeChangerHook {
+    private static int latestTheme = 0;
+
+    public static void onThemeChanged(Configuration configuration) {
+        if (Preferences.systemtheme()) {
+            var theme = configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            if (theme == latestTheme) return;
+
+            switch (theme) {
+                case Configuration.UI_MODE_NIGHT_YES:
+                    // Night mode is active, we're using dark theme
+                    ThemesUtils.applyTheme(ThemesUtils.getDarkTheme());
+                    latestTheme = theme;
+                    break;
+                case Configuration.UI_MODE_NIGHT_NO:
+                case Configuration.UI_MODE_NIGHT_UNDEFINED:
+                    // Night mode is not active, we're using light theme
+                    ThemesUtils.applyTheme(ThemesUtils.getLightTheme());
+                    latestTheme = theme;
+                    break;
+            }
+        }
+    }
+}

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

@@ -1,15 +1,20 @@
 package ru.vtosters.lite.music;
 
+import android.os.Build;
 import android.util.Log;
 
 import com.arthenica.ffmpegkit.FFmpegKit;
 import com.arthenica.ffmpegkit.ReturnCode;
 import com.vk.core.util.ToastUtils;
+import com.vk.dto.music.MusicTrack;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.Arrays;
 
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.IOUtils;
@@ -46,35 +51,81 @@ public class FFMpeg {
         }
     }
 
-    public static boolean convert(String in, String out) {
+    public static boolean convert(String in, String out, MusicTrack track) {
         checkFFMpegLibs();
 
-        // write the list of all .ts files to a txt file in "in" directory
-        var list = new File(in);
-        var listFile = new File(list, "list.txt");
-        try {
-            listFile.createNewFile();
-            var writer = new java.io.FileWriter(listFile);
-            for (var file : list.listFiles()) {
-                if (file.getName().endsWith(".ts")) {
-                    writer.write("file " + file.getName() + "\n");
+        var tsesList = new File(in).listFiles();
+
+        if (tsesList == null) {
+            return false;
+        }
+
+        var mergedTsFile = new File(in, "all.ts");
+        var mergedByteArrayStream = new ByteArrayOutputStream();
+
+        Arrays.sort(tsesList, (o1, o2) -> {
+            var index1 = Integer.parseInt(o1.getName().split("-")[1]);
+            var index2 = Integer.parseInt(o2.getName().split("-")[1]);
+            return index1 - index2;
+        });
+
+        for (var file : tsesList) {
+            if (file.getName().endsWith(".ts")) {
+                try {
+                    mergedByteArrayStream.write(IOUtils.readAllBytes(file));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    return false;
                 }
             }
-            writer.close();
-        } catch (IOException e) {
-            e.printStackTrace();
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            try {
+                Files.write(mergedTsFile.toPath(), mergedByteArrayStream.toByteArray());
+            } catch (IOException e) {
+                e.printStackTrace();
+                return false;
+            }
+        } else {
+            try (FileOutputStream fos = new FileOutputStream(mergedTsFile)) {
+                fos.write(mergedByteArrayStream.toByteArray());
+            } catch (IOException e) {
+                e.printStackTrace();
+                return false;
+            }
         }
 
-        // concatenate .ts files to a single .ts file
-        FFmpegKit.execute("-f concat -safe 0 -i " + in + "/list.txt -c copy " + in + "/all.ts");
 
         // convert .ts file to .mp3 file via ffmpeg
-        var session = FFmpegKit.execute("-i " + in + "/all.ts -f mp3 -acodec mp3 -q:a 0 -y '" + out + "'");
+        var sb = new StringBuilder();
+        sb.append("-y -i ").append(in).append("/all.ts -map 0 -dn ");
+        sb.append(" -loglevel error");
+        sb.append(" -hide_banner");
+        if (track.f != null) {
+            sb.append(" -metadata title='").append(track.f).append("'");
+        }
+        if (track.C != null) {
+            sb.append(" -metadata artist='").append(track.C).append("'");
+        }
+        if (track.I != null) {
+            sb.append(" -metadata album='").append(track.I.getTitle()).append("'");
+        }
+//
+//        if (track.L != null) {
+//            var artists = track.L.stream().map(Artist::w1).reduce((s, s2) -> s + ", " + s2).orElse("");
+//            sb.append(" -metadata artist='").append(artists).append("'");
+//        }
+
+        sb.append(" -c copy '").append(out).append("'");
+
+        var command = sb.toString();
+
+        var session = FFmpegKit.execute(command);
         var rc = session.getReturnCode();
 
+        IOUtils.deleteRecursive(new File(in));
         if (ReturnCode.isSuccess(rc)) {
-            // remove temp files
-            IOUtils.deleteRecursive(new File(in));
             return true;
         }
 

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

@@ -1,17 +1,18 @@
 package ru.vtosters.lite.music;
 
-import android.util.Log;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.crypto.NoSuchPaddingException;
 
+import java8.util.concurrent.CompletableFuture;
 import okhttp3.Call;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -40,31 +41,40 @@ public class M3UDownloader {
     }
 
     private static void parse(String payload, File outDir, Callback callback) {
-        try {
-            VKM3UParser parser = new VKM3UParser(payload);
-            List<TransportStream> tses = parser.getTransportStreams();
-            callback.onProgress(5);
-            for (TransportStream ts : tses) {
-                String tsURL = parser.getBaseUrl() + ts.getName();
-                Log.d("M3UDownloader", "Downloading " + tsURL);
-                InputStream is = IOUtils.openStream(tsURL);
-                byte[] content;
-                if (TransportStream.METHOD_AES128.equals(ts.getMethod())) {
-                    String key = IOUtils.readAllLines(IOUtils.openStream(ts.getKeyURL()));
-                    content = IOUtils.decodeStream(is, key);
-                } else {
-                    content = IOUtils.readAllBytes(is);
+        VKM3UParser parser = new VKM3UParser(payload);
+        List<TransportStream> tses = parser.getTransportStreams();
+        AtomicInteger progress = new AtomicInteger(0);
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+
+        callback.onProgress(5);
+        for (TransportStream ts : tses) {
+            String tsURL = parser.getBaseUrl() + ts.getName();
+
+            futures.add(CompletableFuture.runAsync(() -> {
+                try {
+                    // Log.d("M3UDownloader", "Downloading " + tsURL);
+                    InputStream is = IOUtils.openStream(tsURL);
+                    byte[] content;
+                    if (TransportStream.METHOD_AES128.equals(ts.getMethod())) {
+                        String key = IOUtils.readAllLines(IOUtils.openStream(ts.getKeyURL()));
+                        content = IOUtils.decodeStream(is, key);
+                    } else {
+                        content = IOUtils.readAllBytes(is);
+                    }
+                    File tsDump = new File(outDir, ts.getName());
+                    IOUtils.writeToFile(tsDump, content);
+                    callback.onSizeReceived((long) content.length * tses.size(), parser.getHeapSize());
+                } catch (IOException | NoSuchPaddingException | NoSuchAlgorithmException | InvalidAlgorithmParameterException | InvalidKeyException e) {
+                    e.printStackTrace();
+                    callback.onFailure();
                 }
-                File tsDump = new File(outDir, ts.getName());
-                IOUtils.writeToFile(tsDump, content);
-                callback.onSizeReceived((long) content.length * tses.size(), parser.getHeapSize());
-                callback.onProgress(10 + Math.round(80.0f * tses.indexOf(ts) / tses.size()));
-            }
-        } catch (IOException | NoSuchPaddingException | NoSuchAlgorithmException | InvalidAlgorithmParameterException | InvalidKeyException e) {
-            e.printStackTrace();
-            callback.onFailure();
-            return;
+            }).thenRun(() -> callback.onProgress(10 + Math.round(80.0f * progress.addAndGet(1) / tses.size()))));
         }
+        // wait for all futures
+        for (var future: futures) {
+            future.join();
+        }
+
         callback.onSuccess();
     }
 }

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

@@ -1,7 +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;
 import android.net.Uri;
@@ -80,7 +79,7 @@ public class MP3Downloader {
                 .setAllowedOverRoaming(true)
                 .setTitle("Downloading " + title)
                 .setDestinationInExternalFilesDir(AndroidUtils.getGlobalContext(),
-                        getMusicDir().getAbsolutePath(),
+                        Environment.DIRECTORY_MUSIC,
                         title + ".mp3")
                 .setVisibleInDownloadsUi(true);
         downloadManager.enqueue(request);

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

@@ -1,6 +1,9 @@
 package ru.vtosters.lite.proxy;
 
 import static java.lang.System.clearProperty;
+import static ru.vtosters.lite.proxy.api.VikaMobile.getApiHost;
+import static ru.vtosters.lite.proxy.api.VikaMobile.getOauthHost;
+import static ru.vtosters.lite.proxy.api.VikaMobile.getStaticHost;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 
@@ -23,31 +26,47 @@ public class ProxyUtils{
     public static String getApi(){
         var proxyapi = getPrefsValue("proxyapi");
 
-        if (isApiProxyEnabled() & !proxyapi.isEmpty()) {
+        if (isVikaProxyEnabled()) {
+            proxyapi = getApiHost();
+        }
+
+        if (isAnyProxyEnabled() & !proxyapi.isEmpty()) {
             return proxyapi;
         }
 
-        return "api.vk.ru";
+        return "api.vk.com";
     }
 
     public static String getOauth(){
         var oauth = getPrefsValue("proxyoauth");
 
-        if (isApiProxyEnabled() & !oauth.isEmpty()) {
+        if (isVikaProxyEnabled()) {
+            oauth = getOauthHost();
+        }
+
+        if (isAnyProxyEnabled() & !oauth.isEmpty()) {
             return oauth;
         }
 
-        return "oauth.vk.ru";
+        return "oauth.vk.com";
     }
 
     public static String getStatic(){
-        var oauth = getPrefsValue("proxystatic");
+        var staticapi = getPrefsValue("proxystatic");
 
-        if (isApiProxyEnabled() & !oauth.isEmpty()) {
-            return oauth;
+        if (isVikaProxyEnabled()) {
+            staticapi = getStaticHost();
         }
 
-        return "static.vk.ru";
+        if (isAnyProxyEnabled() & !staticapi.isEmpty()) {
+            return staticapi;
+        }
+
+        return "static.vk.com";
+    }
+
+    public static Boolean isAnyProxyEnabled(){
+        return isApiProxyEnabled() || isVikaProxyEnabled();
     }
 
     public static Boolean isZaboronaEnabled(){
@@ -59,7 +78,7 @@ public class ProxyUtils{
     }
 
     public static Boolean isApiProxyEnabled(){
-        return getPrefsValue("proxy").equals("apiproxy") || getPrefsValue("proxy").equals("vika");
+        return getPrefsValue("proxy").equals("apiproxy");
     }
 
     public static Boolean isVikaProxyEnabled(){

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

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

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

@@ -1,5 +1,5 @@
 package ru.vtosters.lite.proxy.api;
-import static ru.vtosters.lite.proxy.ProxyUtils.isApiProxyEnabled;
+import static ru.vtosters.lite.proxy.ProxyUtils.isAnyProxyEnabled;
 import static ru.vtosters.lite.proxy.ProxyUtils.isVikaProxyEnabled;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 
@@ -7,12 +7,9 @@ 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 vkapi = "api.vk.com";
+        var oauth = "oauth.vk.com";
+        var vkstatic = "static.vk.com";
 
         var proxyapi = getPrefsValue("proxyapi");
         var proxyoauth = getPrefsValue("proxyoauth");
@@ -24,7 +21,7 @@ public class ApiProxy{
             proxystatic = VikaMobile.getStaticHost();
         }
 
-        if ((!isApiProxyEnabled() || !isVikaProxyEnabled()) || link.isEmpty()) {
+        if (!isAnyProxyEnabled() || link.isEmpty()) {
             return link;
         }
 
@@ -45,18 +42,6 @@ public class ApiProxy{
             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;
     }
 
@@ -67,18 +52,24 @@ public class ApiProxy{
             string = VikaMobile.getStaticHost();
         }
 
-        if ((isApiProxyEnabled() || isVikaProxyEnabled()) && string.isEmpty()) return str;
+        if (isAnyProxyEnabled() && !string.isEmpty()) {
+            return str.replaceAll(string, "static.vk.com");
+        }
 
-        return str.replaceAll(string, "static.vk.ru");
+        return str;
     }
 
     public static String getAwayPhpCom(){
         var proxyapi = getPrefsValue("proxyapi");
 
-        if ((isApiProxyEnabled() || isVikaProxyEnabled()) & !proxyapi.isEmpty()) {
+        if (isVikaProxyEnabled()) {
+            proxyapi = VikaMobile.getApiHost();
+        }
+
+        if (isAnyProxyEnabled() && !proxyapi.isEmpty()) {
             return proxyapi;
         }
 
-        return "m.vk.ru";
+        return "m.vk.com";
     }
 }

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

@@ -22,7 +22,7 @@ import ru.vtosters.lite.utils.LayoutUtils;
 
 public class VKAdminTokenActivity extends AppCompatActivity {
 
-    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";
+    private static final String URL = "https://" + getOauth() +"/authorize?client_id=6121396&scope=1073737727&redirect_uri=https://oauth.vk.com/blank.html&display=page&response_type=token&revoke=1";
 
     @Override
     protected void onCreate(@Nullable Bundle bundle) {

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

@@ -24,11 +24,13 @@ import com.aefyr.tsg.g2.TelegramStickersPack;
 import com.aefyr.tsg.g2.TelegramStickersService;
 
 import java.io.File;
+import java.util.Collections;
 
 import ru.vtosters.lite.tgs.TGPref;
+import ru.vtosters.lite.ui.components.IItemMovingListener;
 import ru.vtosters.lite.utils.AndroidUtils;
 
-public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.StickerPackViewHolder> {
+public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.StickerPackViewHolder> implements IItemMovingListener {
     private static final TelegramStickersService sService = TelegramStickersService.getInstance(getGlobalContext());
 
     @SuppressLint("UseCompatLoadingForDrawables")
@@ -62,6 +64,26 @@ public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.
         return sService.getPacksListReference().size();
     }
 
+    @Override
+    public void onItemDismiss(int index) {
+
+    }
+
+    @Override
+    public boolean onItemMove(int fromPosition, int toPosition) {
+        if (fromPosition < toPosition) {
+            for (int i = fromPosition; i < toPosition; i++) {
+                sService.swap(sService.getPacksListReference().get(i), sService.getPacksListReference().get(i + 1));
+            }
+        } else {
+            for (int i = fromPosition; i > toPosition; i--) {
+                sService.swap(sService.getPacksListReference().get(i), sService.getPacksListReference().get(i - 1));
+            }
+        }
+        notifyItemMoved(fromPosition, toPosition);
+        return true;
+    }
+
     public class StickerPackViewHolder extends RecyclerView.ViewHolder {
         private final LinearLayout mContainer;
         private final ImageView mStickerPreview;

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

@@ -6,21 +6,19 @@ import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.Preferences.milkshake;
 import static ru.vtosters.lite.utils.Preferences.superapp;
 import static ru.vtosters.lite.utils.Preferences.useNewSettings;
-import static ru.vtosters.lite.utils.Preferences.videonewcatalog;
 import static ru.vtosters.lite.utils.Preferences.vkme;
 import static ru.vtosters.lite.utils.Preferences.vkme_notifs;
 
 import android.os.Build;
 
 import com.vk.apps.AppsFragment;
-import com.vk.discover.ThemedFeedFragment;
+import com.vk.discover.DiscoverFragment;
 import com.vk.fave.fragments.FaveTabFragment;
 import com.vk.feedlikes.d.FeedLikesFragment;
 import com.vk.friends.catalog.FriendsCatalogFragment;
 import com.vk.menu.MenuFragment;
 import com.vk.menu.SearchMenuFragment;
 import com.vk.music.fragment.MusicCatalogFragment1;
-import com.vk.music.fragment.MusicFragment;
 import com.vk.newsfeed.HomeFragment;
 import com.vk.newsfeed.NewsfeedFragment;
 import com.vk.notifications.NotificationsContainerFragment;
@@ -154,7 +152,7 @@ public class DockBarEditorManager {
                         milkshake() ? R.drawable.ic_services_outline_28 : R.drawable.ic_menu_search_outline_28,
                         milkshake() ? R.string.super_app_title : R.string.search,
                         R.id.tab_discover,
-                        milkshake() ? (superapp() ? SuperAppFragment.class : SearchMenuFragment.class) : ThemedFeedFragment.class);
+                        milkshake() ? (superapp() ? SuperAppFragment.class : SearchMenuFragment.class) : DiscoverFragment.class);
             case "tab_messages":
                 return DockBarTab.valuesOf(
                         "tab_messages",
@@ -203,14 +201,14 @@ public class DockBarEditorManager {
                         R.drawable.ic_music_outline_28,
                         R.string.music,
                         R.id.menu_audios,
-                        getBoolValue("musicnewcatalog", true) ? MusicCatalogFragment1.class : MusicFragment.class);
+                        MusicCatalogFragment1.class);
             case "tab_videos":
                 return DockBarTab.valuesOf(
                         "tab_videos",
                         R.drawable.ic_video_outline_28,
                         R.string.videos,
                         R.id.menu_videos,
-                        videonewcatalog() ? VideoCatalogFragment.class : VideosFragment.class);
+                        VideoCatalogFragment.class);
             case "tab_lives":
                 return DockBarTab.valuesOf(
                         "tab_lives",

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

@@ -0,0 +1,43 @@
+package ru.vtosters.lite.ui.components;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class StickerTouchHelperCallback extends ItemTouchHelper.Callback {
+    private final IItemMovingListener itemAdapter;
+
+    public StickerTouchHelperCallback(IItemMovingListener adapter) {
+        itemAdapter = adapter;
+    }
+
+    @Override
+    public boolean isLongPressDragEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isItemViewSwipeEnabled() {
+        return false;
+    }
+
+    @Override
+    public int getMovementFlags(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
+        int dragFlags = ItemTouchHelper.UP   | ItemTouchHelper.DOWN |
+                ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
+
+        int swipeFlags = ItemTouchHelper.START | ItemTouchHelper.END;
+        return makeMovementFlags(dragFlags, swipeFlags);
+    }
+
+    @Override
+    public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
+        itemAdapter.onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition());
+        return false;
+    }
+
+    @Override
+    public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
+
+    }
+}

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

@@ -9,7 +9,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import ru.vtosters.lite.ui.items.DockBarTab;
 import ru.vtosters.lite.ui.items.SuperAppItem;
 import ru.vtosters.lite.utils.AndroidUtils;
 

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

@@ -8,7 +8,6 @@ import android.content.Context;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
 
-
 import com.vk.core.dialogs.alert.VkAlertDialog;
 
 import ru.vtosters.lite.utils.AndroidUtils;

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

@@ -40,28 +40,28 @@ public class ServerDialog {
     public static void sendRequest() {
         if (getBoolValue("dialogrecomm", false)) return;
 
-        if (isNetworkIsSlow()) return;
+        if (!isNetworkIsSlow() && !getBoolValue("isRoamingState", false)) {
+            Request request = new Request.a()
+                    .b("https://vtosters.app/dialog.json")
+                    .a();
 
-        Request request = new Request.a()
-                .b("https://vtosters.app/dialog.json")
-                .a();
-
-        client.a(request).a(new Callback() {
-            @Override
-            public void a(Call call, IOException e) {
-                Log.d(TAG, "" + e);
-                showAlert = false;
-            }
-
-            @Override
-            public void a(Call call, Response response) {
-                try {
-                    getResponse(response.a().g());
-                } catch (Exception e) {
+            client.a(request).a(new Callback() {
+                @Override
+                public void a(Call call, IOException e) {
+                    Log.d(TAG, "" + e);
                     showAlert = false;
                 }
-            }
-        });
+
+                @Override
+                public void a(Call call, Response response) {
+                    try {
+                        getResponse(response.a().g());
+                    } catch (Exception e) {
+                        showAlert = false;
+                    }
+                }
+            });
+        }
     }
 
     private static Boolean showForNotVerified() {

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

@@ -0,0 +1,33 @@
+package ru.vtosters.lite.ui.dialogs;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+
+import android.app.Activity;
+
+import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vk.core.ui.themes.VKThemeHelper;
+
+import ru.vtosters.lite.hooks.VKUIHook;
+
+public class ThemeChanging{
+    public static void changeTheme(Activity activity, float[] f){
+        if (getBoolValue("systemtheme", true)) {
+            new VkAlertDialog.Builder(activity)
+                    .setTitle("Внимание!")
+                    .setMessage("У вас включена системная тема \n" +
+                            "При переключении темы системная тема будет отключена \n\n" +
+                            "Вы действительно хотите отключить её?")
+                    .setCancelable(false)
+                    .setPositiveButton("Отключить", (dialogInterface, i) -> {
+                        edit().putBoolean("systemtheme", false).commit();
+                        VKThemeHelper.b(activity, f);
+                        VKUIHook.clearWebCache();
+                    })
+                    .setNeutralButton("Отмена", null)
+                    .show();
+        } else {
+            VKThemeHelper.b(activity, f);
+            VKUIHook.clearWebCache();
+        }
+    }
+}

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

@@ -1,7 +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.proxy.ProxyUtils.isAnyProxyEnabled;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getString;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
@@ -25,7 +25,7 @@ public class VKIDProtection {
         // android.content.DialogInterface.OnClickListener
         builder.setNeutralButton(getString("vkiddisable"), (dialogInterface, i) -> {
             edit().putBoolean("showAlertVkId", false).apply();
-            VKUIwrapper.setLink((isApiProxyEnabled() ? "https://id.vk.ru/account" : "https://" + getApi() + "/_/id.vk.ru/account"));
+            VKUIwrapper.setLink((isAnyProxyEnabled() ? "https://id.vk.com/account" : "https://" + getApi() + "/_/id.vk.com/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/DockBarEditorFragment.java

@@ -22,8 +22,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.vtosters.lite.R;
 
-import java.util.Objects;
-
 import ru.vtosters.lite.ui.adapters.CategorizedAdapter;
 import ru.vtosters.lite.ui.components.DockBarEditorManager;
 import ru.vtosters.lite.ui.components.ItemMovingCallback;

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

@@ -2,13 +2,11 @@ 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.NewsFeedFiltersUtils.setupFilters;
 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;
@@ -25,15 +23,15 @@ import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 import ru.vtosters.lite.ui.components.NewsfeedListManager;
 import ru.vtosters.lite.utils.AndroidUtils;
 
-public class FeedFragment extends MaterialPreferenceToolbarFragment {
+public class FeedFragment extends MaterialPreferenceToolbarFragment{
     @Override
-    public void onCreate(Bundle bundle) {
+    public void onCreate(Bundle bundle){
         super.onCreate(bundle);
         addPreferencesFromResource(getIdentifier("preferences_feed", "xml"));
         prefs();
     }
 
-    private void prefs() {
+    private void prefs(){
         findPreference("officialnewssett").setOnPreferenceClickListener(new openofficialsett());
         findPreference("cringecopyright").setEnabled(!copyright_post());
 
@@ -41,6 +39,21 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
         findPreference("sourcenamefilter").setSummary(count(getPrefsValue("sourcenamefilter")));
         findPreference("linkfilter").setSummary(count(getPrefsValue("linkfilter")));
 
+        findPreference("spamfilters").setOnPreferenceClickListener(preference -> {
+            setupFilters();
+            return true;
+        });
+        
+        findPreference("sourcenamefilter").setOnPreferenceClickListener(preference -> {
+            setupFilters();
+            return true;
+        });
+
+        findPreference("linkfilter").setOnPreferenceClickListener(preference -> {
+            setupFilters();
+            return true;
+        });
+
         findPreference("whitelisted_ad_groups").setSummary(countSet("whitelisted_ad_groups"));
         findPreference("whitelisted_filters_groups").setSummary(countSet("whitelisted_filters_groups"));
 
@@ -68,7 +81,7 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
         });
     }
 
-    private String count(String text) {
+    private String count(String text){
         // count comma separated words in string
         var count = text.split(", ").length;
 
@@ -79,7 +92,7 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
         }
     }
 
-    private void remdialog(String key, Context context) {
+    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"));
@@ -87,12 +100,13 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
         builder.setPositiveButton(AndroidUtils.getString("yes"), (dialogInterface, i) -> {
             edit().remove(key).apply();
             sendToast(AndroidUtils.getString("elements_deleted_success"));
+            setupFilters();
         });
         builder.setNegativeButton(AndroidUtils.getString("cancel"), (dialogInterface, i) -> dialogInterface.dismiss());
         builder.show();
     }
 
-    private String countSet(String key) {
+    private String countSet(String key){
         var set = getDefaultPrefs().getStringSet(key, null);
         StringBuilder str = new StringBuilder();
         if (set != null) {
@@ -112,15 +126,16 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
 
 
     @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
+    public boolean onPreferenceTreeClick(Preference preference){
         findPreference("cringecopyright").setEnabled(!copyright_post());
+        setupFilters();
         return super.onPreferenceTreeClick(preference);
     }
 
-    public class openofficialsett implements Preference.OnPreferenceClickListener {
+    public class openofficialsett implements Preference.OnPreferenceClickListener{
         @Override // android.support.v7.preference.Preference.c
-        public boolean onPreferenceClick(Preference preference) {
-            Context context = getContext();
+        public boolean onPreferenceClick(Preference preference){
+            Context context = requireContext();
             Intent a2 = new Navigator(NewsfeedSettingsFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);

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

@@ -2,9 +2,12 @@ package ru.vtosters.lite.ui.fragments;
 
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
+import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
 
+import android.os.Build;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.preference.Preference;
 
@@ -26,11 +29,20 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
         findPreference("swipe").setOnPreferenceClickListener(new restart());
         findPreference("is_likes_on_right").setOnPreferenceClickListener(new restart());
 
+        if (isTablet()){
+            findPreference("menusett").setVisible(false);
+            findPreference("swipe").setVisible(false);
+        }
+
         findPreference("customrounding").setOnPreferenceClickListener(preference -> {
             RoundingSeekbarDialog.dialog(getContext());
             return true;
         });
 
+        if (Build.VERSION.SDK_INT >= 33){
+            findPreference("anim_rtrn_type").setVisible(false);
+        }
+
         if (getPreferences().getInt("pic_rounding", 0) == 0) {
             findPreference("customrounding").setSummary(AndroidUtils.getString("disabled"));
         } else {

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

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.ui.fragments;
 
+import static bruhcollective.itaysonlab.libvkx.client.LibVKXClient.isVkxInstalled;
 import static ru.vtosters.lite.music.Scrobbler.isLoggedIn;
 import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
@@ -9,12 +10,12 @@ import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
+import static ru.vtosters.lite.utils.NewsFeedFiltersUtils.setupFilters;
 import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
 import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
 import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
 import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -34,6 +35,8 @@ import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.network.Network;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.util.Arrays;
 
@@ -44,8 +47,7 @@ import ru.vtosters.lite.downloaders.VideoDownloader;
 import ru.vtosters.lite.music.Scrobbler;
 import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter;
 import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.FileUriUtils;
-import ru.vtosters.lite.utils.Preferences;
+import ru.vtosters.lite.utils.LifecycleUtils;
 
 public class MediaFragment extends MaterialPreferenceToolbarFragment {
     private final int REQUEST_CODE_SET_DOWNLOAD_DIRECTORY = 665;
@@ -63,31 +65,6 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode == Activity.RESULT_OK) {
-            var path = data.getData();
-            if (path != null) {
-                var prefs = getPreferences();
-                var editor = prefs.edit();
-                var actualPath = FileUriUtils.getFullPathFromTreeUri(path, getContext());
-                switch (requestCode) {
-                    case REQUEST_CODE_SET_DOWNLOAD_DIRECTORY:
-                        editor.putString("downloads_directory", actualPath);
-                        break;
-                    case REQUEST_CODE_SET_MUSIC_DIRECTORY:
-                        editor.putString("music_directory", actualPath);
-                        break;
-                    case REQUEST_CODE_SET_PHOTOS_DIRECTORY:
-                        editor.putString("photos_directory", actualPath);
-                        break;
-                    case REQUEST_CODE_SET_VIDEOS_DIRECTORY:
-                        editor.putString("videos_directory", actualPath);
-                        break;
-                    default:
-                        return;
-                }
-                editor.apply();
-            }
-        }
     }
 
     @Override
@@ -99,7 +76,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
     private void prefs() {
         findPreference("download_video").setOnPreferenceClickListener(new MediaFragment.download());
         findPreference("clearvideohistory").setOnPreferenceClickListener(preference -> {
-            deleteVideoHistory();
+            deleteVideoHistoryDialog(requireContext());
             return true;
         });
         findPreference("dateformat").setOnPreferenceChangeListener(new MediaFragment.restart());
@@ -112,56 +89,16 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("downloads_directory").setSummary(
-                AndroidUtils.getString("current_download_folder") + " " + Preferences.getDownloadsDir()
-        );
-
-        findPreference("photos_directory").setSummary(
-                AndroidUtils.getString("current_download_folder") + " " + Preferences.getPhotosDir()
-        );
-
-        findPreference("videos_directory").setSummary(
-                AndroidUtils.getString("current_download_folder") + " " + Preferences.getVideosDir()
-        );
-
-        findPreference("music_directory").setSummary(
-                AndroidUtils.getString("current_download_folder") + " " + Preferences.getMusicDir()
-        );
-
-        findPreference("downloads_directory").setOnPreferenceClickListener(preference -> {
-            var intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-            intent.addCategory(Intent.CATEGORY_DEFAULT);
-            startActivityForResult(intent, REQUEST_CODE_SET_DOWNLOAD_DIRECTORY);
-            return true;
-        });
-
-        findPreference("photos_directory").setOnPreferenceClickListener(preference -> {
-            var intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-            intent.addCategory(Intent.CATEGORY_DEFAULT);
-            startActivityForResult(intent, REQUEST_CODE_SET_PHOTOS_DIRECTORY);
-            return true;
-        });
-
-        findPreference("videos_directory").setOnPreferenceClickListener(preference -> {
-            var intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-            intent.addCategory(Intent.CATEGORY_DEFAULT);
-            startActivityForResult(intent, REQUEST_CODE_SET_VIDEOS_DIRECTORY);
-            return true;
-        });
-
-        findPreference("music_directory").setOnPreferenceClickListener(preference -> {
-            var intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-            intent.addCategory(Intent.CATEGORY_DEFAULT);
-            startActivityForResult(intent, REQUEST_CODE_SET_MUSIC_DIRECTORY);
-            return true;
-        });
-
         if (isLoggedIn()) {
             findPreference("lastfm_auth").setSummary(AndroidUtils.getString("lastfm_authorized_as") + " " + Scrobbler.getUserName());
         } else {
             findPreference("lastfm_enabled").setEnabled(false);
         }
 
+        if (!isVkxInstalled()){
+            findPreference("vkx_sett").setVisible(false);
+        }
+
         findPreference("select_photo_search_engine").setOnPreferenceClickListener(preference -> {
             var items = Arrays.asList(
                     new ImagineArrayAdapter.ImagineArrayAdapterItem(getIdentifier("yandex", "drawable"), "Yandex"),
@@ -245,13 +182,20 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
         Thread thread = new Thread(() -> {
             try {
                 var request = new Request.a()
-                        .b("https://" + getApi() + "/method/" + "video.clearViewingHistoryRecords" + "?https=1" + "&access_token=" + getUserToken() + "&v=5.187")
+                        .b("https://" + getApi() + "/method/" + "video.clearViewingHistoryRecords" + "?https=1" + "&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();
 
                 try {
-                    var response = new OkHttpClient().a(request).execute().a().g();
-                    Log.d("VideoHistory", response);
+                    var response = new JSONObject(new OkHttpClient().a(request).execute().a().g());
+
+                    if (response.optInt("response") == 1){
+                        LifecycleUtils.getCurrentActivity().runOnUiThread(() -> sendToast(AndroidUtils.getString("video_history_cleaned")));
+                    } else {
+                        LifecycleUtils.getCurrentActivity().runOnUiThread(() -> sendToast("Ошибка при очистке истории. Подробности в логах"));
+                    }
+
+                    Log.d("VideoHistory", response.toString());
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -261,8 +205,18 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
         });
 
         thread.start();
+    }
 
-        sendToast(AndroidUtils.getString("video_history_cleaned"));
+    private void deleteVideoHistoryDialog(Context context){
+        VkAlertDialog.Builder builder = new VkAlertDialog.Builder(context);
+        builder.setTitle(AndroidUtils.getString("warning"));
+        builder.setMessage("Вы действительно хотите очистить историю видео?");
+        builder.setCancelable(false);
+        builder.setPositiveButton(AndroidUtils.getString("yes"), (dialogInterface, i) -> {
+            deleteVideoHistory();
+        });
+        builder.setNegativeButton(AndroidUtils.getString("cancel"), (dialogInterface, i) -> dialogInterface.dismiss());
+        builder.show();
     }
 
     public static void download(Context ctx) {

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

@@ -1,12 +1,13 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static ru.vtosters.lite.utils.AndroidUtils.*;
+import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
+import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
 import static ru.vtosters.lite.utils.Preferences.autoalltranslate;
 import static ru.vtosters.lite.utils.Preferences.vkme;
-import static ru.vtosters.lite.utils.ThemesUtils.*;
+import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -22,12 +23,9 @@ import com.vk.navigation.Navigator;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 import java.util.Arrays;
-import java.util.Objects;
 
 import ru.vtosters.lite.ui.adapters.ImagineArrayAdapter;
 import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment;
-import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.ThemesUtils;
 
 public class MessagesFragment extends MaterialPreferenceToolbarFragment {
     @Override
@@ -72,6 +70,11 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
         findPreference("vkme_notifs").setEnabled(vkme());
         findPreference("wallpapers").setIcon(recolorDrawable(getGlobalContext().getDrawable(getIdentifier("ic_media_outline_28", "drawable"))));
         findPreference("vkme").setIcon(getIdentifier("ic_vkme_28", "drawable"));
+
+        if (isTablet()){
+            findPreference("alteremoji").setVisible(false);
+            findPreference("vkmesett").setVisible(false);
+        }
     }
 
     @Override
@@ -103,10 +106,11 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
     public class openwp implements Preference.OnPreferenceClickListener {
         @Override
         public boolean onPreferenceClick(Preference preference) {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(WallpaperMenuFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
+//            sendToast("Обои временно недоступны. Следите за новостями на @vtosters в Telegram");
             return true;
         }
     }

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

@@ -9,10 +9,9 @@ import static ru.vtosters.lite.ui.components.BackupManager.deletePrefs;
 import static ru.vtosters.lite.ui.components.BackupManager.restoreBackup;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
-import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
-import static ru.vtosters.lite.utils.CacheUtils.deleteCache;
+import static ru.vtosters.lite.utils.ContactsUtils.setContactsSync;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication;
 import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
 
@@ -57,6 +56,7 @@ import b.h.g.m.FileUtils;
 import ru.vtosters.lite.ui.activities.VKAdminTokenActivity;
 import ru.vtosters.lite.ui.components.BackupManager;
 import ru.vtosters.lite.utils.AndroidUtils;
+import ru.vtosters.lite.utils.ContactsUtils;
 
 public class OtherFragment extends MaterialPreferenceToolbarFragment {
     private static final int VK_ADMIN_TOKEN_REQUEST_CODE = 1;
@@ -96,9 +96,8 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("resetfolders").setOnPreferenceClickListener(preference -> {
-            edit().remove("photos_directory").remove("videos_directory").remove("audios_directory").remove("downloads_directory").apply();
-            Toast.makeText(getContext(), AndroidUtils.getString("download_folders_reseted"), LENGTH_SHORT).show();
+        findPreference("contacts_sync").setOnPreferenceClickListener((preference) -> {
+            ContactsUtils.getContactsStatus(requireContext());
             return true;
         });
 
@@ -124,7 +123,11 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
                 break;
         }
 
-        findPreference("deleteprefs").setOnPreferenceClickListener(new deleteprefs());
+        findPreference("deleteprefs").setOnPreferenceClickListener(preference -> {
+            delprefs(getContext());
+            return true;
+        });
+
         findPreference("saveonlines").setOnPreferenceClickListener(new onlines());
 
         findPreference("saveprefs").setOnPreferenceClickListener(new saveprefs());
@@ -303,13 +306,17 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
         }
     }
 
-    public static class deleteprefs implements Preference.OnPreferenceClickListener {
-        @Override // android.support.v7.preference.Preference.c
-        public boolean onPreferenceClick(Preference preference) {
+    private void delprefs(Context context) {
+        VkAlertDialog.Builder builder = new VkAlertDialog.Builder(context);
+        builder.setTitle(AndroidUtils.getString("warning"));
+        builder.setMessage("Вы действительно хотите сбросить настройки?");
+        builder.setCancelable(false);
+        builder.setPositiveButton(AndroidUtils.getString("yes"), (dialogInterface, i) -> {
             deletePrefs();
             restartApplication();
-            return true;
-        }
+        });
+        builder.setNegativeButton(AndroidUtils.getString("cancel"), (dialogInterface, i) -> dialogInterface.dismiss());
+        builder.show();
     }
 
     class c implements Preference.OnPreferenceClickListener {

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

@@ -1,7 +1,6 @@
 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;
 
@@ -11,7 +10,6 @@ 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 {

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

@@ -3,6 +3,7 @@ package ru.vtosters.lite.ui.fragments;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
+import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
 
 import android.content.Context;
@@ -32,19 +33,19 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
         findPreference("darktheme").setOnPreferenceChangeListener(new restartdark());
         findPreference("lighttheme").setOnPreferenceChangeListener(new restartlight());
         findPreference("iconmanager").setOnPreferenceClickListener(new openicons());
-        findPreference("dockbar_tab_titles").setOnPreferenceChangeListener((preference, o) -> {
-            getPreferences().edit().putBoolean("dockbar_tab_titles", (boolean) o).commit();
-            LifecycleUtils.restartApplication();
-            return false;
-        });
+        findPreference("dockbar_tab_titles").setOnPreferenceClickListener(new restart());
         findPreference("dockbar_accent").setOnPreferenceClickListener(new restart());
         findPreference("dockcounter").setOnPreferenceClickListener(new restart());
+
+        if (isTablet()){
+            findPreference("dockbarsett").setVisible(false);
+        }
     }
 
     public class openicons implements Preference.OnPreferenceClickListener {
         @Override
         public boolean onPreferenceClick(Preference preference) {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(IconsFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);

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.ru/vkpay");
+        VKUIwrapper.setLink("https://vk.com/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

@@ -12,10 +12,12 @@ import static ru.vtosters.lite.utils.AccountManagerUtils.isVKTester;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
 import static ru.vtosters.lite.utils.CacheUtils.humanReadableByteCountBin;
 import static ru.vtosters.lite.utils.GmsUtils.isGmsInstalled;
 import static ru.vtosters.lite.utils.ImageUtils.getDrawableFromUrl;
 import static ru.vtosters.lite.utils.Preferences.ads;
+import static ru.vtosters.lite.utils.Preferences.autotranslate;
 import static ru.vtosters.lite.utils.Preferences.devmenu;
 import static ru.vtosters.lite.utils.Preferences.disableSettingsSumms;
 import static ru.vtosters.lite.utils.Preferences.hasSpecialVerif;
@@ -30,6 +32,7 @@ import static ru.vtosters.lite.utils.Preferences.superapp;
 import static ru.vtosters.lite.utils.Preferences.vkme;
 import static ru.vtosters.lite.utils.ThemesUtils.getDarkTheme;
 import static ru.vtosters.lite.utils.ThemesUtils.getLightTheme;
+import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
 import static ru.vtosters.lite.utils.ThemesUtils.setTheme;
 import static ru.vtosters.lite.utils.VTVerifications.vtverif;
 
@@ -43,6 +46,7 @@ import android.os.Bundle;
 import com.aefyr.tsg.g2.TelegramStickersService;
 import com.vk.about.AboutAppFragment;
 import com.vk.balance.BalanceFragment;
+import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.navigation.Navigator;
 import com.vk.notifications.settings.NotificationsSettingsFragment;
 import com.vk.webapp.fragments.PrivacyFragment;
@@ -55,13 +59,16 @@ import com.vtosters.lite.fragments.w2.BlacklistFragment;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 import com.vtosters.lite.general.fragments.SettingsAccountFragment;
 import com.vtosters.lite.general.fragments.SettingsGeneralFragment;
+import com.vtosters.lite.ui.MaterialSwitchPreference;
 
+import ru.vtosters.lite.hooks.ui.SystemThemeChangerHook;
 import ru.vtosters.lite.ui.components.DockBarEditorManager;
 import ru.vtosters.lite.ui.components.SuperAppEditorManager;
 import ru.vtosters.lite.ui.dialogs.OTADialog;
 import ru.vtosters.lite.ui.fragments.tgstickers.StickersFragment;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.CacheUtils;
+import ru.vtosters.lite.utils.Preferences;
 import ru.vtosters.lite.utils.SSFSUtils;
 
 public class VTSettings extends MaterialPreferenceToolbarFragment {
@@ -123,13 +130,18 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         return AndroidUtils.getString("autoclearcachesumm") + " " + humanReadableByteCountBin(CacheUtils.getInstance().size);
     }
 
+    private void switchTheme(boolean isDarkTheme) {
+        setTheme(isDarkTheme ? getDarkTheme() : getLightTheme(), requireActivity());
+        edit().putBoolean("isdark", isDarkTheme).commit();
+    }
+
     @Override
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
         var feedsumm = getValAsString("vtlfeedsumm", ads());
         var docksumm = getDocksumm();
-        var msgsumm = getValAsString("vtlmsgsumm", vkme());
+        var msgsumm = isTablet() ? getValAsString("autotranslate_title", autotranslate()) : getValAsString("vtlmsgsumm", vkme());
         var activitysumm = getValAsString("vtlactivitysumm", offline());
         var themessumm = getValAsString("vtlthemessumm", navbar());
         var tgssumm = getTGSsumm();
@@ -147,44 +159,60 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         addPreferenceDrawable(this, "", getUsername(), hasVerification() ? AndroidUtils.getString("thanksfordonate") : AndroidUtils.getString("getdonate"), getDrawableFromUrl(getUserPhoto(), "ic_user_circle_outline_28", true, true), preference -> {
             try {
                 VKAuth.a("logout", false);
-            } catch (Exception ignored) { }
+            } catch (Exception ignored) {
+            }
 
-            var intent = new Intent(getContext(), MainActivity.class);
+            var intent = new Intent(requireContext(), MainActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            getContext().startActivity(intent);
+            requireContext().startActivity(intent);
 
             return false;
         });
 
         addPreferenceCategory(this, AndroidUtils.getString("vtsettdarktheme"));
 
-        addMaterialSwitchPreference(this, "isdark", AndroidUtils.getString("vtsettdarktheme"), "", "ic_palette_outline_28", false, (preference, o) -> {
-            boolean value = (boolean) o;
+        addMaterialSwitchPreference(this, "", AndroidUtils.getString("vtsettdarktheme"), "", "ic_palette_outline_28", isDarkTheme(), (preference, o) -> {
+            final var switchPreference = (MaterialSwitchPreference) preference;
+            final var isDarkTheme = !switchPreference.isChecked();
 
-            if (!value) { // inverted
-                setTheme(getLightTheme(), this.getActivity());
-            } else {
-                setTheme(getDarkTheme(), this.getActivity());
+            if (Preferences.systemtheme()) {
+                new VkAlertDialog.Builder(requireActivity())
+                        .setTitle("Внимание!")
+                        .setMessage("У вас включена системная тема \n" +
+                                "При переключении темы системная тема будет отключена \n\n" +
+                                "Вы действительно хотите отключить её?")
+                        .setCancelable(false)
+                        .setPositiveButton("Отключить", (dialogInterface, i) -> {
+                            switchPreference.setChecked(isDarkTheme);
+                            ((MaterialSwitchPreference) findPreference("systemtheme")).setChecked(false);
+                            requireActivity().runOnUiThread(() -> {
+                                switchTheme(isDarkTheme);
+                            });
+                        })
+                        .setNeutralButton("Отмена", null)
+                        .show();
+                return false;
             }
-
-            edit().putBoolean("isdark", value).commit();
+            switchTheme(isDarkTheme);
             return true;
         });
 
-        if (Build.VERSION.SDK_INT >= 28 && false) { // TODO refactoring system theme
-            addMaterialSwitchPreference(this, "systemtheme", AndroidUtils.getString("appearance_theme_use_system"), AndroidUtils.getString("appearance_theme_use_system_summary"), "ic_recent_outline_28", true, (preference, o) -> {
+        if (Build.VERSION.SDK_INT >= 28) {
+            addMaterialSwitchPreference(this, "systemtheme", AndroidUtils.getString("appearance_theme_use_system"), "", "ic_recent_outline_28", true, (preference, o) -> {
                 boolean value = (boolean) o;
 
                 edit().putBoolean("systemtheme", value).commit();
+
+                SystemThemeChangerHook.onThemeChanged(getResources().getConfiguration());
                 return true;
             });
         }
 
         if (!isGmsInstalled()) {
             addPreference(this, "", AndroidUtils.getString("installgms"), "", "ic_about_outline_28", preference -> {
-                Context context = getContext();
+                Context context = requireContext();
                 Intent a2 = new Navigator(InstallGMSFragment.class).b(context);
                 a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 context.startActivity(a2);
@@ -196,7 +224,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
             addPreferenceCategory(this, AndroidUtils.getString("sett_debug"));
 
             addPreference(this, "", AndroidUtils.getString("sett_debug"), "", "ic_bug_outline_28", preference -> {
-                Context context = getContext();
+                Context context = requireContext();
                 Intent a2 = new Navigator(SettingsDebugFragment.class).b(context);
                 a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 context.startActivity(a2);
@@ -213,7 +241,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         addPreferenceCategory(this, AndroidUtils.getString("vtsettaccount"));
 
         addPreference(this, "", AndroidUtils.getString("vkconnect"), "", "ic_user_circle_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             VKUIwrapper.officalLinks("account");
             Intent a2 = new Navigator(VKUIwrapper.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -222,7 +250,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("privacy_settings"), "", "ic_privacy_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(PrivacyFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -230,7 +258,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("sett_account"), "", "ic_user_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(SettingsAccountFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -239,7 +267,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
 
         if (isVKTester()) {
             addPreference(this, "", AndroidUtils.getString("bugs"), "", "ic_bug_outline_28", preference -> {
-                Context context = getContext();
+                Context context = requireContext();
                 VKUIwrapper.officalLinks("bugs");
                 Intent a2 = new Navigator(VKUIwrapper.class).b(context);
                 a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -249,7 +277,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         }
 
         addPreference(this, "", AndroidUtils.getString("vtssfs"), ssfs, "ic_link_circle_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             VKUIwrapper.setLink(SSFSUtils.getSSFSLink());
             Intent a2 = new Navigator(VKUIwrapper.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -260,7 +288,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         addPreferenceCategory(this, AndroidUtils.getString("notification_settings"));
 
         addPreference(this, "", AndroidUtils.getString("sett_general"), "", "ic_settings_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(SettingsGeneralFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -268,7 +296,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("blacklist"), "", "ic_users_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(BlacklistFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -276,7 +304,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("sett_notifications"), "", "ic_menu_notification_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(NotificationsSettingsFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -285,7 +313,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
 
         if (VKAccountManager.d().isMusicSubs()) {
             addPreference(this, "", AndroidUtils.getString("subscription_music"), "", "ic_music_outline_28", preference -> {
-                Context context = getContext();
+                Context context = requireContext();
                 Intent a2 = new Navigator(MusicSubscriptionControlFragment.class).b(context);
                 a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 context.startActivity(a2);
@@ -294,7 +322,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         }
 
         addPreference(this, "", AndroidUtils.getString("votes"), "", "ic_coins_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(BalanceFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -305,36 +333,38 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
 
         if (!vkme()) {
             addPreference(this, "", AndroidUtils.getString("vtlfeed"), feedsumm, "ic_newsfeed_outline_28", preference -> {
-                Context context = getContext();
+                Context context = requireContext();
                 Intent a2 = new Navigator(FeedFragment.class).b(context);
                 a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 context.startActivity(a2);
                 return false;
             });
 
-            addPreference(this, "", AndroidUtils.getString("dockbar_editor"), docksumm, "ic_list_outline_28", preference -> {
-                Context context = getContext();
-                Intent intent = new Navigator(DockBarEditorFragment.class).b(context);
-                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(intent);
-                return false;
-            });
-
-            if (milkshake() && superapp()) {
-                addPreference(this, "", AndroidUtils.getString("superapp_editor"), superapp, "ic_services_outline_28", (preference) -> {
-                    Context context = getContext();
-                    Intent intent = new Navigator(SuperAppEditorFragment.class).b(context);
+            if (!isTablet()) {
+                addPreference(this, "", AndroidUtils.getString("dockbar_editor"), docksumm, "ic_list_outline_28", preference -> {
+                    Context context = requireContext();
+                    Intent intent = new Navigator(DockBarEditorFragment.class).b(context);
                     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     context.startActivity(intent);
-                    return true;
+                    return false;
                 });
+
+                if (milkshake() && superapp()) {
+                    addPreference(this, "", AndroidUtils.getString("superapp_editor"), superapp, "ic_services_outline_28", (preference) -> {
+                        Context context = requireContext();
+                        Intent intent = new Navigator(SuperAppEditorFragment.class).b(context);
+                        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        context.startActivity(intent);
+                        return true;
+                    });
+                }
             }
         } else {
             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 -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(MediaFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -342,7 +372,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("vtlmessages"), msgsumm, "ic_message_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(MessagesFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -350,7 +380,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("vtlactivity"), activitysumm, "ic_write_outline_28_new_accent", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(ActivityFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -358,7 +388,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("vtlthemes"), themessumm, "ic_write_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(ThemesFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -366,7 +396,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("vtltgs"), tgssumm, "ic_telegram_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(StickersFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -374,7 +404,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("vtlinterface"), interfacesumm, "ic_interface_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(InterfaceFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -382,7 +412,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("vtlproxy"), proxysumm, "ic_globe_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(ProxySettingsFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -390,7 +420,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("vtlother"), othersumm, "ic_more_horizontal_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(OtherFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -400,7 +430,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         addPreferenceCategory(this, AndroidUtils.getString("vtsettaboutmod"));
 
         addPreference(this, "", AndroidUtils.getString("menu_about"), about, "ic_about_outline_28", preference -> {
-            Context context = getContext();
+            Context context = requireContext();
             Intent a2 = new Navigator(AboutAppFragment.class).b(context);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(a2);
@@ -408,17 +438,17 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         });
 
         addPreference(this, "", AndroidUtils.getString("opencommit"), "", "ic_link_outline_28", preference -> {
-            getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse(getCommitLink())));
+            requireContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse(getCommitLink())));
             return false;
         });
 
         addPreference(this, "", AndroidUtils.getString("vtfaq"), AndroidUtils.getString("vtfaqsumm"), "ic_help_outline_28", preference -> {
-            getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://t.me/s/vtosters_faq")));
+            requireContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://t.me/s/vtosters_faq")));
             return false;
         });
 
         addPreference(this, "", AndroidUtils.getString("reportbug"), AndroidUtils.getString("reportbugsumm"), "ic_bug_outline_28", preference -> {
-            getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://github.com/vtosters/lite/issues")));
+            requireContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://github.com/vtosters/lite/issues")));
             return false;
         });
 
@@ -429,14 +459,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
                 OTADialog.checkUpdates(getActivity());
                 return false;
             });
-
-            addMaterialSwitchPreference(this, "checkupdates", AndroidUtils.getString("checkupdates"), "", "ic_recent_outline_28", true, (preference, o) -> {
-                boolean value = (boolean) o;
-
-                edit().putBoolean("checkupdates", value).commit();
-
-                return true;
-            });
         }
     }
 

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

@@ -31,6 +31,7 @@ import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
@@ -40,10 +41,10 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.vk.navigation.Navigator;
 
 import java.io.File;
-import java.util.Objects;
 
 import ru.vtosters.lite.tgs.TGPref;
 import ru.vtosters.lite.ui.adapters.StickerPackAdapter;
+import ru.vtosters.lite.ui.components.StickerTouchHelperCallback;
 import ru.vtosters.lite.ui.fragments.BaseToolbarFragment;
 import ru.vtosters.lite.utils.AndroidUtils;
 
@@ -121,6 +122,11 @@ public class StickersFragment extends BaseToolbarFragment {
 
         mAdapter = new StickerPackAdapter();
         RecyclerView mRecycler = new RecyclerView(getContext());
+
+        var callback = new StickerTouchHelperCallback(mAdapter);
+        var touchHelper = new ItemTouchHelper(callback);
+        touchHelper.attachToRecyclerView(mRecycler);
+
         mRecycler.setAdapter(mAdapter);
         mRecycler.setLayoutManager(new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL));
         layout.addView(mRecycler, new ViewGroup.LayoutParams(-1, -1));

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

@@ -3,18 +3,18 @@ package ru.vtosters.lite.ui.wallpapers;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 
-public class ConvolutionMatrix {
+public class ConvolutionMatrix{
     public static final int SIZE = 3;
 
     public double[][] Matrix;
     public double Factor = 1;
     public double Offset = 1;
 
-    public ConvolutionMatrix(int size) {
+    public ConvolutionMatrix(int size){
         Matrix = new double[size][size];
     }
 
-    public static Bitmap computeConvolution3x3(Bitmap src, ConvolutionMatrix matrix) {
+    public static Bitmap computeConvolution3x3(Bitmap src, ConvolutionMatrix matrix){
         int width = src.getWidth();
         int height = src.getHeight();
         Bitmap result = Bitmap.createBitmap(width, height, src.getConfig());
@@ -81,7 +81,7 @@ public class ConvolutionMatrix {
         return result;
     }
 
-    public void setAll(double value) {
+    public void setAll(double value){
         for (int x = 0; x < SIZE; ++x) {
             for (int y = 0; y < SIZE; ++y) {
                 Matrix[x][y] = value;
@@ -89,7 +89,7 @@ public class ConvolutionMatrix {
         }
     }
 
-    public void applyConfig(double[][] config) {
+    public void applyConfig(double[][] config){
         for (int x = 0; x < SIZE; ++x) {
             for (int y = 0; y < SIZE; ++y) {
                 Matrix[x][y] = config[x][y];

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

@@ -2,7 +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 static ru.vtosters.lite.utils.Preferences.hasVerification;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -13,22 +13,46 @@ import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.util.Log;
 
 import com.vk.medianative.MediaNative;
 
 import java.util.Random;
 
-public class ImageFilters {
+public class ImageFilters{
     public static final double PI = 3.14159d;
     public static final double HALF_CIRCLE_DEGREE = 180d;
     public static final double RANGE = 256d;
     public static final int COLOR_MIN = 0x00;
     public static final int COLOR_MAX = 0xFF;
 
-    public static Drawable getFilteredDrawable(Drawable orig) {
+    public static Drawable getFilteredDrawable(Drawable orig){
         if (orig == null) return null;
         if (!(orig instanceof BitmapDrawable)) return orig;
-        Bitmap instance = ((BitmapDrawable) orig).getBitmap().copy(Bitmap.Config.ARGB_8888, true);
+
+        if (!getPreferences().getString("msg_blur_radius", "disabled").equals("disabled")) {
+            orig = getBlurredWallpaper(orig, getRadius());
+        }
+
+        if (!getPreferences().getString("msg_dim", "off").equals("off")) {
+            orig = getDimmed(orig);
+        }
+
+        if (!getPreferences().getString("msg_mosaic", "disabled").equals("disabled")) {
+            orig = getMosaic(orig);
+        }
+
+        if (!hasVerification()) {
+            return orig;
+        }
+
+        if (getPreferences().getBoolean("msg_monochrome", false)) {
+            orig = getMonochrome(orig);
+        }
+
+        Bitmap bm = ((BitmapDrawable) orig).getBitmap();
+
+        Bitmap instance = bm.copy(Bitmap.Config.ARGB_8888, true);
 
         if (getPreferences().getBoolean("msg_invert", false)) {
             instance = applyInvertEffect(instance);
@@ -57,11 +81,26 @@ public class ImageFilters {
         return new BitmapDrawable(getResources(), instance);
     }
 
-    public static Drawable getBlurredWallpaper(Drawable orig, int radius) {
+    private static int getRadius(){
+        String radius = getPreferences().getString("msg_blur_radius", "disabled");
+        switch(radius) {
+            case "low":
+                return 8;
+            case "med":
+                return 14;
+            default:
+                return 20;
+        }
+    }
+
+    public static Drawable getBlurredWallpaper(Drawable orig, int radius){
         try {
             if (orig == null) return null;
             if (!(orig instanceof BitmapDrawable)) return orig; // we need only BitmapDrawable
-            Bitmap instance = ((BitmapDrawable) orig).getBitmap().copy(Bitmap.Config.ARGB_8888, true);
+            Bitmap bm = ((BitmapDrawable) orig).getBitmap();
+
+            Bitmap instance = bm.copy(Bitmap.Config.ARGB_8888, true);
+
             MediaNative.blurBitmap(instance, radius);
             return new BitmapDrawable(getResources(), instance);
         } catch (Exception e) {
@@ -70,15 +109,20 @@ public class ImageFilters {
         }
     }
 
-    public static Drawable getMosaic(Drawable orig) {
+    public static Drawable getMosaic(Drawable orig){
         int scale = 100;
 
         if (orig == null) return null;
         if (!(orig instanceof BitmapDrawable)) return orig;
-        Bitmap instance = ((BitmapDrawable) orig).getBitmap().copy(Bitmap.Config.ARGB_8888, true);
+        Bitmap bm = ((BitmapDrawable) orig).getBitmap();
+
+
+        Bitmap instance = bm.copy(Bitmap.Config.ARGB_8888, true);
+
+
         String radius = getPreferences().getString("msg_mosaic", "disabled");
 
-        switch (radius) {
+        switch(radius) {
             case "high":
                 scale = 25;
                 break;
@@ -95,12 +139,15 @@ public class ImageFilters {
         return new BitmapDrawable(getResources(), mosaicBitmap);
     }
 
-    public static Drawable getDimmed(Drawable orig) {
+    public static Drawable getDimmed(Drawable orig){
         if (orig == null) return null;
         if (!(orig instanceof BitmapDrawable)) return orig;
-        Bitmap instance = ((BitmapDrawable) orig).getBitmap().copy(Bitmap.Config.ARGB_8888, true);
+        Bitmap bm = ((BitmapDrawable) orig).getBitmap();
+
+        Bitmap instance = bm.copy(Bitmap.Config.ARGB_8888, true);
+
         String radius = getPreferences().getString("msg_dim", "disabled");
-        switch (radius) {
+        switch(radius) {
             case "dim_black":
                 darken(instance);
             case "dim_white":
@@ -109,10 +156,12 @@ public class ImageFilters {
         return new BitmapDrawable(getResources(), instance);
     }
 
-    public static Drawable getMonochrome(Drawable orig) {
+    public static Drawable getMonochrome(Drawable orig){
         if (orig == null) return null;
         if (!(orig instanceof BitmapDrawable)) return orig;
-        Bitmap instance = ((BitmapDrawable) orig).getBitmap().copy(Bitmap.Config.ARGB_8888, true);
+        Bitmap bm = ((BitmapDrawable) orig).getBitmap();
+
+        Bitmap instance = bm.copy(Bitmap.Config.ARGB_8888, true);
 
         Bitmap bwBitmap = Bitmap.createBitmap(instance.getWidth(), instance.getHeight(), Bitmap.Config.RGB_565);
         float[] hsv = new float[3];
@@ -130,7 +179,7 @@ public class ImageFilters {
         return new BitmapDrawable(getResources(), bwBitmap);
     }
 
-    private static void darken(Bitmap bm) {
+    private static void darken(Bitmap bm){
         try {
             Canvas canvas = new Canvas(bm);
             Paint p = new Paint(Color.RED);
@@ -138,11 +187,11 @@ public class ImageFilters {
             p.setColorFilter(filter);
             canvas.drawBitmap(bm, new Matrix(), p);
         } catch (Exception e) {
-            sendToast("Ошибка при работе затемнения обоев");
+            Log.d("WallpaperD", e.getMessage());
         }
     }
 
-    private static void lighten(Bitmap bm) {
+    private static void lighten(Bitmap bm){
         try {
             Canvas canvas = new Canvas(bm);
             Paint p = new Paint(Color.RED);
@@ -150,11 +199,11 @@ public class ImageFilters {
             p.setColorFilter(filter);
             canvas.drawBitmap(bm, new Matrix(), p);
         } catch (Exception e) {
-            sendToast("Ошибка при работе осветления обоев");
+            Log.d("WallpaperL", e.getMessage());
         }
     }
 
-    public static Bitmap applyInvertEffect(Bitmap src) {
+    public static Bitmap applyInvertEffect(Bitmap src){
         // create new bitmap with the same settings as source bitmap
         Bitmap bmOut = Bitmap.createBitmap(src.getWidth(), src.getHeight(), src.getConfig());
         // color info
@@ -184,7 +233,7 @@ public class ImageFilters {
         return bmOut;
     }
 
-    public static Bitmap applySepiaEffect(Bitmap src) {
+    public static Bitmap applySepiaEffect(Bitmap src){
         // image size
         int width = src.getWidth();
         int height = src.getHeight();
@@ -221,8 +270,8 @@ public class ImageFilters {
         return bmOut;
     }
 
-    public static Bitmap applyEmbossEffect(Bitmap src) {
-        double[][] EmbossConfig = new double[][]{
+    public static Bitmap applyEmbossEffect(Bitmap src){
+        double[][] EmbossConfig = new double[][] {
                 {-1, 0, -1},
                 {0, 4, 0},
                 {-1, 0, -1}
@@ -234,7 +283,7 @@ public class ImageFilters {
         return ConvolutionMatrix.computeConvolution3x3(src, convMatrix);
     }
 
-    public static Bitmap applyEngraveEffect(Bitmap src) {
+    public static Bitmap applyEngraveEffect(Bitmap src){
         ConvolutionMatrix convMatrix = new ConvolutionMatrix(3);
         convMatrix.setAll(0);
         convMatrix.Matrix[0][0] = -2;
@@ -244,7 +293,7 @@ public class ImageFilters {
         return ConvolutionMatrix.computeConvolution3x3(src, convMatrix);
     }
 
-    public static Bitmap applyFleaEffect(Bitmap source) {
+    public static Bitmap applyFleaEffect(Bitmap source){
         // get image size
         int width = source.getWidth();
         int height = source.getHeight();
@@ -273,7 +322,7 @@ public class ImageFilters {
         return bmOut;
     }
 
-    public static Bitmap applySnowEffect(Bitmap source) {
+    public static Bitmap applySnowEffect(Bitmap source){
         // get image size
         int width = source.getWidth();
         int height = source.getHeight();
@@ -306,7 +355,7 @@ public class ImageFilters {
         return bmOut;
     }
 
-    public Bitmap applyDecreaseColorDepthEffect(Bitmap src, int bitOffset) {
+    public Bitmap applyDecreaseColorDepthEffect(Bitmap src, int bitOffset){
         // get image size
         int width = src.getWidth();
         int height = src.getHeight();
@@ -349,7 +398,7 @@ public class ImageFilters {
         return bmOut;
     }
 
-    public Bitmap applyContrastEffect(Bitmap src, double value) {
+    public Bitmap applyContrastEffect(Bitmap src, double value){
         // image size
         int width = src.getWidth();
         int height = src.getHeight();
@@ -401,7 +450,7 @@ public class ImageFilters {
         return bmOut;
     }
 
-    public Bitmap applyBrightnessEffect(Bitmap src, int value) {
+    public Bitmap applyBrightnessEffect(Bitmap src, int value){
         // image size
         int width = src.getWidth();
         int height = src.getHeight();
@@ -452,8 +501,8 @@ public class ImageFilters {
         return bmOut;
     }
 
-    public Bitmap applyGaussianBlurEffect(Bitmap src) {
-        double[][] GaussianBlurConfig = new double[][]{
+    public Bitmap applyGaussianBlurEffect(Bitmap src){
+        double[][] GaussianBlurConfig = new double[][] {
                 {1, 2, 1},
                 {2, 4, 2},
                 {1, 2, 1}
@@ -465,8 +514,8 @@ public class ImageFilters {
         return ConvolutionMatrix.computeConvolution3x3(src, convMatrix);
     }
 
-    public Bitmap applySharpenEffect(Bitmap src, double weight) {
-        double[][] SharpConfig = new double[][]{
+    public Bitmap applySharpenEffect(Bitmap src, double weight){
+        double[][] SharpConfig = new double[][] {
                 {0, -2, 0},
                 {-2, weight, -2},
                 {0, -2, 0}
@@ -477,8 +526,8 @@ public class ImageFilters {
         return ConvolutionMatrix.computeConvolution3x3(src, convMatrix);
     }
 
-    public Bitmap applyMeanRemovalEffect(Bitmap src) {
-        double[][] MeanRemovalConfig = new double[][]{
+    public Bitmap applyMeanRemovalEffect(Bitmap src){
+        double[][] MeanRemovalConfig = new double[][] {
                 {-1, -1, -1},
                 {-1, 9, -1},
                 {-1, -1, -1}
@@ -490,7 +539,7 @@ public class ImageFilters {
         return ConvolutionMatrix.computeConvolution3x3(src, convMatrix);
     }
 
-    public Bitmap applySmoothEffect(Bitmap src, double value) {
+    public Bitmap applySmoothEffect(Bitmap src, double value){
         ConvolutionMatrix convMatrix = new ConvolutionMatrix(3);
         convMatrix.setAll(1);
         convMatrix.Matrix[1][1] = value;
@@ -499,7 +548,7 @@ public class ImageFilters {
         return ConvolutionMatrix.computeConvolution3x3(src, convMatrix);
     }
 
-    public Bitmap applyBoostEffect(Bitmap src, int type, float percent) {
+    public Bitmap applyBoostEffect(Bitmap src, int type, float percent){
         int width = src.getWidth();
         int height = src.getHeight();
         Bitmap bmOut = Bitmap.createBitmap(width, height, src.getConfig());
@@ -530,7 +579,7 @@ public class ImageFilters {
         return bmOut;
     }
 
-    public Bitmap applyTintEffect(Bitmap src, int degree) {
+    public Bitmap applyTintEffect(Bitmap src, int degree){
 
         int width = src.getWidth();
         int height = src.getHeight();
@@ -574,7 +623,7 @@ public class ImageFilters {
         return outBitmap;
     }
 
-    public Bitmap applyBlackFilter(Bitmap source) {
+    public Bitmap applyBlackFilter(Bitmap source){
         // get image size
         int width = source.getWidth();
         int height = source.getHeight();
@@ -607,7 +656,7 @@ public class ImageFilters {
         return bmOut;
     }
 
-    public Bitmap applyShadingFilter(Bitmap source, int shadingColor) {
+    public Bitmap applyShadingFilter(Bitmap source, int shadingColor){
         // get image size
         int width = source.getWidth();
         int height = source.getHeight();
@@ -631,7 +680,7 @@ public class ImageFilters {
         return bmOut;
     }
 
-    public Bitmap applySaturationFilter(Bitmap source, int level) {
+    public Bitmap applySaturationFilter(Bitmap source, int level){
         // get image size
         int width = source.getWidth();
         int height = source.getHeight();
@@ -661,7 +710,7 @@ public class ImageFilters {
         return bmOut;
     }
 
-    public Bitmap applyHueFilter(Bitmap source, int level) {
+    public Bitmap applyHueFilter(Bitmap source, int level){
         // get image size
         int width = source.getWidth();
         int height = source.getHeight();

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

@@ -8,7 +8,6 @@ import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.removeWallpaper;
 import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.requestUpdateWallpaper;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
-import static ru.vtosters.lite.utils.CacheUtils.deleteCache;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.Preferences.hasVerification;
 
@@ -33,15 +32,15 @@ import java.io.OutputStream;
 import ru.vtosters.lite.ui.PreferencesUtil;
 import ru.vtosters.lite.utils.AndroidUtils;
 
-public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
+public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment{
 
     private WallpaperPreferences mWPPreviewPref;
 
-    public static void copyStream(InputStream copyFrom, OutputStream copyTo) throws IOException {
+    public static void copyStream(InputStream copyFrom, OutputStream copyTo) throws IOException{
 
         byte[] buffer = new byte[1024];
         int length;
-        while ((length = copyFrom.read(buffer)) > 0) {
+        while((length = copyFrom.read(buffer)) > 0) {
             copyTo.write(buffer, 0, length);
         }
 
@@ -51,7 +50,7 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
     }
 
     @Override
-    public void onCreate(Bundle bundle) {
+    public void onCreate(Bundle bundle){
         super.onCreate(bundle);
 
         int vtosterXml = getIdentifier("empty", "xml");
@@ -87,16 +86,16 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
             });
         }
 
-        PreferencesUtil.addListPreference(this, "msg_blur_radius", "disabled", AndroidUtils.getString("filter_blur"), AndroidUtils.getArray("filter_types"), new String[]{
+        PreferencesUtil.addListPreference(this, "msg_blur_radius", "disabled", AndroidUtils.getString("filter_blur"), AndroidUtils.getArray("filter_types"), new String[] {
                 "disabled", "low", "med", "high"
         });
 
-        PreferencesUtil.addListPreference(this, "msg_dim", "off", AndroidUtils.getString("filter_dim"), AndroidUtils.getArray("filter_dim_types"), new String[]{
+        PreferencesUtil.addListPreference(this, "msg_dim", "off", AndroidUtils.getString("filter_dim"), AndroidUtils.getArray("filter_dim_types"), new String[] {
                 "off", "dim_black", "dim_white"
         });
 
 
-        PreferencesUtil.addListPreference(this, "msg_mosaic", "disabled", AndroidUtils.getString("filter_mosaic"), AndroidUtils.getArray("filter_types"), new String[]{
+        PreferencesUtil.addListPreference(this, "msg_mosaic", "disabled", AndroidUtils.getString("filter_mosaic"), AndroidUtils.getArray("filter_types"), new String[] {
                 "disabled", "low", "med", "high"
         });
 
@@ -200,13 +199,14 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
     }
 
     @Override
-    public void onActivityResult(int i, int i1, @Nullable Intent intent) {
+    public void onActivityResult(int i, int i1, @Nullable Intent intent){
         super.onActivityResult(i, i1, intent);
 
         if (intent == null || intent.getData() == null)
             return;
 
         try {
+            removeWallpaper();
             InputStream fileInputStream = requireActivity().getContentResolver().openInputStream(intent.getData());
             OutputStream outputStream = new FileOutputStream(getWallpaperFile());
 
@@ -217,20 +217,21 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment {
             if (i == 1488) {
                 mWPPreviewPref.redraw();
             }
+
         } catch (Exception e) {
             e.printStackTrace();
             Toast.makeText(requireActivity(), e.getLocalizedMessage(), Toast.LENGTH_LONG).show();
         }
     }
 
-    private void removeStickCache() {
+    private void removeStickCache(){
         SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
         prefs2.edit().clear().apply();
         ImEngineProvider.b().a();
     }
 
     @Override
-    public int T4() {
+    public int T4(){
         return getIdentifier("wallpapers", "string");
     }
 }

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

@@ -1,6 +1,6 @@
 package ru.vtosters.lite.ui.wallpapers;
 
-import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getWallpaper;
+import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getFilteredFile;
 import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getWallpaperFile;
 import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
@@ -18,31 +18,31 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import ru.vtosters.lite.ui.adapters.MessagesPreviewAdapter;
 
-public class WallpaperPreferences extends Preference {
+public class WallpaperPreferences extends Preference{
 
-    private MessagesPreviewAdapter mAdapter;
     RecyclerView mRecyclerView;
     ImageView mChatBackground;
+    private MessagesPreviewAdapter mAdapter;
 
-    public WallpaperPreferences(Context context) {
+    public WallpaperPreferences(Context context){
         this(context, null, -1, -1);
     }
 
-    public WallpaperPreferences(Context context, AttributeSet attributeSet) {
+    public WallpaperPreferences(Context context, AttributeSet attributeSet){
         this(context, attributeSet, -1, -1);
     }
 
-    public WallpaperPreferences(Context context, AttributeSet attributeSet, int defStyleAttr) {
+    public WallpaperPreferences(Context context, AttributeSet attributeSet, int defStyleAttr){
         this(context, attributeSet, defStyleAttr, -1);
     }
 
-    public WallpaperPreferences(Context context, AttributeSet attributeSet, int defStyleAttr, int i1) {
+    public WallpaperPreferences(Context context, AttributeSet attributeSet, int defStyleAttr, int i1){
         super(context, attributeSet, defStyleAttr, i1);
         setLayoutResource(getIdentifier("wppreview", "layout"));
     }
 
     @Override
-    public void onBindViewHolder(PreferenceViewHolder preferenceViewHolder) {
+    public void onBindViewHolder(PreferenceViewHolder preferenceViewHolder){
         super.onBindViewHolder(preferenceViewHolder);
 
         mRecyclerView = (RecyclerView) preferenceViewHolder.findViewById(getIdentifier("install_btn_container", "id"));
@@ -56,17 +56,17 @@ public class WallpaperPreferences extends Preference {
         requestBg();
     }
 
-    private void requestBg() {
-        final Drawable drawable = getWallpaper();
+    private void requestBg(){
+        final Drawable drawable = getFilteredFile();
 
-        if (drawable != null && getWallpaperFile().exists())
+        if (drawable != null && getWallpaperFile() != null)
             mChatBackground.setImageDrawable(drawable);
         else
             mChatBackground.setImageDrawable(null);
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    void redraw() {
+    void redraw(){
         mAdapter.notifyDataSetChanged();
         requestBg();
     }

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

@@ -1,44 +1,75 @@
 package ru.vtosters.lite.ui.wallpapers;
 
 import static com.vk.im.engine.h.im_bg_chat;
-import static ru.vtosters.lite.ui.wallpapers.ImageFilters.getBlurredWallpaper;
-import static ru.vtosters.lite.ui.wallpapers.ImageFilters.getDimmed;
 import static ru.vtosters.lite.ui.wallpapers.ImageFilters.getFilteredDrawable;
-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.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
+import java.io.ByteArrayOutputStream;
 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;
+import vigo.sdk.Log;
 
-public class WallpapersHooks {
+public class WallpapersHooks{
+    private static final boolean compress = getBoolValue("compresswp", true);
     private static File mWallpaperFile;
-
     private static Drawable mWallpaper;
     private static boolean mUpdateWallpaperRequested = true;
+    private static boolean mUpdateWallpaperFileRequested = true;
 
-    public static File getWallpaperFile() {
-        return mWallpaperFile == null ? mWallpaperFile = new File(getGlobalContext().getFilesDir(), "wallpaper.png") : mWallpaperFile;
+    public static File getWallpaperFile(){
+        if (mWallpaperFile == null) {
+            mWallpaperFile = new File(getGlobalContext().getFilesDir(), "wallpaper.webp");
+        }
+
+        return mWallpaperFile;
     }
 
-    private static Boolean eligibleWallpaperFile(File file) {
+    public static Drawable getFilteredFile(){
+        File file = null;
+        File wp = mWallpaperFile;
+        String temp = getGlobalContext().getFilesDir() + File.separator + "filteredwp.webp";
+
+        if (wp != null && mUpdateWallpaperFileRequested) {
+            try {
+                file = new File(temp);
+                file.createNewFile();
+
+                ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                ((BitmapDrawable) getFilteredDrawable(Drawable.createFromPath(wp.getAbsolutePath()))).getBitmap().compress(Bitmap.CompressFormat.WEBP, (compress ? 80 : 95), bos);
+                byte[] bitmapdata = bos.toByteArray();
+
+                FileOutputStream fos = new FileOutputStream(file);
+                fos.write(bitmapdata);
+                fos.flush();
+                fos.close();
+
+            } catch (Exception e) {
+                Log.d("Wallpapers", e.getMessage());
+            }
+
+            mUpdateWallpaperFileRequested = false;
+        }
+
+        try {
+            return Drawable.createFromPath(temp);
+        } catch (Exception e) {
+            return Drawable.createFromPath(file.getAbsolutePath());
+        }
+    }
+
+    private static Boolean eligibleWallpaperFile(File file){
         if (file.length() >= 6291456) {
             sendToast("Размер файла превышает лимит 6 MB");
             removeWallpaper();
@@ -48,85 +79,42 @@ public class WallpapersHooks {
         }
     }
 
-    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) {
+    public static void setBg(View view){
         if (getWallpaper() != null) {
-            ((ImageView) view).setImageDrawable(getWallpaper()); // set picture to background
+            ((ImageView) view).setImageDrawable(getFilteredFile()); // set picture to background
             return;
         }
 
         view.setBackgroundColor(ThemesUtils.getColorFromAttr(im_bg_chat)); // set default bg color
     }
 
-    public static String getWallpaperUrl() {
-        if (getWallpaperFile().exists() && eligibleWallpaperFile(getWallpaperFile()))
-            if (compress(getWallpaperFile()) == null) {
-                return "default";
-            } else if (getBoolValue("compresswp", true)){
-                return compress(getWallpaperFile()).getAbsolutePath();
-            } else {
-                return getWallpaperFile().getAbsolutePath();
-            }
-        else
-            return "default";
+    public static String getWallpaperUrl(){
+        var file = getWallpaperFile();
+
+        if (file.exists() && eligibleWallpaperFile(file)) {
+            return file.getAbsolutePath();
+        }
+
+        return "default";
     }
 
-    public static Drawable getWallpaper() {
+    public static Drawable getWallpaper(){
         if (mWallpaper == null || mUpdateWallpaperRequested) {
-            if (!getPreferences().getString("msg_blur_radius", "disabled").equals("disabled")) {
-                mWallpaper = getBlurredWallpaper(Drawable.createFromPath(getWallpaperUrl()), getRadius());
-            } else {
-                mWallpaper = Drawable.createFromPath(getWallpaperUrl());
-            }
-            if (!getPreferences().getString("msg_dim", "off").equals("off")) {
-                mWallpaper = getDimmed(mWallpaper);
+            String url = getWallpaperUrl();
+
+            if (url.equals("default") || url.isEmpty()) {
+                return null;
             }
 
-            if (!getPreferences().getString("msg_mosaic", "disabled").equals("disabled")) {
-                mWallpaper = getMosaic(mWallpaper);
+            Drawable drawable = Drawable.createFromPath(getWallpaperUrl());
+
+            if (drawable == null) {
+                return null;
             }
 
-            if (hasVerification()) {
-                if (getPreferences().getBoolean("msg_monochrome", false)) {
-                    mWallpaper = getMonochrome(mWallpaper);
-                }
+            mWallpaper = drawable;
 
-                mWallpaper = getFilteredDrawable(mWallpaper);
-            }
+            mWallpaper = getFilteredDrawable(mWallpaper);
 
             mUpdateWallpaperRequested = false;
         }
@@ -134,25 +122,14 @@ public class WallpapersHooks {
         return mWallpaper;
     }
 
-    public static void requestUpdateWallpaper() {
+    public static void requestUpdateWallpaper(){
         mUpdateWallpaperRequested = true;
+        mUpdateWallpaperFileRequested = true;
     }
 
-    private static int getRadius() {
+    public static String getRadiusSummary(){
         String radius = getPreferences().getString("msg_blur_radius", "disabled");
-        switch (radius) {
-            case "low":
-                return 8;
-            case "med":
-                return 14;
-            default:
-                return 20;
-        }
-    }
-
-    public static String getRadiusSummary() {
-        String radius = getPreferences().getString("msg_blur_radius", "disabled");
-        switch (radius) {
+        switch(radius) {
             case "low":
                 return AndroidUtils.getString("wallpapers_low");
             case "med":
@@ -164,21 +141,21 @@ public class WallpapersHooks {
         }
     }
 
-    public static String getDimmingSummary() {
+    public static String getDimmingSummary(){
         String radius = getPreferences().getString("msg_dim", "disabled");
-        switch (radius) {
+        switch(radius) {
             case "dim_black":
                 return AndroidUtils.getString("wallpapers_dim_black");
             case "dim_white":
-                return  AndroidUtils.getString("wallpapers_dim_white");
+                return AndroidUtils.getString("wallpapers_dim_white");
             default:
                 return AndroidUtils.getString("wallpapers_disabled");
         }
     }
 
-    public static String getMosaicSummary() {
+    public static String getMosaicSummary(){
         String radius = getPreferences().getString("msg_mosaic", "disabled");
-        switch (radius) {
+        switch(radius) {
             case "low":
                 return AndroidUtils.getString("wallpapers_low");
             case "med":
@@ -191,7 +168,13 @@ public class WallpapersHooks {
     }
 
 
-    public static void removeWallpaper() {
-        getWallpaperFile().delete();
+    public static void removeWallpaper(){
+        try {
+            new File(getGlobalContext().getFilesDir(), "wallpaper.webp").delete();
+            new File(getGlobalContext().getFilesDir(), "filteredwp.webp").delete();
+            mWallpaperFile = null;
+        } catch (Exception e) {
+            Log.d("Wallpapers", e.getMessage());
+        }
     }
 }

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

@@ -12,9 +12,10 @@ import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 
+import com.vk.core.util.Screen;
+
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Locale;
@@ -31,6 +32,10 @@ public class AndroidUtils {
         return PreferenceManager.getDefaultSharedPreferences(getGlobalContext());
     }
 
+    public static boolean isTablet() {
+        return Screen.l(getGlobalContext());
+    }
+
     public static String getPrefsValue(String pref) {
         return getPreferences().getString(pref, "");
     } // Get pref value as string
@@ -39,14 +44,13 @@ public class AndroidUtils {
         return PreferenceManager.getDefaultSharedPreferences(getGlobalContext()).edit();
     } // Edit SharedPreferences
 
-    @NonNull
     public static Context getGlobalContext() {
         try {
             return ReflectionUtils.invokeStaticMethod("android.app.AppGlobals", "getInitialApplication");
         } catch (Exception e) {
-            e.printStackTrace();
+            Log.d("GlobalContext", "Error while fetching context via refl");
         }
-        return null;
+        return null; // need fix for a13+ cuz google shit disabled global context via refl
     } // Getting the global context through reflection to use context on application initialization
 
     public static Resources getResources() {

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

@@ -13,19 +13,14 @@ import com.vk.im.ui.providers.audiomsg.ImAudioMsgPlayerProvider;
 import com.vk.im.ui.providers.audiomsg.PlayerActionSources;
 import com.vk.imageloader.VKImageLoader;
 import com.vk.media.player.cache.AutoPlayCacheHolder;
-import com.vk.mediastore.MediaStorage;
 import com.vk.stickers.Stickers;
-import com.vtosters.lite.im.ImEngineProvider;
 
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
 
-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)
@@ -33,10 +28,6 @@ public class CacheUtils {
         return sInstance;
     }
 
-    public static void deleteCache() {
-        IOUtils.deleteRecursive(getGlobalContext().getCacheDir());
-    }
-
     @SuppressLint("DefaultLocale")
     public static String humanReadableByteCountBin(long bytes) {
         long absB = bytes == Long.MIN_VALUE ? Long.MAX_VALUE : Math.abs(bytes);
@@ -56,12 +47,11 @@ public class CacheUtils {
     public void autoCleaningCache() {
         size = IOUtils.getDirSize(getGlobalContext().getCacheDir());
 
-        if (size >= getSizeForDelete() && needToDelete) {
+        if (size >= getSizeForDelete()) {
             if (dev()) sendToast(AndroidUtils.getString("cache_cleaned"));
             VKImageLoader.e();
             ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
             ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
-            FileUtils.l();
             Stickers.l.c();
             ImEngineExt.a(ImEngine1.a());
             AutoPlayCacheHolder.d.a();

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

@@ -0,0 +1,102 @@
+package ru.vtosters.lite.utils;
+
+import static androidx.core.app.ActivityCompat.requestPermissions;
+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.sendToast;
+
+import android.Manifest;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.SyncResult;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.core.content.ContextCompat;
+
+import com.vk.auth.VKAuthUtils;
+import com.vk.contacts.ContactsSyncAdapterService;
+import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vk.core.network.Network;
+import com.vtosters.lite.auth.VKAccountManager;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+import okhttp3.Headers;
+import okhttp3.OkHttpClient;
+
+public class ContactsUtils{
+    public static void setContactsSync(boolean enabled){
+        makeRequest("https://" + getApi() + "/method/account.setInfo?" + "name=im_user_name_type&value=" + (enabled ? "contact" : "vk") + "&https=1&v=5.153&access_token=" + getUserToken(),
+                response -> {
+                    try {
+                        JSONObject mainJson = new JSONObject(response);
+                        Log.d("ContactsUtils", "Result: " + mainJson + ", enabled sync: " + enabled);
+                    } catch (JSONException e) {
+                        Log.d("ContactsUtils", e.getMessage());
+                        sendToast("Ошибка установки контактов");
+                    }
+                });
+    }
+
+    public static void uploadContacts(Context ctx){
+        try {
+            if (ContextCompat.checkSelfPermission(ctx, Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
+                sendToast("Для работы данной функции необходимо выдать право на чтение контактов");
+                requestPermissions(LifecycleUtils.getCurrentActivity(), new String[] {Manifest.permission.READ_CONTACTS}, 11111);
+            } else {
+                var account = VKAuthUtils.a.a(VKAccountManager.d().Z());
+                ContactsSyncAdapterService.c(ctx, account, new Bundle(), new SyncResult());
+            }
+        } catch (Exception e){
+            Log.d("ContactsUtils", e.getMessage());
+        }
+    }
+
+    public static void getContactsStatus(Context ctx){
+        final ProgressDialog progressDialog = new ProgressDialog(ctx);
+        progressDialog.setMessage("Загрузка данных о контактах...");
+        progressDialog.show();
+
+        var request = new okhttp3.Request.a()
+                .b("https://" + getApi() + "/method/execute?https=1&v=5.153&code=return%20API.account.getInfo().settings%5B44%5D.value%3B&access_token=" + getUserToken())
+                .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"))
+                .a();
+
+        try {
+            var response = new OkHttpClient().a(request).execute().a().g();
+            progressDialog.cancel();
+
+            try {
+                String resp = new JSONObject(response).optString("response");
+
+                Log.d("ContactsUtils", new JSONObject(response).toString());
+
+                boolean enabledsync = resp.equals("contact");
+
+                VkAlertDialog.Builder builder = new VkAlertDialog.Builder(ctx);
+                builder.setTitle("Синхронизация контактов");
+                builder.setMessage("Статус синхронизации: " + (enabledsync ? "Включена" : "Отключена"));
+                builder.setCancelable(true);
+                builder.setPositiveButton((!enabledsync ? "Включить" : "Отключить"), (dialog, which) -> {
+                    setContactsSync(!enabledsync);
+                });
+//                builder.setNegativeButton("Импортировать контакты", (dialog, which) -> {
+//                    uploadContacts(ctx);
+//                });
+
+                builder.show();
+
+            } catch (JSONException e) {
+                Log.d("ContactsUtils", e.getMessage());
+            }
+        } catch (IOException e) {
+            Log.d("ContactsUtils", e.getMessage());
+        }
+    }
+}

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

@@ -59,12 +59,12 @@ public class ExternalLinkParser {
 
         if (checkVkVideo(file)) {
             if (qualities.size() == 1) {
-                startExternalVideo((String) qualities.values().toArray()[0]);
+                startExternalVideo((String) qualities.values().toArray()[0], context);
             } else {
                 String[] titles = qualities.keySet().toArray(new String[0]);
                 new AlertDialog.Builder(context)
                         .setItems(titles, ((dialog, which) -> {
-                            startExternalVideo(qualities.get(titles[which]));
+                            startExternalVideo(qualities.get(titles[which]), context);
                         }))
                         .show();
             }
@@ -117,7 +117,7 @@ public class ExternalLinkParser {
         return qualities.size() > 0;
     }
 
-    public static boolean startExternalVideo(String url) {
+    public static boolean startExternalVideo(String url, Context ctx) {
         try {
             qualities.clear();
 
@@ -136,7 +136,7 @@ public class ExternalLinkParser {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                     intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             }
-            getGlobalContext().startActivity(intent);
+            ctx.startActivity(intent);
             return true;
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -1,119 +0,0 @@
-package ru.vtosters.lite.utils;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.net.Uri;
-import android.os.Build;
-import android.os.storage.StorageManager;
-import android.os.storage.StorageVolume;
-import android.provider.DocumentsContract;
-
-import androidx.annotation.Nullable;
-
-import java.io.File;
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-import java.util.List;
-
-// https://stackoverflow.com/questions/34927748/android-5-0-documentfile-from-tree-uri/36162691#36162691
-
-public final class FileUriUtils {
-
-    private static final String PRIMARY_VOLUME_NAME = "primary";
-
-    @Nullable
-    public static String getFullPathFromTreeUri(@Nullable final Uri treeUri, Context con) {
-        if (treeUri == null) return null;
-        String volumePath = getVolumePath(getVolumeIdFromTreeUri(treeUri),con);
-        if (volumePath == null) return File.separator;
-        if (volumePath.endsWith(File.separator))
-            volumePath = volumePath.substring(0, volumePath.length() - 1);
-
-        String documentPath = getDocumentPathFromTreeUri(treeUri);
-        if (documentPath.endsWith(File.separator))
-            documentPath = documentPath.substring(0, documentPath.length() - 1);
-
-        if (documentPath.length() > 0) {
-            if (documentPath.startsWith(File.separator))
-                return volumePath + documentPath;
-            else
-                return volumePath + File.separator + documentPath;
-        }
-        else return volumePath;
-    }
-
-
-    private static String getVolumePath(final String volumeId, Context context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
-            return getVolumePathForAndroid11AndAbove(volumeId, context);
-        else
-            return getVolumePathBeforeAndroid11(volumeId, context);
-    }
-
-
-    private static String getVolumePathBeforeAndroid11(final String volumeId, Context context){
-        try {
-            StorageManager mStorageManager = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE);
-            Class<?> storageVolumeClazz = Class.forName("android.os.storage.StorageVolume");
-            Method getVolumeList = mStorageManager.getClass().getMethod("getVolumeList");
-            Method getUuid = storageVolumeClazz.getMethod("getUuid");
-            Method getPath = storageVolumeClazz.getMethod("getPath");
-            Method isPrimary = storageVolumeClazz.getMethod("isPrimary");
-            Object result = getVolumeList.invoke(mStorageManager);
-
-            final int length = Array.getLength(result);
-            for (int i = 0; i < length; i++) {
-                Object storageVolumeElement = Array.get(result, i);
-                String uuid = (String) getUuid.invoke(storageVolumeElement);
-                Boolean primary = (Boolean) isPrimary.invoke(storageVolumeElement);
-
-                if (primary && PRIMARY_VOLUME_NAME.equals(volumeId))    // primary volume?
-                    return (String) getPath.invoke(storageVolumeElement);
-
-                if (uuid != null && uuid.equals(volumeId))    // other volumes?
-                    return (String) getPath.invoke(storageVolumeElement);
-            }
-            // not found.
-            return null;
-        } catch (Exception ex) {
-            return null;
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.R)
-    private static String getVolumePathForAndroid11AndAbove(final String volumeId, Context context) {
-        try {
-            StorageManager mStorageManager = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE);
-            List<StorageVolume> storageVolumes = mStorageManager.getStorageVolumes();
-            for (StorageVolume storageVolume : storageVolumes) {
-                // primary volume?
-                if (storageVolume.isPrimary() && PRIMARY_VOLUME_NAME.equals(volumeId))
-                    return storageVolume.getDirectory().getPath();
-
-                // other volumes?
-                String uuid = storageVolume.getUuid();
-                if (uuid != null && uuid.equals(volumeId))
-                    return storageVolume.getDirectory().getPath();
-
-            }
-            // not found.
-            return null;
-        } catch (Exception ex) {
-            return null;
-        }
-    }
-
-    private static String getVolumeIdFromTreeUri(final Uri treeUri) {
-        final String docId = DocumentsContract.getTreeDocumentId(treeUri);
-        final String[] split = docId.split(":");
-        if (split.length > 0) return split[0];
-        else return null;
-    }
-
-    private static String getDocumentPathFromTreeUri(final Uri treeUri) {
-        final String docId = DocumentsContract.getTreeDocumentId(treeUri);
-        final String[] split = docId.split(":");
-        if ((split.length >= 2) && (split[1] != null)) return split[1];
-        else return File.separator;
-    }
-}

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

@@ -26,7 +26,10 @@ public class IOUtils {
 
     public static byte[] decodeStream(InputStream encIs, String keyURL) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, IOException {
         CipherInputStream cip = new CipherInputStream(encIs, getCipher(keyURL));
-        return readAllBytes(cip);
+        var bytes = readAllBytes(cip);
+        cip.close();
+
+        return bytes;
     }
 
     public static Cipher getCipher(String key) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException {
@@ -46,7 +49,11 @@ public class IOUtils {
     }
 
     public static String readAllLines(File file) throws IOException {
-        return readAllLines(new FileInputStream(file));
+        var is = new FileInputStream(file);
+        var bytes = readAllBytes(is);
+        is.close();
+
+        return new String(bytes, StandardCharsets.UTF_8);
     }
 
     public static String readAllLines(InputStream is) throws IOException {
@@ -54,7 +61,11 @@ public class IOUtils {
     }
 
     public static byte[] readAllBytes(File file) throws IOException {
-        return readAllBytes(new FileInputStream(file));
+        var is = new FileInputStream(file);
+        var bytes = readAllBytes(is);
+        is.close();
+
+        return bytes;
     }
 
     public static byte[] readAllBytes(InputStream is) throws IOException {
@@ -63,7 +74,11 @@ public class IOUtils {
         int len;
         while ((len = is.read(buffer)) > 0)
             bos.write(buffer, 0, len);
-        return bos.toByteArray();
+
+        var bytes = bos.toByteArray();
+        bos.close();
+
+        return bytes;
     }
 
     public static void writeToFile(File file, String content) throws IOException {
@@ -73,6 +88,7 @@ public class IOUtils {
     public static void writeToFile(File file, byte[] content) throws IOException {
         FileOutputStream fos = new FileOutputStream(file);
         fos.write(content);
+        fos.close();
     }
 
     public static void deleteRecursive(File f) {

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

@@ -10,7 +10,6 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
-import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PorterDuff;
 import android.graphics.RectF;

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

@@ -23,14 +23,14 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Scanner;
 
-import ru.vtosters.lite.hooks.JsonInjectors;
+import ru.vtosters.lite.hooks.AdBlockHook;
 
-public class NewsFeedFiltersUtils {
+public class NewsFeedFiltersUtils{
     public static List<String> mFilters;
     public static List<String> mFiltersNames;
     public static List<String> mFiltersLinks;
 
-    public static void setupFilters() {
+    public static void setupFilters(){
         mFilters = new ArrayList<>();
         mFiltersNames = new ArrayList<>();
         mFiltersLinks = new ArrayList<>();
@@ -57,43 +57,53 @@ public class NewsFeedFiltersUtils {
         }
     }
 
-    public static void getFilter(String boolname, String filename, List<String> list) {
-        if (getBoolValue(boolname, true)) {
+    public static void getFilter(String boolname, String filename, List<String> list){
+        var ctx = getGlobalContext();
+
+        if (getBoolValue(boolname, false)) {
             try {
-                var scanner = new Scanner(getGlobalContext().getAssets().open(filename));
-                while (scanner.hasNextLine()) {
-                    var line = scanner.nextLine();
-                    if (!line.isEmpty())
-                        list.add(line.toLowerCase());
+                Scanner scanner;
+                if (ctx != null) {
+                    scanner = new Scanner(ctx.getAssets().open(filename));
+
+                    while(scanner.hasNextLine()) {
+                        var line = scanner.nextLine();
+                        if (!line.isEmpty())
+                            list.add(line.toLowerCase());
+                    }
                 }
             } catch (IOException e) {
-                e.printStackTrace();
+                Log.d("NewsFeedFiltersUtils", e.getMessage());
             }
         }
     } // Get needed filter list from assets
 
-    public static boolean injectFiltersReposts(JSONObject obj) throws JSONException {
+    public static boolean injectFiltersReposts(JSONObject obj) throws JSONException{
         if (getBoolValue("cringerepost", false) && obj.has("copy_history")) {
             var copyHistoryNode = obj.optJSONArray("copy_history");
-            for (int i = 0; i < copyHistoryNode.length(); i++) {
-                var item = copyHistoryNode.optJSONObject(i);
-                var text = item.optString("text");
+            if (copyHistoryNode != null && copyHistoryNode.length() != 0) {
+                for (int i = 0; i < copyHistoryNode.length(); i++) {
+                    var item = copyHistoryNode.optJSONObject(i);
+                    var text = item.optString("text");
 
-                if (isBadNews(text)) {
-                    if (dev())
-                        Log.d("RepostFilter", "Fetched repost ad (isBadNews), owner id " + item.optString("owner_id") + ", text: " + text);
-                    return true;
-                } else if (JsonInjectors.isAds(item, item.optString("post_type"))) {
-                    if (dev())
-                        Log.d("RepostFilter", "Fetched repost ad (ads), owner id " + item.optString("owner_id") + ", text: " + text);
-                    return true;
-                }
-
-                for (String filter : mFiltersLinks) {
-                    if (text.contains(filter)) {
+                    if (isBadNews(text)) {
                         if (dev())
-                            Log.d("RepostFilter", "Fetched repost ad, owner id " + item.optString("owner_id") + ", text: " + text);
+                            Log.d("RepostFilter", "Fetched repost ad (isBadNews), owner id " + item.optString("owner_id") + ", text: " + text);
                         return true;
+                    } else if (AdBlockHook.isAds(item, item.optString("post_type"))) {
+                        if (dev())
+                            Log.d("RepostFilter", "Fetched repost ad (ads), owner id " + item.optString("owner_id") + ", text: " + text);
+                        return true;
+                    }
+
+                    if (mFiltersLinks != null) {
+                        for (String filter : mFiltersLinks) {
+                            if (text.contains(filter)) {
+                                if (dev())
+                                    Log.d("RepostFilter", "Fetched repost ad, owner id " + item.optString("owner_id") + ", text: " + text);
+                                return true;
+                            }
+                        }
                     }
                 }
             }
@@ -101,65 +111,89 @@ public class NewsFeedFiltersUtils {
         return false;
     }
 
-    public static boolean checkCopyright(JSONObject json) throws JSONException {
+    public static boolean checkCopyright(JSONObject json) throws JSONException{
         if (json.has("copyright")) {
             if (copyright_post()) return true;
 
             var copyright = json.optJSONObject("copyright");
-            var copyrightName = copyright.getString("name").toLowerCase();
-            var copyrightLink = copyright.getString("link").toLowerCase();
-            
-            for (String filter : mFiltersNames) {
-                if (copyrightName.contains(filter)) return true;
+
+            String copyrightName = null;
+
+            if (copyright != null) {
+                copyrightName = copyright.getString("name").toLowerCase();
             }
 
-            for (String filter : mFiltersLinks) {
-                if (copyrightLink.contains(filter)) return true;
+            String copyrightLink = null;
+
+            if (copyright != null) {
+                copyrightLink = copyright.getString("link").toLowerCase();
             }
+
+            if (mFiltersNames != null) {
+                for (String filter : mFiltersNames) {
+                    if (copyrightName != null && copyrightName.contains(filter)) return true;
+                }
+            }
+
+
+            if (mFiltersLinks != null) {
+                for (String filter : mFiltersLinks) {
+                    if (copyrightLink != null && copyrightLink.contains(filter)) return true;
+                }
+            }
+
         }
         return false;
     }
 
-    public static boolean isRecomsGroup(String src) {
+    public static boolean isRecomsGroup(String src){
         return authorsrecomm() && src.equals("recommended_groups");
     }
 
-    public static boolean isMusicBlock(String src) {
+    public static boolean isMusicBlock(String src){
         return authorsrecomm() && (src.equals("recommended_audios") || src.equals("recommended_artists") || src.equals("recommended_playlists"));
     }
 
-    public static boolean isNewsBlock(String src) {
+    public static boolean isNewsBlock(String src){
         return ads() && src.equals("tags_suggestions");
     }
 
-    public static String getAllFilters() {
+    public static String getAllFilters(){
         return getPrefsValue("spamfilters");
     }
 
-    public static boolean isBadNews(String text) {
+    public static boolean isBadNews(String text){
         var textInLowerCase = text.toLowerCase();
-        for (String filter : mFilters) {
-            if (textInLowerCase.contains(filter)) {
-                if (dev())
-                    Log.d("VTLite", text);
-                return true;
+
+        if (mFilters != null) {
+            for (String filter : mFilters) {
+                if (textInLowerCase.contains(filter)) {
+                    if (dev())
+                        Log.d("NewsfeedAdBlockV2", text);
+                    return true;
+                }
             }
         }
+
+
         return false;
     }
 
-    public static boolean checkCaption(JSONObject postJson) {
+    public static boolean checkCaption(JSONObject postJson){
         if (postJson.has("caption")) {
             if (captions()) return true;
             var caption = postJson.optJSONObject("caption");
             if (postsrecomm()) {
                 try {
-                    var type = caption.getString("type");
-                    return type.equals("explorebait") || // Может быть интересно
-                            type.equals("shared") || // Поделился записью
-                            type.equals("digest") || // Рекомедации
-                            type.equals("commented") || // Комментирует
-                            type.equals("voted"); // Проголосовал в опросе
+                    String type;
+                    if (caption != null) {
+                        type = caption.getString("type");
+                        return type.equals("explorebait") || // Может быть интересно
+                                type.equals("shared") || // Поделился записью
+                                type.equals("digest") || // Рекомедации
+                                type.equals("commented") || // Комментирует
+                                type.equals("voted"); // Проголосовал в опросе
+                    }
                 } catch (JSONException e) {
                     Log.d("checkCaption", "Caption error");
                 }
@@ -169,29 +203,29 @@ public class NewsFeedFiltersUtils {
         return false;
     }
 
-    public static boolean isAds(String optString) {
+    public static boolean isAds(String optString){
         return ads() && (optString.equals("ads_easy_promote") ||
                 optString.equals("promo_button") ||
                 optString.equals("app_widget") ||
                 optString.equals("ads"));
     }
 
-    public static boolean isAuthorRecommendations(String optString) {
+    public static boolean isAuthorRecommendations(String optString){
         return authorsrecomm() && optString.equals("authors_rec");
     }
 
-    public static boolean isPostRecommendations(String optString) {
+    public static boolean isPostRecommendations(String optString){
         return postsrecomm() && (optString.equals("live_recommended") ||
                 optString.equals("inline_user_rec"));
     }
 
-    public static boolean isFriendsRecommendations(String optString) {
+    public static boolean isFriendsRecommendations(String optString){
         return friendsrecomm() && (optString.equals("user_rec") ||
                 optString.equals("friends_recommendations") ||
                 optString.equals("friends_recomm"));
     }
 
-    public static boolean isGroupAds(JSONObject obj) {
+    public static boolean isGroupAds(JSONObject obj){
         return adsgroup() && obj.optInt("marked_as_ads", 0) == 1;
     }
 }

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

@@ -1,15 +1,11 @@
 package ru.vtosters.lite.utils;
 
 import static java.lang.Long.MAX_VALUE;
+import static ru.vtosters.lite.proxy.ProxyUtils.setProxy;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
-import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
-import static ru.vtosters.lite.utils.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.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;
@@ -19,13 +15,12 @@ import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.os.Environment;
+import android.os.Build;
 import android.preference.PreferenceManager;
 
 import com.vtosters.lite.data.Users;
 import com.vtosters.lite.fragments.SettingsListFragment;
 
-import java.io.File;
 import java.security.NoSuchAlgorithmException;
 
 import ru.vtosters.lite.ui.fragments.VTSettings;
@@ -35,19 +30,16 @@ public class Preferences {
     public static String VERSIONNAME = "Beta";
 
     public static void init(Application application) throws Exception {
-        setupFilters();
         GmsUtils.fixGapps();
         setProxy();
-        reloadMessagesList();
         LifecycleUtils.registerActivities(application);
-        getInstance().autoCleaningCache();
     } // VK Init
 
     public static void forceOffline() {
-        setupFilters();
-        getInstance().autoCleaningCache();
         edit().putBoolean("isdark", isDarkTheme()).commit();
 
+        setupFilters();
+
         if (setoffline() && offline()) {
             Users.a();
         }
@@ -69,7 +61,7 @@ public class Preferences {
     }
 
     public static boolean systemtheme() {
-        return false; //getBoolValue("systemtheme", true) && VERSION.SDK_INT >= 28;
+        return Build.VERSION.SDK_INT >= 28 && getBoolValue("systemtheme", true);
     }
 
     public static boolean authorsrecomm() {
@@ -205,14 +197,6 @@ public class Preferences {
         return getBoolValue("milkshake", true);
     }
 
-    public static boolean musicnewcatalog() {
-        return getBoolValue("musicnewcatalog", true);
-    }
-
-    public static boolean videonewcatalog() {
-        return getBoolValue("videonewcatalog", true);
-    }
-
     public static boolean postsredesign() {
         return getBoolValue("postsredesign", true);
     }
@@ -332,7 +316,7 @@ public class Preferences {
     }
 
     public static boolean checkupdates() {
-        return getBoolValue("checkupdates", true) && isValidSignature();
+        return !getBoolValue("isRoamingState", false) && isValidSignature();
     }
 
     public static boolean isValidSignature() {
@@ -363,22 +347,16 @@ 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;
         }
     }
@@ -389,28 +367,4 @@ public class Preferences {
         }
         return origquality;
     }
-
-    public static File getDownloadsDir() {
-        return new File(getPreferences().getString(
-                "downloads_directory",
-                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath()));
-    }
-
-    public static File getPhotosDir() {
-        return new File(getPreferences().getString(
-                "photos_directory",
-                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath()));
-    }
-
-    public static File getVideosDir() {
-        return new File(getPreferences().getString(
-                "videos_directory",
-                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES).getAbsolutePath()));
-    }
-
-    public static File getMusicDir() {
-        return new File(getPreferences().getString(
-                "music_directory",
-                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).getAbsolutePath()));
-    }
 }

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

@@ -1,11 +1,11 @@
 package ru.vtosters.lite.utils;
 
 import static ru.vtosters.lite.hooks.DateHook.getLocale;
+import static ru.vtosters.lite.proxy.ProxyUtils.isAnyProxyEnabled;
 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.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 isApiProxyEnabled() ? "1" : "0";
+        return isAnyProxyEnabled() ? "1" : "0";
     }
 
     public static String isVKSansEnabled() {

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

@@ -3,7 +3,6 @@ package ru.vtosters.lite.utils;
 import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
 import static ru.vtosters.lite.hooks.VKUIHook.isLoaded;
 import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getWallpaper;
-import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getCenterScreenCoords;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
@@ -12,14 +11,12 @@ import static ru.vtosters.lite.utils.Preferences.color_grishka;
 import static ru.vtosters.lite.utils.Preferences.dockbar_accent;
 import static ru.vtosters.lite.utils.Preferences.milkshake;
 import static ru.vtosters.lite.utils.Preferences.navbar;
-import static ru.vtosters.lite.utils.Preferences.systemtheme;
 import static ru.vtosters.lite.utils.Preferences.vkme;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.content.res.Configuration;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
@@ -49,7 +46,14 @@ public class ThemesUtils {
     );
 
     public static void applyTheme(VKTheme theme) {
-        VKThemeHelper.theme(theme, LifecycleUtils.getCurrentActivity(), getCenterScreenCoords());
+        var currentActivity = LifecycleUtils.getCurrentActivity();
+        if (currentActivity != null) {
+            try {
+                VKThemeHelper.theme(theme, currentActivity, getCenterScreenCoords());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
     } // Apply VKTheme and ImTheme (hard applying without dynamic theme changing)
 
     public static void setTheme(VKTheme theme, Activity activity) {
@@ -329,20 +333,21 @@ public class ThemesUtils {
     }
 
     public static void setNeededTheme(Activity activity) {
+        var currentTheme = getCurrentTheme();
         if (milkshake()) {
-            if (getCurrentTheme() == VKTheme.VKAPP_LIGHT) {
+            if (currentTheme == VKTheme.VKAPP_LIGHT) {
                 setTheme(VKTheme.VKAPP_MILK_LIGHT, activity);
             }
 
-            if (getCurrentTheme() == VKTheme.VKAPP_DARK) {
+            if (currentTheme == VKTheme.VKAPP_DARK) {
                 setTheme(VKTheme.VKAPP_MILK_DARK, activity);
             }
         } else {
-            if (getCurrentTheme() == VKTheme.VKAPP_MILK_LIGHT) {
+            if (currentTheme == VKTheme.VKAPP_MILK_LIGHT) {
                 setTheme(VKTheme.VKAPP_LIGHT, activity);
             }
 
-            if (getCurrentTheme() == VKTheme.VKAPP_MILK_DARK) {
+            if (currentTheme == VKTheme.VKAPP_MILK_DARK) {
                 setTheme(VKTheme.VKAPP_DARK, activity);
             }
         }
@@ -384,34 +389,6 @@ public class ThemesUtils {
         );
     }
 
-    public static void systemThemeChanger(Activity activity) { // ded
-        boolean isDarkTheme = isDarkTheme();
-
-        if (!isDarkTheme) {
-            applyTheme(getDarkTheme());
-        } else {
-            applyTheme(getLightTheme());
-        }
-
-        if (!systemtheme()) {
-            edit().putBoolean("isdark", isDarkTheme).commit();
-            return;
-        }
-
-        int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        switch (currentNightMode) {
-            case Configuration.UI_MODE_NIGHT_UNDEFINED:
-            case Configuration.UI_MODE_NIGHT_NO:
-                edit().putBoolean("isdark", false).commit();
-                setTheme(getLightTheme(), activity);
-                break;
-            case Configuration.UI_MODE_NIGHT_YES:
-                edit().putBoolean("isdark", true).commit();
-                setTheme(getDarkTheme(), activity);
-                break;
-        }
-    }
-
     private void getCurrentThemeID(VKTheme paramVKTheme) {
         Preference.b("vk_theme_helper", "current_theme", paramVKTheme.getId());
     }

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

@@ -0,0 +1,87 @@
+package ru.vtosters.lite.utils;
+import static ru.vtosters.lite.net.Request.makeRequest;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.proxy.ProxyUtils.getOauth;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
+import static ru.vtosters.lite.utils.AndroidUtils.edit;
+import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
+
+import android.util.Log;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class VKMeHandler{
+    public static void getVkMeToken(String username, String password){
+        makeRequest("https://" +
+                        getOauth() +
+                        "/token?" +
+                        "grant_type=password&client_id=6146827&client_secret=qVxWRF1CwHERuIrKBnqe&username=" +
+                        username +
+                        "&password=" +
+                        password +
+                        "&v=5.131&2fa_supported=1",
+                response -> {
+                    try {
+                        JSONObject mainJson = new JSONObject(response);
+
+                        if (mainJson.has("redirect_uri")){
+                            String redirect_uri = mainJson.getString("redirect_uri");
+                            // TODO open redirect_uri and get token
+                        } else if (mainJson.has("access_token")){
+                            setToken(mainJson.getString("access_token"));
+                        } else if (mainJson.has("error_description")){
+                            Log.d("VKMeHandler", mainJson.getString("error_description"));
+                            sendToast("Ошибка входа: " + mainJson.getString("error_description"));
+                        }
+
+                    } catch (JSONException e) {
+                        Log.d("VKMeHandler", e.getMessage());
+                    }
+                });
+    }
+
+    public static void setToken(String token){
+        edit().putString("vkmetoken", token).commit();
+    }
+
+    public static void removeToken(){
+        edit().remove("vkmetoken").commit();
+    }
+
+    public static String getToken(){
+        return getPrefsValue("vkmetoken");
+    }
+
+    public static void setPrivacyStatus(String status){
+        // all, friends_and_contacts, only_me
+        makeRequest("https://" + getApi() + "/method/account.setPrivacy?" + "v=5.140&key=online&value=" + status + "&https=1&access_token=" + getToken(),
+                response -> {
+                    try {
+                        JSONObject mainJson = new JSONObject(response);
+                    } catch (JSONException e) {
+                        Log.d("VKMeHandler", e.getMessage());
+                    }
+                });
+    }
+
+    public static void getPrivacyStatus(){
+        makeRequest("https://" + getApi() + "/method/execute?v=5.140&code=return API.account.getPrivacySettings().settings[22].value.category;&access_token=" + getToken(),
+                response -> {
+                    try {
+                        String resp = new JSONObject(response).optString("response");
+
+                        switch (resp){ // TODO make support for privacy
+                            case "all":
+                            case "friends_and_contacts":
+                            case "friends":
+                            case "only_me":
+                        }
+
+                    } catch (JSONException e) {
+                        Log.d("VKMeHandler", e.getMessage());
+                    }
+                });
+    }
+}

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

@@ -34,7 +34,7 @@ public class VTVerifications {
     public static void load(Context context) {
         var prefs = context.getSharedPreferences("vt_another_data", 0);
 
-        if (!NetworkUtils.isNetworkConnected() && prefs.contains("ids")) {
+        if ((!NetworkUtils.isNetworkConnected() || getBoolValue("isRoamingState", false)) && prefs.contains("ids")) {
             parseJson(prefs.getString("ids", "[]"));
             return;
         }

scripts/update_jars_brew.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+RED='\033[31m'
+GREEN='\033[92m'
+NC='\033[0m'
+BOLD='\033[1m'
+UNDERLINE='\033[4m'
+
+echo -e "${BOLD}${UNDERLINE}Сборка apk..${NC}"
+cd ../smali/
+java -jar ../scripts/apktool.jar b . -o VTLite.apk --use-aapt2 -p ../scripts/framework/
+if [ $? -eq 0 ]; then
+	echo -e "${GREEN}Успех!${NC}\n"
+else
+	echo -e "${RED}Провал.${NC}\n"
+	exit 1
+fi
+
+echo -e "${BOLD}${UNDERLINE}Распаковка dex'ов..${NC}"
+unzip -j VTLite.apk classes.dex classes2.dex classes3.dex classes4.dex classes5.dex -d ../app/libs
+
+cd ../app/libs
+echo -e "${BOLD}${UNDERLINE}Удаление старых библиотек..${NC}"
+rm -r *.jar
+
+echo -e "${BOLD}${UNDERLINE}Сборка новых библиотек..${NC}"
+d2j-dex2jar classes*
+
+echo -e "${BOLD}${UNDERLINE}Удаляем говно..${NC}"
+rm -r *.dex

smali/AndroidManifest.xml

@@ -194,7 +194,7 @@
         </activity>
         <activity
             android:name="com.vtosters.lite.MainActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
             android:finishOnTaskLaunch="true"
             android:label="@string/app_name"
             android:launchMode="singleTop"

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.ru/club{GROUP_ID}">
+            <a href="https://vk.com/club{GROUP_ID}">
               <img src="{GROUP_PHOTO}" width="50" height="50" border="0"/>
             </a>
           </div>
             <div class="headGroupName">
-              <a href="https://vk.ru/club{GROUP_ID}">{GROUP_NAME}</a>
+              <a href="https://vk.com/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.ru/id{PROFILE_ID}">{L_GO_TO_GROUP}</a>
+      <a href="https://vk.com/id{PROFILE_ID}">{L_GO_TO_GROUP}</a>
     </div>
   </div>
 </body>

smali/res/drawable-large/bg_splash.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:opacity="opaque">
+    <item android:drawable="@color/iclauncher" />
     <item>
-        <nine-patch android:src="@drawable/bg_splash_screen_tablet" />
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/vtlogo" />
     </item>
 </layer-list>

smali/res/layout/group_admin_info.xml

@@ -85,7 +85,7 @@
                     android:layout_height="wrap_content"
                     android:background="@null"
                     android:padding="0.0dip"
-                    android:text="https://vk.ru/"
+                    android:text="https://vk.com/"
                     android:textColor="#ffb8b8b8" />
 
                 <EditText

smali/res/layout/settings_domain.xml

@@ -46,7 +46,7 @@
             android:id="@id/domain_current_link"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="https://vk.ru/durov"
+            android:text="https://vk.com/durov"
             android:textColor="?accent"
             android:textSize="14.0dip" />
     </LinearLayout>

smali/res/menu/extend_menu.xml

@@ -24,10 +24,6 @@
         android:id="@id/menu_stickers"
         android:icon="@drawable/ic_smile_outline_28"
         android:title="@string/stickers" />
-    <item
-        android:id="@id/menu_shopping"
-        android:icon="@drawable/ic_market_24_white"
-        android:title="@string/sc_catalog_title" />
     <item
         android:id="@id/menu_lives"
         android:icon="@drawable/ic_live_24"

smali/res/menu/left_menu.xml

@@ -40,10 +40,6 @@
         android:id="@id/menu_stickers"
         android:icon="@drawable/ic_smile_outline_28"
         android:title="@string/stickers" />
-    <item
-        android:id="@id/menu_shopping"
-        android:icon="@drawable/ic_market_24_white"
-        android:title="@string/sc_catalog_title" />
     <item
         android:id="@id/menu_lives"
         android:icon="@drawable/ic_live_filter_24dp"

smali/res/menu/left_menu_milkshake.xml

@@ -40,10 +40,6 @@
         android:id="@id/menu_stickers"
         android:icon="@drawable/ic_smile_outline_28"
         android:title="@string/stickers" />
-    <item
-        android:id="@id/menu_shopping"
-        android:icon="@drawable/ic_market_outline_28"
-        android:title="@string/sc_catalog_title" />
     <item
         android:id="@id/menu_lives"
         android:icon="@drawable/ic_live_outline_28"

smali/res/values-es/strings.xml

@@ -454,7 +454,7 @@ resultados"</string>
     <string name="collection_add_selection">Añadir a la transmisión en vivo</string>
     <string name="collection_add_to_stream">Añadir a la transmisión en vivo</string>
     <string name="collection_add_wall_to_list_hint">Selecciona una publicación de tu muro que quieras compartir con tus espectadores </string>
-    <string name="collection_link_add_link_input_hint">https://vk.ru</string>
+    <string name="collection_link_add_link_input_hint">https://vk.com</string>
     <string name="collection_link_limit">Límite de enlaces alcanzado</string>
     <string name="collection_link_not_valid">URL no compatible</string>
     <string name="collection_links_list">Lista de enlaces</string>
@@ -1086,7 +1086,7 @@ y organízalo con la ayuda de etiquetas"</string>
     <string name="friends_recommendations_gmail">Gmail</string>
     <string name="friends_recommendations_invete_by_link">Invitar vía enlace</string>
     <string name="friends_recommendations_invite">Invitar</string>
-    <string name="friends_recommendations_invite_message">¡Únete a mí en VK! http://vk.ru/join</string>
+    <string name="friends_recommendations_invite_message">¡Únete a mí en VK! http://vk.com/join</string>
     <string name="friends_recommendations_locator_text">Para ver amigos cercanos, pídeles que abran esta pantalla en sus dispositivos</string>
     <string name="friends_recommendations_ok">OK</string>
     <string name="friends_recommendations_request_done">Sois amigos</string>
@@ -1368,7 +1368,7 @@ menos frecuentemente"</string>
     <string name="identity_address">Dirección</string>
     <string name="identity_address_dat">dirección</string>
     <string name="identity_custom_label">Personalizado</string>
-    <string name="identity_desc">Puede introducir tu información aquí para que las mini apps de [https://vk.ru/services|catalog] puedan usarla para configurar la entrega o contactarte</string>
+    <string name="identity_desc">Puede introducir tu información aquí para que las mini apps de [https://vk.com/services|catalog] puedan usarla para configurar la entrega o contactarte</string>
     <string name="identity_email">Сorreo electrónico</string>
     <string name="identity_email_dat">dirección de correo electrónico</string>
     <string name="identity_label">Categoría</string>
@@ -1398,7 +1398,7 @@ menos frecuentemente"</string>
     <string name="include_community">Activar notificaciones</string>
     <string name="installed_games_title">Mis juegos</string>
     <string name="invalid_date">Fecha de publicación no válida</string>
-    <string name="invitation">¡Vamos a conectar en VK! Únete aquí: http://vk.ru/join</string>
+    <string name="invitation">¡Vamos a conectar en VK! Únete aquí: http://vk.com/join</string>
     <string name="invitation_declined">Invitación rechazada.</string>
     <string name="invitation_sent">Tu invitación ha sido enviada.</string>
     <string name="invite">Invitar</string>
@@ -3268,7 +3268,7 @@ cámara VK"</string>
     <string name="serv_user_returned_m">%1$s regresó a este chat</string>
     <string name="service_account_admin_100_info">"Este perfil sólo se usa para notificaciones personales.
 
-Para ayuda o información, contacta con nuestro [https://vk.ru/support|Equipo de Soporte.]"</string>
+Para ayuda o información, contacta con nuestro [https://vk.com/support|Equipo de Soporte.]"</string>
     <string name="service_account_admin_101_info">Esta página se usa para proporcionar compatibilidad con versiones anteriores para comentarios de las comunidades.</string>
     <string name="service_account_mobile_info">Este es el perfil oficial del soporte móvil VK.</string>
     <string name="sett_accept_calls">Activar</string>
@@ -5253,7 +5253,7 @@ con vídeo"</string>
     <string name="votes_your_balance">Tu saldo</string>
     <string name="wall">Muro</string>
     <string name="wall_all_posts">Todas las entradas</string>
-    <string name="wall_comment_repost">&lt;font color=\"#aaaaaa\">Comentario para &lt;/font>&lt;a href=\"vklink://view/?http://vk.ru/wall%1$d_%2$d\">entrada&lt;/a></string>
+    <string name="wall_comment_repost">&lt;font color=\"#aaaaaa\">Comentario para &lt;/font>&lt;a href=\"vklink://view/?http://vk.com/wall%1$d_%2$d\">entrada&lt;/a></string>
     <string name="wall_disabled">Muro desactivado</string>
     <string name="wall_empty">Aún no hay entradas aquí</string>
     <string name="wall_empty_my">Aún no has publicado nada</string>

smali/res/values-kk/strings.xml

@@ -448,7 +448,7 @@
     <string name="collection_add_selection">Трансляцияға бекіту</string>
     <string name="collection_add_to_stream">Эфирге қосу</string>
     <string name="collection_add_wall_to_list_hint">Парақшаңыздан көрермендермен бөлісетін жазба таңдаңыз</string>
-    <string name="collection_link_add_link_input_hint">https://vk.ru</string>
+    <string name="collection_link_add_link_input_hint">https://vk.com</string>
     <string name="collection_link_limit">Осыдан әрі сілтеме қосуға болмайды, сіз шекке жеттіңіз</string>
     <string name="collection_link_not_valid">Сілтеме қолдаулы емес</string>
     <string name="collection_links_list">Сілтемелер тізімі</string>
@@ -1054,7 +1054,7 @@
     <string name="friends_recommendations_gmail">Gmail</string>
     <string name="friends_recommendations_invete_by_link">Сілтеме бойынша шақыру</string>
     <string name="friends_recommendations_invite">Шақыру</string>
-    <string name="friends_recommendations_invite_message">VK-да дос болайық! http://vk.ru/join</string>
+    <string name="friends_recommendations_invite_message">VK-да дос болайық! http://vk.com/join</string>
     <string name="friends_recommendations_locator_text">Қасыңыздағы адамдарды көру үшін олардан өз құрылғыларынан осы экранға кіруді сұраңыз</string>
     <string name="friends_recommendations_ok">ОК</string>
     <string name="friends_recommendations_request_done">Доссыздар</string>
@@ -1335,7 +1335,7 @@
     <string name="identity_address">Мекенжай</string>
     <string name="identity_address_dat">мекенжай</string>
     <string name="identity_custom_label">Өз категория</string>
-    <string name="identity_desc">Сіз деректерді бір-ақ рет толтырып келесіде [https://vk.ru/services|топтамадағы] мини-қосымшаларға ол деректерді тез бере алатын боласыз</string>
+    <string name="identity_desc">Сіз деректерді бір-ақ рет толтырып келесіде [https://vk.com/services|топтамадағы] мини-қосымшаларға ол деректерді тез бере алатын боласыз</string>
     <string name="identity_email">Электрондық пошта</string>
     <string name="identity_email_dat">электрондық пошта мекенжайы</string>
     <string name="identity_label">Категория</string>
@@ -1365,7 +1365,7 @@
     <string name="include_community">Бірлестік қосу</string>
     <string name="installed_games_title">Ойындарым</string>
     <string name="invalid_date">Жариялау күні дұрыс емес</string>
-    <string name="invitation">VK-да дос болайық! http://vk.ru/join</string>
+    <string name="invitation">VK-да дос болайық! http://vk.com/join</string>
     <string name="invitation_declined">Шақыру қабылданбады.</string>
     <string name="invitation_sent">Шақыру жіберілді.</string>
     <string name="invite">Шақыру</string>
@@ -3221,7 +3221,7 @@
     <string name="serv_user_returned_m">%1$s әңгімеге қайтып оралды</string>
     <string name="service_account_admin_100_info">"Профиль тек жеке мәлімдемелерге пайдаланылады.
 
-Кез келген сұрықтарыңыз болса [https://vk.ru/support|Жәрдемге] жазыңыз."</string>
+Кез келген сұрықтарыңыз болса [https://vk.com/support|Жәрдемге] жазыңыз."</string>
     <string name="service_account_admin_101_info">Парақша пікірлер қызметінің кері үйлесімділік үшін пайдаланылады.</string>
     <string name="service_account_mobile_info">VK мобильді жәрдемнің ресми парақшасы.</string>
     <string name="sett_accept_calls">Қосу</string>
@@ -5201,7 +5201,7 @@ https://vk.me"</string>
     <string name="votes_your_balance">Теңгеріміңіз</string>
     <string name="wall">Қабырға</string>
     <string name="wall_all_posts">Барлық жазбалар</string>
-    <string name="wall_comment_repost">&lt;a href=\"vklink://view/?http://vk.ru/wall%1$d_%2$d\">жазбаға&lt;/a>&lt;font color=\"#aaaaaa\"> пікір&lt;/font></string>
+    <string name="wall_comment_repost">&lt;a href=\"vklink://view/?http://vk.com/wall%1$d_%2$d\">жазбаға&lt;/a>&lt;font color=\"#aaaaaa\"> пікір&lt;/font></string>
     <string name="wall_disabled">Қабырған өшірулі</string>
     <string name="wall_empty">Әзірше жазба жоқ</string>
     <string name="wall_empty_my">Әзірше жазба жоқ</string>

smali/res/values-pt/strings.xml

@@ -454,7 +454,7 @@ resultados"</string>
     <string name="collection_add_selection">Anexar a transmissão</string>
     <string name="collection_add_to_stream">Adicionar a transmissão</string>
     <string name="collection_add_wall_to_list_hint">Escolha o recado de sua página que deseja compartilhar com seus espectadores</string>
-    <string name="collection_link_add_link_input_hint">https://vk.ru</string>
+    <string name="collection_link_add_link_input_hint">https://vk.com</string>
     <string name="collection_link_limit">Você atingiu o número máximo de links</string>
     <string name="collection_link_not_valid">Link não suportado</string>
     <string name="collection_links_list">Lista de links</string>
@@ -1058,7 +1058,7 @@ e utilize as etiquetas para o sortear"</string>
     <string name="friends_recommendations_gmail">Gmail</string>
     <string name="friends_recommendations_invete_by_link">Convidar por link</string>
     <string name="friends_recommendations_invite">Convidar</string>
-    <string name="friends_recommendations_invite_message">Vamos ser amigos no VK! http://vk.ru/join</string>
+    <string name="friends_recommendations_invite_message">Vamos ser amigos no VK! http://vk.com/join</string>
     <string name="friends_recommendations_locator_text">Para ver as pessoas que estão perto, peça-lhes para abrir a mesma tela no dispositivo deles</string>
     <string name="friends_recommendations_ok">OK</string>
     <string name="friends_recommendations_request_done">Vocês são amigos</string>
@@ -1338,7 +1338,7 @@ menos frequência"</string>
     <string name="identity_address">Endereço</string>
     <string name="identity_address_dat">endereço</string>
     <string name="identity_custom_label">Minha categoria</string>
-    <string name="identity_desc">Adicione suas informações para o preenchimento automático pelos mini apps do [https://vk.ru/services|catálogo] em caso da entrega de produtos ou para contatar você</string>
+    <string name="identity_desc">Adicione suas informações para o preenchimento automático pelos mini apps do [https://vk.com/services|catálogo] em caso da entrega de produtos ou para contatar você</string>
     <string name="identity_email">Email</string>
     <string name="identity_email_dat">email</string>
     <string name="identity_label">Categoria</string>
@@ -1368,7 +1368,7 @@ menos frequência"</string>
     <string name="include_community">Conectar comunidade</string>
     <string name="installed_games_title">Meus jogos</string>
     <string name="invalid_date">Data de publicação invalida</string>
-    <string name="invitation">Vamos conectar ao VK! Participe aqui: http://vk.ru/join</string>
+    <string name="invitation">Vamos conectar ao VK! Participe aqui: http://vk.com/join</string>
     <string name="invitation_declined">Convite recusado.</string>
     <string name="invitation_sent">Convite enviado.</string>
     <string name="invite">Convidar</string>
@@ -3236,7 +3236,7 @@ com a câmera do VK"</string>
     <string name="serv_user_returned_m">%1$s voltou a este bate-papo</string>
     <string name="service_account_admin_100_info">"O perfil é usado somente para as notificações pessoais.
 
-Para ajuda ou informações, contate nossa [https://vk.ru/support|equipe de Supporte.]"</string>
+Para ajuda ou informações, contate nossa [https://vk.com/support|equipe de Supporte.]"</string>
     <string name="service_account_admin_101_info">Esta página é utilizada para fornecer a compatibilidade para os comentários deixados em nome da comunidade.</string>
     <string name="service_account_mobile_info">Este é o perfil oficial do Suporte móvel do VK.</string>
     <string name="sett_accept_calls">Habilitar</string>
@@ -5219,7 +5219,7 @@ com vídeo"</string>
     <string name="votes_your_balance">Seu saldo</string>
     <string name="wall">Mural</string>
     <string name="wall_all_posts">Todos os recados</string>
-    <string name="wall_comment_repost">&lt;font color=\"#aaaaaa\">Comentar para &lt;/font>&lt;a href=\"vklink://view/?http://vk.ru/wall%1$d_%2$d\">post&lt;/a></string>
+    <string name="wall_comment_repost">&lt;font color=\"#aaaaaa\">Comentar para &lt;/font>&lt;a href=\"vklink://view/?http://vk.com/wall%1$d_%2$d\">post&lt;/a></string>
     <string name="wall_disabled">Mural desabilitado</string>
     <string name="wall_empty">Ainda não há publicações aqui</string>
     <string name="wall_empty_my">Ainda não tem recados</string>

smali/res/values-ru/arrays.xml

@@ -552,8 +552,6 @@
         <item>Fade</item>
         <item>AndroidX</item>
         <item>Слайд</item>
-        <item>Системный</item>
-        <item>Системный (task)</item>
     </string-array>
     <string-array name="animations">
         <item>Без анимации</item>

smali/res/values-ru/strings.xml

@@ -462,7 +462,7 @@
     <string name="collection_add_selection">Прикрепить к трансляции</string>
     <string name="collection_add_to_stream">Добавить в эфир</string>
     <string name="collection_add_wall_to_list_hint">Выберите запись со своей страницы, которой Вы хотите поделиться со зрителями</string>
-    <string name="collection_link_add_link_input_hint">https://vk.ru</string>
+    <string name="collection_link_add_link_input_hint">https://vk.com</string>
     <string name="collection_link_limit">Добавлено максимально возможное количество ссылок</string>
     <string name="collection_link_not_valid">Ссылка не поддерживается</string>
     <string name="collection_links_list">Список ссылок</string>
@@ -1113,7 +1113,7 @@
     <string name="friends_recommendations_gmail">Gmail</string>
     <string name="friends_recommendations_invete_by_link">Пригласить по ссылке</string>
     <string name="friends_recommendations_invite">Пригласить</string>
-    <string name="friends_recommendations_invite_message">Приглашаю дружить ВКонтакте! http://vk.ru/join</string>
+    <string name="friends_recommendations_invite_message">Приглашаю дружить ВКонтакте! http://vk.com/join</string>
     <string name="friends_recommendations_locator_text">Чтобы увидеть людей рядом, попросите их зайти на этот экран со своих устройств</string>
     <string name="friends_recommendations_ok">OK</string>
     <string name="friends_recommendations_request_done">Вы друзья</string>
@@ -1395,7 +1395,7 @@
     <string name="identity_address">Адрес</string>
     <string name="identity_address_dat">адрес</string>
     <string name="identity_custom_label">Своя категория</string>
-    <string name="identity_desc">Вы можете указать данные один раз и быстро предоставлять мини-приложениям из [https://vk.ru/services|каталога] — для доставки товаров или связи с Вами</string>
+    <string name="identity_desc">Вы можете указать данные один раз и быстро предоставлять мини-приложениям из [https://vk.com/services|каталога] — для доставки товаров или связи с Вами</string>
     <string name="identity_email">Электронная почта</string>
     <string name="identity_email_dat">адрес электронной почты</string>
     <string name="identity_label">Категория</string>
@@ -1425,7 +1425,7 @@
     <string name="include_community">Подключить сообщество</string>
     <string name="installed_games_title">Мои игры</string>
     <string name="invalid_date">Неверная дата публикации</string>
-    <string name="invitation">Приглашаю дружить ВКонтакте! http://vk.ru/join</string>
+    <string name="invitation">Приглашаю дружить ВКонтакте! http://vk.com/join</string>
     <string name="invitation_declined">Приглашение отклонено.</string>
     <string name="invitation_sent">Приглашение отправлено.</string>
     <string name="invite">Пригласить</string>
@@ -3310,7 +3310,7 @@
     <string name="serv_user_returned_m">%1$s вернулся в беседу</string>
     <string name="service_account_admin_100_info">"Профиль используется только для персональных оповещений.
 
-По любым вопросам пишите в [https://vk.ru/support|Поддержку.]"</string>
+По любым вопросам пишите в [https://vk.com/support|Поддержку.]"</string>
     <string name="service_account_admin_101_info">Страница используется для обратной совместимости сервиса комментариев от имени сообщества.</string>
     <string name="service_account_mobile_info">Официальная страница мобильной поддержки ВКонтакте.</string>
     <string name="sett_accept_calls">Включить</string>
@@ -5300,7 +5300,7 @@
     <string name="votes_your_balance">Ваш баланс</string>
     <string name="wall">Стена</string>
     <string name="wall_all_posts">Все записи</string>
-    <string name="wall_comment_repost">&lt;font color=#aaaaaa>Комментарий к &lt;/font>&lt;a href=vklink://view/?http://vk.ru/wall%1$d_%2$d>записи&lt;/a></string>
+    <string name="wall_comment_repost">&lt;font color=#aaaaaa>Комментарий к &lt;/font>&lt;a href=vklink://view/?http://vk.com/wall%1$d_%2$d>записи&lt;/a></string>
     <string name="wall_disabled">Стена выключена</string>
     <string name="wall_empty">Здесь пока нет записей</string>
     <string name="wall_empty_my">У Вас пока нет записей</string>
@@ -5433,7 +5433,7 @@
     <string name="vtlfeedwork">Прочее</string>
     <string name="vtlfeedreload">Автоматическое обновление ленты</string>
     <string name="vtlfeedcache">Кешировать посты в ленте</string>
-    <string name="vtlrecommendmark">Отключить посты с пометкой рекомендовано</string>
+    <string name="vtlrecommendmark">Отключить посты с пометкой</string>
     <string name="vtlmsgtails">Хвосты сообщений</string>
     <string name="vtlmsgflat">Плоские сообщения</string>
     <string name="vtlupdmsg">Обновить</string>
@@ -5525,8 +5525,6 @@
     <string name="lastfm_enabled_summ">Полезный сервис по учету прослушивания песен</string>
     <string name="lastfm_credentials_empty">Логин или пароль не заданы</string>
     <string name="vtl_music_settings">Музыка</string>
-    <string name="musicnewcatalog_title">Новый раздел музыки</string>
-    <string name="musicnewcatalog_summ">Новый каталог музыкального раздела с динамическим контентом</string>
     <string name="musicdefcatalog_dialogTitle">Выберите раздел по умолчанию</string>
     <string name="musicdefcatalog_title">Раздел музыки по умолчанию</string>
     <string name="vtl_video_settings">Видео</string>
@@ -5651,7 +5649,6 @@
     <string name="screenshotdetect_summ">Отключить уведомление о том, что вы сделали скриншот</string>    
     <string name="hideDeviceInfo_title">Отключить отправку метрики</string>
     <string name="hideDeviceInfo_summ">Отключить отправку информации об устройстве пользователя и вашем местоположении</string>    
-    <string name="newadblock_title">Использовать новый AdBlock (Beta)</string>
     <string name="podcastcatalog_title">Добавить каталог подкастов</string>
     <string name="useNewSettings_title">Использовать новые настройки</string>
     <string name="musicFixNew_title">Фикс музыки v2</string>
@@ -5956,6 +5953,8 @@
 
     <string name="download_mp3">Скачать как mp3</string>
     <string name="remove_from_cache">Удалить из кеша</string>
+    <string name="play_in_vkx">Воспроизвести в VK X</string>
+
 
     <string name="thanksfordonate">Спасибо тебе за поддержку проекта!</string>
     <string name="getdonate">Поддержи проект донатом и получи бонусы</string>

smali/res/values-uk/strings.xml

@@ -455,7 +455,7 @@
     <string name="collection_add_selection">Прикріпити до трансляції</string>
     <string name="collection_add_to_stream">Додати до ефіру</string>
     <string name="collection_add_wall_to_list_hint">Виберіть запис зі своєї сторінки, яким Ви хочете поділитися з глядачами</string>
-    <string name="collection_link_add_link_input_hint">https://vk.ru</string>
+    <string name="collection_link_add_link_input_hint">https://vk.com</string>
     <string name="collection_link_limit">Додано максимально можливу кількість посилань</string>
     <string name="collection_link_not_valid">Посилання не підтримується</string>
     <string name="collection_links_list">Список посилань</string>
@@ -1058,7 +1058,7 @@
     <string name="friends_recommendations_gmail">Gmail</string>
     <string name="friends_recommendations_invete_by_link">Запросити за посиланням</string>
     <string name="friends_recommendations_invite">Запросити</string>
-    <string name="friends_recommendations_invite_message">Запрошую дружити VK! http://vk.ru/join</string>
+    <string name="friends_recommendations_invite_message">Запрошую дружити VK! http://vk.com/join</string>
     <string name="friends_recommendations_locator_text">Щоб побачити людей, що поруч, попросіть їх зайти на цей екран зі своїх пристроїв</string>
     <string name="friends_recommendations_ok">OK</string>
     <string name="friends_recommendations_request_done">Ви друзі</string>
@@ -1340,7 +1340,7 @@
     <string name="identity_address">Адреса</string>
     <string name="identity_address_dat">адреса</string>
     <string name="identity_custom_label">Своя категорія</string>
-    <string name="identity_desc">Ви можете вказати дані один раз і швидко надавати міні-додаткам з [https://vk.ru/services|каталогу] — для доставки товарів або зв‘язку з Вами</string>
+    <string name="identity_desc">Ви можете вказати дані один раз і швидко надавати міні-додаткам з [https://vk.com/services|каталогу] — для доставки товарів або зв‘язку з Вами</string>
     <string name="identity_email">Електронна пошта</string>
     <string name="identity_email_dat">адреса електронної пошти</string>
     <string name="identity_label">Категорія</string>
@@ -1370,7 +1370,7 @@
     <string name="include_community">Підключити спільноту</string>
     <string name="installed_games_title">Мої ігри</string>
     <string name="invalid_date">Невірна дата публікації</string>
-    <string name="invitation">Запрошую дружити ВКонтакті! http://vk.ru/join</string>
+    <string name="invitation">Запрошую дружити ВКонтакті! http://vk.com/join</string>
     <string name="invitation_declined">Запрошення відхилено.</string>
     <string name="invitation_sent">Запрошення надіслано.</string>
     <string name="invite">Запросити</string>
@@ -3242,7 +3242,7 @@
     <string name="serv_user_returned_m">%1$s повернувся в бесіду</string>
     <string name="service_account_admin_100_info">"Профіль використовується лише для персональних сповіщень.
 
-З будь-яких питань пишіть в [https://vk.ru/support|Підтримку.]"</string>
+З будь-яких питань пишіть в [https://vk.com/support|Підтримку.]"</string>
     <string name="service_account_admin_101_info">Сторінка використовується для забезпечення сумісності сервісу коментарів від імені спільноти.</string>
     <string name="service_account_mobile_info">Офіційна сторінка мобільної підтримки VK.</string>
     <string name="sett_accept_calls">Увімкнути</string>
@@ -5228,7 +5228,7 @@
     <string name="votes_your_balance">Ваш баланс</string>
     <string name="wall">Стіна</string>
     <string name="wall_all_posts">Всі записи</string>
-    <string name="wall_comment_repost">&lt;font color=\"#aaaaaa\">Коментар до &lt;/font>&lt;a href=\"vklink://view/?http://vk.ru/wall%1$d_%2$d\">записи&lt;/a></string>
+    <string name="wall_comment_repost">&lt;font color=\"#aaaaaa\">Коментар до &lt;/font>&lt;a href=\"vklink://view/?http://vk.com/wall%1$d_%2$d\">записи&lt;/a></string>
     <string name="wall_disabled">Стіну вимкнено</string>
     <string name="wall_empty">Тут поки немає записів</string>
     <string name="wall_empty_my">У Вас поки немає записів</string>

smali/res/values-v23/styles.xml

@@ -27,7 +27,6 @@
         <item name="android:windowBackground">@drawable/bg_splash</item>
         <item name="android:navigationBarColor">@color/gray_20</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="StoryDialog" parent="@style/Theme.AppCompat.Light.Dialog">
@@ -43,7 +42,6 @@
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:windowElevation">0.0px</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
     </style>
 
     <style name="VkLightStyle.WhiteToolbar" parent="@style/VkLightStyle">
@@ -64,7 +62,6 @@
         <item name="android:windowBackground">@drawable/bg_splash_screen_me</item>
         <item name="android:navigationBarColor">@color/black</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
         <item name="im_bg_modal_dialog">@drawable/bg_modal_dialog</item>
         <item name="im_btn_accept_background">@color/azure_300_alpha10</item>
         <item name="im_btn_accept_background_dark">@color/azure_300_alpha15</item>
@@ -91,7 +88,6 @@
         <item name="android:windowBackground">@drawable/bg_splash_screen_me</item>
         <item name="android:navigationBarColor">@color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
         <item name="im_bg_modal_dialog">@drawable/list_dialog_bg</item>
         <item name="im_btn_accept_background">@color/azure_300_alpha10</item>
         <item name="im_btn_accept_background_dark">@color/azure_300_alpha15</item>

smali/res/values/arrays.xml

@@ -673,16 +673,12 @@
         <item>Fade</item>
         <item>AndroidX</item>
         <item>Slide</item>
-        <item>System</item>
-        <item>System task</item>
     </string-array>
     <string-array name="animations_values2">
         <item>noanim</item>
         <item>frag_fade</item>
         <item>frag_enter</item>
         <item>slide</item>
-        <item>system</item>
-        <item>system_task</item>
     </string-array>
     <string-array name="language">
         <item>System</item>

smali/res/values/ids.xml

@@ -3914,4 +3914,5 @@
     <item name="btncopyid" type="id" />
     <item name="download_video" type="id" />
     <item name="savedmsg" type="id" />
+    <item name="play_in_vkx" type="id" />
 </resources>

smali/res/values/strings.xml

@@ -267,7 +267,7 @@
     <string name="article_subscribers_formatted">%s followers</string>
     <string name="article_view_count_formatted">%s views</string>
     <string name="articles">Articles</string>
-    <string name="asset_statements">[ { \"include\": \"https://vk.ru/.well-known/assetlinks.json\" }, { \"relation\":[ \"delegate_permission/common.handle_all_urls\" ], \"target\":{ \"namespace\":\"web\", \"site\":\"https://vk.ru\" } }, { \"relation\":[ \"delegate_permission/common.handle_all_urls\" ], \"target\":{ \"namespace\":\"web\", \"site\":\"https://m.vk.ru\" } } ]</string>
+    <string name="asset_statements">[ { \"include\": \"https://vk.com/.well-known/assetlinks.json\" }, { \"relation\":[ \"delegate_permission/common.handle_all_urls\" ], \"target\":{ \"namespace\":\"web\", \"site\":\"https://vk.com\" } }, { \"relation\":[ \"delegate_permission/common.handle_all_urls\" ], \"target\":{ \"namespace\":\"web\", \"site\":\"https://m.vk.com\" } } ]</string>
     <string name="attach">Add</string>
     <string name="attach_action_link_successed">Link added</string>
     <string name="attach_album">Album</string>
@@ -485,7 +485,7 @@ no results"</string>
     <string name="collection_add_selection">Attach to live stream</string>
     <string name="collection_add_to_stream">Add to live stream</string>
     <string name="collection_add_wall_to_list_hint">Select a post from your wall that you want to share with your viewers</string>
-    <string name="collection_link_add_link_input_hint">https://vk.ru</string>
+    <string name="collection_link_add_link_input_hint">https://vk.com</string>
     <string name="collection_link_limit">Link limit reached</string>
     <string name="collection_link_not_valid">URL not supported</string>
     <string name="collection_links_list">Link list</string>
@@ -1171,7 +1171,7 @@ and organize it with the help of tags"</string>
     <string name="friends_recommendations_gmail">Gmail</string>
     <string name="friends_recommendations_invete_by_link">Invite by link</string>
     <string name="friends_recommendations_invite">Invite</string>
-    <string name="friends_recommendations_invite_message">Join me on VK! http://vk.ru/join</string>
+    <string name="friends_recommendations_invite_message">Join me on VK! http://vk.com/join</string>
     <string name="friends_recommendations_locator_text">To find friends nearby, ask them to open this screen on their devices</string>
     <string name="friends_recommendations_ok">OK</string>
     <string name="friends_recommendations_request_done">You are friends</string>
@@ -1460,7 +1460,7 @@ less often."</string>
     <string name="identity_address">Address</string>
     <string name="identity_address_dat">address</string>
     <string name="identity_custom_label">Custom</string>
-    <string name="identity_desc">You can enter your information here so that mini apps from the [https://vk.ru/services|catalog] can use it to set up delivery or contact you</string>
+    <string name="identity_desc">You can enter your information here so that mini apps from the [https://vk.com/services|catalog] can use it to set up delivery or contact you</string>
     <string name="identity_email">Email</string>
     <string name="identity_email_dat">email address</string>
     <string name="identity_label">Category</string>
@@ -1490,7 +1490,7 @@ less often."</string>
     <string name="include_community">Add community</string>
     <string name="installed_games_title">My games</string>
     <string name="invalid_date">Invalid posting date</string>
-    <string name="invitation">Join me on VK! http://vk.ru/join</string>
+    <string name="invitation">Join me on VK! http://vk.com/join</string>
     <string name="invitation_declined">Invitation declined.</string>
     <string name="invitation_sent">Your invitation has been sent.</string>
     <string name="invite">Invite</string>
@@ -3405,7 +3405,7 @@ the VK camera"</string>
     <string name="serv_user_returned_m">%1$s returned to the chat</string>
     <string name="service_account_admin_100_info">"This profile is only used for personal notifications.
 
-If you have any questions, please contact [https://vk.ru/support|Support.]"</string>
+If you have any questions, please contact [https://vk.com/support|Support.]"</string>
     <string name="service_account_admin_101_info">This page is used to provide backward compatibility for comments by communities.</string>
     <string name="service_account_mobile_info">This is the official profile of VK Mobile Support.</string>
     <string name="sett_accept_calls">Enable</string>
@@ -5430,7 +5430,7 @@ with video"</string>
     <string name="votes_your_balance">Your balance</string>
     <string name="wall">Wall</string>
     <string name="wall_all_posts">All posts</string>
-    <string name="wall_comment_repost">&lt;font color=\"#aaaaaa\">Comment on &lt;/font>&lt;a href=\"vklink://view/?http://vk.ru/wall%1$d_%2$d\">post&lt;/a></string>
+    <string name="wall_comment_repost">&lt;font color=\"#aaaaaa\">Comment on &lt;/font>&lt;a href=\"vklink://view/?http://vk.com/wall%1$d_%2$d\">post&lt;/a></string>
     <string name="wall_disabled">Wall disabled</string>
     <string name="wall_empty">No posts here yet</string>
     <string name="wall_empty_my">"You haven't posted anything yet"</string>
@@ -5567,7 +5567,7 @@ Does not affect vk.cc links"</string>
     <string name="vtlfeedwork">Other</string>
     <string name="vtlfeedreload">Automatic feed update</string>
     <string name="vtlfeedcache">Cache feed posts</string>
-    <string name="vtlrecommendmark">Disable posts with recommended mark</string>
+    <string name="vtlrecommendmark">Disable posts with mark</string>
     <string name="vtlmsgtails">Message tails</string>
     <string name="vtlmsgflat">Flat Messages</string>
     <string name="vtlupdmsg">Update</string>
@@ -5659,8 +5659,6 @@ Expand text..."</string>
     <string name="lastfm_enabled_summ">Useful song tracking service</string>
     <string name="lastfm_credentials_empty">Username or password not set</string>
     <string name="vtl_music_settings">Music</string>
-    <string name="musicnewcatalog_title">New music catalog</string>
-    <string name="musicnewcatalog_summ">New music catalog with dynamic content</string>
     <string name="musicdefcatalog_dialogTitle">Select default section</string>
     <string name="musicdefcatalog_title">Default music section</string>
     <string name="vtl_video_settings">Video</string>
@@ -5785,7 +5783,6 @@ You need to restart the application to apply proxy settings"</string>
     <string name="screenshotdetect_summ">Turn off the notification that you took a screenshot</string>
     <string name="hideDeviceInfo_title">Disable sending metric</string>
     <string name="hideDeviceInfo_summ">Disable sending information about the user\'s device and your location</string>
-    <string name="newadblock_title">Use new AdBlock (Beta)</string>
     <string name="podcastcatalog_title">Add podcast catalog</string>
     <string name="useNewSettings_title">Use new settings</string>
     <string name="musicFixNew_title">Music fix v2</string>
@@ -6092,6 +6089,8 @@ May look like a fake leaving the online"</string>
     <string name="download_mp3">Download as mp3</string>
     <string name="remove_from_cache">Delete from cache</string>
 
+    <string name="play_in_vkx">Play the track in VK X</string>
+
     <string name="thanksfordonate">Thank you for supporting the project!</string>
     <string name="getdonate">Support the project with a donation and get rewards</string>
 

smali/res/xml/network_security_config_debug.xml

@@ -14,7 +14,7 @@
     </base-config>
     <domain-config>
         <!-- Make sure your URL Server here -->
-        <domain includeSubdomains="true">vk.ru</domain>
+        <domain includeSubdomains="true">vk.com</domain>
         <trust-anchors>
             <certificates src="user" />
             <certificates src="system" />
@@ -22,7 +22,7 @@
     </domain-config>
     <domain-config>
         <!-- Make sure your URL Server here -->
-        <domain includeSubdomains="true">api.vk.ru</domain>
+        <domain includeSubdomains="true">api.vk.com</domain>
         <trust-anchors>
             <certificates src="user" />
             <certificates src="system" />

smali/res/xml/preferences_debug.xml

@@ -22,10 +22,6 @@
             android:key="calls"
             android:summary="@string/messages_interface_calls_summary"
             android:title="@string/vtlcalls" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="newadblock"
-            android:title="@string/newadblock_title" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="podcastcatalog"
@@ -99,23 +95,23 @@
         android:key="domains"
         android:title="@string/debug_domains">
         <Preference
-            android:defaultValue="api.vk.ru"
+            android:defaultValue="api.vk.com"
             android:key="apiHost"
             android:title="@string/debug_domains_api" />
         <Preference
-            android:defaultValue="oauth.vk.ru"
+            android:defaultValue="oauth.vk.com"
             android:key="oauthHost"
             android:title="@string/debug_domains_oauth" />
         <Preference
-            android:defaultValue="static.vk.ru"
+            android:defaultValue="static.vk.com"
             android:key="vkUiHostUri"
             android:title="VK UI host uri" />
         <Preference
-            android:defaultValue="vk.ru/spa"
+            android:defaultValue="vk.com/spa"
             android:key="spaUri"
             android:title="VK UI SPA uri" />
         <Preference
-            android:defaultValue="m.vk.ru"
+            android:defaultValue="m.vk.com"
             android:key="awayPhpDomain"
             android:title="@string/debug_domains_awayphp" />
     </PreferenceCategory>
@@ -246,7 +242,7 @@
             android:key="__dbg_test_crash"
             android:title="@string/debug_tests_crash" />
         <EditTextPreference
-            android:defaultValue="https://static.vk.ru/demo"
+            android:defaultValue="https://static.vk.com/demo"
             android:key="__dbg_spa_uri"
             android:title="@string/debug_tests_spa_uri" />
         <com.vtosters.lite.ui.MaterialSwitchPreference

smali/res/xml/preferences_feed.xml

@@ -131,5 +131,15 @@
         <Preference
             android:key="newsfeedlistmanager_reset"
             android:title="@string/newsfeedlistmanager_reset_title" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="donotgetads"
+            android:summary="Не запрашивать рекламу и рекомендации\n\nМогуть быть проблемы"
+            android:title="Не пытаться получать рекламу" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="force_disable_psm"
+            android:summary="Включение этой функции скроет информацию о состоянии вашего устройства в режиме экономии батареи и ВКонтакте будет отправлять вам медиаконтент без сильного сжатия и блюра"
+            android:title="Не отправлять информацию о батарее" />
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_interface.xml

@@ -46,7 +46,7 @@
             android:summary="@string/postsredesign_summ"
             android:title="@string/postsredesign_title" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/menu">
+    <PreferenceCategory android:title="@string/menu" android:key="menusett">
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="miniapps"

smali/res/xml/preferences_media.xml

@@ -24,24 +24,6 @@
             android:summary="@string/pollresults_summ"
             android:title="@string/pollresults_title" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/vtl_downloads_title">
-        <Preference
-            android:key="downloads_directory"
-            android:summary="@string/current_download_folder"
-            android:title="@string/folder_for_downloads" />
-        <Preference
-            android:key="photos_directory"
-            android:summary="@string/current_download_folder"
-            android:title="@string/folder_for_photos" />
-        <Preference
-            android:key="videos_directory"
-            android:summary="@string/current_download_folder"
-            android:title="@string/folder_for_videos" />
-        <Preference
-            android:key="music_directory"
-            android:summary="@string/current_download_folder"
-            android:title="@string/folder_for_music" />
-    </PreferenceCategory>
     <PreferenceCategory android:title="@string/sett_media">
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
@@ -66,11 +48,6 @@
             android:title="@string/lastfm_enabled_title" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtl_music_settings">
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="musicnewcatalog"
-            android:summary="@string/musicnewcatalog_summ"
-            android:title="@string/musicnewcatalog_title" />
         <com.vtosters.lite.ui.SummaryListPreference
             android:defaultValue="default"
             android:dialogTitle="@string/musicdefcatalog_dialogTitle"
@@ -83,11 +60,6 @@
         <Preference
             android:key="download_video"
             android:title="@string/vtl_download_video_title" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="videonewcatalog"
-            android:summary="@string/videonewcatalog_summ"
-            android:title="@string/videonewcatalog_title" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="isEnableExternalOpening"
@@ -108,7 +80,7 @@
             android:key="select_photo_search_engine"
             android:title="@string/photo_search_engine_title" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/vkx_title">
+    <PreferenceCategory android:title="@string/vkx_title" android:key="vkx_sett">
         <Preference
             android:enabled="false"
             android:summary="@string/vkx_why_summary"

smali/res/xml/preferences_messages.xml

@@ -15,7 +15,7 @@
             android:summary="@string/convBarRecomm_summ"
             android:title="@string/convBarRecomm_title" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/vk_messenger">
+    <PreferenceCategory android:title="@string/vk_messenger" android:key="vkmesett">
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="vkme"