speedup setupfilters and cache

This reverts commit c8c8678785.

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,27 @@
+---
+name: Bug Report
+about: Заготовка для репорта багов
+title: Ошибка обновлении ленты новостей
+labels: bug
+assignees: ''
+
+---
+
+**Опишите сам баг**
+При обновлении новостей вылезает ошибка
+
+**Опишите действия для воспроизведения ошибки**
+1. Обновил ленту интересных новостей
+2. Пролистал до конца страницы
+
+**Опишите ожидаемый результат**
+Интересная лента должна прогружать результаты
+
+**Скриншот ошибки**
+
+**Информация об устройстве:**
+ - Устройство: Samsung Galaxy J1 Mini
+ - OS: Android 9 | OneUi 3.0
+ - Коммит: fa12e8f (В О Приложении написана версия коммита)
+
+**Дополнительная информация о баге или мыслях почему оно может происходить (если есть)**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Предложение функции
+title: Улучшение голосовых сообщений
+labels: enhancement
+assignees: ''
+
+---
+
+**Опишите вашу идею максимально подробно и понятно**
+Необходима функция улучшения голосовых сообщений. Она значительно улучшит запись голосовых сообщений и собеседнику будет лучше слышно меня
+
+**Опишите возможное решение/реализацию функции (если понимаете как это можно реализовать на Java/C++)**
+
+**Остальные мысли о предложенной функции**

.gitignore

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

README.md

@@ -66,6 +66,7 @@
   * Округление чисел
   * Сокращение постов **(Показать полностью)**
   * Результаты опросов без участия
+  * Возможность указывать папку для загрузки фото/видео/музыки/всего
   * Интеграция с <a href="https://www.last.fm/">LAST.FM</a> (а также возможность скробблинга)
   * Новый раздел музыки
   * Возможность скачивать видео
@@ -90,6 +91,7 @@
   * Возможность видеть онлайн пользователей, если у вас скрыт онлайн через VK Messenger
   * Отключить уведомление о том, что вы сделали скриншот в беседе
   * Отключение редиректа через away.php
+  * Отключение отправки метрики
 * Внешний вид
   * **Milkshake** тема (дизайн новых версий ВК)
   * Название заголовков в докбаре
@@ -103,8 +105,10 @@
   * Возможность отключить блок историй наверху ленты
   * Возможность отключить боковую камеру в разделе «Новости»
   * Возможность отключить блок «Что у вас нового?» в разделе «Новости»
-  * Возможность менять раздел, который запускается при запуске
+  * Возможность показывать лайки у постов справа
+  * Возможность менять стартовый раздел при запуске приложения
   * Анимации фрагментов
+  * Возможность изменять размер закругления картинок (аватарок и прочего)
   * Возможность отключить редизайн видеопостов
   * Возможность отключить блок миниаппов/VK Pay/Superapp
   * Возможность отключить сокращение названий разделов в меню

app/build.gradle

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

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

@@ -1 +0,0 @@
-ea0425fab4379ae5f7e9db05a22d4b7afd709560

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

@@ -1 +0,0 @@
-3b92d8876dd59d5afc60a53bb23b103cede6a194

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

@@ -16,6 +16,7 @@ import com.aefyr.tsg.g2.stickersgrabber.TelegramStickersGrabber;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
+import ru.vtosters.lite.utils.AndroidUtils;
 
 /**
  * Created by Aefyr on 20.05.2018.
@@ -39,7 +40,7 @@ public class NotificationsHelper {
         downloadingPacksNotificationsIds = new HashMap<>();
 
         if (oreo()) {
-            NotificationChannel notificationChan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, "Сервис стикеров Telegram в VTosters", NotificationManager.IMPORTANCE_HIGH);
+            NotificationChannel notificationChan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, AndroidUtils.getString("telegram_stickers_service"), NotificationManager.IMPORTANCE_HIGH);
             ((NotificationManager) c.getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(notificationChan);
         }
     }
@@ -49,8 +50,8 @@ public class NotificationsHelper {
         downloadingPacksNotificationsIds.put(pack, notificationId);
 
         Notification.Builder builder = commonBuilder();
-        builder.setContentTitle(pack.state == TelegramStickersPack.DOWNLOADING ? pack.title + ": загрузка" : pack.title + ": обновление");
+        builder.setContentTitle(pack.state == TelegramStickersPack.DOWNLOADING ? pack.title + AndroidUtils.getString("telegram_stickers_downloading") : pack.title + AndroidUtils.getString("telegram_stickers_updating"));
-        builder.setContentText("Получение информации");
+        builder.setContentText(AndroidUtils.getString("telegram_stickers_gettinginfo"));
         builder.setOngoing(true);
 
         manager.notify(notificationId, builder.build());
@@ -63,7 +64,7 @@ public class NotificationsHelper {
         lastNotificationTime.set(System.currentTimeMillis());
 
         Notification.Builder builder = commonBuilder();
-        builder.setContentTitle(pack.state == TelegramStickersPack.DOWNLOADING ? pack.title + ": загрузка" : pack.title + ": обновление");
+        builder.setContentTitle(pack.state == TelegramStickersPack.DOWNLOADING ? pack.title + AndroidUtils.getString("telegram_stickers_downloading") : pack.title + AndroidUtils.getString("telegram_stickers_updating"));
         builder.setContentText(downloadProgress + "/" + pack.stickersCount);
         builder.setProgress(pack.stickersCount, downloadProgress, false);
         builder.setOngoing(true);
@@ -77,13 +78,13 @@ public class NotificationsHelper {
         Notification.Builder builder = commonBuilder();
         builder.setProgress(0, 0, false);
         builder.setOngoing(false);
-        builder.setContentTitle("Сервис стикеров Telegram в VTosters");
+        builder.setContentTitle(AndroidUtils.getString("telegram_stickers_service"));
 
         String text;
         if (success)
-            text = wasUpdate ? pack.title + " успешно обновлен" : pack.title + " успешно загружен";
+            text = wasUpdate ? pack.title + AndroidUtils.getString("telegram_stickers_updated") : pack.title + AndroidUtils.getString("telegram_stickers_downloaded");
         else
-            text = wasUpdate ? pack.title + ": ошибка при обновлении" : pack.title + ": ошибка при загрузке";
+            text = wasUpdate ? pack.title + AndroidUtils.getString("telegram_stickers_error_update") : pack.title + AndroidUtils.getString("telegram_stickers_error_download");
 
         if (e instanceof TelegramStickersGrabber.TSGException) {
             text = pack.title + ": " + e.getMessage();

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

@@ -14,7 +14,6 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteException;
 import android.net.Uri;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.facebook.common.i.MediaUtils;
 import com.facebook.x.g.EncodedImage;
@@ -51,7 +50,7 @@ public class DownloadUtils {
             ToastUtils.a(context.getString(R.string.error) + " [" + e2.getMessage() + "]");
         }
     }
-
+    
     private static void b(final Context context, String str, String str2, boolean z) {
         if (TextUtils.isEmpty(str2)) {
             return;
@@ -59,13 +58,15 @@ public class DownloadUtils {
 
         String file = a(str, str2);
         File b2;
+        boolean pic = false;
         boolean c2 = MediaUtils.c(MediaUtils.b(str2));
 
-        if (str.endsWith("png") || str.endsWith("jpg") || str.endsWith("jpeg")) {
+        if (file.endsWith(".jpg") || file.endsWith(".png") || file.endsWith(".jpeg")) {
             b2 = new File(getPhotosDir(), file);
-        } else if (str.endsWith("mp3") || str.endsWith("wav") || str.endsWith("ogg") || str.endsWith("aac") || str.endsWith("flac") || str.endsWith("m4a")) {
+            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 (str.endsWith("mp4") || str.endsWith("mkv") || str.endsWith("avi") || str.endsWith("flv") || str.endsWith("wmv") || str.endsWith("mov") || str.endsWith("3gp")) {
+        } 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);
         } else {
             b2 = new File(getDownloadsDir(), file);
@@ -76,16 +77,23 @@ public class DownloadUtils {
             final InputStream h = c3 == null ? null : c3.h();
             if (h != null) {
                 try {
-                    if (b2.exists() || FileUtils.b(b2)) {
+                    if (b2.getParentFile() != null) {
+                        b2.createNewFile();
+                    }
+
+                    if (b2.exists()) {
                         VkExecutors.x.a().execute(() -> ToastUtils.a(context.getString(R.string.file_saved, b2.getAbsoluteFile())));
                     }
+
                 } catch (Exception e2) {
                     L.a(e2);
                 }
+
                 CameraUtils.a(context, b2, null);
                 return;
             }
         }
+
         DownloadManager.Request request = new DownloadManager.Request(Uri.parse(str2));
         request.setDestinationUri(Uri.fromFile(b2));
         request.setMimeType(FileUtils.f(new File(str)));
@@ -98,6 +106,9 @@ public class DownloadUtils {
         }
         try {
             long enqueue = a2.enqueue(request);
+            if (pic) {
+                CameraUtils.a(context, b2, null);
+            }
             if (!z) {
                 return;
             }
@@ -180,7 +191,7 @@ public class DownloadUtils {
                     String f2 = FileUtils.f(file);
                     if (!TextUtils.isEmpty(f2)) {
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        intent.setDataAndType(FileUtils.n(file), f2);
+                        intent.setDataAndType(FileUtils.uriFromFile(file), f2);
                         context.startActivity(intent);
                         return true;
                     }

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

@@ -34,4 +34,7 @@ public enum DialogAction {
     DNT_OFF,
     pinmsg,
     unpinmsg,
+    ENCRYPT_SETT,
+    ENCRYPT,
+    DOWNLOAD
 }

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

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

app/src/main/java/com/vk/profile/ui/community/CommunityBorderedImageView.java

@@ -0,0 +1,106 @@
+package com.vk.profile.ui.community;
+
+import android.content.Context;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.util.AttributeSet;
+
+import com.vk.core.ui.themes.Themable;
+import com.vk.core.ui.themes.VKThemeHelper;
+import com.vk.core.util.ContextExtKt;
+import com.vk.dto.stories.model.StoriesContainer;
+import com.vk.stories.view.BorderedCircleImageView;
+import com.vtosters.lite.R;
+
+public final class CommunityBorderedImageView extends BorderedCircleImageView implements Themable{
+    private boolean f0;
+    private int g0;
+    private int h0;
+    private PorterDuffColorFilter i0;
+    private PorterDuffColorFilter j0;
+    private int unread;
+    private int read;
+
+    public CommunityBorderedImageView(Context context){
+        this(context, null, 0, 6);
+    }
+
+    public CommunityBorderedImageView(Context context, AttributeSet attributeSet){
+        this(context, attributeSet, 0, 4);
+    }
+
+    public CommunityBorderedImageView(Context context, AttributeSet attributeSet, int i, int i2){
+        this(context, (i2 & 2) != 0 ? null : attributeSet, (i2 & 4) != 0 ? 0 : i);
+    }
+
+    public CommunityBorderedImageView(Context context, AttributeSet attributeSet, int i){
+        super(context, attributeSet, i);
+        this.g0 = VKThemeHelper.d((int) R.attr.accent);
+        this.h0 = ContextExtKt.a(context, (int) R.color.gray_200);
+        this.i0 = new PorterDuffColorFilter(this.g0, PorterDuff.Mode.SRC_IN);
+        this.j0 = new PorterDuffColorFilter(this.h0, PorterDuff.Mode.SRC_IN);
+    }
+
+    public final void c(int unread, int read){ // get unread and read resid
+        this.unread = unread;
+        this.read = read;
+        this.T = BitmapFactory.decodeResource(getResources(), this.unread);
+    }
+
+    public final int getPrimaryColor(){
+        return this.g0;
+    }
+
+    public final void setPrimaryColor(int i){
+        this.g0 = i;
+        this.i0 = new PorterDuffColorFilter(i, PorterDuff.Mode.SRC_IN);
+    }
+
+    public final int getWasViewedColor(){
+        return this.h0;
+    }
+
+    public final void setWasViewedColor(int i){
+        this.h0 = i;
+        this.j0 = new PorterDuffColorFilter(i, PorterDuff.Mode.SRC_IN);
+    }
+
+    public final void o(){
+        this.f0 = false;
+        l();
+    }
+
+    @Override // com.vk.stories.view.ClippedImageView, android.widget.ImageView, android.view.View
+    public void onDraw(Canvas canvas){
+        super.onDraw(canvas);
+        if (this.f0) {
+            a(canvas);
+        }
+    }
+
+    public final void setStoryContainer(StoriesContainer storiesContainer){
+        if (storiesContainer.L1()) {
+            this.f0 = true;
+            m();
+            if (storiesContainer.K1()) {
+                this.T = BitmapFactory.decodeResource(getResources(), this.unread);
+                setBorderColorFilter(this.i0);
+                b(getWidth(), getHeight());
+                invalidate();
+                return;
+            }
+            this.T = BitmapFactory.decodeResource(getResources(), this.read);
+            setBorderColorFilter(this.j0);
+            b(getWidth(), getHeight());
+            invalidate();
+            return;
+        }
+        o();
+    }
+
+    @Override // com.vk.core.ui.themes.Themable
+    public void v(){
+    }
+}

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

@@ -0,0 +1,442 @@
+package com.vk.stories.view;
+
+import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.util.AttributeSet;
+import android.view.ViewTreeObserver;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
+import com.airbnb.lottie.LottieComposition;
+import com.airbnb.lottie.LottieCompositionFactory;
+import com.airbnb.lottie.LottieDrawable;
+import com.airbnb.lottie.LottieListener;
+import com.facebook.common.internal.Supplier;
+import com.facebook.common.references.CloseableReference;
+import com.facebook.datasource.DataSource;
+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.ui.themes.Themable;
+import com.vk.core.ui.themes.VKThemeHelper;
+import com.vk.core.util.DrawableUtils;
+import com.vk.core.util.ResUtils;
+import com.vk.core.util.Screen;
+import com.vk.dto.stories.d.StoriesContainerExt;
+import com.vk.dto.stories.model.CommunityGroupedStoriesContainer;
+import com.vk.dto.stories.model.StoriesContainer;
+import com.vk.dto.stories.model.StoryEntry;
+import com.vk.im.engine.models.Image;
+import com.vk.im.ui.views.avatars.AvatarDataSource;
+import com.vk.imageloader.FrescoWrapper;
+import com.vk.stories.StoriesController;
+import com.vtosters.lite.R;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+
+public class StoryCircleImageView extends BorderedCircleImageView implements Themable{
+    private static final HashSet<Integer> B0 = new HashSet<>();
+    private final PipelineDraweeControllerBuilder f0;
+    private int A0;
+    private Drawable g0;
+    private Drawable h0;
+    private Drawable i0;
+    private int j0;
+    private int k0;
+    private int l0;
+    private int m0;
+    private int n0;
+    private int o0;
+    private Bitmap p0;
+    private Bitmap q0;
+    private Bitmap r0;
+    private Bitmap s0;
+    private boolean t0;
+    private boolean u0;
+    private boolean v0;
+    private boolean w0;
+    private boolean x0;
+    private String y0;
+    private LottieDrawable z0;
+
+    public StoryCircleImageView(Context context){
+        this(context, null);
+    }
+
+    public StoryCircleImageView(Context context, AttributeSet attributeSet){
+        this(context, attributeSet, 0);
+    }
+
+    public StoryCircleImageView(Context context, AttributeSet attributeSet, int i){
+        super(context, attributeSet, i);
+        this.f0 = FrescoWrapper.c.d();
+        a(context, attributeSet, i);
+    }
+
+    private void b(Canvas canvas){
+        this.z0.draw(canvas);
+    }
+
+    private boolean o(){
+        return !this.u0 && !this.t0 && this.z0 == null && !this.w0 && !this.v0;
+    }
+
+    private void p(){
+        this.z0.stop();
+        this.z0 = null;
+        invalidate();
+    }
+
+    private void q(){
+        int i = this.j0;
+        if (i != 0 && VKThemeHelper.k.a(i)) {
+            this.k0 = VKThemeHelper.d(this.j0);
+        }
+        this.g0 = DrawableUtils.a(this.g0, ColorStateList.valueOf(this.k0));
+        Drawable drawable = this.g0;
+        int i2 = this.A0;
+        this.p0 = DrawableUtils.a(drawable, i2, i2);
+        int i3 = this.l0;
+        if (i3 != 0 && VKThemeHelper.k.a(i3)) {
+            this.m0 = VKThemeHelper.d(this.l0);
+        }
+        int i4 = this.m0;
+        if (i4 != 0) {
+            this.i0 = DrawableUtils.a(this.i0, ColorStateList.valueOf(i4));
+        }
+        int i5 = this.n0;
+        if (i5 != 0 && VKThemeHelper.k.a(i5)) {
+            this.o0 = VKThemeHelper.d(this.n0);
+        }
+        Drawable a2 = DrawableUtils.a(this.g0, ColorStateList.valueOf(0));
+        int i6 = this.A0;
+        DrawableUtils.a(a2, i6, i6);
+        Drawable a3 = DrawableUtils.a(this.h0, ColorStateList.valueOf(this.o0));
+        int i7 = this.A0;
+        this.r0 = DrawableUtils.a(a3, i7, i7);
+        Drawable a4 = DrawableUtils.a(this.g0, ColorStateList.valueOf(ContextCompat.getColor(getContext(), R.color.orange)));
+        int i8 = this.A0;
+        this.s0 = DrawableUtils.a(a4, i8, i8);
+    }
+
+    private void r(){
+        this.c0 = Screen.a(o() ? 0 : 2);
+        m();
+        q();
+    }
+
+    private void setUploadFailed(boolean z){
+        this.u0 = z;
+        invalidate();
+    }
+
+    @Override // com.vk.stories.view.ClippedImageView, android.widget.ImageView, android.view.View
+    public void onDraw(Canvas canvas){
+        super.onDraw(canvas);
+        setBorderAlpha(255);
+        if (this.u0) {
+            this.i0.draw(canvas);
+        } else if (this.t0) {
+            if (this.z0 != null) {
+                b(canvas);
+                return;
+            }
+            this.T = this.x0 ? this.s0 : this.p0;
+            b(getWidth(), getHeight());
+            a(canvas);
+        } else if (this.z0 != null) {
+            p();
+        } else if (!this.w0) {
+
+        } else {
+            this.T = this.r0;
+            setBorderAlpha(163);
+            b(getWidth(), getHeight());
+            a(canvas);
+        }
+    }
+
+    @Override // com.vk.stories.view.BorderedCircleImageView, android.view.View
+    public void onSizeChanged(int i, int i2, int i3, int i4){
+        super.onSizeChanged(i, i2, i3, i4);
+        this.i0.setBounds(0, 0, i, i2);
+        b(i);
+    }
+
+    public void setStoryContainer(@Nullable StoriesContainer storiesContainer){
+        boolean z = true;
+        boolean z2 = storiesContainer != null && storiesContainer.Q1();
+        this.v0 = storiesContainer != null && storiesContainer.S1() && !storiesContainer.L1();
+        boolean z3 = storiesContainer instanceof CommunityGroupedStoriesContainer;
+        this.x0 = z3;
+        if (storiesContainer != null) {
+            if (!StoriesContainerExt.c(storiesContainer) && !StoriesContainerExt.d(storiesContainer)) {
+                this.T = this.p0;
+            } else {
+                this.T = this.q0;
+            }
+            b(getWidth(), getHeight());
+            if (StoriesContainerExt.e(storiesContainer)) {
+                a(storiesContainer);
+            } else if (this.z0 != null) {
+                p();
+            }
+            this.w0 = !storiesContainer.K1() && storiesContainer.L1();
+            if (z2) {
+                String h = storiesContainer.h(ResUtils.c(R.dimen.story_preview_image_size));
+                if (h != null) {
+                    a(h);
+                } else {
+                    g();
+                }
+                if (StoriesController.a(storiesContainer)) {
+                    setUploadFailed(true);
+                    a(false, false);
+                } else {
+                    setUploadFailed(false);
+                    if (!storiesContainer.K1() && !StoriesContainerExt.c(storiesContainer)) {
+                        a(false, false);
+                    } else {
+                        StoryEntry A1 = storiesContainer.A1();
+                        if (A1 != null) {
+                            a(true, !B0.contains(A1.b));
+                            B0.add(A1.b);
+                        } else {
+                            a(true, false);
+                        }
+                    }
+                }
+            } else {
+                setUploadFailed(false);
+                if (!storiesContainer.K1() && !StoriesContainerExt.c(storiesContainer)) {
+                    z = false;
+                }
+                a(z, false);
+                if (z3) {
+                    b(((CommunityGroupedStoriesContainer) storiesContainer).j(ResUtils.c(R.dimen.story_preview_image_size)));
+                } else {
+                    String h2 = storiesContainer.h(ResUtils.c(R.dimen.story_preview_image_size));
+                    if (h2 != null) {
+                        a(h2);
+                    } else {
+                        g();
+                    }
+                }
+            }
+        } else {
+            g();
+            a(false, false);
+            setUploadFailed(false);
+            this.w0 = false;
+        }
+        r();
+    }
+
+    @Override // com.vk.core.ui.themes.Themable
+    public void v(){
+        r();
+        invalidate();
+    }
+
+    private void b(int i){
+        LottieDrawable lottieDrawable = this.z0;
+        if (lottieDrawable == null || lottieDrawable.e() == null) {
+            return;
+        }
+        this.z0.d(i / this.z0.e().a().width());
+    }
+
+    protected void a(Context context, AttributeSet attributeSet, int i){
+        TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, com.vtosters.lite.a0.StoryCircleImageView, i, 0);
+        a(context, attributeSet, obtainStyledAttributes);
+        obtainStyledAttributes.recycle();
+        r();
+        this.T = this.p0;
+    }
+
+    public void b(@Nullable List<String> list){
+        PipelineDraweeControllerBuilder pipelineDraweeControllerBuilder = this.f0;
+        pipelineDraweeControllerBuilder.j();
+        pipelineDraweeControllerBuilder.a(getController());
+        setControllerListener(pipelineDraweeControllerBuilder);
+        a(pipelineDraweeControllerBuilder, list);
+        setController(pipelineDraweeControllerBuilder.k0());
+    }
+
+    @SuppressLint("ResourceType")
+    private void a(Context context, AttributeSet attributeSet, TypedArray typedArray){ // bullshit vk code is not working with custom bordered circle image
+        Drawable drawable;
+        this.A0 = typedArray.getDimensionPixelSize(0, Screen.a(64.0f));
+        if (typedArray.hasValue(2)) {
+            this.g0 = typedArray.getDrawable(2);
+        } else {
+            this.g0 = ContextCompat.getDrawable(context, R.drawable.bg_stores_unread_border_80);
+        }
+        if (typedArray.hasValue(3)) {
+            this.h0 = typedArray.getDrawable(3);
+        } else {
+            this.h0 = ContextCompat.getDrawable(context, R.drawable.bg_stores_read_border_80);
+        }
+
+        int b2 = VKThemeHelper.b(attributeSet, "vk_borderTint");
+        if (b2 != 0 && VKThemeHelper.k.a(b2)) {
+            this.j0 = b2;
+        } else if (typedArray.hasValue(5)) {
+            this.k0 = typedArray.getColor(5, 0);
+        } else {
+            this.j0 = R.attr.accent;
+        }
+
+        int b3 = VKThemeHelper.b(attributeSet, "vk_failBorderTint");
+        if (b3 != 0 && VKThemeHelper.k.a(b3)) {
+            this.l0 = b3;
+        } else if (typedArray.hasValue(7)) {
+            this.m0 = typedArray.getColor(7, 0);
+        }
+
+        int b4 = VKThemeHelper.b(attributeSet, "vk_borderSeenTint");
+        if (b4 != 0 && VKThemeHelper.k.a(b4)) {
+            this.n0 = b4;
+        } else if (typedArray.hasValue(4)) {
+            this.o0 = typedArray.getColor(4, 0);
+        } else {
+            this.o0 = 0;
+        }
+        if (typedArray.hasValue(6)) {
+            this.i0 = typedArray.getDrawable(6);
+        } else {
+            this.i0 = ContextCompat.getDrawable(context, R.drawable.ic_story_error_size64);
+        }
+        if (typedArray.hasValue(8)) {
+            drawable = typedArray.getDrawable(8);
+        } else {
+            drawable = ContextCompat.getDrawable(context, R.drawable.bg_live_unread_border);
+        }
+        if (typedArray.hasValue(9)) {
+            this.y0 = typedArray.getString(9);
+        } else {
+            this.y0 = "stories_animation_64.json";
+        }
+
+        int i = this.A0;
+        this.q0 = DrawableUtils.a(Objects.requireNonNull(drawable), i, i);
+        Drawable drawable2 = this.g0;
+        int i2 = this.A0;
+        DrawableUtils.a(drawable2, i2, i2);
+        Drawable drawable3 = this.h0;
+        int i3 = this.A0;
+        this.r0 = DrawableUtils.a(drawable3, i3, i3);
+        Drawable drawable4 = this.g0;
+        int i4 = this.A0;
+        this.s0 = DrawableUtils.a(drawable4, i4, i4);
+    }
+
+    public void a(StoriesContainer storiesContainer){
+        if (this.z0 == null) {
+            LottieCompositionFactory.a(getContext(), this.y0).b(new a(storiesContainer));
+        }
+    }
+
+    public void a(StoriesContainer storiesContainer, LottieComposition lottieComposition){
+        this.z0 = new LottieDrawable();
+        this.z0.a(lottieComposition);
+        this.z0.d(-1);
+        b(getWidth());
+        if (!StoriesContainerExt.f(storiesContainer)) {
+            this.z0.a(new b());
+            this.z0.start();
+            return;
+        }
+        this.z0.stop();
+    }
+
+    private void a(boolean z, boolean z2){
+        k();
+        this.t0 = z;
+        if (!z2) {
+            setSelectionAmount(1.0f);
+        } else {
+            n();
+        }
+    }
+
+    private void a(@NonNull PipelineDraweeControllerBuilder pipelineDraweeControllerBuilder, @Nullable final List<String> list){
+        pipelineDraweeControllerBuilder.b(null);
+        pipelineDraweeControllerBuilder.a((Supplier<DataSource<CloseableReference<com.facebook.x.g.CloseableImage>>>) null);
+        if (list != null && !list.isEmpty()) {
+            if (list.size() == 1) {
+                ImageRequestBuilder b2 = ImageRequestBuilder.b(Uri.parse(list.get(0)));
+                b2.a(ImageRequest.CacheChoice.SMALL);
+                pipelineDraweeControllerBuilder.b(b2.a());
+                return;
+            }
+
+            pipelineDraweeControllerBuilder.a((Supplier<DataSource<CloseableReference<CloseableImage>>>) () -> StoryCircleImageView.this.a(list));
+            return;
+        }
+        pipelineDraweeControllerBuilder.b(null);
+    }
+
+    public DataSource<CloseableReference<CloseableImage>> a(@Nullable List<String> list){
+        ArrayList<Image> arrayList = new ArrayList<>();
+        for (String o : Objects.requireNonNull(list)) {
+            arrayList.add(new Image(-1, -1, o));
+        }
+        return AvatarDataSource.a(arrayList, this.A0, 0);
+    }
+
+    public class a implements LottieListener<LottieComposition>{
+        final StoriesContainer a;
+
+        a(StoriesContainer storiesContainer){
+            this.a = storiesContainer;
+        }
+
+        @Override // com.airbnb.lottie.LottieListener
+        public void a(LottieComposition lottieComposition){
+            if (StoryCircleImageView.this.getWidth() > 0) {
+                StoryCircleImageView.this.a(this.a, lottieComposition);
+            } else {
+                StoryCircleImageView.this.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver$OnGlobalLayoutListenerC0393a(lottieComposition));
+            }
+        }
+
+        public class ViewTreeObserver$OnGlobalLayoutListenerC0393a implements ViewTreeObserver.OnGlobalLayoutListener{
+            final LottieComposition a;
+
+            ViewTreeObserver$OnGlobalLayoutListenerC0393a(LottieComposition lottieComposition){
+                this.a = lottieComposition;
+            }
+
+            @Override // android.view.ViewTreeObserver.OnGlobalLayoutListener
+            public void onGlobalLayout(){
+                StoryCircleImageView.this.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                a aVar = a.this;
+                StoryCircleImageView.this.a(aVar.a, this.a);
+            }
+        }
+    }
+
+    public class b implements ValueAnimator.AnimatorUpdateListener{
+        b(){
+        }
+
+        @Override // android.animation.ValueAnimator.AnimatorUpdateListener
+        public void onAnimationUpdate(ValueAnimator valueAnimator){
+            StoryCircleImageView.this.invalidate();
+        }
+    }
+}

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

@@ -3560,26 +3560,26 @@ public class R {
         public static final int stickers_notifications_size = 0x7f070285;
         public static final int stickers_tabs_padding = 0x7f070286;
         public static final int stickers_tabs_size = 0x7f070287;
-        public static final int stiсkers_catalog_button_padding_bottom = 0x7f070288;
+        public static final int stickers_catalog_button_padding_bottom = 0x7f070288;
-        public static final int stiсkers_catalog_button_padding_left = 0x7f070289;
+        public static final int stickers_catalog_button_padding_left = 0x7f070289;
-        public static final int stiсkers_catalog_button_padding_right = 0x7f07028a;
+        public static final int stickers_catalog_button_padding_right = 0x7f07028a;
-        public static final int stiсkers_catalog_button_padding_top = 0x7f07028b;
+        public static final int stickers_catalog_button_padding_top = 0x7f07028b;
-        public static final int stiсkers_catalog_double_stacked_slider_image_bg_size = 0x7f07028c;
+        public static final int stickers_catalog_double_stacked_slider_image_bg_size = 0x7f07028c;
-        public static final int stiсkers_catalog_double_stacked_slider_image_corner_radius = 0x7f07028d;
+        public static final int stickers_catalog_double_stacked_slider_image_corner_radius = 0x7f07028d;
-        public static final int stiсkers_catalog_double_stacked_slider_image_size = 0x7f07028e;
+        public static final int stickers_catalog_double_stacked_slider_image_size = 0x7f07028e;
-        public static final int stiсkers_catalog_large_slider_image_bg_height = 0x7f07028f;
+        public static final int stickers_catalog_large_slider_image_bg_height = 0x7f07028f;
-        public static final int stiсkers_catalog_large_slider_image_bg_width = 0x7f070290;
+        public static final int stickers_catalog_large_slider_image_bg_width = 0x7f070290;
-        public static final int stiсkers_catalog_large_slider_image_corner_radius = 0x7f070291;
+        public static final int stickers_catalog_large_slider_image_corner_radius = 0x7f070291;
-        public static final int stiсkers_catalog_large_slider_image_size = 0x7f070292;
+        public static final int stickers_catalog_large_slider_image_size = 0x7f070292;
-        public static final int stiсkers_catalog_small_slider_image_bg_size = 0x7f070293;
+        public static final int stickers_catalog_small_slider_image_bg_size = 0x7f070293;
-        public static final int stiсkers_catalog_small_slider_image_corner_radius = 0x7f070294;
+        public static final int stickers_catalog_small_slider_image_corner_radius = 0x7f070294;
-        public static final int stiсkers_catalog_small_slider_image_size = 0x7f070295;
+        public static final int stickers_catalog_small_slider_image_size = 0x7f070295;
-        public static final int stiсkers_catalog_triple_stacked_slider_image_bg_size = 0x7f070296;
+        public static final int stickers_catalog_triple_stacked_slider_image_bg_size = 0x7f070296;
-        public static final int stiсkers_catalog_triple_stacked_slider_image_corner_radius = 0x7f070297;
+        public static final int stickers_catalog_triple_stacked_slider_image_corner_radius = 0x7f070297;
-        public static final int stiсkers_catalog_triple_stacked_slider_image_size = 0x7f070298;
+        public static final int stickers_catalog_triple_stacked_slider_image_size = 0x7f070298;
-        public static final int stiсkers_catalog_vertical_list_image_bg_size = 0x7f070299;
+        public static final int stickers_catalog_vertical_list_image_bg_size = 0x7f070299;
-        public static final int stiсkers_catalog_vertical_list_image_corner_radius = 0x7f07029a;
+        public static final int stickers_catalog_vertical_list_image_corner_radius = 0x7f07029a;
-        public static final int stiсkers_catalog_vertical_list_image_size = 0x7f07029b;
+        public static final int stickers_catalog_vertical_list_image_size = 0x7f07029b;
         public static final int story_author_title_top_space = 0x7f07029c;
         public static final int story_cadre_bottom_btn_top_padding = 0x7f07029d;
         public static final int story_camera_tabs_height = 0x7f07029e;

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

@@ -1,5 +1,6 @@
 package com.vtosters.lite.ui.bottomnavigation;
 
+import static ru.vtosters.lite.utils.Preferences.vkme;
 import static ru.vtosters.lite.utils.ThemesUtils.getCSTDock;
 
 import android.annotation.SuppressLint;
@@ -219,13 +220,19 @@ public class BottomNavigationItemView extends FrameLayout implements MenuView.It
 //                ViewCompat.setScaleY(mLargeLabel, !mStaticModeEnabled && !checked ? mLargeScale : 1.0f);
                 ViewCompat.setScaleX(mSmallLabel, !mStaticModeEnabled && checked ? mSmallScale : 1.0f);
                 ViewCompat.setScaleY(mSmallLabel, !mStaticModeEnabled && checked ? mSmallScale : 1.0f);
-                // make mLargeLabel and mSmallLabel are bold
                 mLargeLabel.setTypeface(null, Typeface.BOLD);
                 mSmallLabel.setTypeface(null, Typeface.BOLD);
 
-                // make mLargeLabel and mSmallLabel text size is 10sp
+                int textsize;
-                mLargeLabel.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
+
-                mSmallLabel.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
+                if (vkme()){
+                    textsize = 11;
+                } else {
+                    textsize = 10;
+                }
+
+                mLargeLabel.setTextSize(TypedValue.COMPLEX_UNIT_SP, textsize);
+                mSmallLabel.setTextSize(TypedValue.COMPLEX_UNIT_SP, textsize);
 
                 mLargeLabel.setVisibility(/*checked ? VISIBLE :*/ INVISIBLE);
                 mSmallLabel.setVisibility(VISIBLE);//checked ? INVISIBLE : VISIBLE);

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

@@ -1,5 +1,7 @@
 package ru.vtosters.lite.deviceinfo;
 
+import androidx.annotation.NonNull;
+
 public class Device {
     private String androidId;
     private String bluetoothMac;
@@ -86,6 +88,7 @@ public class Device {
         return this;
     }
 
+    @NonNull
     public String toString() {
         return "Device{serialId='" + this.serialId + "', androidId='" + this.androidId + "', wifiMac='" + this.wifiMac + "', bluetoothMac='" + this.bluetoothMac + "'}";
     }

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

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.deviceinfo;
 
+import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.net.wifi.WifiInfo;
@@ -28,6 +29,7 @@ public class DeviceInfoCollector {
     private String serialId() {
         String str;
         try {
+            @SuppressLint("PrivateApi")
             Class<?> cls = Class.forName("android.os.SystemProperties");
             Method method = cls.getMethod("get", String.class);
             str = (String) method.invoke(cls, "gsm.sn1");
@@ -53,6 +55,7 @@ public class DeviceInfoCollector {
         return null;
     }
 
+    @SuppressLint("HardwareIds")
     private String androidId(Context context) {
         return Settings.Secure.getString(context.getContentResolver(), "android_id").toLowerCase();
     }
@@ -99,7 +102,7 @@ public class DeviceInfoCollector {
                     StringBuilder sb = new StringBuilder();
                     int length = hardwareAddress.length;
                     for (int i = 0; i < length; i++) {
-                        sb.append(String.format("%02X:", Byte.valueOf(hardwareAddress[i])));
+                        sb.append(String.format("%02X:", hardwareAddress[i]));
                     }
                     if (sb.length() > 0) {
                         sb.deleteCharAt(sb.length() - 1);

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

@@ -1,93 +1,263 @@
 package ru.vtosters.lite.dnr;
 
+import static com.vk.im.engine.h.im_ic_done;
+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.ui.c.im_ic_keyboard;
 import static ru.vtosters.lite.dnr.DNRModule.hookDNR;
 import static ru.vtosters.lite.dnr.DNRModule.hookDNT;
 import static ru.vtosters.lite.dnr.DNRModule.isDnrEnabledFor;
 import static ru.vtosters.lite.dnr.DNRModule.isDntEnabledFor;
+import static ru.vtosters.lite.encryption.EncryptProvider.decryptMessage;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
 import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
+import static ru.vtosters.lite.utils.Preferences.getDownloadsDir;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
+import android.os.Environment;
 import android.util.Log;
 
 import com.vk.core.network.Network;
+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.dialogs.Dialog;
 import com.vk.im.engine.models.messages.Msg;
 import com.vk.im.engine.models.messages.MsgFromUser;
 import com.vk.im.ui.components.common.DialogAction;
 import com.vk.im.ui.components.common.MsgAction;
 import com.vk.im.ui.components.viewcontrollers.popup.DelegateMsg;
+import com.vk.im.ui.views.dialog_actions.DialogActionsListView;
 
+import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import ru.vtosters.lite.downloaders.MessagesDownloader;
+import ru.vtosters.lite.encryption.EncryptProvider;
+import ru.vtosters.lite.encryption.base.IMProcessor;
+import ru.vtosters.lite.hooks.CryptImHook;
 import ru.vtosters.lite.ui.dialogs.Translate;
 
 public class DNRInjector {
     public static void inject(Dialog dialog, List<DialogAction> list) {
-        int peerId = dialog.getId();
+        int peerId = 0;
 
-        list.add(DialogAction.valueOf("pinmsg"));
+        if (dialog != null) {
-        list.add(DialogAction.valueOf("unpinmsg"));
+            peerId = dialog.getId();
+        }
+
+        list.add(DialogAction.DOWNLOAD);
+
+        list.add(DialogAction.pinmsg);
+        list.add(DialogAction.unpinmsg);
 
         if (isDnrEnabledFor(peerId)) {
-            list.add(DialogAction.valueOf("DNR_OFF"));
+            list.add(DialogAction.DNR_OFF);
         } else {
-            list.add(DialogAction.valueOf("DNR_ON"));
+            list.add(DialogAction.DNR_ON);
         }
 
         if (isDntEnabledFor(peerId)) {
-            list.add(DialogAction.valueOf("DNT_OFF"));
+            list.add(DialogAction.DNT_OFF);
         } else {
-            list.add(DialogAction.valueOf("DNT_ON"));
+            list.add(DialogAction.DNT_ON);
+        }
+
+        list.add(DialogAction.ENCRYPT);
+        IMProcessor prov = EncryptProvider.getProcessorFor(peerId);
+        if (prov != null && !prov.isPublic()) {
+            list.add(DialogAction.ENCRYPT_SETT);
         }
     }
 
     public static LinkedHashMap<DialogAction, Integer> injectToHashMap(LinkedHashMap<DialogAction, Integer> hashMap) {
-        hashMap.put(DialogAction.valueOf("DNR_ON"), getIdentifier("DNR_ON", "string"));
+        hashMap.put(DialogAction.DOWNLOAD, getIdentifier("download_dl", "string"));
-        hashMap.put(DialogAction.valueOf("DNR_OFF"), getIdentifier("DNR_OFF", "string"));
-        hashMap.put(DialogAction.valueOf("DNT_ON"), getIdentifier("DNT_ON", "string"));
-        hashMap.put(DialogAction.valueOf("DNT_OFF"), getIdentifier("DNT_OFF", "string"));
 
+        hashMap.put(DialogAction.DNR_ON, getIdentifier("DNR_ON", "string"));
+        hashMap.put(DialogAction.DNR_OFF, getIdentifier("DNR_OFF", "string"));
+        hashMap.put(DialogAction.DNT_ON, getIdentifier("DNT_ON", "string"));
+        hashMap.put(DialogAction.DNT_OFF, getIdentifier("DNT_OFF", "string"));
 
-//        hashMap.put(DialogAction.valueOf("pinmsg"), getIdentifier("pinmsg", "string"));
+        hashMap.put(DialogAction.ENCRYPT, getIdentifier("encryption", "string"));
-//        hashMap.put(DialogAction.valueOf("unpinmsg"), getIdentifier("unpinmsg", "string"));
+        hashMap.put(DialogAction.ENCRYPT_SETT, getIdentifier("encryption_sett", "string"));
+
+//        hashMap.put(DialogAction.pinmsg, getIdentifier("pinmsg", "string"));
+//        hashMap.put(DialogAction.unpinmsg, getIdentifier("unpinmsg", "string"));
         return hashMap;
     }
 
-    public static boolean onClick(Dialog dialog, DialogAction action) {
+    @SuppressLint("ResourceType")
-        var id = dialog.getId();
+    public static List<Object> injectToList(List<Object> actions) {
+        var list = new ArrayList<>(actions);
+        list.add(new DialogActionsListView.b.a(DialogAction.DOWNLOAD, 1, getIdentifier("im_ic_msgdl", "attr"), getIdentifier("download_dl", "string"))); // DialogAction, Int, Icon, String
 
-        if (action == DialogAction.valueOf("MARK_AS_READ")) {
+        list.add(new DialogActionsListView.b.a(DialogAction.DNR_ON, 2, im_ic_pinned_msg_hide, getIdentifier("DNR_ON", "string"))); // DialogAction, Int, Icon, String
+        list.add(new DialogActionsListView.b.a(DialogAction.DNR_OFF, 2, im_ic_pinned_msg_show, getIdentifier("DNR_OFF", "string"))); // DialogAction, Int, Icon, String
+
+        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
+
+        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
+
+        return list;
+    }
+
+    public static void forceInvalidateDialogActions(Dialog d) {
+        EntityIntMap<Dialog> map = new EntityIntMap<>();
+        map.a(d.getId(), d);
+        ImEngine1.a().a(new OnDialogUpdateEvent(null, map));
+    }
+
+    public static List<DialogAction> injectToListAccess(List<DialogAction> actions, Dialog dialog) {
+        int peerId = 0;
+
+        if (dialog != null) {
+            peerId = dialog.getId();
+        }
+
+        actions.add(DialogAction.DOWNLOAD);
+
+        if (isDnrEnabledFor(peerId)) {
+            actions.add(DialogAction.DNR_OFF);
+        } else {
+            actions.add(DialogAction.DNR_ON);
+        }
+
+        if (isDntEnabledFor(peerId)) {
+            actions.add(DialogAction.DNT_OFF);
+        } else {
+            actions.add(DialogAction.DNT_ON);
+        }
+
+        actions.add(DialogAction.ENCRYPT);
+        IMProcessor prov = EncryptProvider.getProcessorFor(peerId);
+        if (prov != null && !prov.isPublic()) {
+            actions.add(DialogAction.ENCRYPT_SETT);
+        }
+
+        actions.add(DialogAction.MARK_AS_READ);
+        return actions;
+    }
+
+    public static boolean onClickHeader(DialogAction action, Dialog dialog) {
+        int peerId = 0;
+
+        if (dialog != null) {
+            peerId = dialog.getId();
+        }
+
+        if (action == DialogAction.MARK_AS_READ) {
+            DNRModule.hookRead(dialog);
+            forceInvalidateDialogActions(dialog);
+        }
+
+        if (action == DialogAction.DOWNLOAD) {
+            File out = new File(Environment.getExternalStoragePublicDirectory(getDownloadsDir().getName()), "dialog-" + peerId + ".html");
+            try {
+                new MessagesDownloader().downloadDialog(peerId, new MessagesDownloader.HtmlDialogDownloaderFormatProvider(), out);
+            } catch (Exception e) {
+                sendToast(getString("download_dl_error"));
+                e.printStackTrace();
+            }
+            return true;
+        }
+
+        if (action == DialogAction.DNR_ON) {
+            setDnr(dialog, true);
+            forceInvalidateDialogActions(dialog);
+            return true;
+        } else if (action == DialogAction.DNR_OFF) {
+            setDnr(dialog, false);
+            forceInvalidateDialogActions(dialog);
+            return true;
+        }
+
+        if (action == DialogAction.DNT_ON) {
+            setDnt(dialog, true);
+            forceInvalidateDialogActions(dialog);
+            return true;
+        } else if (action == DialogAction.DNT_OFF) {
+            setDnt(dialog, false);
+            forceInvalidateDialogActions(dialog);
+            return true;
+        }
+
+        if (action == DialogAction.ENCRYPT_SETT) {
+            CryptImHook.hookPref(peerId);
+            return true;
+        } else if (action == DialogAction.ENCRYPT) {
+            CryptImHook.hook(peerId, dialog);
+            return true;
+        }
+
+        return false;
+    }
+
+    public static boolean onClick(Dialog dialog, DialogAction action) {
+        int peerId = 0;
+
+        if (dialog != null) {
+            peerId = dialog.getId();
+        }
+
+        if (action == DialogAction.MARK_AS_READ) {
             DNRModule.hookRead(dialog);
         }
 
-        if (action == DialogAction.valueOf("DNR_ON")) {
+        if (action == DialogAction.DOWNLOAD) {
+            File out = new File(Environment.getExternalStoragePublicDirectory(getDownloadsDir().getPath()), peerId + "-dialog.html");
+            try {
+                new MessagesDownloader().downloadDialog(peerId, new MessagesDownloader.HtmlDialogDownloaderFormatProvider(), out);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return true;
+        }
+
+        if (action == DialogAction.DNR_ON) {
             setDnr(dialog, true);
             return true;
-        } else if (action == DialogAction.valueOf("DNR_OFF")) {
+        } else if (action == DialogAction.DNR_OFF) {
             setDnr(dialog, false);
             return true;
         }
 
-        if (action == DialogAction.valueOf("DNT_ON")) {
+        if (action == DialogAction.DNT_ON) {
             setDnt(dialog, true);
             return true;
-        } else if (action == DialogAction.valueOf("DNT_OFF")) {
+        } else if (action == DialogAction.DNT_OFF) {
             setDnt(dialog, false);
             return true;
         }
 
-        if (action == DialogAction.valueOf("pinmsg")) {
+        if (action == DialogAction.pinmsg) {
-            pinnedMsg(id, true);
+            pinnedMsg(peerId, true);
             return true;
-        } else if (action == DialogAction.valueOf("unpinmsg")) {
+        } else if (action == DialogAction.unpinmsg) {
-            pinnedMsg(id, false);
+            pinnedMsg(peerId, false);
+            return true;
+        }
+
+        if (action == DialogAction.ENCRYPT_SETT) {
+            CryptImHook.hookPref(peerId);
+            return true;
+        } else if (action == DialogAction.ENCRYPT) {
+            CryptImHook.hook(peerId, dialog);
             return true;
         }
 
@@ -102,6 +272,7 @@ 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);
 
@@ -113,15 +284,24 @@ public class DNRInjector {
         var isTextExist = !text.isEmpty() && !text.equals(" ");
         var isReplyExist = !reply.isEmpty() && !reply.equals(" ");
 
+
+        if (isReplyExist) {
+            reply = decryptMessage(reply, peerId);
+        }
+
+        if (isTextExist) {
+            text = decryptMessage(text, peerId);
+        }
+
         if (action == MsgAction.valueOf("TRANSLATE")) {
             if (isTextExist && isReplyExist) {
-                Translate.showTranslatedText(context, text + "\n\nРеплай:\n" + reply);
+                Translate.showTranslatedText(context, text + "\n\n" + getString("translator_reply") + "\n" + reply);
             } else if (isReplyExist) {
-                Translate.showTranslatedText(context, "Реплай:\n" + reply);
+                Translate.showTranslatedText(context, getString("translator_reply") + "\n" + reply);
             } else if (isTextExist) {
                 Translate.showTranslatedText(context, text);
             } else {
-                sendToast("Нет текста для перевода");
+                sendToast(getString("translator_no_text"));
             }
         }
 
@@ -132,7 +312,7 @@ public class DNRInjector {
         Thread thread = new Thread(() -> {
             try {
                 var request = new Request.a()
-                        .b("https://api.vk.com/method/" + (needToBePinned ? "messages.pinConversation" : "messages.unpinConversation") + "?peer_id=" + dialogid + "&access_token=" + getUserToken() + "&v=5.119")
+                        .b("https://" + getApi() + "/method/" + (needToBePinned ? "messages.pinConversation" : "messages.unpinConversation") + "?peer_id=" + dialogid + "&access_token=" + getUserToken() + "&v=5.119")
                         .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"))
                         .a();
 
@@ -149,15 +329,27 @@ public class DNRInjector {
 
         thread.start();
 
-        sendToast("Диалог успешно " + (needToBePinned ? "закреплен" : "откреплен"));
+        sendToast(getString("pin_dialog") + " " + getString(needToBePinned ? "dialog_pinned" : "dialog_unpinned"));
     }
 
     public static void setDnr(Dialog dialog, boolean value) {
-        hookDNR(dialog.getId());
+        int peerId = 0;
+
+        if (dialog != null) {
+            peerId = dialog.getId();
+        }
+
+        hookDNR(peerId);
     }
 
     public static void setDnt(Dialog dialog, boolean value) {
-        hookDNT(dialog.getId());
+        int peerId = 0;
+
+        if (dialog != null) {
+            peerId = dialog.getId();
+        }
+
+        hookDNT(peerId);
     }
 }
 

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

@@ -1,8 +1,8 @@
 package ru.vtosters.lite.dnr;
 
 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.ProxyUtils.getApi;
 
 import android.util.Log;
 

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

@@ -1,6 +1,7 @@
 package ru.vtosters.lite.downloaders;
 
-import android.os.Environment;
+import static ru.vtosters.lite.utils.Preferences.getMusicDir;
+
 import android.util.Log;
 
 import androidx.core.app.NotificationCompat;
@@ -31,11 +32,11 @@ public class AudioDownloader {
 
     public static void downloadM3U8(MusicTrack track) {
         if (track.D == null) {
-            ToastUtils.a("Не удалось найти ссылку на аудиозапись");
+            ToastUtils.a(AndroidUtils.getString("link_audio_error"));
             return;
         }
 
-        var musicPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).getAbsolutePath();
+        var musicPath = getMusicDir().getAbsolutePath();
         var musicDir = new File(musicPath);
         if (!musicDir.exists()) {
             if (musicDir.mkdirs()) {
@@ -64,7 +65,7 @@ public class AudioDownloader {
                     var success = FFMpeg.convert(downloadPath, musicPath + File.separator + fileName + ".mp3");
                     if (success) {
                         notification
-                                .setContentText("Загрузка завершена")
+                                .setContentText(AndroidUtils.getString("player_download_finished"))
                                 .setProgress(0, 0, false)
                                 .setSmallIcon(android.R.drawable.stat_sys_download_done);
                         notificationManager.notify(tempId, notification.build());
@@ -72,7 +73,7 @@ public class AudioDownloader {
                         onFailure();
                     }
                 } catch (UnsatisfiedLinkError e) {
-                    Log.e("AudioDownloader", "Опять эти нативные либы");
+                    Log.e("AudioDownloader", "native libs");
                     Log.e("AudioDownloader", e.getMessage());
                     onFailure();
                 }
@@ -80,7 +81,7 @@ public class AudioDownloader {
 
             @Override
             public void onFailure() {
-                notification.setContentText("Не удалось загрузить аудиозапись").setProgress(0, 0, false);
+                notification.setContentText(AndroidUtils.getString("load_audio_error")).setProgress(0, 0, false);
                 notificationManager.notify(tempId, notification.build());
             }
 
@@ -109,7 +110,7 @@ public class AudioDownloader {
     private static NotificationCompat.Builder buildDownloadNotification(MusicTrack track, int id) {
         var notificationBuilder = new NotificationCompat.Builder(AndroidUtils.getGlobalContext(), NotificationChannels.MUSIC_DOWNLOAD_CHANNEL_ID)
                 .setSmallIcon(android.R.drawable.stat_sys_download)
-                .setContentTitle("Загрузка аудиозаписи")
+                .setContentTitle(AndroidUtils.getString("audio_downloading"))
                 .setContentText(track.toString())
                 .setPriority(NotificationCompat.PRIORITY_LOW)
                 .setCategory(NotificationCompat.CATEGORY_PROGRESS)

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

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

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

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

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

@@ -7,7 +7,6 @@ import static ru.vtosters.lite.utils.Preferences.getPhotosDir;
 import android.app.DownloadManager;
 import android.content.Context;
 import android.net.Uri;
-import android.os.Environment;
 
 import com.vk.dto.common.ImageSize;
 import com.vk.dto.stories.model.StoryEntry;
@@ -23,8 +22,9 @@ public class StoryDownloader {
                 String url = imageSizes.get(imageSizes.size() - 1).url;
                 DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
                 request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-                request.setTitle("photo" + story.E.a);
+                request.setTitle("photo" + story.E.a + ".jpg");
-                request.setDestinationInExternalPublicDir(getPhotosDir().getAbsolutePath(), "/Stories/photo" + story.E.a + ".jpg");
+                request.setDestinationInExternalPublicDir(getPhotosDir().getName(), "photo" + story.E.a + ".jpg");
+                request.allowScanningByMediaScanner();
                 ((DownloadManager) getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
                 return;
             }

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

@@ -1,20 +1,20 @@
 package ru.vtosters.lite.downloaders;
 
 import static ru.vtosters.lite.net.Request.makeRequest;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 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;
 import android.net.Uri;
-import android.os.Environment;
 import android.widget.Toast;
 
+import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.dialogs.bottomsheet.MenuBottomSheetAction;
 import com.vk.core.util.ToastUtils;
 import com.vk.dto.common.VideoFile;
@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.ExternalLinkParser;
 
 public class VideoDownloader {
@@ -105,31 +106,33 @@ public class VideoDownloader {
             DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
             request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
             request.setTitle(videoFile.toString());
-            request.setDestinationInExternalPublicDir(getVideosDir().getAbsolutePath(), videoFile + ".mp4");
+            request.allowScanningByMediaScanner();
+            request.setDestinationInExternalPublicDir(getVideosDir().getName(), videoFile + ".mp4");
             ((DownloadManager) getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
             return;
         }
 
-        var builder = new AlertDialog.Builder(context);
+        var builder = new VkAlertDialog.Builder(context);
         builder.setItems(max, ((dialog, which) -> {
             var url = urls.get(which);
             DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
             request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
             request.setTitle(videoFile.toString());
-            request.setDestinationInExternalPublicDir(getVideosDir().getAbsolutePath(), videoFile + ".mp4");
+            request.allowScanningByMediaScanner();
+            request.setDestinationInExternalPublicDir(getVideosDir().getName(), videoFile + ".mp4");
             ((DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
         }));
         builder.show();
     }
 
     public static void parseVideoLink(String url, Context ctx) {
-        if (url.contains("vk.com/story")) {
+        if (url.contains("vk.com/story") || url.contains("vk.com/story")) {
-            ToastUtils.a("Не поддерживается загрузка историй");
+            ToastUtils.a(AndroidUtils.getString("video_dl_stories_not_supported"));
             return;
         }
 
-        if (!url.contains("vk.com/video")) {
+        if (!url.contains("vk.com/video") || !url.contains("vk.com/video")) {
-            ToastUtils.a("Неверная ссылка");
+            ToastUtils.a(AndroidUtils.getString("video_dl_wrong_link"));
             return;
         }
 
@@ -137,10 +140,10 @@ public class VideoDownloader {
         String ownerId = videoId.split("_")[0];
 
         final ProgressDialog progressDialog = new ProgressDialog(ctx);
-        progressDialog.setMessage("Обработка видео");
+        progressDialog.setMessage(AndroidUtils.getString("video_dl_progress"));
         progressDialog.show();
 
-        makeRequest("https://" + "api.vk.com" + "/method/video.get?owner_id=" + ownerId + "&videos=" + videoId + "&v=5.99&access_token=" + getUserToken(),
+        makeRequest("https://" + getApi() + "/method/video.get?owner_id=" + ownerId + "&videos=" + videoId + "&v=5.99&access_token=" + getUserToken(),
                 response -> {
                     progressDialog.cancel();
 
@@ -153,7 +156,7 @@ public class VideoDownloader {
                         downloadVideo(videoFile, ctx);
                     } catch (JSONException e) {
                         e.printStackTrace();
-                        Toast.makeText(ctx, "Видео нельзя скачать", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(ctx, AndroidUtils.getString("video_dl_error"), Toast.LENGTH_SHORT).show();
                     }
                 });
     }

app/src/main/java/ru/vtosters/lite/downloaders/notifications/NotificationChannels.java

@@ -12,8 +12,8 @@ import ru.vtosters.lite.utils.AndroidUtils;
 
 public class NotificationChannels {
     public static final String MUSIC_DOWNLOAD_CHANNEL_ID = "music_download_channel";
-    public static final String MUSIC_DOWNLOAD_CHANNEL_NAME = "Загрузка музыки";
+    public static final String MUSIC_DOWNLOAD_CHANNEL_NAME = AndroidUtils.getString("music_dl_title");
-    public static final String MUSIC_DOWNLOAD_CHANNEL_DESCRIPTION = "Прогресс загрузки музыки";
+    public static final String MUSIC_DOWNLOAD_CHANNEL_DESCRIPTION = AndroidUtils.getString("music_dl_progress");
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     public static void createChannels() {

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

@@ -1,10 +1,14 @@
 package ru.vtosters.lite.encryption;
 
+import static ru.vtosters.lite.hooks.MessagesHook.injectOwnText;
+import static ru.vtosters.lite.hooks.MessagesHook.injectOwnTextAll;
+
 import android.util.Log;
 import android.util.Pair;
 
 import com.vk.im.engine.models.messages.Msg;
 import com.vk.im.engine.models.messages.MsgFromUser;
+import com.vk.im.ui.components.msg_list.MsgListComponent;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -48,6 +52,48 @@ public class EncryptProvider {
     public static int getPeerId(Msg msg) {
         return msg.v1();
     }
+    
+    // For message editing
+    public static String decryptMessage(MsgFromUser msg, boolean showEmoji) {
+        var decryptedMessage = decryptMessage(getBody(msg), getPeerId(msg));
+        if (!showEmoji && !decryptedMessage.equals(injectOwnTextAll(getBody(msg)))) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", "");
+        return decryptedMessage;
+    }
+
+    public static String decryptMessage(String msg, MsgListComponent list) {
+        var peerid = list.G().getId();
+        var decryptedMessage = decryptMessage(msg, peerid);
+        if (!decryptedMessage.equals(injectOwnTextAll(msg))) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", "");
+        return decryptedMessage;
+    }
+
+    public static CharSequence decryptMessage(CharSequence msg, int peerid) {
+        return decryptMessage(msg.toString(), peerid);
+    }
+
+    public static CharSequence decryptMessage(Msg msg, CharSequence orig) {
+        if (msg instanceof MsgFromUser) {
+            var decrypted = decryptMessage(((MsgFromUser) msg).f(), msg.v1());
+
+            if (decrypted.contains("\uD83D\uDD12")) {
+                return decrypted;
+            }
+
+        }
+
+        return orig;
+    }
+
+    public static String decryptMessages(String msgBody, int peer, boolean showEmoji) {
+        return (String) decryptMessage(msgBody, peer, showEmoji);
+    }
+
+    // For MentionsFormatter that requires CharSequence
+    public static CharSequence decryptMessage(String msgBody, int peer, boolean showEmoji) {
+        var decryptedMessage = decryptMessage(msgBody, peer);
+        if (!showEmoji && !decryptedMessage.equals(injectOwnTextAll(msgBody))) decryptedMessage = decryptedMessage.replaceAll("^\uD83D\uDD12 ", "");
+        return decryptedMessage;
+    }
 
     // This will run through EVERY single processor available.
     public static String decryptMessage(MsgFromUser msg) {
@@ -58,12 +104,13 @@ public class EncryptProvider {
         try {
             for (IMProcessor processor : processors) {
                 if ((processor.isUsed() || !processor.isPublic()) && processor.isEncrypted(msgBody) && (processor.isPublic() || getKeyForProcessor(processor, peer) != null))
-                    return "\uD83D\uDD12 " + processor.decode(msgBody, getKeyForProcessor(processor, peer));
+                    return "\uD83D\uDD12 " + injectOwnTextAll(processor.decode(msgBody, getKeyForProcessor(processor, peer)));
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return msgBody;
+
+        return injectOwnTextAll(msgBody);
     }
 
     private static byte[] getKeyForProcessor(IMProcessor processor, int peer) {
@@ -84,9 +131,8 @@ public class EncryptProvider {
         return keyString.getBytes();
     }
 
-    // This will use only the processor which was chosen in chat menu [that's why ID is needed, bruh]
+    // This will use only the processor which was chosen in chat menu
     public static String encryptMessage(MsgFromUser msg) {
-
         String msgBody = getBody(msg);
 
         Log.d("EncryptProvider", "encryptMessage: msg = " + msg);
@@ -96,11 +142,11 @@ public class EncryptProvider {
         for (IMProcessor processor : processors) {
             int peer = getPeerId(msg);
             if (processor.isUsedToEncrypt(peer)) {
-                return processor.encode(msgBody, getKeyForProcessor(processor, peer));
+                return injectOwnText(processor.encode(msgBody, getKeyForProcessor(processor, peer)));
             }
         }
 
-        return msgBody;
+        return injectOwnText(msgBody);
     }
 
     // For rendering UI

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

@@ -2,12 +2,13 @@ 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.utils.ProxyUtils.apiproxy;
-import static ru.vtosters.lite.utils.ProxyUtils.getApi;
 
+import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.util.Log;
@@ -17,11 +18,15 @@ import androidx.exifinterface.media.ExifInterface;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.network.Network;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
@@ -35,6 +40,7 @@ public class FoafBase {
     private static final Pattern FOAF_REGEX = Pattern.compile("<ya:created dc:date=\"(.+?)\"\\/>");
     private static final Pattern FOAF_REGEX_LAST_SEEN = Pattern.compile("<ya:lastLoggedIn dc:date=\"(.*)(((\\+|-)\\d\\d):(\\d\\d))\"\\/>");
     private static final Pattern FOAF_REGEX_LOGIN = Pattern.compile("<ya:created dc:date=\"(.+?)\"\\/>");
+    private static final String API_VKNEXT = "https://api.vtosters.app/v1/getBypassedOnlineInfo?json=1&ids=";
     private static final OkHttpClient client = new OkHttpClient();
 
     public static long getLastSeen(long origtime, int id) throws ParseException, IOException {
@@ -58,15 +64,57 @@ public class FoafBase {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);
         sdf.setTimeZone(TimeZone.getTimeZone("Europe/Moscow"));
-        Date date = sdf.parse(matcher.group(1));
+        Date date = sdf.parse(Objects.requireNonNull(matcher.group(1)));
         sdf.setTimeZone(TimeZone.getDefault());
         return sdf.parse(sdf.format(date)).getTime() / 1000;
     }
 
+
+    public static JSONObject getBypassedOnlineInfo(int id) throws JSONException {
+        var request = new okhttp3.Request.a()
+                .b(API_VKNEXT + Integer.toString(id))
+                .a();
+
+        String response = null;
+
+        var dummy = new JSONObject();
+        dummy.put("last_seen", 0);
+
+        try {
+            response = client.a(request).execute().a().g();
+            var online_info = new JSONObject(response).optJSONObject("response").optJSONObject(Integer.toString(id));
+            return online_info == null ? dummy : online_info;
+        } catch (Exception e) {
+            Log.e("GetBypassedOnlineInfo", e.getMessage());
+            return dummy;
+        }
+    }
+
+    public static JSONObject getBypassedOnlineInfo(String ids) throws JSONException {
+
+
+        var request = new okhttp3.Request.a()
+                .b(API_VKNEXT + ids)
+                .a();
+
+        String response = null;
+
+        var dummy = new JSONObject();
+
+        try {
+            response = client.a(request).execute().a().g();
+            var online_info = new JSONObject(response).optJSONObject("response");
+            return online_info == null ? dummy : online_info;
+        } catch (Exception e) {
+            Log.e("GetBypassedOnlineInfo1", e.getMessage());
+            return dummy;
+        }
+    }
+
     private static String getLink(int i) {
         String str;
         StringBuilder sb;
-        if (apiproxy()) {
+        if (isAnyProxyEnabled()) {
             sb = new StringBuilder();
             str = "https://" + getApi() + "/_/vk.com/foaf.php?id=";
         } else {
@@ -95,8 +143,8 @@ public class FoafBase {
             Matcher matcher2 = FOAF_REGEX_LOGIN.matcher(str);
             matcher.find();
             matcher2.find();
-            String normalHumanDate = getNormalHumanDate(matcher.group(1));
+            String normalHumanDate = getNormalHumanDate(Objects.requireNonNull(matcher.group(1)));
-            getNormalHumanDate(matcher2.group(1));
+            getNormalHumanDate(Objects.requireNonNull(matcher2.group(1)));
             VkAlertDialog.Builder a2 = new VkAlertDialog.Builder(context).setTitle(getIdentifier("addinf", "string"));
             a2.setMessage(getString("foafid") + " " + i + getString("foafregdate") + " " + normalHumanDate + getString("foafdate") + " " + daysPassedFromFoafDate(normalHumanDate)).setPositiveButton(17039370, null).create().show();
         } catch (Exception e) {
@@ -105,8 +153,9 @@ public class FoafBase {
         }
     }
 
-    private static long daysPassedFromFoafDate(String str) {
+    private static long daysPassedFromFoafDate(String str) { 
         try {
+            @SuppressLint("SimpleDateFormat")
             Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(str.split(" ")[1]);
             return TimeUnit.DAYS.convert(new Date().getTime() - parse.getTime(), TimeUnit.MILLISECONDS);
         } catch (ParseException e) {

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

@@ -0,0 +1,129 @@
+package ru.vtosters.lite.hooks;
+import static ru.vtosters.lite.dnr.DNRInjector.forceInvalidateDialogActions;
+import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
+import static ru.vtosters.lite.utils.AndroidUtils.getString;
+import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
+import static ru.vtosters.lite.utils.LifecycleUtils.getCurrentActivity;
+import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
+import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.text.Editable;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vk.im.engine.models.dialogs.Dialog;
+
+import java.util.List;
+import java.util.Objects;
+
+import ru.vtosters.lite.encryption.EncryptProvider;
+import ru.vtosters.lite.encryption.base.IMProcessor;
+
+public class CryptImHook{
+    public static boolean isPrivateProcessor(int peerID){
+        for (IMProcessor processor : EncryptProvider.processors) {
+            if (processor.isUsedToEncrypt(peerID)) {
+                return !processor.isPublic();
+            }
+        }
+
+        return false;
+    }
+
+    public static void hook(int peerId, Dialog d){
+        List<IMProcessor> processors = EncryptProvider.processors;
+
+        IMProcessor enabled = null;
+        int enabledPosition = 0;
+
+        String[] titles = new String[processors.size() + 1];
+        titles[0] = getString("encryption_disable");
+
+        for (int i = 0; i < processors.size(); i++) {
+            IMProcessor proc = processors.get(i);
+
+            titles[i + 1] = proc.getUIName();
+
+            if (proc.isUsedToEncrypt(peerId)) {
+                enabled = proc;
+                enabledPosition = i + 1;
+            }
+        }
+
+        IMProcessor finalEnabled = enabled;
+        new VkAlertDialog.Builder(getCurrentActivity())
+                .setTitle(getString("encryption_sett"))
+                .setSingleChoiceItems(titles, enabledPosition, (dialog, which) -> {
+                    if (which == 0) {
+                        if (finalEnabled != null) finalEnabled.disableEncryptFor(peerId);
+                    } else {
+                        IMProcessor proc = processors.get(which - 1);
+
+                        if (proc.isUsedToEncrypt(peerId)) {
+                            proc.disableEncryptFor(peerId);
+                        } else {
+                            proc.enableEncryptFor(peerId);
+                            if (finalEnabled != null) finalEnabled.disableEncryptFor(peerId);
+                        }
+                    }
+
+                    dialog.dismiss();
+                    forceInvalidateDialogActions(d);
+                }).create().show();
+    }
+
+    public static void hookPref(int peerId){
+        IMProcessor enabled = null;
+        String key = null;
+
+        for (IMProcessor processor : EncryptProvider.processors) {
+            if (processor.isUsedToEncrypt(peerId)) {
+                enabled = processor;
+            }
+        }
+
+        if (enabled != null && enabled.isPublic()) {
+            sendToast(getString("encryption_public_algorithm_error"));
+            return;
+        }
+
+        if (Objects.requireNonNull(enabled).getEncryptionKeyFor(peerId) != null) {
+            key = enabled.getEncryptionKeyFor(peerId);
+        }
+
+        if (key.equals("VTAesDefault")) {
+            key = null;
+        }
+
+        Context ctx = getCurrentActivity();
+
+        LinearLayout linearLayout = new LinearLayout(ctx);
+
+        final EditText editText = new EditText(ctx);
+        editText.setHintTextColor(getSTextAttr());
+        editText.setBackgroundTintList(ColorStateList.valueOf(getSTextAttr()));
+
+        linearLayout.addView(editText);
+        editText.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
+        ViewGroup.MarginLayoutParams margin = ((ViewGroup.MarginLayoutParams) editText.getLayoutParams());
+        margin.setMargins(dp2px(24f), 0, dp2px(24f), 0);
+        editText.setLayoutParams(margin);
+        editText.setText(key == null ? "" : key);
+
+        IMProcessor finalEnabled = enabled;
+        new AlertDialog.Builder(ctx, getAlertStyle())
+                .setTitle(getString("encryption_enter_key"))
+                .setMessage(String.format(getString("encryption_current_algorithm_title"), enabled.getUIName()))
+                .setView(linearLayout)
+                .setPositiveButton(android.R.string.ok, (dialog, which) -> {
+                    Editable edit = editText.getText();
+                    finalEnabled.setEncryptionKeyFor(peerId, edit == null ? null : edit.toString());
+                }).setNegativeButton(android.R.string.cancel, null).create().show();
+    }
+}

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

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

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

@@ -286,7 +286,7 @@ public class DockBarInjector {
     }
 
     public static Class<?> interceptClick(int id, RightMenu rightMenu) {
-        if (id == tab_menu) {
+        if (id == tab_menu && rightMenu != null) {
             rightMenu.a();
         }
 
@@ -294,6 +294,7 @@ public class DockBarInjector {
             if (id == tab.id)
                 return tab.fragmentClass;
         }
+
         for (DockBarTab tab : sManager.getDisabledTabs()) {
             if (id == tab.id)
                 return tab.fragmentClass;

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

@@ -1,8 +1,11 @@
 package ru.vtosters.lite.hooks;
 
-import static ru.vtosters.lite.foaf.FoafBase.getLastSeen;
+import static ru.vtosters.lite.foaf.FoafBase.getBypassedOnlineInfo;
 import static ru.vtosters.lite.hooks.DateHook.getLocale;
-import static ru.vtosters.lite.utils.Base64Utils.decode;
+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;
@@ -21,6 +24,7 @@ import static ru.vtosters.lite.utils.VTVerifications.isDeveloper;
 import static ru.vtosters.lite.utils.VTVerifications.isPrometheus;
 import static ru.vtosters.lite.utils.VTVerifications.isVerified;
 
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.vk.core.network.Network;
@@ -33,6 +37,8 @@ import org.json.JSONObject;
 
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Objects;
 import java.util.Random;
 
@@ -69,7 +75,7 @@ public class JsonInjectors {
     }
 
     public static JSONObject donateRecomm() throws JSONException {
-        var title = "Помоги проекту донатом и получи бонус!";
+        var title = AndroidUtils.getString("donate_to_vtl");
         var link = "https://vk.com/vtosters_official";
         var text_color = "2D81E0";
 
@@ -110,9 +116,9 @@ public class JsonInjectors {
     }
 
     public static JSONObject vktesters(int id) throws JSONException {
-        var title = "Карточка Тестера";
+        var title = AndroidUtils.getString("tester_profile");
         var text_color = "2D81E0";
-        var link = "https://static.vk.com/bugs?lang=" + LangUtils.a() + "#/reporter" + id;
+        var link = "https://" + getStatic() + "/bugs?lang=" + LangUtils.a() + "#/reporter" + id;
 
         var json = new JSONObject();
         var icons = new JSONArray();
@@ -154,27 +160,20 @@ public class JsonInjectors {
         var peerid = Objects.requireNonNull(orig.optJSONObject("peer")).optInt("id");
 
         var pic = "https://image.pngaaa.com/641/326641-middle.png"; // can be null
-        var text = "Я не загрузил данные (9(9((";
+        var text = AndroidUtils.getString("no_data_error");
         var link = "https://vtosters.app"; // can be null
         var linktitle = "Test button"; // can be null
 
-        // "{\"layout\":\"tertiary\",\"text\":\"" + linktitle + "\",\"type\":\"link\",\"link\":\"" + link + "\"}";
-        var buttons = decode("eyJsYXlvdXQiOiJ0ZXJ0aWFyeSIsInRleHQiOiI=") + linktitle + decode("IiwidHlwZSI6ImxpbmsiLCJsaW5rIjoi") + link + decode("In0=");
-        // ,"icon":" + pic + "
-        var icon = decode("LCJpY29uIjoi") + pic + decode("Ig==");
-
         var hasIcon = !pic.isEmpty();
-        var hasButton = !buttons.isEmpty();
+        var hasButton = !link.isEmpty();
+
         var isPicture = pic.endsWith(".png") || pic.endsWith(".jpg") || pic.endsWith(".jpeg") || pic.endsWith(".webp");
 
-        if (!isPicture) hasIcon = false;
+        if (isVerified(peerid)) text = AndroidUtils.getString("i_bought") + " VTosters Premium";
-        if (!hasIcon) icon = "";
+        if (isPrometheus(peerid)) text = AndroidUtils.getString("i_bought") + " VTosters Premium Gold Prime Pro Plus";
-        if (!hasButton) buttons = "";
+        if (isDeveloper(peerid)) text = AndroidUtils.getString("i_created_poop");
 
-        if (isVerified(peerid)) text = "Я купил VTosters Premium";
+        if (!isVerified(peerid) || text.equals("") || peerid == AccountManagerUtils.getUserId() || peerid == 0) {
-        if (isPrometheus(peerid)) text = "Я купил VTosters Premium Gold Prime Pro Plus";
-        if (isDeveloper(peerid)) text = "Я создал говно";
-        if (!isVerified(peerid) || text.equals("")) {
             if (getBoolValue("convBarRecomm", false)) {
                 return null;
             } else {
@@ -182,14 +181,27 @@ public class JsonInjectors {
             }
         }
 
-        if (!dev()) return orig.optJSONObject("conversation_bar");
+        if (!dev()) return orig.optJSONObject("conversation_bar"); // for devs only
 
-        // JSONObject("{\"name\":\"group_admin_welcome\",\"text\":\"" + textverif + "\",\"buttons\":[],\"icon\":\"" + pic + "\"}");
+        var json = new JSONObject();
-        return new JSONObject(decode("eyJuYW1lIjoiZ3JvdXBfYWRtaW5fd2VsY29tZSIsInRleHQiOiI=")
+
-                + text + decode("IiwiYnV0dG9ucyI6Ww==")
+        var buttonsJson = new JSONObject();
-                + buttons + decode("XQ==")
+        buttonsJson.put("layout", "tertiary");
-                + icon
+        buttonsJson.put("text", linktitle);
-                + decode("fQ=="));
+        buttonsJson.put("type", "link");
+        buttonsJson.put("link", link);
+
+        var buttonsjson = new JSONArray(); // max 3 buttons in array
+        if (hasButton) buttonsjson.put(buttonsJson);
+
+        json.put("name", "group_admin_welcome");
+        json.put("text", text);
+        json.put("buttons", buttonsjson);
+        if (hasIcon && isPicture) {
+            json.put("icon", pic);
+        }
+
+        return json;
     }
 
     public static JSONObject menu(JSONObject orig) throws JSONException {
@@ -267,29 +279,82 @@ public class JsonInjectors {
 
     public static JSONObject setOnlineInfo(JSONObject json) throws ParseException, IOException, JSONException {
         var id = json.optInt("id");
+        if (id == AccountManagerUtils.getUserId()) {
+            return json;
+        }
         var onlineinfo = json.optJSONObject("online_info");
-        var time = getLastSeen(0L, id);
+        if (onlineinfo != null && !onlineinfo.optBoolean("visible")) {
+            var bypassed = getBypassedOnlineInfo(id);
+            if (bypassed.optInt("last_seen", 0) != 0) {
+                json.remove("online_info");
 
-        if (time != 0L && onlineinfo != null && !onlineinfo.optBoolean("is_online") && id != AccountManagerUtils.getUserId()) {
+                var online_info = new JSONObject()
-            json.remove("online_info");
+                        .put("visible", true)
+                        .put("last_seen", bypassed.optInt("last_seen"))
+                        .put("is_online", bypassed.optBoolean("is_online"))
+                        .put("app_id", bypassed.optInt("app_id"))
+                        .put("is_mobile", bypassed.optBoolean("is_mobile"));
 
-            var online_info = new JSONObject()
+                var last_seen = new JSONObject()
-                    .put("visible", true)
+                        .put("platform", bypassed.optInt("platform"))
-                    .put("last_seen", time)
+                        .put("time", bypassed.optInt("last_seen"));
-                    .put("is_online", false)
-                    .put("app_id", 0)
-                    .put("is_mobile", false);
 
-            var last_seen = new JSONObject()
+                json.put("last_seen", last_seen).put("online_info", online_info);
-                    .put("platform", 4)
+            }
-                    .put("time", time);
-
-            json.put("last_seen", last_seen).put("online_info", online_info);
         }
 
         return json;
     }
 
+    public static JSONArray setOnlineInfoUsers(JSONArray profiles) throws ParseException, IOException, JSONException {
+        if (profiles == null || profiles.length() == 0) return profiles;
+        StringBuilder sb = new StringBuilder();
+        var curVkId = AccountManagerUtils.getUserId();
+        for (int i=0; i < profiles.length(); i++) {
+            JSONObject profile = profiles.getJSONObject(i);
+            int id = profile.optInt("id", -1);
+            JSONObject onlinfo = profile.optJSONObject("online_info");
+            if (id == curVkId || id < 0 || onlinfo == null || onlinfo.optBoolean("visible")) {
+                continue;
+            }
+            sb.append(id);
+            sb.append(",");
+        }
+        var ids = sb.toString();
+        if (ids.length() > 0) {
+            ids = ids.substring(0, ids.length() - 1);
+        } else {
+            return profiles;
+        }
+
+        JSONObject bypassedObj = getBypassedOnlineInfo(ids);
+        for (int i=0; i < profiles.length(); i++) {
+            JSONObject profile = profiles.getJSONObject(i);
+            int id = profile.optInt("id");
+            JSONObject bypassed = bypassedObj.optJSONObject(Integer.toString(id));
+            if (bypassed == null) {
+                continue;
+            }
+            profile.remove("online_info");
+
+            var online_info = new JSONObject()
+                    .put("visible", true)
+                    .put("last_seen", bypassed.optInt("last_seen"))
+                    .put("is_online", bypassed.optBoolean("is_online"))
+                    .put("app_id", bypassed.optInt("app_id"))
+                    .put("is_mobile", bypassed.optBoolean("is_mobile"));
+
+            var last_seen = new JSONObject()
+                    .put("platform", bypassed.optInt("platform"))
+                    .put("time", bypassed.optInt("last_seen"));
+
+            profile.put("last_seen", last_seen).put("online_info", online_info);
+        }
+
+        return profiles;
+    }
+
+
     public static JSONObject storiesads(JSONObject json, boolean isDeleteFix) throws JSONException {
         if (!adsstories()) {
             return json;
@@ -370,15 +435,62 @@ public class JsonInjectors {
         return false;
     }
 
-    public static JSONArray newsfeedlist(JSONArray items) throws JSONException {
+    public static Boolean isWhitelistedFilters(JSONObject list) throws JSONException {
-        for (int j = 0; j < items.length(); j++) {
+        var id = String.valueOf(list.optInt("owner_id"));
-            var list = items.optJSONObject(j);
-            var name = list.optString("id");
 
-            if (!name.equals("kpop") && !name.equals("foryou") && !name.equals("qazaqstan")) {
+        if (id.equals("0")) {
-                list.put("is_hidden", false).put("is_unavailable", false);
+            id = String.valueOf(list.optInt("source_id"));
-                if (dev()) Log.d("NewsfeedListInj", "Unlocked " + name + " in newsfeed list");
+        }
+
+        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);
+        var mutableFiltersSet = Collections.synchronizedSet(new LinkedHashSet<String>());
+        if (filtersSet != null)
+            mutableFiltersSet.addAll(filtersSet);
+
+        synchronized (mutableFiltersSet) {
+            for (int i = 0; i < items.length(); i++) {
+                var item = items.optJSONObject(i);
+                if (item == null) continue;
+
+                var id = item.optString("id");
+                var title = item.optString("title");
+
+                if (TextUtils.isEmpty(id) || TextUtils.isEmpty(title)
+                        // this items not working
+                        || id.equals("kpop") || id.equals("foryou")
+                        || id.equals("qazaqstan") || id.equals("podcasts"))
+                    continue;
+
+                mutableFiltersSet.add(id + "|" + title);
+
+                var hide = selectedItems.contains(id);
+
+                Log.d("NewsfeedList", "Added list " + id + " to feed");
+                item.put("is_hidden", hide)
+                        .put("is_unavailable", hide);
+                if (dev()) Log.d("NewsfeedListInj", "Unlocked " + id + " in newsfeed list");
             }
+            getDefaultPrefs().edit().putStringSet("news_feed_items_set", mutableFiltersSet)
+                    .apply();
         }
 
         return items;
@@ -418,31 +530,31 @@ public class JsonInjectors {
                 continue;
             }
 
-            if (adsgroup() && list.optInt("marked_as_ads") == 1) {
+            if (adsgroup() && list.optInt("marked_as_ads") == 1 && !isWhitelistedAd(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: marked_as_ads is true");
                 continue;
             }
 
-            if (isBadNews(list.optString("text"))) {
+            if (isBadNews(list.optString("text")) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: text filters");
                 continue;
             }
 
-            if (checkCopyright(list)) {
+            if (checkCopyright(list) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: copyright filters");
                 continue;
             }
 
-            if (checkCaption(list)) {
+            if (checkCaption(list) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: caption filters");
                 continue;
             }
 
-            if (NewsFeedFiltersUtils.injectFiltersReposts(list)) {
+            if (NewsFeedFiltersUtils.injectFiltersReposts(list) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: repost ad");
                 continue;
@@ -541,7 +653,7 @@ public class JsonInjectors {
         if (section == null) return null;
 
         var request = new Request.a()
-                .b("https://api.vk.com/method/catalog.getAudio"
+                .b("https://" + getApi() + "/method/catalog.getAudio"
                         + "?v=5.119"
                         + "&https=1"
                         + "&need_blocks=1"
@@ -565,7 +677,7 @@ public class JsonInjectors {
 
     public static JSONObject fetchCatalogPodcast() {
         var request = new Request.a()
-                .b("https://api.vk.com/method/catalog.getPodcasts"
+                .b("https://" + getApi() + "/method/catalog.getPodcasts"
                         + "?v=5.119"
                         + "&https=1"
                         + "&need_blocks=1"
@@ -585,8 +697,8 @@ public class JsonInjectors {
         return null;
     }
 
-    public static JSONObject friends(JSONObject json) throws JSONException {
+    public static JSONObject friends(JSONObject json) throws JSONException, ParseException, IOException {
-        JSONObject catalog = json;
+        JSONObject catalog = onlineHookProfiles(json);
         boolean sectionexecute = true;
         boolean hasBirthday = false;
 

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

@@ -1,9 +1,12 @@
 package ru.vtosters.lite.hooks;
 
 import static ru.vtosters.lite.ui.dialogs.ServerDialog.sendRequest;
+import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.removeWallpaper;
 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.Preferences.preferences;
 import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
 import static ru.vtosters.lite.utils.ThemesUtils.setNeededTheme;
 
@@ -11,12 +14,15 @@ 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 {
 
@@ -25,7 +31,7 @@ public class MainActivityInjector {
         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 +39,18 @@ public class MainActivityInjector {
                 .edit()
                 .putBoolean("isdark", isDarkTheme())
                 .commit();
-        getInstance().autoCleaningCache();
+
+        VkExecutors.x.q().a(() -> {
+            if (preferences.getString("clearcache", "").isEmpty()) {
+                preferences.edit().putString("clearcache", "100mb").apply();
+            } // temp shit fix
+            removeWallpaper(); // temp fix
+
+
+            getInstance().autoCleaningCache();
+            setupFilters();
+        }); // slowTasksScheduler
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             NotificationChannels.createChannels();
         }

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

@@ -12,11 +12,10 @@ 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;
 
 public class MessagesHook {
     public static String injectOwnText(String oldText) {

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

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

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

@@ -1,14 +1,17 @@
 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.utils.ProxyUtils.getApi;
+
+import android.util.Log;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -17,6 +20,8 @@ import org.json.JSONObject;
 import java.io.IOException;
 import java.text.ParseException;
 
+import ru.vtosters.lite.utils.AndroidUtils;
+
 public class OnlineFormatterHook {
     private static String AppName;
 
@@ -59,37 +64,37 @@ public class OnlineFormatterHook {
             case 5027722:
                 return "VK Messenger (Desktop)";
             case 6146827:
-                return "VK Мессенджер (Android)";
+                return AndroidUtils.getString("vk_messenger") + " (Android)"; // VK Мессенджер (Android)
             case 6482950:
-                return "VK Мессенджер (iPhone)";
+                return AndroidUtils.getString("vk_messenger") + " (iPhone)"; // VK Мессенджер (iPhone)
             case 6481715:
-                return "VK Мессенджер Dev (iPhone)";
+                return AndroidUtils.getString("vk_messenger") + " Dev (iPhone)"; // VK Мессенджер Dev (iPhone)
             case 7799655:
-                return "VK Почта";
+                return AndroidUtils.getString("vk_mail_online"); // VK Почта
             case 7598572:
-                return "Сферум (Android)";
+                return AndroidUtils.getString("sferum_online") + " (Android)"; // Сферум (Android)
             case 7571751:
-                return "Сферум (iPhone)";
+                return AndroidUtils.getString("sferum_online") + " (iPhone)"; // Сферум (iPhone)
             case 7556576:
-                return "Сферум";
+                return AndroidUtils.getString("sferum_online"); // Сферум
             case 7497650:
                 return "VK ID";
             case 8094476:
-                return "VK Звонки (Android)";
+                return AndroidUtils.getString("vk_calls_online") + " (Android)"; // VK Звонки (Android)
             case 8093730:
-                return "VK Звонки (iPhone)";
+                return AndroidUtils.getString("vk_calls_online") + " (iPhone)"; // VK Звонки (iPhone)
             case 7793118:
-                return "VK Звонки (Desktop)";
+                return AndroidUtils.getString("vk_calls_online") + " (Desktop)"; // VK Звонки (Desktop)
             case 6767438:
-                return "VK Музыка (Android)";
+                return AndroidUtils.getString("vk_music_online") + " (Android)"; // VK Музыка (Android)
             case 8113297:
-                return "VK Клипы (Android)";
+                return AndroidUtils.getString("vk_clips_online") + " (Android)"; // VK Клипы (Android)
             case 8106428:
-                return "VK Клипы (iPhone)";
+                return AndroidUtils.getString("vk_clips_online") + " (iPhone)"; // VK Клипы (iPhone)
             case 5044491:
                 return "Candy";
             case 8114066:
-                return "VK Видео";
+                return AndroidUtils.getString("vk_video_online"); // VK Видео
             case 4894723:
                 return "Phoenix Lite";
             case 4994316:
@@ -165,14 +170,66 @@ public class OnlineFormatterHook {
         return getString("custom_online") + " " + appname;
     }
 
-    public static JSONObject onlineHook(JSONObject json, boolean isGlobalHook) throws ParseException, IOException, JSONException {
+    public static JSONObject onlineHook(JSONObject json) throws ParseException, IOException, JSONException {
-        if (!getBoolValue("onlinefix", false)) return json;
+        if (getBoolValue("onlinefix", false)) setOnlineInfo(json);
 
-        if (isGlobalHook && !getBoolValue("globalUsersOnline", false)) {
+        return json;
-            return json;
+    }
+
+    public static JSONArray onlineHookList(JSONArray jsonArr) throws ParseException, IOException, JSONException {
+        if (!getBoolValue("onlinefix", false)) return jsonArr;
+
+        try {
+            setOnlineInfoUsers(jsonArr);
+        } catch (Exception e) {
+            Log.e("onlineHookProfiles", e.getMessage());
         }
 
-        setOnlineInfo(json);
+        return jsonArr;
+    }
+
+    public static JSONObject onlineHookProfiles(JSONObject json) throws ParseException, IOException, JSONException {
+        if (!getBoolValue("onlinefix", false)) return json;
+
+        try {
+            setOnlineInfoUsers(json.optJSONArray("profiles"));
+        } catch (Exception e) {
+            Log.e("onlineHookProfiles", e.getMessage());
+        }
+        return json;
+    }
+
+    public static JSONObject onlineHookItems(JSONObject json) throws ParseException, IOException, JSONException {
+        if (!getBoolValue("onlinefix", false)) return json;
+
+        try {
+            setOnlineInfoUsers(json.optJSONArray("items"));
+        } catch (Exception e) {
+            Log.e("onlineHookItems", e.getMessage());
+        }
+        return json;
+    }
+
+    public static JSONObject onlineHookRequestsAndRecommendations(JSONObject json) throws ParseException, IOException, JSONException {
+        if (!getBoolValue("onlinefix", false)) return json;
+
+        try {
+            setOnlineInfoUsers(json.optJSONObject("read_requests").optJSONArray("items"));
+        } catch (Exception e) {
+            Log.e("onlineHookItems", e.getMessage());
+        }
+
+        try {
+            setOnlineInfoUsers(json.optJSONObject("recommendations").optJSONArray("items"));
+        } catch (Exception e) {
+            Log.e("onlineHookItems", e.getMessage());
+        }
+
+        try {
+            setOnlineInfoUsers(json.optJSONArray("profiles"));
+        } catch (Exception e) {
+            Log.e("onlineHookItems", e.getMessage());
+        }
         return json;
     }
 }

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

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

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

@@ -47,6 +47,22 @@ public class PicRoundingHook{
         }
     }
 
+    public static void inject(Canvas canvas, Paint paint, float orig){
+        if (pref > 0) {
+            canvas.drawRoundRect(new RectF(0, 0, canvas.getWidth(), canvas.getHeight()), AndroidUtils.dp2px(pref), AndroidUtils.dp2px(pref), paint);
+        } else {
+            canvas.drawCircle(canvas.getClipBounds().exactCenterX(), canvas.getClipBounds().exactCenterY(), orig, paint);
+        }
+    }
+
+    public static void inject(Canvas canvas, float orig, float orig2, float orig3, Paint paint){
+        if (pref > 0) {
+            canvas.drawRoundRect(new RectF(0, 0, canvas.getWidth(), canvas.getHeight()), AndroidUtils.dp2px(pref), AndroidUtils.dp2px(pref), paint);
+        } else {
+            canvas.drawCircle(orig, orig2, orig3, paint);
+        }
+    }
+
     public static void inject(Bitmap bitmap, Bitmap bitmap2, Paint b2) {
         Shader.TileMode tileMode = Shader.TileMode.CLAMP;
         b2.setShader(new BitmapShader(bitmap2, tileMode, tileMode));

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.AndroidUtils.getPrefsValue;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication;
-import static ru.vtosters.lite.utils.ProxyUtils.apiproxy;
-import static ru.vtosters.lite.utils.ProxyUtils.isZaboronaEnabled;
 import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
 import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
 import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
@@ -14,7 +14,6 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.RadioButton;
@@ -27,11 +26,12 @@ import com.vk.auth.ui.VkAuthTextView;
 import com.vk.navigation.Navigator;
 
 import ru.vtosters.lite.ui.fragments.ProxySettingsFragment;
+import ru.vtosters.lite.utils.AndroidUtils;
 
 public class ProxyHook {
     public static void hookAuth(View v) {
         VkAuthTextView button = (VkAuthTextView) v;
-        button.setText("Настроить прокси");
+        button.setText(AndroidUtils.getString("proxy_setup"));
         button.setOnClickListener(v1 -> callProxyDialog(v1.getContext()));
     }
 
@@ -40,44 +40,60 @@ public class ProxyHook {
         RadioGroup rg = new RadioGroup(ctx);
 
         RadioButton rgDefault = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
-        RadioButton rgProxy = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
+        RadioButton rgZaborona = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
+        RadioButton rgRandomProxy = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
+        RadioButton rgVika = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
 
         rg.addView(rgDefault);
-        rg.addView(rgProxy);
+        rg.addView(rgZaborona);
+        rg.addView(rgVika);
+        rg.addView(rgRandomProxy);
 
         rgDefault.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
-        rgProxy.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
+        rgZaborona.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
+        rgRandomProxy.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
+        rgVika.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
 
         rg.setPadding(dp2px(18f), dp2px(12f), dp2px(18f), 0);
 
-        rgDefault.setText("Отключить");
+        rgDefault.setText(AndroidUtils.getString("proxy_disable"));
         rgDefault.setTextColor(getTextAttr());
 
-        rgProxy.setText("Включить (Zaborona)");
+        rgZaborona.setText(AndroidUtils.getString("proxy_enable") + " (Zaborona)");
-        rgProxy.setTextColor(getTextAttr());
+        rgZaborona.setTextColor(getTextAttr());
 
-        rgProxy.setChecked(isZaboronaEnabled());
+        rgRandomProxy.setText(AndroidUtils.getString("proxy_enable") + " (Random Proxy)");
-        rgDefault.setChecked(!isZaboronaEnabled());
+        rgRandomProxy.setTextColor(getTextAttr());
+
+        rgVika.setText(AndroidUtils.getString("proxy_enable") + " (Vika)");
+        rgVika.setTextColor(getTextAttr());
+
+        rgZaborona.setChecked(isZaboronaEnabled());
+        rgDefault.setChecked(!isZaboronaEnabled() && !isRandomProxyEnabled() && !isVikaProxyEnabled());
+        rgRandomProxy.setChecked(isRandomProxyEnabled());
+        rgVika.setChecked(isVikaProxyEnabled());
 
         AlertDialog.Builder builder = new AlertDialog.Builder(ctx, getAlertStyle());
-        builder.setTitle("Прокси");
+        builder.setTitle(AndroidUtils.getString("vtlproxy"));
-        builder.setMessage("Zaborona никак не связана с ВТостерс и мы не можем гарантировать её работу и безопасность");
+        builder.setMessage(AndroidUtils.getString("proxy_warning"));
         builder.setView(rg);
-        builder.setPositiveButton("Применить", ((dialog, which) -> {
+        builder.setPositiveButton(AndroidUtils.getString("vtl_confirm"), ((dialog, which) -> { // Применить
-            if (rgProxy.isChecked()) {
+            if (rgZaborona.isChecked()) {
                 edit().putString("proxy", "zaborona").commit();
                 restartApplication();
+            } else if (rgRandomProxy.isChecked()) {
+                edit().putString("proxy", "randomproxy").commit();
+                restartApplication();
+            } else if (rgVika.isChecked()) {
+                edit().putString("proxy", "vika").commit();
+                restartApplication();
             } else {
-                if (isZaboronaEnabled()) {
-                    edit().putString("proxy", "noproxy").commit();
-                    restartApplication();
-                }
-
                 edit().putString("proxy", "noproxy").commit();
+                restartApplication();
             }
         }));
 
-        builder.setNeutralButton("Настройки прокси", ((dialog, which) -> {
+        builder.setNeutralButton(AndroidUtils.getString("proxy_settings"), ((dialog, which) -> {
             Intent a2 = new Navigator(ProxySettingsFragment.class).b(ctx);
             a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             ctx.startActivity(a2);
@@ -90,47 +106,4 @@ public class ProxyHook {
         alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(getAccentColor());
         alert.getButton(DialogInterface.BUTTON_NEUTRAL).setTextColor(getAccentColor());
     }
-
-    public static String linkReplacer(String link) {
-        var vkapi = "api.vk.com";
-        var oauth = "oauth.vk.com";
-        var vkstatic = "static.vk.com";
-
-        var proxyapi = getPrefsValue("proxyapi");
-        var proxyoauth = getPrefsValue("proxyoauth");
-        var proxystatic = getPrefsValue("proxystatic");
-
-        if (!apiproxy() || link.isEmpty()) {
-            return link;
-        }
-
-        if (proxyapi.isEmpty() || proxyoauth.isEmpty() || proxystatic.isEmpty()) {
-            Log.d("VTLite", "Proxy is not set" + " " + proxyapi + " " + proxyoauth + " " + proxystatic);
-            return link;
-        }
-
-        if (link.contains(vkapi)) {
-            return link.replace(proxyapi, vkapi);
-        }
-
-        if (link.contains(oauth)) {
-            return link.replace(proxyoauth, oauth);
-        }
-
-        if (link.contains(vkstatic)) {
-            return link.replace(proxystatic, vkstatic);
-        }
-
-        return link;
-    }
-
-    public static String getAwayPhpCom() {
-        var proxyapi = getPrefsValue("proxyapi");
-
-        if (apiproxy() & !proxyapi.isEmpty()) {
-            return proxyapi;
-        }
-
-        return "m.vk.com";
-    }
 }

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

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

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

@@ -9,7 +9,7 @@ import java.util.LinkedHashMap;
 
 public class RequestDumper{
     public static void addParams(MethodCall.a paramslist, String method, LinkedHashMap params, String apiver) {
-        if (method.contains("execute.getGiftByStickerId") || method.contains("execute.getNewsfeedCustom")) {
+        if (method.contains("execute.getGiftByStickerId") ) {
             apiver = "5.187";
         }
 

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

@@ -41,7 +41,7 @@ public class FFMpeg {
     private static void checkFFMpegLibs() {
         var lib = new File(AndroidUtils.getGlobalContext().getFilesDir(), "libffmpegkit_abidetect.so");
         if (!lib.exists()) {
-            ToastUtils.a("Копирование библиотеки ffmpegkit");
+            ToastUtils.a(AndroidUtils.getString("ffmpegkit_copy"));
             copyAssets();
         }
     }

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

@@ -1,11 +1,11 @@
 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;
 import android.os.Build;
-import android.os.Environment;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -28,13 +28,13 @@ import ru.vtosters.lite.utils.AndroidUtils;
 
 public class MP3Downloader {
 
-    private static final String URL_FORMAT = "https://api.vk.com/method/audio.getById?v=5.131&access_token=%s&audios=%s&copyright=https://vtosters.app/";
+    private static final String URL_FORMAT = "https://" + getApi() + "/method/audio.getById?v=5.131&access_token=%s&audios=%s&copyright=https://vtosters.app/";
     private static final OkHttpClient client = new OkHttpClient();
 
     public static void execute(MusicTrack track) {
         var token = AndroidUtils.getPreferences().getString("vk_admin_token", "");
         if (token.isEmpty()) {
-            Toast.makeText(AndroidUtils.getGlobalContext(), "Обновите токен VK Admin в настройках", Toast.LENGTH_SHORT).show();
+            Toast.makeText(AndroidUtils.getGlobalContext(), AndroidUtils.getString("update_vk_admin_token"), Toast.LENGTH_SHORT).show();
             return;
         }
         var request = new Request.a()

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

@@ -24,6 +24,7 @@ import ru.vtosters.lite.net.NetCallback;
 import ru.vtosters.lite.net.NetClient;
 import ru.vtosters.lite.net.NetRequest;
 import ru.vtosters.lite.net.NetResponse;
+import ru.vtosters.lite.utils.AndroidUtils;
 
 public class Scrobbler {
     private static final String key = "5965d63402414776c54c266db0211746";
@@ -103,7 +104,7 @@ public class Scrobbler {
 
     public static void auth(String login, String pass) {
         if (login == null || pass == null) {
-            sendToast("Логин или пароль не заданы");
+            sendToast(AndroidUtils.getString("lastfm_credentials_empty"));
             return;
         }
 
@@ -119,7 +120,7 @@ public class Scrobbler {
             @Override
             public void onFailure(NetCall call, IOException e) {
                 Log.d("Scrobbler", "Auth failed", e);
-                sendToast("Ошибка входа");
+                sendToast(AndroidUtils.getString("lastfm_auth_error"));
             }
 
             @Override
@@ -155,7 +156,7 @@ public class Scrobbler {
         edit().remove("username").apply();
         edit().remove("sessionKey").apply();
         scrobbled.clear();
-        sendToast("Вы успешно вышли из учетной записи");
+        sendToast(AndroidUtils.getString("lastfm_logout_success"));
     }
 
     public static boolean needToBeScrobble(String uid) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/src/main/java/ru/vtosters/lite/services/LogWriterService.java

@@ -22,6 +22,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import ru.vtosters.lite.utils.AndroidUtils;
+
 public class LogWriterService extends Service {
     public LogWriterService() {
     }
@@ -44,12 +46,12 @@ public class LogWriterService extends Service {
             writeLog(intent, file);
         } catch (Exception e) {
             e.printStackTrace();
-            makeText(getGlobalContext(), "Не удалось сохранить лог-файл", LENGTH_SHORT).show();
+            makeText(getGlobalContext(), AndroidUtils.getString("logfile_error"), LENGTH_SHORT).show();
         }
         var notificationId = intent.getIntExtra("notificationId", 1);
         var manager = (NotificationManager) getGlobalContext().getSystemService(Context.NOTIFICATION_SERVICE);
         manager.cancel(notificationId);
-        makeText(getGlobalContext(), "Лог-файл был сохранен", LENGTH_SHORT).show();
+        makeText(getGlobalContext(), AndroidUtils.getString("logfile_saved"), LENGTH_SHORT).show();
 
         stopSelf();
         return START_NOT_STICKY;

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

@@ -11,6 +11,8 @@ import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import ru.vtosters.lite.utils.AndroidUtils;
+
 public class APKInstallActivity extends AppCompatActivity {
     public static final int REQUEST_INSTALL_PERMISSION = 1;
 
@@ -65,7 +67,7 @@ public class APKInstallActivity extends AppCompatActivity {
 
             startActivity(intent);
         } catch (Exception e) {
-            Toast.makeText(this, "Ошибка установки обновления " + e.getLocalizedMessage(), Toast.LENGTH_LONG).show();
+            Toast.makeText(this, AndroidUtils.getString("apk_install_error") + " " + e.getLocalizedMessage(), Toast.LENGTH_LONG).show();
         }
 
         finish();

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

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

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

@@ -34,10 +34,10 @@ public class CategorizedAdapter extends RecyclerView.Adapter<CategorizedAdapter.
     public static final int SELECTED_STATE = -0x1;
     public static final int DISABLED_STATE = -0x2;
 
-    private List mSelectedItems;
+    private final List mSelectedItems;
-    private List mDisabledItems;
+    private final List mDisabledItems;
-    private List mUnmovedItems;
+    private final List mUnmovedItems;
-    private IViewHolderBinder mBinder;
+    private final IViewHolderBinder mBinder;
 
     private int mMinSelectedItems = -1;
     private int mMaxSelectedItems = -1;

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

@@ -25,7 +25,7 @@ import ru.vtosters.lite.utils.LayoutUtils;
 public class ImagineArrayAdapter extends ArrayAdapter<ImagineArrayAdapter.ImagineArrayAdapterItem> {
 
     private List<ImagineArrayAdapterItem> mItems = new ArrayList<>();
-    private OnClickListener mListener;
+    private final OnClickListener mListener;
     private int mSelectedIndex = -1;
 
     public ImagineArrayAdapter(@NonNull Context context, OnClickListener listener) {
@@ -134,8 +134,8 @@ public class ImagineArrayAdapter extends ArrayAdapter<ImagineArrayAdapter.Imagin
     }
 
     public static class ImagineArrayAdapterItem {
-        private Drawable mIcon;
+        private final Drawable mIcon;
-        private String mText;
+        private final String mText;
 
         public ImagineArrayAdapterItem(Drawable icon, String text) {
             this.mIcon = icon;
@@ -167,6 +167,6 @@ public class ImagineArrayAdapter extends ArrayAdapter<ImagineArrayAdapter.Imagin
     }
 
     public interface OnClickListener {
-        public void onClick(int i);
+        void onClick(int i);
     }
 }

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

@@ -20,13 +20,10 @@ import com.vtosters.lite.R;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class MessagesPreviewAdapter extends RecyclerView.Adapter<MessagesPreviewAdapter.MessagePreviewViewHolder> {
-
     private static final int ME = 0x0;
     private static final int ANONYMOUS = -0x1;
 
-    private final String[] mMessages = {
+    private final String[] mMessages = AndroidUtils.getArray("wallpaper_change_dialog");
-            "Доброе время", "Доброе утро, день, вечер. ночь", "Как живёшь?", "Не мёртвый, и то хорошо"
-    };
 
     @Override
     public int getItemViewType(int i) {

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

@@ -7,6 +7,7 @@ import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
 import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
 import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable;
 
+import android.annotation.SuppressLint;
 import android.net.Uri;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,8 +29,9 @@ import ru.vtosters.lite.tgs.TGPref;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.StickerPackViewHolder> {
-    private static TelegramStickersService sService = TelegramStickersService.getInstance(getGlobalContext());
+    private static final TelegramStickersService sService = TelegramStickersService.getInstance(getGlobalContext());
 
+    @SuppressLint("UseCompatLoadingForDrawables")
     @NonNull
     @Override
     public StickerPackViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -61,13 +63,13 @@ public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.
     }
 
     public class StickerPackViewHolder extends RecyclerView.ViewHolder {
-        private LinearLayout mContainer;
+        private final LinearLayout mContainer;
-        private ImageView mStickerPreview;
+        private final ImageView mStickerPreview;
-        private ImageView mUpdateButton;
+        private final ImageView mUpdateButton;
-        private ImageView mDeleteButton;
+        private final ImageView mDeleteButton;
-        private TextView mName;
+        private final TextView mName;
-        private TextView mStickersCount;
+        private final TextView mStickersCount;
-        private SwitchCompat mSwitch;
+        private final SwitchCompat mSwitch;
 
 
         public StickerPackViewHolder(@NonNull View view) {
@@ -82,6 +84,7 @@ public class StickerPackAdapter extends RecyclerView.Adapter<StickerPackAdapter.
             mStickersCount = view.findViewWithTag("vkim_cancel_label_text");
         }
 
+        @SuppressLint("SetTextI18n")
         public void bind(int position) {
             final TelegramStickersPack pack = sService.getPacksListReference().get(position);
             if (pack.state != TelegramStickersPack.DOWNLOADED) return;

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

@@ -23,6 +23,7 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.IOUtils;
 import ru.vtosters.lite.utils.Preferences;
 
@@ -42,7 +43,7 @@ public class BackupManager {
 
     public static void backupOnlines() throws IOException {
         if (getPrefContent("onlines.xml") == null) {
-            Toast.makeText(getGlobalContext(), "Нет данных для резервного копирования", LENGTH_SHORT).show();
+            Toast.makeText(getGlobalContext(), AndroidUtils.getString("no_data_to_backup"), LENGTH_SHORT).show();
             return;
         }
 
@@ -54,10 +55,10 @@ public class BackupManager {
             FileWriter out = new FileWriter(file);
             out.write(getPrefContent("onlines.xml"));
             out.close();
-            Toast.makeText(getGlobalContext(), "Сохранено в файл " + file.getAbsolutePath(), LENGTH_LONG).show();
+            Toast.makeText(getGlobalContext(), AndroidUtils.getString("backup_saved_in") + " " + file.getAbsolutePath(), LENGTH_LONG).show();
         } catch (IOException e) {
             e.printStackTrace();
-            Toast.makeText(getGlobalContext(), "Не удалось сохранить файл", LENGTH_SHORT).show();
+            Toast.makeText(getGlobalContext(), AndroidUtils.getString("backup_save_error"), LENGTH_SHORT).show();
         }
     }
 
@@ -70,10 +71,10 @@ public class BackupManager {
             FileWriter out = new FileWriter(file);
             out.write(getPrefContent("com.vtosters.lite_preferences.xml"));
             out.close();
-            Toast.makeText(getGlobalContext(), "Сохранено в файл " + file.getAbsolutePath(), LENGTH_LONG).show();
+            Toast.makeText(getGlobalContext(), AndroidUtils.getString("backup_saved_in") + " " + file.getAbsolutePath(), LENGTH_LONG).show();
         } catch (IOException e) {
             e.printStackTrace();
-            Toast.makeText(getGlobalContext(), "Не удалось сохранить файл", LENGTH_SHORT).show();
+            Toast.makeText(getGlobalContext(), AndroidUtils.getString("backup_save_error"), LENGTH_SHORT).show();
         }
     }
 

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

@@ -5,6 +5,7 @@ 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 android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -57,6 +58,7 @@ public class CrashReporter {
         var saveLogIntent = new Intent(getGlobalContext(), LogWriterService.class);
         saveLogIntent.putExtra("log", logString);
         saveLogIntent.putExtra("notificationId", 1);
+        @SuppressLint("UnspecifiedImmutableFlag")
         var psaveLogIntent = PendingIntent.getService(getGlobalContext(), 0, saveLogIntent, PendingIntent.FLAG_CANCEL_CURRENT);
 
         var builder = new Notification.Builder(getGlobalContext());
@@ -65,12 +67,8 @@ public class CrashReporter {
         builder.setContentText(logString);
         builder.setStyle(new Notification.BigTextStyle().bigText(logString));
         builder.setAutoCancel(true);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) {
+        builder.addAction(new Notification.Action(0, getString("vtl_crash_upload"), PendingIntent.getActivity(getGlobalContext(), (int) (Math.random() * 100.0d), foxbinIntent, PendingIntent.FLAG_CANCEL_CURRENT)));
-            builder.addAction(new Notification.Action(0, getString("vtl_crash_upload"), PendingIntent.getActivity(getGlobalContext(), (int) (Math.random() * 100.0d), foxbinIntent, PendingIntent.FLAG_CANCEL_CURRENT)));
+        builder.addAction(new Notification.Action(0, getString("vtl_crash_save"), psaveLogIntent));
-            builder.addAction(new Notification.Action(0, getString("vtl_crash_save"), psaveLogIntent));
-        } else {
-            builder.setContentIntent(PendingIntent.getActivity(activity, 0, foxbinIntent, PendingIntent.FLAG_ONE_SHOT));
-        }
 
         if (Build.VERSION.SDK_INT >= 26) {
             builder.setChannelId("crashes");

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

@@ -10,6 +10,8 @@ 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.fave.fragments.FaveTabFragment;
@@ -47,7 +49,6 @@ import ru.vtosters.lite.ui.items.DockBarTab;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class DockBarEditorManager {
-
     public static final int MIN_SELECTED_TABS = 3;
     public static final int MAX_SELECTED_TABS = 9;
 
@@ -96,19 +97,31 @@ public class DockBarEditorManager {
     private void parseSelectedTabs(String[] selectedTabsTags) {
         List<String> allTags = new ArrayList<>(Arrays.asList("tab_news", "tab_superapps", "tab_messages", "tab_feedback", "tab_profile",
                 "tab_friends", "tab_groups", "tab_photos", "tab_audios", "tab_videos", "tab_lives", "tab_games", "tab_liked",
-                "tab_fave", "tab_documents", "tab_payments", "tab_vk_apps", "tab_settings", "tab_menu"));
+                "tab_fave", "tab_documents", "tab_payments", "tab_vk_apps", "tab_settings"));
+
         for (String tag : selectedTabsTags) {
             mSelectedTabs.add(getTabByTag(tag));
             allTags.remove(tag);
         }
-        allTags.forEach(tag -> mDisabledTabs.add(getTabByTag(tag)));
+
+        for (String tag : allTags) {
+            mDisabledTabs.add(getTabByTag(tag));
+        }
     }
 
     public void save() {
-        AndroidUtils.getPreferences().edit().putString("dockbar_tabs", mSelectedTabs.stream()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                        .map(tab -> tab.tag)
+            getPreferences().edit().putString("dockbar_tabs", mSelectedTabs.stream()
-                        .collect(Collectors.joining(",")))
+                            .map(tab -> tab.tag)
-                .commit();
+                            .collect(Collectors.joining(",")))
+                    .commit();
+        } else {
+            StringBuilder sb = new StringBuilder();
+            for (DockBarTab tab : mSelectedTabs) {
+                sb.append(tab.tag).append(",");
+            }
+            getPreferences().edit().putString("dockbar_tabs", sb.toString()).commit();
+        }
     }
 
     public void reset() {
@@ -247,13 +260,6 @@ public class DockBarEditorManager {
                         R.string.menu_apps,
                         R.id.menu_vk_apps,
                         AppsFragment.class);
-            case "tab_menu":
-                return DockBarTab.valuesOf(
-                        "tab_menu",
-                        milkshake() ? R.drawable.ic_user_circle_outline_28 : R.drawable.ic_menu_more_outline_28,
-                        milkshake() ? R.string.profile : R.string.menu,
-                        R.id.tab_menu,
-                        milkshake() ? ProfileFragment.class : MenuFragment.class);
             case "tab_settings":
             default:
                 return DockBarTab.valuesOf(

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

@@ -1,7 +1,6 @@
 package ru.vtosters.lite.ui.components;
 
 public interface IItemMovingListener {
-
     void onItemDismiss(int index);
 
     boolean onItemMove(int fromPosition, int toPosition);

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

@@ -0,0 +1,62 @@
+package ru.vtosters.lite.ui.components;
+
+import static ru.vtosters.lite.ui.vkui.VBListBuilder.VBListItem;
+import static ru.vtosters.lite.ui.vkui.VBListBuilder.buildListOf;
+import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs;
+import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
+
+import android.app.Activity;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+
+import ru.vtosters.lite.ui.vkui.VBottomSheetBuilder;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class NewsfeedListManager {
+
+    public static void callEditorPopup(Activity activity) {
+        var selectedItems = getDefaultPrefs().getString("news_feed_selected_items", "");
+        var filtersSet = getDefaultPrefs().getStringSet("news_feed_items_set", Collections.synchronizedSet(new LinkedHashSet<>()));
+        var list = new ArrayList<VBListItem>();
+
+        if (filtersSet.size() == 0) {
+            sendToast(AndroidUtils.getString("newsfeed_list_update_feed"));
+            return;
+        }
+
+        synchronized (filtersSet) {
+            for (String item : filtersSet) {
+                var id = item.substring(0, item.indexOf("|"));
+                var title = item.substring(item.indexOf("|") + 1);
+
+                list.add(new VBListItem(id, title, selectedItems.contains(id)));
+            }
+        }
+
+        VBottomSheetBuilder.show(activity, new VBottomSheetBuilder.VBSContent(
+                AndroidUtils.getString("newsfeed_list_choose_to_hide"),
+                buildListOf(activity, list),
+                new VBottomSheetBuilder.VBSContent.VBSButton(
+                        AndroidUtils.getString("save"),
+                        () -> {
+                            var newSelectedItems = "";
+                            for (VBListItem item : list)
+                                if (item.checked)
+                                    newSelectedItems += item.id + ",";
+                            getDefaultPrefs().edit()
+                                    .putString("news_feed_selected_items", newSelectedItems)
+                                    .apply();
+                            sendToast(AndroidUtils.getString("newsfeed_list_update_feed_to_work"));
+                        }
+                )
+        ));
+    }
+
+    public static void resetHideItems() {
+        getDefaultPrefs().edit().remove("news_feed_selected_items").remove("news_feed_items_set")
+                .apply();
+        sendToast(AndroidUtils.getString("newsfeed_list_hidden_reseted"));
+    }
+}

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

@@ -2,6 +2,8 @@ package ru.vtosters.lite.ui.components;
 
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 
+import android.os.Build;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -40,15 +42,30 @@ public class SuperAppEditorManager {
             mSelectedItems.add(getItemByTag(tag));
             allTags.remove(tag);
         }
-        allTags.forEach(tag -> mDisabledItems.add(getItemByTag(tag)));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            allTags.forEach(tag -> mDisabledItems.add(getItemByTag(tag)));
+        } else {
+            for (String tag : allTags) {
+                mDisabledItems.add(getItemByTag(tag));
+            }
+        }
     }
 
     public void save() {
         if (mSelectedItems.size() > 0)
-            getPreferences().edit().putString("superapp_items", mSelectedItems.stream()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                            .map(item -> item.type)
+                getPreferences().edit().putString("superapp_items", mSelectedItems.stream()
-                            .collect(Collectors.joining(",")))
+                                .map(item -> item.type)
-                    .commit();
+                                .collect(Collectors.joining(",")))
+                        .commit();
+            } else {
+                StringBuilder sb = new StringBuilder();
+                for (SuperAppItem item : mSelectedItems) {
+                    sb.append(item.type);
+                    sb.append(",");
+                }
+                getPreferences().edit().putString("superapp_items", sb.toString()).commit();
+            }
         else
             reset();
     }
@@ -71,33 +88,33 @@ public class SuperAppEditorManager {
     private SuperAppItem getItemByTag(String tag) {
         switch (tag) {
             case "menu":
-                return SuperAppItem.valuesOf("menu", "Меню приложения");
+                return SuperAppItem.valuesOf("menu", AndroidUtils.getString("superapp_menu"));
             case "miniapps":
-                return SuperAppItem.valuesOf("miniapps", "Mini Apps: виджет");
+                return SuperAppItem.valuesOf("miniapps", AndroidUtils.getString("superapp_miniapps"));
             case "vkpay_slim":
-                return SuperAppItem.valuesOf("vkpay_slim", "VK Pay");
+                return SuperAppItem.valuesOf("vkpay_slim", AndroidUtils.getString("superapp_vkpay"));
             case "greeting":
-                return SuperAppItem.valuesOf("greeting", "Приветствие");
+                return SuperAppItem.valuesOf("greeting", AndroidUtils.getString("superapp_greeting"));
             case "promo":
-                return SuperAppItem.valuesOf("promo", "Mini Apps: промо");
+                return SuperAppItem.valuesOf("promo", AndroidUtils.getString("superapp_miniapps_promo"));
             case "holiday":
-                return SuperAppItem.valuesOf("holiday", "Дни рождения у друзей");
+                return SuperAppItem.valuesOf("holiday", AndroidUtils.getString("superapp_holiday"));
             case "weather":
-                return SuperAppItem.valuesOf("weather", "Погода");
+                return SuperAppItem.valuesOf("weather", AndroidUtils.getString("superapp_weather"));
             case "sport":
-                return SuperAppItem.valuesOf("sport", "Спортивные события");
+                return SuperAppItem.valuesOf("sport", AndroidUtils.getString("superapp_sport"));
             case "games":
-                return SuperAppItem.valuesOf("games", "Игры");
+                return SuperAppItem.valuesOf("games", AndroidUtils.getString("superapp_games"));
             case "informer":
-                return SuperAppItem.valuesOf("informer", "Информер");
+                return SuperAppItem.valuesOf("informer", AndroidUtils.getString("superapp_informer"));
             case "food":
-                return SuperAppItem.valuesOf("food", "Еда");
+                return SuperAppItem.valuesOf("food", AndroidUtils.getString("superapp_food"));
             case "event":
-                return SuperAppItem.valuesOf("event", "Мероприятия");
+                return SuperAppItem.valuesOf("event", AndroidUtils.getString("superapp_event"));
             case "music":
-                return SuperAppItem.valuesOf("music", "Музыка");
+                return SuperAppItem.valuesOf("music", AndroidUtils.getString("superapp_music"));
             case "vk_run":
-                return SuperAppItem.valuesOf("vk_run", "VK Run");
+                return SuperAppItem.valuesOf("vk_run", AndroidUtils.getString("superapp_vk_run"));
             default:
                 return null;
         }

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

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

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

@@ -15,6 +15,7 @@ import androidx.appcompat.widget.SwitchCompat;
 
 import com.vk.core.dialogs.alert.VkAlertDialog;
 
+import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.LayoutUtils;
 
 public class MessageSettings {
@@ -50,12 +51,12 @@ public class MessageSettings {
         four.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
         five.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
 
-        zero.setText("Отключить");
+        zero.setText(AndroidUtils.getString("proxy_disable")); // Отключить
-        one.setText("15 секунд");
+        one.setText(AndroidUtils.getString("message_self_destruct_15sec"));
-        two.setText("1 минута");
+        two.setText(AndroidUtils.getString("message_self_destruct_1min"));
-        three.setText("5 минут");
+        three.setText(AndroidUtils.getString("message_self_destruct_5min"));
-        four.setText("1 час");
+        four.setText(AndroidUtils.getString("message_self_destruct_1hour"));
-        five.setText("24 часа");
+        five.setText(AndroidUtils.getString("message_self_destruct_24hours"));
 
         zero.setTextColor(getTextAttr());
         one.setTextColor(getTextAttr());
@@ -87,7 +88,7 @@ public class MessageSettings {
 
         @SuppressLint("UseSwitchCompatOrMaterialCode")
         var silentSwitch = new SwitchCompat(new ContextThemeWrapper(context, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_Switch));
-        silentSwitch.setText("Бесшумные сообщения");
+        silentSwitch.setText(AndroidUtils.getString("silent_messages"));
         silentSwitch.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
         silentSwitch.setTextColor(getTextAttr());
         silentSwitch.setChecked(isSilentEnabled);
@@ -104,12 +105,12 @@ public class MessageSettings {
         mContainer.addView(silentSwitch, LayoutUtils.createLinear(-1, -2));
 
         VkAlertDialog.Builder builder = new VkAlertDialog.Builder(context);
-        builder.setTitle("Настройки отправки");
+        builder.setTitle(AndroidUtils.getString("message_send_settings_title"));
-        builder.setMessage("Выберите время исчезновения сообщения");
+        builder.setMessage(AndroidUtils.getString("silent_messages_time_select"));
         builder.setCancelable(true);
-        builder.setNegativeButton("Отмена", null);
+        builder.setNegativeButton(AndroidUtils.getString("cancel"), null);
         builder.setView(mContainer);
-        builder.setPositiveButton("Применить", (dialog, which) -> {
+        builder.setPositiveButton(AndroidUtils.getString("vtl_confirm"), (dialog, which) -> { // Применить
             var checked = rg.getCheckedRadioButtonId();
 
             if (checked == zero.getId()) {

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

@@ -9,7 +9,6 @@ import ru.vtosters.lite.ui.vkui.ModalBottomSheetWrapper;
 import ru.vtosters.lite.utils.OTAUtils;
 
 public class OTADialog implements OTAUtils.OTAListener {
-
     private final Activity mActivity;
 
     private final OTAUtils mHelper;
@@ -21,8 +20,8 @@ public class OTADialog implements OTAUtils.OTAListener {
         mHelper.loadData();
     }
 
-    public static OTADialog checkUpdates(Activity activity) {
+    public static void checkUpdates(Activity activity) {
-        return new OTADialog(activity);
+        new OTADialog(activity);
     }
 
     @Override

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

@@ -8,9 +8,9 @@ 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;
 import ru.vtosters.lite.utils.LayoutUtils;
 
 public class RoundingSeekbarDialog{
@@ -25,12 +25,12 @@ public class RoundingSeekbarDialog{
         mContainer.addView(seek, LayoutUtils.createLinear(-1, -2));
 
         VkAlertDialog.Builder builder = new VkAlertDialog.Builder(context);
-        builder.setTitle("Выберите размер закругления углов");
+        builder.setTitle(AndroidUtils.getString("pic_rounding_title"));
-        builder.setMessage("Для отключения функции закругления углов введите 0");
+        builder.setMessage(AndroidUtils.getString("pic_rounding_info"));
         builder.setCancelable(true);
-        builder.setNegativeButton("Отмена", null);
+        builder.setNegativeButton(AndroidUtils.getString("cancel"), null);
         builder.setView(mContainer);
-        builder.setPositiveButton("Применить", (dialog, which) -> {
+        builder.setPositiveButton(AndroidUtils.getString("vtl_confirm"), (dialog, which) -> {
             edit().putInt("pic_rounding", seek.getProgress()).commit();
             restartApplicationWithTimer();
         });

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

@@ -77,8 +77,6 @@ public class ServerDialog {
     private static void getResponse(String body) throws Exception {
         JSONObject jSONObject = new JSONObject(body);
 
-        Log.d("VTLOG", "getResponse: " + jSONObject);
-
         if (jSONObject.getString("title").equals("")) {
             showAlert = false;
             return;

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

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

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

@@ -10,6 +10,7 @@ import android.util.Log;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 
 import ru.vtosters.lite.translators.BaseTranslator;
+import ru.vtosters.lite.utils.AndroidUtils;
 
 public class Translate {
     public static void showTranslatedText(Context context, String text) {
@@ -27,16 +28,16 @@ public class Translate {
 
     private static void showDialog(Context context, String text) {
         VkAlertDialog.Builder alertDialog = new VkAlertDialog.Builder(context);
-        alertDialog.setTitle("Переводчик");
+        alertDialog.setTitle(AndroidUtils.getString("translator_title"));
         alertDialog.setMessage(text);
-        alertDialog.setPositiveButton("Закрыть", (dialog, which) -> {
+        alertDialog.setPositiveButton(AndroidUtils.getString("close"), (dialog, which) -> {
             dialog.cancel();
         });
-        alertDialog.setNeutralButton("Скопировать", (dialog, which) -> {
+        alertDialog.setNeutralButton(AndroidUtils.getString("copy"), (dialog, which) -> {
             android.content.ClipboardManager clipboard = (android.content.ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
             android.content.ClipData clip = android.content.ClipData.newPlainText("Copied Text", text);
             clipboard.setPrimaryClip(clip);
-            sendToast("Скопировано в буфер обмена");
+            sendToast(AndroidUtils.getString("copied_to_clipboard"));
         });
         var alert = alertDialog.create();
         alert.show();

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

@@ -1,5 +1,7 @@
 package ru.vtosters.lite.ui.dialogs;
 
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.proxy.ProxyUtils.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;
@@ -15,7 +17,7 @@ import ru.vtosters.lite.ui.fragments.VKUIwrapper;
 public class VKIDProtection {
     public static void alert(final Activity activity) {
         VkAlertDialog.Builder builder = new VkAlertDialog.Builder(activity);
-        builder.setTitle(getString("debug_warning"));
+        builder.setTitle(getString("warning"));
         builder.setMessage(getString("vkidsumm"));
         builder.setCancelable(false);
         // android.content.DialogInterface.OnClickListener
@@ -23,7 +25,7 @@ public class VKIDProtection {
         // android.content.DialogInterface.OnClickListener
         builder.setNeutralButton(getString("vkiddisable"), (dialogInterface, i) -> {
             edit().putBoolean("showAlertVkId", false).apply();
-            VKUIwrapper.setLink("https://id.vk.com/account");
+            VKUIwrapper.setLink((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

@@ -83,7 +83,7 @@ public class DockBarEditorFragment extends BaseToolbarFragment {
         });
         adapter.setMinAndMaxCounts(DockBarEditorManager.MIN_SELECTED_TABS, DockBarEditorManager.MAX_SELECTED_TABS);
 
-        var recyclerView = new RecyclerView(getContext());
+        var recyclerView = new RecyclerView(requireContext());
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         recyclerView.setAdapter(adapter);
         recyclerView.setHasFixedSize(true);

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

@@ -1,20 +1,27 @@
 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.getIdentifier;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
+import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 import static ru.vtosters.lite.utils.Preferences.copyright_post;
-import static ru.vtosters.lite.utils.Preferences.offline;
 
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 
 import androidx.preference.Preference;
 
+import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.navigation.Navigator;
 import com.vk.newsfeed.NewsfeedSettingsFragment;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
+import ru.vtosters.lite.ui.components.NewsfeedListManager;
+import ru.vtosters.lite.utils.AndroidUtils;
+
 public class FeedFragment extends MaterialPreferenceToolbarFragment {
     @Override
     public void onCreate(Bundle bundle) {
@@ -30,6 +37,32 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
         findPreference("spamfilters").setSummary(count(getPrefsValue("spamfilters")));
         findPreference("sourcenamefilter").setSummary(count(getPrefsValue("sourcenamefilter")));
         findPreference("linkfilter").setSummary(count(getPrefsValue("linkfilter")));
+
+        findPreference("whitelisted_ad_groups").setSummary(countSet("whitelisted_ad_groups"));
+        findPreference("whitelisted_filters_groups").setSummary(countSet("whitelisted_filters_groups"));
+
+        findPreference("whitelisted_ad_groups").setOnPreferenceClickListener(preference -> {
+            remdialog("whitelisted_ad_groups", getContext());
+            return true;
+        });
+
+        findPreference("whitelisted_filters_groups").setOnPreferenceClickListener(preference -> {
+            remdialog("whitelisted_filters_groups", getContext());
+            return true;
+        });
+
+        findPreference("newsfeedlistmanager").setOnPreferenceClickListener(preference -> {
+            NewsfeedListManager.callEditorPopup(getActivity());
+            return true;
+        });
+        var str = getDefaultPrefs().getString("news_feed_selected_items", "");
+        findPreference("newsfeedlistmanager").setSummary(
+                String.format(AndroidUtils.getString("feed_hidden"), (!TextUtils.isEmpty(str) ? str.split(",").length : 0))
+        );
+        findPreference("newsfeedlistmanager_reset").setOnPreferenceClickListener(preference -> {
+            NewsfeedListManager.resetHideItems();
+            return true;
+        });
     }
 
     private String count(String text) {
@@ -37,12 +70,44 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
         var count = text.split(", ").length;
 
         if (count < 1 || text.isEmpty()) {
-            return "Нет добавленных элементов";
+            return AndroidUtils.getString("feed_no_elements");
         } else {
-            return "Добавлено " + count + " элементов";
+            return String.format(AndroidUtils.getString("feed_elements_count"), count);
         }
     }
 
+    private void remdialog(String key, Context context) {
+        VkAlertDialog.Builder builder = new VkAlertDialog.Builder(context);
+        builder.setTitle(AndroidUtils.getString("warning"));
+        builder.setMessage(AndroidUtils.getString("delete_elements_confirm"));
+        builder.setCancelable(false);
+        builder.setPositiveButton(AndroidUtils.getString("yes"), (dialogInterface, i) -> {
+            edit().remove(key).apply();
+            sendToast(AndroidUtils.getString("elements_deleted_success"));
+        });
+        builder.setNegativeButton(AndroidUtils.getString("cancel"), (dialogInterface, i) -> dialogInterface.dismiss());
+        builder.show();
+    }
+
+    private String countSet(String key) {
+        var set = getDefaultPrefs().getStringSet(key, null);
+        StringBuilder str = new StringBuilder();
+        if (set != null) {
+            for (var s : set) {
+                str.append(s).append(", ");
+            }
+        }
+
+        var count = str.toString().split(", ").length;
+
+        if (count < 1 || (str.length() == 0)) {
+            return AndroidUtils.getString("feed_no_elements");
+        } else {
+            return String.format(AndroidUtils.getString("feed_elements_count"), count);
+        }
+    }
+
+
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         findPreference("cringecopyright").setEnabled(!copyright_post());

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

@@ -15,7 +15,6 @@ import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.Preferences.hasVerification;
 import static ru.vtosters.lite.utils.Preferences.preferences;
-import static ru.vtosters.lite.utils.ProxyUtils.isZaboronaEnabled;
 import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
 import static ru.vtosters.lite.utils.ThemesUtils.getAlertStyle;
 import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
@@ -37,9 +36,14 @@ import androidx.core.content.res.ResourcesCompat;
 
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
+import ru.vtosters.lite.utils.AndroidUtils;
+
 public class IconsFragment extends MaterialPreferenceToolbarFragment {
     @SuppressLint("SetTextI18n")
     public static void callSelectDialog(Context ctx, String appicon) {
+        var defname = preferences.getString("appname", "vt");
+        var deficon = preferences.getString("selectedicon", "vt");
+
         RadioGroup rg = new RadioGroup(ctx);
 
         RadioButton rgDefault = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
@@ -62,20 +66,17 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
         rgVK.setText("VK");
         rgVK.setTextColor(getTextAttr());
 
-        rgVKontakte.setText("ВКонтакте");
+        rgVKontakte.setText(AndroidUtils.getString("app_name_alter"));
         rgVKontakte.setTextColor(getTextAttr());
 
-        rgVKontakte.setChecked(isZaboronaEnabled());
+        rgVKontakte.setChecked(defname.contains("vkontakte"));
-        rgVK.setChecked(isZaboronaEnabled());
+        rgVK.setChecked(defname.contains("standard"));
-        rgDefault.setChecked(!isZaboronaEnabled());
+        rgDefault.setChecked(defname.contains("vt") || defname.isEmpty());
 
         AlertDialog.Builder builder = new AlertDialog.Builder(ctx, getAlertStyle());
-        builder.setTitle("Выберите название приложения");
+        builder.setTitle(AndroidUtils.getString("app_name_select_title"));
         builder.setView(rg);
-        builder.setPositiveButton("Применить", ((dialog, which) -> {
+        builder.setPositiveButton(AndroidUtils.getString("vtl_confirm"), ((dialog, which) -> {
-            var defname = preferences.getString("appname", "vt");
-            var deficon = preferences.getString("selectedicon", "vt");
-
             if (rgDefault.isChecked()) {
                 edit().putString("appname", "vt").commit();
                 edit().putString("selectedicon", appicon).commit();
@@ -93,7 +94,7 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
                 switchComponent(appicon, "vkontakte", deficon, defname);
             }
         }));
-        builder.setNegativeButton("Отмена", ((dialog, which) -> {
+        builder.setNegativeButton(AndroidUtils.getString("cancel"), ((dialog, which) -> {
             dialog.dismiss();
         }));
 
@@ -114,13 +115,13 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
         this.addPreferencesFromResource(vtosterXml);
 
         if (!hasVerification() && !getBoolValue("dialogrecomm", false)) {
-            addPreference(this, "", "Доступны не все функции!", "Для разблокировки необходимо сделать пожертование от 99р", "ic_about_outline_28", preference -> {
+            addPreference(this, "", AndroidUtils.getString("icons_warning"), AndroidUtils.getString("icons_warning_info"), "ic_about_outline_28", preference -> {
-                getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://vtosters.app")));
+                getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://vtosters.app/donate/")));
                 return false;
             });
         }
 
-        addPreferenceCategory(this, "Иконки");
+        addPreferenceCategory(this, AndroidUtils.getString("icons_title"));
 
         for (var i = 0; i < icons().size(); i++) {
             if (icons().get(i) == null || iconsValues().get(i) == null) return;
@@ -151,7 +152,7 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
         }
 
         if (!hasVerification() && !getBoolValue("dialogrecomm", false)) {
-            addPreferenceCategory(this, "Недоступные иконки");
+            addPreferenceCategory(this, AndroidUtils.getString("unavailable_icons"));
 
             for (var i = 2; i < sIconsPlusNames.size(); i++) {
                 if (sIconsPlusNames.get(i) == null || sIconsPlus.get(i) == null) return;
@@ -176,7 +177,7 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment {
                 }
 
                 addPreferenceDrawable(this, icon, iconname, "", drawable, preference -> {
-                    sendToast("Иконка доступна только обладателям верификации");
+                    sendToast(AndroidUtils.getString("unavailable_icon_warning"));
                     return false;
                 });
             }

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

@@ -11,6 +11,7 @@ import androidx.preference.Preference;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
 import ru.vtosters.lite.ui.dialogs.RoundingSeekbarDialog;
+import ru.vtosters.lite.utils.AndroidUtils;
 
 public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
     @Override
@@ -31,9 +32,9 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
         });
 
         if (getPreferences().getInt("pic_rounding", 0) == 0) {
-            findPreference("customrounding").setSummary("Отключено");
+            findPreference("customrounding").setSummary(AndroidUtils.getString("disabled"));
         } else {
-            findPreference("customrounding").setSummary("Размер закругления: " + getPreferences().getInt("pic_rounding", 0) + "dp");
+            findPreference("customrounding").setSummary(String.format(AndroidUtils.getString("rounding_size"), getPreferences().getInt("pic_rounding", 0)));
         }
     }
 

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

@@ -1,6 +1,7 @@
 package ru.vtosters.lite.ui.fragments;
 
 import static ru.vtosters.lite.music.Scrobbler.isLoggedIn;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
 import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
 import static ru.vtosters.lite.utils.AndroidUtils.edit;
@@ -42,6 +43,7 @@ import okhttp3.Request;
 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;
 
@@ -67,8 +69,6 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
                 var prefs = getPreferences();
                 var editor = prefs.edit();
                 var actualPath = FileUriUtils.getFullPathFromTreeUri(path, getContext());
-                Log.d("MediaFragment", "onActivityResult: " + actualPath);
-                Log.d("MediaFragment", "onActivityResult: " + requestCode);
                 switch (requestCode) {
                     case REQUEST_CODE_SET_DOWNLOAD_DIRECTORY:
                         editor.putString("downloads_directory", actualPath);
@@ -113,19 +113,19 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
         });
 
         findPreference("downloads_directory").setSummary(
-                "Текущая папка: " + Preferences.getDownloadsDir()
+                AndroidUtils.getString("current_download_folder") + " " + Preferences.getDownloadsDir()
         );
 
         findPreference("photos_directory").setSummary(
-                "Текущая папка: " + Preferences.getPhotosDir()
+                AndroidUtils.getString("current_download_folder") + " " + Preferences.getPhotosDir()
         );
 
         findPreference("videos_directory").setSummary(
-                "Текущая папка: " + Preferences.getVideosDir()
+                AndroidUtils.getString("current_download_folder") + " " + Preferences.getVideosDir()
         );
 
         findPreference("music_directory").setSummary(
-                "Текущая папка: " + Preferences.getMusicDir()
+                AndroidUtils.getString("current_download_folder") + " " + Preferences.getMusicDir()
         );
 
         findPreference("downloads_directory").setOnPreferenceClickListener(preference -> {
@@ -157,7 +157,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
         });
 
         if (isLoggedIn()) {
-            findPreference("lastfm_auth").setSummary("Вы авторизованы как " + Scrobbler.getUserName());
+            findPreference("lastfm_auth").setSummary(AndroidUtils.getString("lastfm_authorized_as") + " " + Scrobbler.getUserName());
         } else {
             findPreference("lastfm_enabled").setEnabled(false);
         }
@@ -191,7 +191,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
         linearLayout.setOrientation(LinearLayout.VERTICAL);
 
         final EditText fn = new EditText(ctx);
-        fn.setHint("Логин");
+        fn.setHint(AndroidUtils.getString("lastfm_login"));
         fn.setTextColor(getTextAttr());
         fn.setHintTextColor(getSTextAttr());
         fn.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
@@ -202,7 +202,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
         fn.setLayoutParams(margin);
 
         final EditText ln = new EditText(ctx);
-        ln.setHint("Пароль");
+        ln.setHint(AndroidUtils.getString("lastfm_password"));
         ln.setTextColor(getTextAttr());
         ln.setHintTextColor(getSTextAttr());
         ln.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
@@ -211,10 +211,10 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
         ln.setLayoutParams(margin);
 
         AlertDialog.Builder alertDialog = new AlertDialog.Builder(ctx, getAlertStyle());
-        alertDialog.setTitle("Введите логин и пароль");
+        alertDialog.setTitle(AndroidUtils.getString("lastfm_enter_credentials"));
 
         alertDialog.setView(linearLayout);
-        alertDialog.setPositiveButton("Войти", (dialog, which) -> {
+        alertDialog.setPositiveButton(AndroidUtils.getString("lastfm_enter"), (dialog, which) -> {
             String login = fn.getText().toString();
             String pass = ln.getText().toString();
 
@@ -227,12 +227,12 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
 
     private void logout(Context ctx) {
         VkAlertDialog.Builder alertDialog = new VkAlertDialog.Builder(ctx);
-        alertDialog.setTitle("Вы уверены?");
+        alertDialog.setTitle(AndroidUtils.getString("lastfm_logout_title"));
-        alertDialog.setMessage("Вы действительно хотите выйти из аккаунта?");
+        alertDialog.setMessage(AndroidUtils.getString("lastfm_logout_confirm"));
-        alertDialog.setPositiveButton("Да", (dialog, which) -> {
+        alertDialog.setPositiveButton(AndroidUtils.getString("vkim_yes"), (dialog, which) -> {
             Scrobbler.logout();
         });
-        alertDialog.setNeutralButton("Нет", (dialog, which) -> {
+        alertDialog.setNeutralButton(AndroidUtils.getString("vkim_no"), (dialog, which) -> {
             dialog.cancel();
         });
         var alert = alertDialog.create();
@@ -245,7 +245,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
         Thread thread = new Thread(() -> {
             try {
                 var request = new Request.a()
-                        .b("https://api.vk.com/method/" + "video.clearViewingHistoryRecords" + "?https=1" + "&access_token=" + getUserToken() + "&v=5.187")
+                        .b("https://" + getApi() + "/method/" + "video.clearViewingHistoryRecords" + "?https=1" + "&access_token=" + getUserToken() + "&v=5.187")
                         .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"))
                         .a();
 
@@ -262,12 +262,12 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
 
         thread.start();
 
-        sendToast("История просмотра видео очищена");
+        sendToast(AndroidUtils.getString("video_history_cleaned"));
     }
 
     public static void download(Context ctx) {
         AlertDialog.Builder alertDialog = new AlertDialog.Builder(ctx, getAlertStyle());
-        alertDialog.setTitle("Введите ссылку на видео");
+        alertDialog.setTitle(AndroidUtils.getString("video_dl_enter_link"));
 
         final EditText input = new EditText(ctx);
         LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
@@ -277,7 +277,7 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
         input.setTextColor(getTextAttr());
         input.setBackgroundTintList(ColorStateList.valueOf(getAccentColor()));
         alertDialog.setView(input);
-        alertDialog.setPositiveButton("Скачать", (dialog, which) -> VideoDownloader.parseVideoLink(input.getText().toString(), ctx));
+        alertDialog.setPositiveButton(AndroidUtils.getString("download"), (dialog, which) -> VideoDownloader.parseVideoLink(input.getText().toString(), ctx));
         var alert = alertDialog.create();
         alert.show();
         alert.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(getAccentColor());

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

@@ -1,11 +1,16 @@
 package ru.vtosters.lite.ui.fragments;
 
+import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.removeWallpaper;
+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.sendToast;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
 import static ru.vtosters.lite.utils.Preferences.autoalltranslate;
-import static ru.vtosters.lite.utils.Preferences.offline;
+import static ru.vtosters.lite.utils.Preferences.vkme;
+import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -31,6 +36,7 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
         prefs();
     }
 
+    @SuppressLint("UseCompatLoadingForDrawables")
     private void prefs() {
         findPreference("vkme").setOnPreferenceClickListener(new MessagesFragment.restart());
         findPreference("vkme_notifs").setOnPreferenceClickListener(new MessagesFragment.restart());
@@ -50,7 +56,7 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
                     .create();
 
             var listView = (ListView) LayoutInflater.from(getContext()).inflate(com.vtosters.lite.R.layout.abc_select_dialog_material, null, false);
-            var adapter = new ImagineArrayAdapter(getContext(), items, i -> {
+            var adapter = new ImagineArrayAdapter(requireContext(), items, i -> {
                 getPreferences().edit().putInt("translator", i).apply();
                 alert.dismiss();
             });
@@ -61,15 +67,20 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
 
             return true;
         });
+
+        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"));
     }
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         findPreference("autotranslate").setEnabled(!autoalltranslate());
+        findPreference("vkme_notifs").setEnabled(vkme());
         return super.onPreferenceTreeClick(preference);
     }
 
-    public boolean restart(Preference preference) {
+    public boolean restart() {
         restartApplicationWithTimer();
         return true;
     }
@@ -77,24 +88,25 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
     public class restart implements Preference.OnPreferenceClickListener {
         @Override
         public boolean onPreferenceClick(Preference preference) {
-            return MessagesFragment.this.restart(preference);
+            return MessagesFragment.this.restart();
         }
     }
 
     public class clearCache implements Preference.OnPreferenceClickListener {
         @Override
         public boolean onPreferenceClick(Preference preference) {
-            return MessagesFragment.this.restart(preference);
+            return MessagesFragment.this.restart();
         }
     }
 
     public class openwp implements Preference.OnPreferenceClickListener {
         @Override
         public boolean onPreferenceClick(Preference preference) {
-            Context context = getContext();
+//            Context context = getContext();
-            Intent a2 = new Navigator(WallpaperMenuFragment.class).b(context);
+//            Intent a2 = new Navigator(WallpaperMenuFragment.class).b(context);
-            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//            a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(a2);
+//            context.startActivity(a2);
+            sendToast("Обои временно недоступны. Следите за новостями на @vtosters в Telegram");
             return true;
         }
     }

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

@@ -9,9 +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.LifecycleUtils.restartApplication;
 import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
 
@@ -76,7 +76,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
                 String token = data.getStringExtra("token");
                 AndroidUtils.getPreferences().edit().putString("vk_admin_token", token).apply();
                 Log.d("VkAdminToken", token);
-                Toast.makeText(getContext(), "Токен успешно сохранён", LENGTH_SHORT).show();
+                Toast.makeText(getContext(), AndroidUtils.getString("token_saved"), LENGTH_SHORT).show();
             }
         }
     }
@@ -95,25 +95,31 @@ 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();
+            return true;
+        });
+
         var pref = getDefaultPrefs().getString("autoclearcache", "Default");
         switch (pref) {
             case "Default":
-                findPreference("autoclearcache").setSummary("Не включено");
+                findPreference("autoclearcache").setSummary(AndroidUtils.getString("cache_disabled"));
                 break;
             case "100mb":
-                findPreference("autoclearcache").setSummary("Очищать кеш при не менее 100 Мб");
+                findPreference("autoclearcache").setSummary(AndroidUtils.getString("cache_100mb"));
                 break;
             case "500mb":
-                findPreference("autoclearcache").setSummary("Очищать кеш при не менее 500 Мб");
+                findPreference("autoclearcache").setSummary(AndroidUtils.getString("cache_500mb"));
                 break;
             case "1gb":
-                findPreference("autoclearcache").setSummary("Очищать кеш при не менее 1 Гб");
+                findPreference("autoclearcache").setSummary(AndroidUtils.getString("cache_1gb"));
                 break;
             case "2gb":
-                findPreference("autoclearcache").setSummary("Очищать кеш при не менее 2 Гб");
+                findPreference("autoclearcache").setSummary(AndroidUtils.getString("cache_2gb"));
                 break;
             case "5gb":
-                findPreference("autoclearcache").setSummary("Очищать кеш при не менее 5 Гб");
+                findPreference("autoclearcache").setSummary(AndroidUtils.getString("cache_5gb"));
                 break;
         }
 
@@ -185,12 +191,12 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
         five.setChecked(val == 5);
 
         VkAlertDialog.Builder builder = new VkAlertDialog.Builder(getContext());
-        builder.setTitle("Очистка кеша");
+        builder.setTitle(AndroidUtils.getString("cache_clean_title"));
-        builder.setMessage("Выберите объём кеша для очистки");
+        builder.setMessage(AndroidUtils.getString("cache_select_size"));
         builder.setCancelable(true);
-        builder.setNegativeButton("Отмена", null);
+        builder.setNegativeButton(AndroidUtils.getString("cancel"), null);
         builder.setView(rg);
-        builder.setPositiveButton("Сохранить", (dialog, which) -> {
+        builder.setPositiveButton(AndroidUtils.getString("save"), (dialog, which) -> {
             var pref = getDefaultPrefs().edit();
             var checked = rg.getCheckedRadioButtonId();
 
@@ -221,8 +227,8 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
 
     private void cacheCleanDialog() {
         VkAlertDialog.Builder builder = new VkAlertDialog.Builder(getContext());
-        builder.setTitle("Выберите что вы хотите очистить");
+        builder.setTitle(AndroidUtils.getString("select_which_clean"));
-        builder.setItems(new String[]{"Очистить весь кеш", "Очистить кеш стикеров", "Очистить кеш изображений", "Очистить кеш видео", "Очистить кеш сообщений", "Очистить кеш WebView"}, (dialog, which) -> {
+        builder.setItems(AndroidUtils.getArray("cache_cleaner"), (dialog, which) -> {
             switch (which) {
                 case 0: {
                     SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
@@ -237,7 +243,6 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
                     ImEngineExt.a(ImEngine1.a());
                     AutoPlayCacheHolder.d.a();
                     MediaStorage.a();
-                    deleteCache();
                     break;
                 }
                 case 1: {
@@ -264,7 +269,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
                     break;
             }
 
-            Toast.makeText(getContext(), "Кеш очищен", LENGTH_SHORT).show();
+            Toast.makeText(getContext(), AndroidUtils.getString("cache_cleaned"), LENGTH_SHORT).show();
         });
         builder.create().show();
     }
@@ -283,7 +288,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
             try {
                 backupOnlines();
             } catch (IOException e) {
-                Toast.makeText(getContext(), "Нет данных для резервного копирования", LENGTH_SHORT).show();
+                Toast.makeText(getContext(), AndroidUtils.getString("no_data_to_backup"), LENGTH_SHORT).show();
             }
             return true;
         }
@@ -353,14 +358,14 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment {
             var arr = BackupManager.getBackupsNames();
             var adapter = new ArrayAdapter(getContext(), android.R.layout.simple_list_item_1, arr);
             new VkAlertDialog.Builder(getContext())
-                    .setTitle("Выберите бэкап")
+                    .setTitle(AndroidUtils.getString("select_backup"))
                     .setAdapter(adapter, (dialog, which) -> {
                         try {
                             restoreBackup(arr[which]);
-                            Toast.makeText(getContext(), "Настройки восстановлены", LENGTH_LONG).show();
+                            Toast.makeText(getContext(), AndroidUtils.getString("backup_success"), LENGTH_LONG).show();
                         } catch (IOException e) {
                             e.printStackTrace();
-                            Toast.makeText(getContext(), "Ошибка, Настройки не восстановлены", LENGTH_LONG).show();
+                            Toast.makeText(getContext(), AndroidUtils.getString("backup_error"), LENGTH_LONG).show();
                         }
                     }).create().show();
             return true;

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

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

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

@@ -4,6 +4,7 @@ import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
 import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplication;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.view.ContextThemeWrapper;
 import android.view.Gravity;
@@ -46,9 +47,9 @@ public class SuperAppEditorFragment extends BaseToolbarFragment {
         message.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
         message.setTextColor(ThemesUtils.getTextAttr());
         message.setPadding(
-                AndroidUtils.dp2px(10),
+                dp2px(10),
-                AndroidUtils.dp2px(10),
+                dp2px(10),
-                AndroidUtils.dp2px(10),
+                dp2px(10),
                 0
         );
         container.addView(message, LayoutUtils.createLinear(-1, -2));
@@ -94,16 +95,29 @@ public class SuperAppEditorFragment extends BaseToolbarFragment {
                     : manager.getDisabledTabs().get(pos - manager.getSelectedTabs().size() - 2);
             holder.bindMovingItem(item.title);
         });
-        manager.getSelectedTabs().forEach(item -> {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            if (item.type.equals("menu"))
+            manager.getSelectedTabs().forEach(item -> {
-                adapter.addUnmovedItem(item);
+                if (item.type.equals("menu"))
-        });
+                    adapter.addUnmovedItem(item);
-        manager.getDisabledTabs().forEach(item -> {
+            });
-            if (item.type.equals("menu"))
-                adapter.addUnmovedItem(item);
-        });
 
-        var recyclerView = new RecyclerView(getContext());
+            manager.getDisabledTabs().forEach(item -> {
+                if (item.type.equals("menu"))
+                    adapter.addUnmovedItem(item);
+            });
+        } else {
+            for (var item : manager.getSelectedTabs()) {
+                if (item.type.equals("menu"))
+                    adapter.addUnmovedItem(item);
+            }
+
+            for (var item : manager.getDisabledTabs()) {
+                if (item.type.equals("menu"))
+                    adapter.addUnmovedItem(item);
+            }
+        }
+
+        var recyclerView = new RecyclerView(requireContext());
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         recyclerView.setAdapter(adapter);
         recyclerView.setHasFixedSize(true);

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

@@ -114,7 +114,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
     public static String getSuperappsumm() {
         if (disableSettingsSumms()) return null;
 
-        return "Скрыто элементов" + ": " + SuperAppEditorManager.getInstance().getDisabledTabs().size();
+        return AndroidUtils.getString("elements_hidden_count") + ": " + SuperAppEditorManager.getInstance().getDisabledTabs().size();
     }
 
     public static String getCachesumm() {
@@ -183,7 +183,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
         }
 
         if (!isGmsInstalled()) {
-            addPreference(this, "", AndroidUtils.getString("installgms"), "", "ic_warning_24", preference -> {
+            addPreference(this, "", AndroidUtils.getString("installgms"), "", "ic_about_outline_28", preference -> {
                 Context context = getContext();
                 Intent a2 = new Navigator(InstallGMSFragment.class).b(context);
                 a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -330,7 +330,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
                 });
             }
         } else {
-            addPreference(this, "", "Внимание!", "Некоторые пункты настроек были скрыты из-за режима VK Me \n\nДля отключения режима перейдите в настройки Сообщений", "ic_about_outline_28", preference -> false);
+            addPreference(this, "", AndroidUtils.getString("warning"), AndroidUtils.getString("vkme_mode_info"), "ic_about_outline_28", preference -> false);
         }
 
         addPreference(this, "", AndroidUtils.getString("vtlmedia"), mediasumm, "ic_media_outline_28", preference -> {

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

@@ -47,7 +47,6 @@ import ru.vtosters.lite.ui.fragments.BaseToolbarFragment;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class StickersFragment extends BaseToolbarFragment {
-
     public final static String ACTION_RELOAD = "com.vtosters.lite.action.RELOAD_TGS_LIST";
 
     private final static int TYPE_DIRECT = 0, TYPE_SOCKS = 2;
@@ -147,7 +146,7 @@ public class StickersFragment extends BaseToolbarFragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        getContext().unregisterReceiver(mReceiver);
+        requireContext().unregisterReceiver(mReceiver);
     }
 
     private void fabClick() {

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

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

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

@@ -0,0 +1,50 @@
+package ru.vtosters.lite.ui.vkui;
+import static ru.vtosters.lite.utils.AndroidUtils.dp2px;
+import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
+
+import android.content.Context;
+import android.util.TypedValue;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+
+import java.util.List;
+
+public class VBListBuilder{
+    public static ViewGroup buildListOf(Context ctx, List<VBListItem> items){
+        LinearLayout mainView = new LinearLayout(ctx);
+        mainView.setOrientation(LinearLayout.VERTICAL);
+        mainView.setPadding(dp2px(8f), 0, dp2px(8f), 0);
+
+        for (VBListItem item : items) {
+            CheckBox mcb = new CheckBox(ctx, null);
+            mcb.setPadding(0, dp2px(8f), 0, dp2px(8f));
+
+            mcb.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14f);
+            mcb.setTextColor(getTextAttr());
+
+            mcb.setChecked(item.checked);
+            mcb.setText(item.title);
+
+            mcb.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                item.checked = isChecked;
+            });
+
+            mainView.addView(mcb);
+        }
+
+        return mainView;
+    }
+
+    public static class VBListItem{
+        public String id;
+        public String title;
+        public boolean checked;
+
+        public VBListItem(String id, String title, boolean checked){
+            this.id = id;
+            this.title = title;
+            this.checked = checked;
+        }
+    }
+}