cached playlists dialog in settings

also some catalog fixes

app/src/main/java/com/vk/libvideo/VideoTracker.java

@@ -1,336 +0,0 @@
-package com.vk.libvideo;
-
-import android.os.Bundle;
-import android.text.TextUtils;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.NotificationCompat;
-import com.vk.bridges.StatisticsBridge1;
-import com.vk.dto.common.VideoFile;
-import com.vk.media.player.PlayerTypes;
-import com.vk.navigation.NavigatorKeys;
-import com.vk.statistic.Statistic;
-import org.json.JSONException;
-import org.json.JSONObject;
-import ru.vtosters.hooks.other.Preferences;
-import ru.vtosters.lite.utils.Metrics;
-
-import java.util.Locale;
-import java.util.Objects;
-
-/* loaded from: classes3.dex */
-public class VideoTracker {
-    private final VideoFile a;
-
-    /* renamed from: b  reason: collision with root package name */
-    private Statistic f15638b;
-
-    /* renamed from: c  reason: collision with root package name */
-    private String f15639c;
-
-    /* renamed from: d  reason: collision with root package name */
-    private String f15640d;
-
-    /* renamed from: e  reason: collision with root package name */
-    private final boolean f15641e;
-
-    /* renamed from: f  reason: collision with root package name */
-    private int f15642f = -1;
-    private final int g;
-    private final int h;
-    private final int i;
-    private final int j;
-    private final int k;
-    private int l;
-    private PlayerType m;
-    private Screen n;
-
-    /* loaded from: classes3.dex */
-    public enum FullscreenTransition {
-        TAP,
-        SCREEN_ROTATION
-    }
-
-    /* loaded from: classes3.dex */
-    public enum PlayerType {
-        INLINE,
-        CAROUSEL,
-        FULLSCREEN
-    }
-
-    /* loaded from: classes3.dex */
-    public enum ResizeAction {
-        BUTTON,
-        GESTURE
-    }
-
-    /* loaded from: classes3.dex */
-    public enum RewindType {
-        SLIDER,
-        DOUBLE_TAP
-    }
-
-    /* loaded from: classes3.dex */
-    public enum Screen {
-        INLINE,
-        CAROUSEL,
-        PORTRAIT,
-        LANDSCAPE
-    }
-
-    public VideoTracker(VideoFile videoFile, @Nullable Statistic statistic, String str, boolean z, @Nullable String str2) {
-        this.a = videoFile;
-        this.f15638b = statistic;
-        int i = videoFile.d;
-        this.g = (int) (i * 0.25f);
-        this.h = (int) (i * 0.5f);
-        this.i = (int) (i * 0.75f);
-        this.j = (int) (i * 0.95f);
-        this.k = i - 1;
-        this.f15639c = str;
-        this.f15641e = z;
-        this.f15640d = str2;
-    }
-
-    private static boolean a(int i, int i2, int i3) {
-        return i3 > i && i3 <= i2;
-    }
-
-    public void a(String str) {
-        this.f15640d = str;
-    }
-
-    public boolean b() {
-        return this.f15638b != null;
-    }
-
-    public void c() {
-        this.f15642f = -1;
-    }
-
-    public void d() {
-        c("video_fullscreen_off");
-    }
-
-    public void e() {
-        c("video_fullscreen_on");
-    }
-
-    public void f() {
-        c("video_pause");
-        c("pause", "pause");
-    }
-
-    public void g() {
-        c("video_resume");
-        c("pause", "resume");
-    }
-
-    public void h() {
-        c("video_volume_off");
-        c("volume", "off");
-    }
-
-    public void i() {
-        c("video_volume_on");
-        c("volume", "on");
-    }
-
-    private void c(String str, String str2) {
-        a(b(str, str2));
-    }
-
-    public String a() {
-        return this.f15640d;
-    }
-
-    public void b(String str) {
-        if (Objects.equals(this.f15639c, str)) {
-            return;
-        }
-        this.f15639c = str;
-    }
-
-    private void c(String str) {
-        if (this.f15638b != null) {
-            StatisticsBridge1.a().a(this.f15638b, str);
-        }
-    }
-
-    public void a(@Nullable Statistic statistic) {
-        this.f15638b = statistic;
-    }
-
-    private Bundle b(String str, String str2) {
-        Bundle bundle = new Bundle();
-        bundle.putString(NotificationCompat.CATEGORY_EVENT, str);
-        bundle.putString("value", str2);
-        bundle.putInt("position", this.f15642f);
-        return bundle;
-    }
-
-    public void a(PlayerType playerType) {
-        if (this.m != playerType) {
-            this.m = playerType;
-        }
-    }
-
-    public void a(int i, int i2) {
-        int i3 = this.f15642f;
-        if (i == i3) {
-            return;
-        }
-        if (a(i3, i, 0)) {
-            a("start", i2);
-            c("video_start");
-        }
-//        if (this.a.d > 0) {
-//            if (a(this.f15642f, i, 3)) {
-//                a("3s", i2);
-//                c("video_play_3s");
-//            }
-//            if (a(this.f15642f, i, 10)) {
-//                a("10s", i2);
-//                c("video_play_10s");
-//            }
-//            if (a(this.f15642f, i, this.g)) {
-//                a("25", i2);
-//                c("video_play_25");
-//            }
-//            if (a(this.f15642f, i, this.h)) {
-//                a("50", i2);
-//                c("video_play_50");
-//            }
-//            if (a(this.f15642f, i, this.i)) {
-//                a("75", i2);
-//                c("video_play_75");
-//            }
-//            if (a(this.f15642f, i, this.j)) {
-//                a("95", i2);
-//                c("video_play_95");
-//            }
-//            if (a(this.f15642f, i, this.k)) {
-//                a("100", i2);
-//                c("video_play_100");
-//            }
-//        }
-        this.f15642f = i;
-    }
-
-    public void a(int i) {
-        a("continue", i);
-        c("video_start");
-    }
-
-    public void a(@NonNull Screen screen) {
-        if (this.n != screen) {
-            this.n = screen;
-            c("screen", screen.toString().toLowerCase());
-        }
-    }
-
-    public void a(@NonNull FullscreenTransition fullscreenTransition) {
-        c("full_screen_transition", fullscreenTransition.toString().toLowerCase());
-    }
-
-    public void a(int i, boolean z) {
-        if (this.l != i) {
-            this.l = i;
-            c(z ? "auto_quality" : "quality", PlayerTypes.c(i));
-        }
-    }
-
-    public void a(@Nullable String str, boolean z) {
-        String str2 = z ? "auto_subtitles" : "subtitles";
-        if (str == null) {
-            str = "off";
-        }
-        c(str2, str);
-    }
-
-    public void a(int i, int i2, @NonNull RewindType rewindType) {
-        Bundle b2 = b("rewind", i <= i2 ? "forward" : "backward");
-        b2.putString("rewind_type", rewindType.toString().toLowerCase());
-        b2.putInt("rewind_start", i);
-        b2.putInt("rewind_end", i2);
-        a(b2);
-    }
-
-    public void a(float f2) {
-        String format;
-        if (f2 == 1.0f) {
-            format = "normal";
-        } else {
-            int i = (int) f2;
-            format = f2 == ((float) i) ? String.format(Locale.US, "%s", i) : String.format(Locale.US, "%.2f", f2);
-        }
-        c("speed", format);
-    }
-
-    public void a(boolean z, @NonNull ResizeAction resizeAction) {
-        Bundle b2 = b("resize", z ? "widen" : "narrow");
-        b2.putString("resize_action", resizeAction.toString().toLowerCase());
-        a(b2);
-    }
-
-    public void a(String str, String str2) {
-        Bundle bundle = new Bundle();
-        bundle.putString("link_type", str);
-        bundle.putString("value", str2);
-        bundle.putString(NotificationCompat.CATEGORY_EVENT, "show_link");
-        a(bundle);
-    }
-
-    private void a(String str, int i) {
-        Bundle bundle = new Bundle();
-        bundle.putString("autoplay", this.f15641e ? "1" : "0");
-        bundle.putString("position", str);
-        if (i >= 0) {
-            bundle.putInt("quality", i - 2);
-        }
-        PlayerType playerType = this.m;
-        if (playerType != null) {
-            bundle.putString("player_type", playerType.toString().toLowerCase());
-        }
-        a("video_play", bundle);
-    }
-
-    private void a(Bundle bundle) {
-        a("video_event", bundle);
-    }
-
-    private void a(String str, Bundle bundle) {
-        bundle.putString("video_id", this.a.a + "_" + this.a.b);
-        bundle.putString(NavigatorKeys.V, this.f15639c);
-        bundle.putString(NavigatorKeys.Z, this.f15639c);
-        if (!TextUtils.isEmpty(this.f15640d)) {
-            bundle.putString("context", this.f15640d);
-        }
-        if (!TextUtils.isEmpty(this.a.l0)) {
-            bundle.putString(NavigatorKeys.l0, this.a.l0);
-        }
-        bundle.putLong("ts", System.currentTimeMillis());
-        StatisticsBridge1.a().a(str, bundle);
-
-        if (Preferences.getBoolValue("sendVideoMetrics", true) && str.equals("video_play")) {
-            try {
-                sendMetrics(str);
-            } catch (JSONException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    public void sendMetrics(String event) throws JSONException {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("e", event);
-        jsonObject.put("source", this.f15639c);
-        jsonObject.put("ref", this.f15639c);
-        jsonObject.put("video_id", this.a.a + "_" + this.a.b);
-        jsonObject.put("position", "start");
-        jsonObject.put("position_sec", 0);
-        jsonObject.put("cur_quality", "auto");
-
-        Metrics.trackEvents(jsonObject, false);
-    }
-}

app/src/main/java/com/vk/music/stats/VKMusicStatsTracker.java

@@ -1,256 +0,0 @@
-package com.vk.music.stats;
-
-import android.content.Intent;
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.app.NotificationCompat;
-import com.vk.core.extensions.StringExt;
-import com.vk.music.common.MusicPlaybackLaunchContext;
-import com.vk.music.logger.MusicLogger;
-import com.vk.music.stats.i.MusicPlaybackParams;
-import com.vk.navigation.NavigatorKeys;
-import com.vtosters.lite.data.Analytics;
-import kotlin.jvm.b.Functions2;
-import org.json.JSONException;
-import org.json.JSONObject;
-import ru.vtosters.hooks.other.Preferences;
-import ru.vtosters.lite.utils.Metrics;
-
-import java.util.Objects;
-import java.util.UUID;
-
-public final class VKMusicStatsTracker implements MusicStatsTracker {
-    private String a;
-    private final Functions2<String, Analytics.l> b;
-    private static final a c = new a();
-
-    public VKMusicStatsTracker(Functions2<String, Analytics.l> functions2) {
-        this.b = functions2;
-    }
-
-    private String e(MusicPlaybackParams musicPlaybackParams) {
-        String g = musicPlaybackParams.g();
-        if (g == null) {
-            g = this.a;
-        }
-        if (g == null) {
-            g = "auto";
-        }
-        this.a = g;
-        return g;
-    }
-
-    @Override
-    public void a(boolean z) {
-        MusicStatsTracker.a.a(this, z);
-    }
-
-    @Override
-    public void b(MusicPlaybackParams musicPlaybackParams) {
-        c.a(a(musicPlaybackParams, "music_start_playback"));
-
-        if (Preferences.sendMusicMetrics()) {
-            try {
-                makeMetricsRequest(musicPlaybackParams, "music_start_playback");
-            } catch (JSONException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    @Override
-    public void b(boolean z) {
-    }
-
-    @Override
-    public void c(MusicPlaybackParams musicPlaybackParams) {
-        MusicStatsTracker.a.b(this, musicPlaybackParams);
-    }
-
-    @Override
-    public void d() {
-        MusicStatsTracker.a.a(this);
-    }
-
-    @Override
-    public void a(Intent intent, String str) {
-        MusicStatsTracker.a.a(this, intent, str);
-    }
-
-    @Override
-    public void b(String str, @NonNull String str2) {
-        Analytics.l invoke = this.b.invoke("music_subscription_action");
-        invoke.a("popup", str);
-        invoke.a("action", str2);
-        c.a(invoke);
-    }
-
-    @Override
-    public void c(boolean z) {
-        MusicStatsTracker.a.b(this, z);
-    }
-
-    @Override
-    public void d(MusicPlaybackParams musicPlaybackParams) {
-        if (Objects.equals("pause", this.a)) {
-            a(musicPlaybackParams);
-        }
-    }
-
-    @Override
-    public void a(long j) {
-        MusicStatsTracker.a.a(this, j);
-    }
-
-    @Override
-    public void c() {
-        Analytics.l invoke = this.b.invoke("music_subscription_push");
-        invoke.a("action", "open");
-        c.a(invoke);
-    }
-
-    @Override
-    public void a(String str, MusicStatsRefer musicStatsRefer) {
-        Analytics.l invoke = this.b.invoke("music_subscription_show");
-        invoke.a("popup", str);
-        c.a(invoke);
-    }
-
-    @Override
-    public void b() {
-        Analytics.l invoke = this.b.invoke("music_subscription_push");
-        invoke.a("action", "send");
-        c.a(invoke);
-    }
-
-    @Override
-    public void a(MusicPlaybackParams musicPlaybackParams) {
-        c.a(a(musicPlaybackParams, "music_stop_playback"));
-
-        if (Preferences.sendMusicMetrics()) {
-            try {
-                makeMetricsRequest(musicPlaybackParams, "music_stop_playback");
-            } catch (JSONException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    @Override
-    public void a(PlayerStateChangedParams playerStateChangedParams) {
-        Analytics.l invoke = this.b.invoke("audio_player");
-        invoke.a(NavigatorKeys.t0, playerStateChangedParams.a());
-        invoke.a("prev_state", playerStateChangedParams.c());
-        invoke.a("duration", playerStateChangedParams.b());
-        c.a(invoke);
-    }
-
-    @Override
-    public void b(String str) {
-        Analytics.l invoke = this.b.invoke("music_subscription_free_displayed");
-        invoke.a("popup", str);
-        c.a(invoke);
-    }
-
-    @Override
-    public void a(String str) {
-        Analytics.l invoke = this.b.invoke("playlist_start");
-        invoke.a(NavigatorKeys.e, str);
-        c.a(invoke);
-    }
-
-    private void makeMetricsRequest(MusicPlaybackParams musicPlaybackParams, String str) throws JSONException {
-        JSONObject event = new JSONObject();
-
-        if (str.equals("music_stop_playback")) {
-            event.put("e", str);
-            event.put("audio_id", musicPlaybackParams.c());
-            event.put("duration", musicPlaybackParams.a());
-            event.put("start_time", musicPlaybackParams.i());
-            event.put("shuffle", "false");
-            event.put("reason", "new");
-            event.put("state", "app");
-            event.put("duration", musicPlaybackParams.a());
-        } else {
-            event.put("e", str);
-            event.put("audio_id", musicPlaybackParams.c());
-            event.put("start_time", musicPlaybackParams.i());
-            event.put("shuffle", "false");
-            event.put("reason", "auto");
-            event.put("state", "app");
-
-            if (StringExt.a((CharSequence) musicPlaybackParams.e())) {
-                event.put("prev_audio_id", musicPlaybackParams.e());
-            }
-        }
-
-        Metrics.trackEvents(event, true);
-    }
-
-    private Analytics.l a(MusicPlaybackParams musicPlaybackParams, String str) {
-        Analytics.l invoke = this.b.invoke(str);
-        invoke.a("audio_id", musicPlaybackParams.c());
-        invoke.a("uuid", UUID.randomUUID().hashCode());
-        invoke.a("shuffle", musicPlaybackParams.l());
-        invoke.a("reason", e(musicPlaybackParams));
-        invoke.a("start_time", musicPlaybackParams.i());
-        invoke.a("playback_started_at", musicPlaybackParams.d());
-        invoke.a(NavigatorKeys.l0, musicPlaybackParams.j());
-        if (!Objects.equals("music_start_playback", str)) {
-            invoke.a("duration", musicPlaybackParams.a());
-        }
-        int i = h.$EnumSwitchMapping$0[musicPlaybackParams.b().ordinal()];
-        if (i == 1) {
-            invoke.a("repeat", "one");
-        } else if (i == 2) {
-            invoke.a("repeat", "all");
-        }
-        invoke.a(NavigatorKeys.t0, musicPlaybackParams.m());
-        MusicPlaybackLaunchContext h = musicPlaybackParams.h();
-        invoke.a(NavigatorKeys.V, h.v0());
-        if (h.v1()) {
-            invoke.a("playlist_id", h.u1());
-        }
-        if (h.i(4) || h.i(8)) {
-            invoke.a("expanded", h.i(4));
-        }
-        if (StringExt.a((CharSequence) musicPlaybackParams.e())) {
-            invoke.a("prev_audio_id", musicPlaybackParams.e());
-        }
-        if (StringExt.a((CharSequence) musicPlaybackParams.f())) {
-            invoke.a("prev_playlist_id", musicPlaybackParams.f());
-        }
-        return invoke;
-    }
-
-    @Override
-    public void a(String str, String str2) {
-        boolean a2 = Objects.equals("success", str2);
-        Analytics.l builder = this.b.invoke("music_subscription_purchase_result");
-        builder.a("popup", str);
-        builder.a(NotificationCompat.CATEGORY_STATUS, a2 ? "success" : "fail");
-        if (!a2) {
-            builder.a("reason", str2);
-        }
-        c.a(builder);
-    }
-
-    @Override
-    public void a() {
-        Analytics.l invoke = this.b.invoke("music_subscription");
-        invoke.a("popup", "background_v2");
-        invoke.a("action", "link");
-        c.a(invoke);
-    }
-
-    public static final class a {
-        private a() {
-        }
-
-        @VisibleForTesting
-        public void a(Analytics.l lVar) {
-            MusicLogger.a("MusicStats", "[VK_TRACKER]", lVar);
-            lVar.b();
-        }
-    }
-}

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

@@ -11,37 +11,37 @@ import com.vtosters.lite.R;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class GmsHook {
-    private static final String[] spoofPackages = {"com.mgoogle", "app.revanced"};
-    private static final String currentGms;
+    private static final boolean needToSpoof = !isGmsInstalled() && (isFakeGmsInstalled() || isFakeGms2Installed());
 
-    static {
-        currentGms = getSpoofPackagePrefix();
-    }
-
-    private static boolean isPackageInstalled(String packageName) {
+    public static boolean isGmsInstalled() {
         try {
-            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo(packageName, 0);
+            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("com.google.android.gms", 0);
             return true;
         } catch (Exception unused) {
             return false;
         }
-    }
+    } // Google Market Services check
 
-    public static boolean isGmsInstalled() {
-        return isPackageInstalled("com.google.android.gms");
-    }
+    public static boolean isFakeGmsInstalled() {
+        try {
+            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("com.mgoogle.android.gms", 0);
+            return true;
+        } catch (Exception unused) {
+            return false;
+        }
+    } // Microg Google Market Services check
 
-    public static boolean isSpoofPackageInstalled(String packageName) {
-        return isPackageInstalled(packageName + ".android.gms");
-    }
+    public static boolean isFakeGms2Installed() {
+        try {
+            AndroidUtils.getGlobalContext().getPackageManager().getPackageInfo("app.revanced.android.gms", 0);
+            return true;
+        } catch (Exception unused) {
+            return false;
+        }
+    } // Microg Google Market Services check
 
     public static boolean isAnyServicesInstalled() {
-        for (String packageName : spoofPackages) {
-            if (isSpoofPackageInstalled(packageName)) {
-                return true;
-            }
-        }
-        return false;
+        return isGmsInstalled() || isFakeGmsInstalled() || isFakeGms2Installed();
     }
 
     public static void fixGapps() {
@@ -52,10 +52,10 @@ public class GmsHook {
                 notificationManager.createNotificationChannel(new NotificationChannel("audio_playback_channel", AndroidUtils.getResources().getString(R.string.audio_message_play_error), NotificationManager.IMPORTANCE_LOW));
             }
         }
-    }
+    } // Music channels fix
 
     public static String replaceGMSPackage(String str) {
-        return shouldSpoof() ? str.replaceAll("com.google", currentGms) : str;
+        return needToSpoof ? str.replaceAll("com.google", (isFakeGms2Installed() ? "app.revanced" : "com.mgoogle")) : str;
     }
 
     public static String getFirebaseInstanceIdReceiver() {
@@ -63,37 +63,6 @@ public class GmsHook {
     }
 
     public static Class getFirebaseInstanceIdReceiverClass() {
-        return getSpoofFirebaseInstanceIdReceiverClass();
+        return needToSpoof ? (isFakeGms2Installed() ? FirebaseInstanceIdReceiver3.class : FirebaseInstanceIdReceiver2.class) : FirebaseInstanceIdReceiver.class;
     }
-
-    public static String getCurrentGms() {
-        return currentGms;
-    }
-
-    private static boolean shouldSpoof() {
-        return !isGmsInstalled() && (isSpoofPackageInstalled("com.mgoogle") || isSpoofPackageInstalled("app.revanced"));
-    }
-
-    private static String getSpoofPackagePrefix() {
-        for (String packageName : spoofPackages) {
-            if (isSpoofPackageInstalled(packageName)) {
-                return packageName;
-            }
-        }
-        return "com.google";
-    }
-
-    private static Class getSpoofFirebaseInstanceIdReceiverClass() {
-        switch (currentGms) {
-            case "com.mgoogle" -> {
-                return FirebaseInstanceIdReceiver2.class;
-            }
-            case "app.revanced" -> {
-                return FirebaseInstanceIdReceiver3.class;
-            }
-            default -> {
-                return FirebaseInstanceIdReceiver.class;
-            }
-        }
-    }
-}
+}

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

@@ -66,8 +66,7 @@ public class MainActivityInjector {
         // VKIDProtection.alert(activity);
         //needs to show selected tgs pack count in settings after cold launch
         TelegramStickersService.getInstance(activity);
-
-        if (AccountManagerUtils.isLogin() && !Preferences.serverFeaturesDisable() && Preferences.isValidSignature()) {
+        if (AccountManagerUtils.isLogin()) {
             Native.canVote = NativeLibLoader.loadLibrary("sponsorpost");
         }
     }
@@ -83,7 +82,7 @@ public class MainActivityInjector {
                 ThemesManager.generateModApk(ThemesUtils.getReservedAccent());
                 activity.runOnUiThread(LifecycleUtils::restartApplication);
             } catch (Throwable e) {
-                e.fillInStackTrace();
+                e.printStackTrace();
                 activity.runOnUiThread(() -> {
                     dialog.cancel();
                     new VkAlertDialog.Builder(activity)

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

@@ -1,10 +1,7 @@
 package ru.vtosters.hooks;
 
 import android.util.Log;
-import android.util.SparseArray;
 import com.vk.core.network.Network;
-import com.vk.im.engine.internal.api_parsers.UserApiParser;
-import com.vk.im.engine.models.users.User;
 import com.vtosters.lite.R;
 import okhttp3.Call;
 import okhttp3.Callback;
@@ -13,6 +10,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.hooks.other.Preferences;
+import ru.vtosters.lite.proxy.ProxyUtils;
+import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 import java.io.IOException;
@@ -147,36 +146,16 @@ public class OnlineFormatterHook {
         return json;
     }
 
-    public static SparseArray<User> onlineHookList(String str) {
-        JSONArray jSONArray;
+    public static JSONArray onlineHookList(JSONArray jsonArr) {
+        if (!getBoolValue("onlinefix", false) || Preferences.serverFeaturesDisable()) return jsonArr;
+
         try {
-            jSONArray = new JSONObject(str).getJSONArray("response");
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-        SparseArray<User> sparseArray = new SparseArray<>(jSONArray.length());
-        int length = jSONArray.length();
-
-        if (getBoolValue("onlinefix", false) || !Preferences.serverFeaturesDisable()) {
-            try {
-                jSONArray = JsonInjectors.setOnlineInfoUsers(jSONArray);
-            } catch (JSONException e) {
-                throw new RuntimeException(e);
-            }
+            JsonInjectors.setOnlineInfoUsers(jsonArr);
+        } catch (Exception e) {
+            Log.e("onlineHookProfiles", e.getMessage());
         }
 
-        for (int i = 0; i < length; i++) {
-            JSONObject jSONObject;
-            try {
-                jSONObject = jSONArray.getJSONObject(i);
-            } catch (JSONException e) {
-                throw new RuntimeException(e);
-            }
-            User b = UserApiParser.b(jSONObject);
-            sparseArray.put(b.getId(), b);
-        }
-
-        return sparseArray;
+        return jsonArr;
     }
 
     public static JSONObject onlineHookProfiles(JSONObject json) {
@@ -209,19 +188,19 @@ public class OnlineFormatterHook {
         try {
             JsonInjectors.setOnlineInfoUsers(json.optJSONObject("read_requests").optJSONArray("items"));
         } catch (Exception e) {
-            Log.e("onlineHookItemsRec", e.getMessage());
+            Log.e("onlineHookItems", e.getMessage());
         }
 
         try {
             JsonInjectors.setOnlineInfoUsers(json.optJSONObject("recommendations").optJSONArray("items"));
         } catch (Exception e) {
-            Log.e("onlineHookItemsRec", e.getMessage());
+            Log.e("onlineHookItems", e.getMessage());
         }
 
         try {
             JsonInjectors.setOnlineInfoUsers(json.optJSONArray("profiles"));
         } catch (Exception e) {
-            Log.e("onlineHookItemsRec", e.getMessage());
+            Log.e("onlineHookItems", e.getMessage());
         }
 
         return json;

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

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

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

@@ -1,29 +0,0 @@
-package ru.vtosters.hooks;
-
-import android.os.Build;
-import me.leolin.shortcutbadger.Badger;
-import me.leolin.shortcutbadger.impl.*;
-
-import java.util.List;
-
-public class ShortcutBadgerHook {
-    public static void init(List<Class<? extends Badger>> list) {
-        list.add(AdwHomeBadger.class);
-        list.add(ApexHomeBadger.class);
-        list.add(DefaultBadger.class);
-        list.add(NewHtcHomeBadger.class);
-        list.add(NovaHomeBadger.class);
-        list.add(AsusHomeBadger.class);
-        list.add(HuaweiHomeBadger.class);
-        list.add(OPPOHomeBader.class);
-        list.add(SamsungHomeBadger.class);
-        list.add(ZukHomeBadger.class);
-        list.add(VivoHomeBadger.class);
-        list.add(ZTEHomeBadger.class);
-        list.add(EverythingMeHomeBadger.class);
-
-        if (Build.VERSION.SDK_INT < 34) {
-            list.add(SonyHomeBadger.class);
-        }
-    }
-}

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

@@ -3,17 +3,15 @@ package ru.vtosters.hooks;
 import com.vk.medianative.MediaImageEncoder;
 import com.vk.toggle.FeatureManager;
 import com.vk.toggle.Features;
-import ru.vtosters.hooks.other.Preferences;
 
 import static ru.vtosters.hooks.other.Preferences.*;
 
 public class TogglesHook {
     public static boolean shouldPatch(Features.Type feature) {
         return switch (feature) {
-            case AB_IM_LONGPOLL_MSG_BATCHING, AB_IM_VIEW_POOL, AB_MULTI_GIFTS, AB_NEWS_VIDEO_LAYOUT_TEXT, AB_STICKERS_DISCOVER, AB_GIFTS_FROM_KEYBOARD, EXPERIMENT_NEWS_VIDEO_LAYOUT_TEXT, FEATURE_DISCOVER_CATEGORIES, FEATURE_FAVE_PERF_IMPROVE, FEATURE_GROUP_ADMIN_MESSAGES, FEATURE_GROUP_MSG_PUSH_PARAM, FEATURE_IMAGE_QUALITY_UPGRADE, FEATURE_IM_AUDIO_MSG_TRANSCRIPT, FEATURE_IM_CASPER_MSGS, FEATURE_IM_DISABLE_FORCE_OPEN_VK_ME, FEATURE_IM_GIF_AUTOPLAY, FEATURE_IM_MR_IN_VKAPP, FEATURE_MEMORIES_ENABLED, FEATURE_MENU_GAMES_CAROUSEL, FEATURE_MILKSHAKE, FEATURE_MILKSHAKE_NEWS_SCROLL_ON_BACK, FEATURE_MILKSHAKE_SWITCH_THEME_ON_TAP, FEATURE_ML_BRANDS, FEATURE_ML_FEATURES, FEATURE_ML_MODELS_LOADING, FEATURE_MONEY_TRANSFERS_VKPAY, FEATURE_MUSIC_ARTIST_CATALOG, FEATURE_MUSIC_NEW_CATALOG, FEATURE_NARRATIVE_SNIPPET_TYPE, FEATURE_NEWS_GAMES_IN_DISCOVER, FEATURE_NEWS_HEADER_SCROLL, FEATURE_NEW_FORMAT_SHOW_WPB, FEATURE_PODCASTS_PAGE, FEATURE_QR_CREATE_QR, FEATURE_QR_DYNAMIC_FRAME, FEATURE_QR_SCAN_FROM_PHOTO, FEATURE_QR_VISION_DECODER, FEATURE_QUEUE_COUNTERS, FEATURE_REEF, FEATURE_ROAMING_AUTOPLAY, FEATURE_SHARE_MSGS_ON_INVITE, FEATURE_STICKERS_BOT_LINK, FEATURE_STICKERS_NEW_CATALOG, FEATURE_STORIES_AVATAR, FEATURE_STORIES_FEED_TYPE, FEATURE_STORIES_SHOW_ALWAYS, FEATURE_STORY_ANSWER_PUBLIC, FEATURE_STORY_APP_STICKER, FEATURE_STORY_ARCHIVE, FEATURE_STORY_ARCHIVE_POST, FEATURE_STORY_BAKGROUND_ALL, FEATURE_STORY_BOX, FEATURE_STORY_CADRE, FEATURE_STORY_CAMERA_TOOLTIP, FEATURE_STORY_EDITOR_GALLERY, FEATURE_STORY_EDITOR_TYPE, FEATURE_STORY_ENDLESS_VIDEO, FEATURE_STORY_FAST_REACTIONS, FEATURE_STORY_GIF, FEATURE_STORY_GROUPED, FEATURE_STORY_HIGH_QUALITY, FEATURE_STORY_MASKS_FRONTAL, FEATURE_STORY_MENTION_ICON, FEATURE_STORY_MODERN_PUBLISH, FEATURE_STORY_MUSIC_EDITOR, FEATURE_STORY_MUSIC_REPLIES, FEATURE_STORY_MUSIC_REPLIES_2, FEATURE_STORY_NEW_FRAME, FEATURE_STORY_ONE_TIME, FEATURE_STORY_PHOTO_SHARING, FEATURE_STORY_PHOTO_STICKER, FEATURE_STORY_POLLS, FEATURE_STORY_POST_REPOST, FEATURE_STORY_PRELOADING, FEATURE_STORY_QUESTION, FEATURE_STORY_QUESTION_STYLE, FEATURE_STORY_RLOTTIE, FEATURE_STORY_RLOTTIE_CACHE, FEATURE_STORY_SAVE_DEFAULT_ON, FEATURE_STORY_SEND_DIALOG_LIST, FEATURE_STORY_STICKER_PACK, FEATURE_STORY_TIME, FEATURE_STORY_VIEWER_CAMERA, FEATURE_STORY_VOICE_ANSWER, FEATURE_STORY_WITH_CONTEXT, FEATURE_SUPERAPP_MENU, FEATURE_TRAFFIC_SAVER, FEATURE_VKPAY_WIDGET, FEATURE_VKUI_INTERNAL_TO_MINI_APPS, FEATURE_VKUI_TOKEN_CACHE, FEATURE_VK_APPS_SEARCH, FEATURE_VOTES_BALANCE, FEATURE_WEBVIEW_TOKEN_ACTIVE, FEATURE_MILKSHAKE_FORCE_DISABLED, FEATURE_MILKSHAKE_ACTIVATION_DISABLED, EXPERIMENT_NEWS_DISABLE_CACHE ->
+            case AB_MULTI_GIFTS, AB_NEWS_VIDEO_LAYOUT_TEXT, AB_STICKERS_DISCOVER, AB_GIFTS_FROM_KEYBOARD, EXPERIMENT_NEWS_VIDEO_LAYOUT_TEXT, FEATURE_DISCOVER_CATEGORIES, FEATURE_FAVE_PERF_IMPROVE, FEATURE_GROUP_ADMIN_MESSAGES, FEATURE_GROUP_MSG_PUSH_PARAM, FEATURE_IMAGE_QUALITY_UPGRADE, FEATURE_IM_AUDIO_MSG_TRANSCRIPT, FEATURE_IM_CASPER_MSGS, FEATURE_IM_DISABLE_FORCE_OPEN_VK_ME, FEATURE_IM_GIF_AUTOPLAY, FEATURE_IM_MR_IN_VKAPP, FEATURE_MEMORIES_ENABLED, FEATURE_MENU_GAMES_CAROUSEL, FEATURE_MILKSHAKE, FEATURE_MILKSHAKE_NEWS_SCROLL_ON_BACK, FEATURE_MILKSHAKE_SWITCH_THEME_ON_TAP, FEATURE_ML_BRANDS, FEATURE_ML_FEATURES, FEATURE_ML_MODELS_LOADING, FEATURE_MONEY_TRANSFERS_VKPAY, FEATURE_MUSIC_ARTIST_CATALOG, FEATURE_MUSIC_NEW_CATALOG, FEATURE_NARRATIVE_SNIPPET_TYPE, FEATURE_NEWS_GAMES_IN_DISCOVER, FEATURE_NEWS_HEADER_SCROLL, FEATURE_NEW_FORMAT_SHOW_WPB, FEATURE_PODCASTS_PAGE, FEATURE_QR_CREATE_QR, FEATURE_QR_DYNAMIC_FRAME, FEATURE_QR_SCAN_FROM_PHOTO, FEATURE_QR_VISION_DECODER, FEATURE_QUEUE_COUNTERS, FEATURE_REEF, FEATURE_ROAMING_AUTOPLAY, FEATURE_SHARE_MSGS_ON_INVITE, FEATURE_STICKERS_BOT_LINK, FEATURE_STICKERS_NEW_CATALOG, FEATURE_STORIES_AVATAR, FEATURE_STORIES_FEED_TYPE, FEATURE_STORIES_SHOW_ALWAYS, FEATURE_STORY_ANSWER_PUBLIC, FEATURE_STORY_APP_STICKER, FEATURE_STORY_ARCHIVE, FEATURE_STORY_ARCHIVE_POST, FEATURE_STORY_BAKGROUND_ALL, FEATURE_STORY_BOX, FEATURE_STORY_CADRE, FEATURE_STORY_CAMERA_TOOLTIP, FEATURE_STORY_EDITOR_GALLERY, FEATURE_STORY_EDITOR_TYPE, FEATURE_STORY_ENDLESS_VIDEO, FEATURE_STORY_FAST_REACTIONS, FEATURE_STORY_GIF, FEATURE_STORY_GROUPED, FEATURE_STORY_HIGH_QUALITY, FEATURE_STORY_MASKS_FRONTAL, FEATURE_STORY_MENTION_ICON, FEATURE_STORY_MODERN_PUBLISH, FEATURE_STORY_MUSIC_EDITOR, FEATURE_STORY_MUSIC_REPLIES, FEATURE_STORY_MUSIC_REPLIES_2, FEATURE_STORY_NEW_FRAME, FEATURE_STORY_ONE_TIME, FEATURE_STORY_PHOTO_SHARING, FEATURE_STORY_PHOTO_STICKER, FEATURE_STORY_POLLS, FEATURE_STORY_POST_REPOST, FEATURE_STORY_PRELOADING, FEATURE_STORY_QUESTION, FEATURE_STORY_QUESTION_STYLE, FEATURE_STORY_RLOTTIE, FEATURE_STORY_RLOTTIE_CACHE, FEATURE_STORY_SAVE_DEFAULT_ON, FEATURE_STORY_SEND_DIALOG_LIST, FEATURE_STORY_STICKER_PACK, FEATURE_STORY_TIME, FEATURE_STORY_VIEWER_CAMERA, FEATURE_STORY_VOICE_ANSWER, FEATURE_STORY_WITH_CONTEXT, FEATURE_SUPERAPP_MENU, FEATURE_TRAFFIC_SAVER, FEATURE_VKPAY_WIDGET, FEATURE_VKUI_INTERNAL_TO_MINI_APPS, FEATURE_VKUI_TOKEN_CACHE, FEATURE_VK_APPS_SEARCH, FEATURE_VOTES_BALANCE, FEATURE_WEBVIEW_TOKEN_ACTIVE, FEATURE_MILKSHAKE_FORCE_DISABLED, FEATURE_MILKSHAKE_ACTIVATION_DISABLED, EXPERIMENT_NEWS_DISABLE_CACHE ->
                     true;
-            default ->
-                    false;
+            default -> false;
         };
     }
 
@@ -28,7 +26,6 @@ public class TogglesHook {
             case FEATURE_IMAGE_QUALITY_UPGRADE -> !MediaImageEncoder.needToCompress();
             case FEATURE_MENU_GAMES_CAROUSEL -> miniapps();
             case FEATURE_TRAFFIC_SAVER -> !disableForceTrafficSaver();
-            case AB_IM_LONGPOLL_MSG_BATCHING, AB_IM_VIEW_POOL -> Preferences.getBoolValue("batchmessages", false);
             default -> true;
         };
     }

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

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

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

@@ -42,15 +42,9 @@ public class CatalogJsonInjector {
 
                 removeUnsupportedLayouts(blocks);
 
-                if (Preferences.getBoolValue("playlistsCatalogs", true)) {
-                    fetchCatalogId("https://vk.com/audio?section=my_playlists", oldItems);
+                fetchCatalogId("https://vk.com/audio?section=my_playlists", oldItems);
 
-                    fetchCatalogId("https://vk.com/audio?section=albums", oldItems);
-                }
-
-                if (Preferences.sendMusicMetrics() && Preferences.getBoolValue("playStatCatalog", false)) {
-                    fetchCatalogId("https://vk.com/audio?section=recent", oldItems);
-                }
+                fetchCatalogId("https://vk.com/audio?section=albums", oldItems);
 
                 setDefaultAudioPage(oldItems, catalog);
             }

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

@@ -15,7 +15,6 @@ import ru.vtosters.lite.downloaders.AudioDownloader;
 import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.music.cache.helpers.PlaylistHelper;
 import ru.vtosters.lite.music.cache.helpers.TracklistHelper;
-import ru.vtosters.lite.utils.AccountManagerUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,10 +36,8 @@ public class PlaylistInjector {
 
     public static Observable<AudioGetPlaylist.c> injectGetPlaylist(AudioGetPlaylist audioGetPlaylist) {
         try {
-            if (MusicCacheImpl.isEmpty()) {
+            if (MusicCacheImpl.isEmpty())
                 return null;
-            }
-            
             var requestArgs = audioGetPlaylist.b();
 
             var id = requestArgs.get("id");
@@ -48,11 +45,9 @@ public class PlaylistInjector {
             var accessKey = requestArgs.get("access_key");
             boolean isVirtualPlaylist = accessKey != null && (accessKey.equals("cache"));
             boolean isAlbumVirtualPlaylist = accessKey != null && (accessKey.equals("cacheAlbum"));
-            boolean isOwnCachePlaylist = Objects.equals(ownerId, String.valueOf(AccountManagerUtils.getUserId())) && Objects.equals(id, "-1");
 
-            if (TextUtils.isEmpty(id) || (!isVirtualPlaylist && !isAlbumVirtualPlaylist)) {
+            if (TextUtils.isEmpty(id) || (!isVirtualPlaylist && !isAlbumVirtualPlaylist))
                 return null;
-            }
 
             return Observable.a((ObservableOnSubscribe<AudioGetPlaylist.c>) observableEmitter -> {
                 AudioGetPlaylist.c response = new AudioGetPlaylist.c();
@@ -86,11 +81,13 @@ public class PlaylistInjector {
                     return;
                 }
 
-                if (isOwnCachePlaylist) {
-                    response.c = (ArrayList<MusicTrack>) TracklistHelper.getMyCachedMusicTracks();
+                response.c = (ArrayList<MusicTrack>) MusicCacheImpl.getPlaylistSongs(ownerId, id);
+
+                Log.d("Playlist", "Open playlist " + ownerId + "_" + id);
+
+                if (Objects.equals(id, "-1")) {
                     response.b = PlaylistHelper.createCachedPlaylistMetadata();
                 } else {
-                    response.c = (ArrayList<MusicTrack>) MusicCacheImpl.getPlaylistSongs(ownerId, id);
                     response.b = MusicCacheImpl.getPlaylist(id, ownerId);
                 }
 

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

@@ -42,7 +42,7 @@ public class TracklistInjector {
                             Log.d("TracklistInjector", "Using vkx cache catalog");
                             observableEmitter.b(parser.c(new JSONObject(service.getCacheCatalog())));
                         } catch (Exception e) {
-                            e.fillInStackTrace();
+                            e.printStackTrace();
                             List<MusicTrack> tracks = new ArrayList<>();
                             List<String> cache = service.getCache();
 
@@ -55,14 +55,16 @@ public class TracklistInjector {
                             observableEmitter.b(parser.c(createVirtualCatalog(tracks)));
                         }
                     } catch (Exception e) {
-                        e.fillInStackTrace();
+                        e.printStackTrace();
                     }
                 });
             } else {
                 if (MusicCacheImpl.isEmpty()) {
                     observableEmitter.b(parser.c(getEmptyCatalog()));
                 } else {
-                    observableEmitter.b(parser.c(createVirtualCatalog(TracklistHelper.getMyCachedMusicTracks())));
+                    observableEmitter.b(parser.c(createVirtualCatalog(
+                            PlaylistCacheDbDelegate.getTracksInPlaylist(AndroidUtils.getGlobalContext(),
+                            AccountManagerUtils.getUserId() + "_-1"))));
                 }
             }
         });
@@ -246,7 +248,7 @@ public class TracklistInjector {
                     .put(getCatalogPlaylist());
         }
 
-        if (!PlaylistCacheDbDelegate.isPlaylistEmpty(AndroidUtils.getGlobalContext(), AccountManagerUtils.getUserId() + "_-1")) {
+        if (!MusicCacheImpl.getAllOwnTracks().isEmpty()) {
             if (MusicCacheImpl.hasPlaylist()) blocks.put(getCatalogSeparator());
             blocks.put(getCatalogHeader(AndroidUtils.getString(R.string.cached_tracks_title)))
                     .put(getShuffleButton())

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

@@ -100,8 +100,8 @@ public class Preferences {
         return getBoolValue("vkme", false);
     }
 
-    public static int autocache() {
-        return Preferences.getPreferences().getInt("autocaching", 0);
+    public static boolean autocache() {
+        return getBoolValue("autocache", false);
     }
 
     public static boolean adsstories() {
@@ -292,10 +292,6 @@ public class Preferences {
         return getBoolValue("vkme_notifs", false);
     }
 
-    public static boolean sendMusicMetrics() {
-        return getBoolValue("sendMusicMetrics", true);
-    }
-
     public static boolean screenshotdetect() {
         return getBoolValue("screenshotdetect", true);
     }

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

@@ -24,8 +24,6 @@ import com.vk.core.drawable.RecoloredDrawable;
 import com.vk.core.ui.themes.MilkshakeHelper;
 import com.vk.core.ui.themes.VKTheme;
 import com.vk.core.ui.themes.VKThemeHelper;
-import com.vk.im.engine.models.dialogs.DialogTheme;
-import com.vk.im.ui.themes.DefaultThemeProvider;
 import com.vtosters.lite.R;
 import com.vtosters.lite.data.ThemeTracker;
 import ru.vtosters.lite.deviceinfo.OEMDetector;
@@ -33,7 +31,9 @@ import ru.vtosters.lite.themes.ThemesCore;
 import ru.vtosters.lite.themes.ThemesHacks;
 import ru.vtosters.lite.themes.ThemesManager;
 import ru.vtosters.lite.ui.wallpapers.WallpapersHooks;
+import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.LifecycleUtils;
+import ru.vtosters.lite.utils.WebViewColoringUtils;
 
 import java.lang.reflect.Field;
 
@@ -45,7 +45,7 @@ public class ThemesUtils {
         try {
             setTheme(theme, LifecycleUtils.getCurrentActivity(), restartActivity);
         } catch (Exception e) {
-            e.fillInStackTrace();
+            e.printStackTrace();
         }
     } // Apply VKTheme and ImTheme (hard applying without dynamic theme changing)
 
@@ -62,27 +62,14 @@ public class ThemesUtils {
             activity = LifecycleUtils.getCurrentActivity();
         }
         VKThemeHelper.theme(theme, activity, fl);
-        if (isMonetTheme() || ThemesManager.canApplyCustomAccent()) {
-            ThemesCore.clear();
-            ThemesCore.init();
-            DialogTheme.d.a(new DefaultThemeProvider(VKThemeHelper.k).b()); // reset dialog attrs cache
-        }
+        if (isMonetTheme() || ThemesManager.canApplyCustomAccent()) ThemesCore.clear();
+        if (restartActivity) activity.recreate();
         ThemeTracker.a();
-        if (restartActivity) {
-            activity.recreate();
-        }
+        WebViewColoringUtils.isLoaded = false;
         new WebView(activity).clearCache(true);
         WebCachePreloader.e();
     }
 
-    public static DialogTheme getDialogTheme() {
-        if (isMonetTheme()) {
-            return new DefaultThemeProvider(VKThemeHelper.k).b(); // get directly from theme cuz monet issue
-        } else {
-            return DialogTheme.d.a(); // get cached theme
-        }
-    }
-
     public static boolean isDarkTheme() {
         return VKThemeHelper.r();
     }

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

@@ -115,7 +115,7 @@ public class Device {
                 + "- Manufacturer: " + this.manufacturerName + "\n"
                 + "- Brand: " + this.brandName + "\n"
                 + "- Model: " + this.modelName + "\n"
-                + (isMIUI() || isHyperOs() ? "- Miui/HyperOS Version Code: " + this.MiuiUiVersionCode + "\n" + "- Miui/HyperOS Version Name: " + this.MiuiUiVersionName + "\n" : "")
+                + (isMIUI() ? "- Miui Version Code: " + this.MiuiUiVersionCode + "\n" + "- Miui Version Name: " + this.MiuiUiVersionName + "\n" : "")
                 + (isSamsung() ? "- OneUi Major Version: " + this.OneUiMajorVersion + "\n" + "- OneUi Minor Version: " + this.OneUiMinorVersion + "\n" : "")
                 + (hasMiuiIncrCode() ? "- Miui Version Incremental Code: " + this.MiuiIncrementalCode + "\n" : "")
                 + (isEMUI() ? "- Emui Version: " + this.EmuiVersion : "");

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

@@ -56,7 +56,7 @@ public class OEMDetector {
     }
 
     public static boolean isOEM() {
-        return isMIUI() || isEMUI() || isFlyme() || isZenUI() || isSamsung() || isVivo() || isOneUi() || isHyperOs();
+        return isMIUI() || isEMUI() || isFlyme() || isZenUI() || isSamsung() || isVivo() || isOneUi();
     }
 
     public static boolean isMIUI() {
@@ -68,15 +68,6 @@ public class OEMDetector {
         }
     }
 
-    public static boolean isHyperOs() {
-        try {
-            int miuiVer = Integer.parseInt(getMiuiUiVersionCode()); // cuz hyperos gives 816 and etc
-            return miuiVer > 14 && isMIUI();
-        } catch (Exception unused) {
-            return false;
-        }
-    }
-
     public static boolean isIntentResolved(Context ctx, Intent intent) {
         return (intent != null && ctx.getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null);
     }
@@ -133,6 +124,7 @@ public class OEMDetector {
         try {
             return (String) getPropMtd.invoke(null, prop);
         } catch (Throwable e) {
+            e.printStackTrace();
             return null;
         }
     }

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

@@ -30,7 +30,6 @@ import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.downloaders.AudioDownloader;
 import ru.vtosters.lite.music.cache.MusicCacheImpl;
-import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.music.MusicTrackUtils;
 
@@ -51,14 +50,13 @@ public class LastFMScrobbler {
         var access_key = !TextUtils.isEmpty(musictrack.J) ? musictrack.J : "";
         var album_id = musictrack.I;
         var album = album_id != null ? album_id.getTitle() : null;
-        var isOwnTrack = musictrack.e == AccountManagerUtils.getUserId();
 
         if (TextUtils.isEmpty(uid) || TextUtils.isEmpty(artist) || TextUtils.isEmpty(title) || duration == 0) {
             Log.d("Scrobbler", "grabTrackInfo: " + "Empty track, info: " + artist + " - " + title + " - " + duration + " - " + uid);
             return;
         }
 
-        if (needToCache(isOwnTrack) && !MusicCacheImpl.isCachedTrack(uid)) {
+        if (Preferences.autocache() && !MusicCacheImpl.isCachedTrack(uid)) {
             if (LibVKXClient.isIntegrationEnabled()) {
                 LibVKXClient.getInstance().runOnService(service -> {
                     try {
@@ -75,12 +73,6 @@ public class LastFMScrobbler {
         scrobbleTrack(duration, artist, title, uid, album);
     }
 
-    private static boolean needToCache(boolean isOwnTrack) {
-        int autocache = Preferences.autocache();
-
-        return autocache == 2 || (autocache == 1 && isOwnTrack);
-    }
-
     public static void scrobbleTrack(
             long duration,
             String artist,

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

@@ -59,12 +59,12 @@ public class MusicCacheImpl {
     }
 
     public static boolean hasPlaylist() {
-        return !PlaylistCacheDbDelegate.isPlaylistsDbEmpty(AndroidUtils.getGlobalContext()); // has playlists or not
+        return PlaylistCacheDbDelegate.getPlaylistsCount(AndroidUtils.getGlobalContext()) != 0; // has playlists or not
     }
 
     public static long getTracksCount() {
         return !LibVKXClient.isIntegrationEnabled()
-                ? PlaylistCacheDbDelegate.getTracksCountInPlaylist(AndroidUtils.getGlobalContext(),AccountManagerUtils.getUserId() + "_-1")
+                ? MusicCacheDbDelegate.getTracksCount(AndroidUtils.getGlobalContext())
                 : LibVKXClient.getInstance().runOnServiceSync(
                 new LibVKXClientImpl.LibVKXActionGeneric<Long>() {
                     @Override
@@ -89,7 +89,7 @@ public class MusicCacheImpl {
     }
 
     public static boolean isEmpty() {
-        return !LibVKXClient.isIntegrationEnabled() && MusicCacheDbDelegate.isEmpty(AndroidUtils.getGlobalContext());
+        return !LibVKXClient.isIntegrationEnabled() && getTracksCount() == 0L;
     }
 
     public static void clear() {

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

@@ -174,15 +174,6 @@ public class MusicCacheDb extends SQLiteOpenHelper implements AutoCloseable { //
         return DatabaseUtils.queryNumEntries(getReadableDatabase(), Constants.TABLE_NAME);
     }
 
-    public boolean isDatabaseEmpty() {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor cursor = db.rawQuery("SELECT EXISTS(SELECT 1 FROM " + Constants.TABLE_NAME + " LIMIT 1)", null);
-        cursor.moveToFirst();
-        boolean isEmpty = cursor.getInt(0) == 0;
-        cursor.close();
-        return isEmpty;
-    }
-
     public MusicTrack getTrackById(String trackId) {
         SQLiteDatabase db = getReadableDatabase();
         Cursor cursor = db.query(Constants.TABLE_NAME, null, Constants.COLUMN_TRACK_ID + " = ?", new String[]{trackId}, null, null, null);

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

@@ -53,7 +53,8 @@ public class PlaylistCacheDb extends SQLiteOpenHelper implements AutoCloseable {
                 Boolean.parseBoolean(cur.getString(cur.getColumnIndex(Constants.COLUMN_IS_EXPLICIT))),
                 cur.getString(cur.getColumnIndex(Constants.COLUMN_TITLE)),
                 cur.getString(cur.getColumnIndex(Constants.COLUMN_DESCRIPTION)),
-                photo);
+                photo,
+                0);
 
         Log.d("Playlist", "generated " + Playlist.U.a(playlist).v1());
 
@@ -169,50 +170,6 @@ public class PlaylistCacheDb extends SQLiteOpenHelper implements AutoCloseable {
         return playlists;
     }
 
-    public long getTracksCountInPlaylist(String playlistId) {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor cursor = db.query(
-                Constants.TABLE_PLAYLIST_TRACKS,
-                new String[]{Constants.COLUMN_TRACK_ID},
-                Constants.COLUMN_PLAYLIST_ID + " = ?",
-                new String[]{playlistId},
-                null, null, null
-        );
-
-        long count = cursor.getCount();
-        cursor.close();
-        return count;
-    }
-
-    public List<String> getAllPlaylistIds() {
-        SQLiteDatabase db = getReadableDatabase();
-        List<String> playlistIds = new ArrayList<>();
-        Cursor cursor = db.query(
-                Constants.TABLE_NAME,
-                new String[]{Constants.COLUMN_ID, Constants.COLUMN_OWNER_ID},
-                null, null, null, null, null
-        );
-
-        if (cursor.moveToFirst()) {
-            do {
-                String playlistId = cursor.getString(cursor.getColumnIndexOrThrow(Constants.COLUMN_OWNER_ID)) + "_" + cursor.getString(cursor.getColumnIndexOrThrow(Constants.COLUMN_ID));
-                playlistIds.add(playlistId);
-            } while (cursor.moveToNext());
-        }
-
-        cursor.close();
-        return playlistIds;
-    }
-
-    public boolean isPlaylistsDbEmpty() {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor cursor = db.rawQuery("SELECT EXISTS(SELECT 1 FROM " + Constants.TABLE_NAME + " LIMIT 1)", null);
-        cursor.moveToFirst();
-        boolean isEmpty = cursor.getInt(0) == 0;
-        cursor.close();
-        return isEmpty;
-    }
-
     public void addTrackToPlaylist(String playlistId, String trackId) {
         ContentValues values = new ContentValues();
         values.put(Constants.COLUMN_PLAYLIST_ID, playlistId);
@@ -224,15 +181,6 @@ public class PlaylistCacheDb extends SQLiteOpenHelper implements AutoCloseable {
         getWritableDatabase().delete(Constants.TABLE_PLAYLIST_TRACKS, Constants.COLUMN_PLAYLIST_ID + " = ? AND " + Constants.COLUMN_TRACK_ID + " = ?", new String[]{playlistId, trackId});
     }
 
-    public boolean isPlaylistEmpty(String playlistId) {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor cursor = db.rawQuery("SELECT EXISTS(SELECT 1 FROM " + Constants.TABLE_PLAYLIST_TRACKS + " WHERE " + Constants.COLUMN_PLAYLIST_ID + " = ? LIMIT 1)", new String[]{playlistId});
-        cursor.moveToFirst();
-        boolean isEmpty = cursor.getInt(0) == 0;
-        cursor.close();
-        return isEmpty;
-    }
-
     public List<MusicTrack> getTracksInPlaylist(String playlistId) {
         SQLiteDatabase db = getReadableDatabase();
         Cursor cursor = db.query(

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

@@ -55,12 +55,6 @@ public class MusicCacheDbDelegate {
         }
     }
 
-    public static boolean isEmpty(Context context) {
-        try (var db = connectToDb(context)) {
-            return db.isDatabaseEmpty();
-        }
-    }
-
     public static boolean isCachedTrack(Context context, String trackId) {
         try (var db = connectToDb(context)) {
             return db.isCachedTrack(trackId);

app/src/main/java/ru/vtosters/lite/music/cache/delegate/PlaylistCacheDbDelegate.java

@@ -62,31 +62,6 @@ public class PlaylistCacheDbDelegate {
         }
     }
 
-    public static long getTracksCountInPlaylist(Context context, String playlistId) {
-        try (var db = connectToDb(context)) {
-            return db.getTracksCountInPlaylist(playlistId);
-        }
-    }
-
-    public static boolean isPlaylistsDbEmpty(Context context) {
-        try (var db = connectToDb(context)) {
-            return db.isPlaylistsDbEmpty();
-        }
-    }
-
-    public static void removeAllPlaylists(Context context) {
-        List<String> playlistIds = getAllPlaylistIds(context);
-        for (String playlistId : playlistIds) {
-            deletePlaylist(context, playlistId);
-        }
-    }
-
-    public static List<String> getAllPlaylistIds(Context context) {
-        try (var db = connectToDb(context)) {
-            return db.getAllPlaylistIds();
-        }
-    }
-
     public static boolean isCachedPlaylist(Context context, String id) {
         try (var db = connectToDb(context)) {
             String[] parts = id.split("_");
@@ -137,12 +112,6 @@ public class PlaylistCacheDbDelegate {
         }
     }
 
-    public static boolean isPlaylistEmpty(Context context, String playlistId) {
-        try (var db = connectToDb(context)) {
-            return db.isPlaylistEmpty(playlistId);
-        }
-    }
-
     public static void drop(Context context) {
         context.deleteDatabase(PlaylistCacheDb.Constants.DB_NAME);
     }

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

@@ -7,7 +7,6 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.lite.music.cache.MusicCacheImpl;
-import ru.vtosters.lite.music.cache.delegate.PlaylistCacheDbDelegate;
 import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.NetworkUtils;
@@ -26,19 +25,19 @@ public class PlaylistHelper {
     public static JSONArray addCachedPlaylists(JSONArray jsonArray, Boolean noPlaylists) {
         try {
             if (noPlaylists) {
-                jsonArray.put(new JSONArray());
-            }
-
-            if (!PlaylistCacheDbDelegate.isPlaylistEmpty(AndroidUtils.getGlobalContext(), AccountManagerUtils.getUserId() + "_-1")) {
+                jsonArray.put(new JSONArray().put(getCachedSongsPlaylist()));
+            } else {
                 jsonArray.put(getCachedSongsPlaylist());
             }
 
-            if (MusicCacheImpl.hasPlaylist()) {
-                for (Playlist playlist : MusicCacheImpl.getPlaylists()) {
-                    jsonArray.put(generatePlaylist(playlist.a, playlist.b, playlist.C, playlist.g, playlist.B, PlaylistUtils.getThumb(playlist)));
-
-                    Log.d("PlaylistHelper", "Playlist cache added: " + playlist.a + " " + playlist.b + " " + playlist.C + " " + playlist.g + " " + playlist.B);
+            for (Playlist playlist : MusicCacheImpl.getPlaylists()) {
+                if (noPlaylists) {
+                    jsonArray.put(new JSONArray().put(generatePlaylist(playlist.a, playlist.b, playlist.C, playlist.g, playlist.B, PlaylistUtils.getThumb(playlist), playlist.O)));
+                } else {
+                    jsonArray.put(generatePlaylist(playlist.a, playlist.b, playlist.C, playlist.g, playlist.B, PlaylistUtils.getThumb(playlist), playlist.O));
                 }
+
+                Log.d("PlaylistHelper", "Playlist cache added: " + playlist.a + " " + playlist.b + " " + playlist.C + " " + playlist.g + " " + playlist.B);
             }
         } catch (JSONException e) {
             e.fillInStackTrace();
@@ -46,7 +45,7 @@ public class PlaylistHelper {
         return jsonArray;
     }
 
-    public static JSONObject generatePlaylist(int id, int owner_id, boolean is_explicit, String title, String description, JSONObject photo) throws JSONException {
+    public static JSONObject generatePlaylist(int id, int owner_id, boolean is_explicit, String title, String description, JSONObject photo, int count) throws JSONException {
         JSONObject playlist = new JSONObject()
                 .put("id", id)
                 .put("owner_id", owner_id)
@@ -65,7 +64,7 @@ public class PlaylistHelper {
                 .put("subtitle", "")
                 .put("meta", new JSONObject()
                         .put("view", "compact"))
-                .put("count", 0);
+                .put("count", count);
 
         if (photo != null) {
             playlist.put("photo", photo);
@@ -102,18 +101,18 @@ public class PlaylistHelper {
                         .put("height", 600))
                 .put("meta", new JSONObject()
                         .put("view", "compact"))
-                .put("count", 0);
+                .put("count", MusicCacheImpl.getAllOwnTracks().size());
     }
 
     public static JSONArray getCachedPlaylistsIds() {
         JSONArray arr = new JSONArray();
 
-        if (NetworkUtils.isNetworkConnected() && !PlaylistCacheDbDelegate.isPlaylistEmpty(AndroidUtils.getGlobalContext(), AccountManagerUtils.getUserId() + "_-1")) {
+        if (NetworkUtils.isNetworkConnected() && !MusicCacheImpl.getAllOwnTracks().isEmpty()) {
             arr.put(AccountManagerUtils.getUserId() + "_-1");
         }
 
-        for (String playlist : PlaylistCacheDbDelegate.getAllPlaylistIds(AndroidUtils.getGlobalContext())) {
-            arr.put(playlist);
+        for (var playlist : MusicCacheImpl.getPlaylists()) {
+            arr.put(playlist.v1());
         }
 
         return arr;

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

@@ -28,7 +28,7 @@ public class TracklistHelper {
 
         boolean doNotinvertOrder = Preferences.getBoolValue("invertCachedTracks", false);
 
-        if (doNotinvertOrder) {
+        if (!doNotinvertOrder) {
             Collections.reverse(tracks);
         }
 

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

@@ -8,11 +8,9 @@ import com.google.android.exoplayer2.source.hls.playlist.e;
 import com.google.android.exoplayer2.source.hls.playlist.f;
 import com.google.android.exoplayer2.source.hls.playlist.f.a;
 import com.vk.dto.music.MusicTrack;
-import com.vk.dto.music.Playlist;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.util.Arrays;
 import java.util.List;
@@ -22,6 +20,7 @@ import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
+import com.vk.dto.music.Playlist;
 import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.music.converter.ts.MpegDemuxer;
 import ru.vtosters.lite.music.interfaces.Callback;
@@ -38,29 +37,17 @@ public final class Mp3Downloader implements ITrackDownloader {
     @Override
     public void download(MusicTrack track, Callback callback, Playlist playlist) {
         String uri = track.D;
-
         if (Objects.requireNonNull(uri).isEmpty()) {
             String msg = "link error: " + track.y1() + ", title: " + Mp3Downloader.getTitle(track);
             Log.d("Mp3Downloader", msg);
             throw new RuntimeException(msg);
         }
 
-        if (Objects.requireNonNull(uri).contains("master.m3u8?siren=1")) {
-            try {
-                String content = IOUtils.readAllLines(new URL(uri).openStream());
-                String replacement = content.split("\n")[2].trim();
-                uri = uri.replace("master.m3u8?siren=1", replacement);
-            } catch (IOException e) {
-                callback.onFailure(e);
-                return;
-            }
-        }
-
-        var tsParser = new com.google.android.exoplayer2.source.hls.playlist.h(e.a(uri));
-        var baseUri = uri.substring(0, uri.lastIndexOf("/") + 1);
+        var tsParser = new com.google.android.exoplayer2.source.hls.playlist.h(e.a(track.D));
+        var baseUri = track.D.substring(0, track.D.lastIndexOf("/") + 1);
 
         try {
-            var segments = ((f) tsParser.a(Uri.parse(baseUri), IOUtils.openStream(uri))).o;
+            var segments = ((f) tsParser.a(Uri.parse(baseUri), IOUtils.openStream(track.D))).o;
 
             byte[] buff = getMergedTs(baseUri, segments, callback);
             MpegDemuxer.convert(buff, outputFile.getAbsolutePath());

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

@@ -28,7 +28,8 @@ public class ThemesCore {
     private static int darken_color;
 
     static {
-        init();
+        setExceptions();
+        setThemedColors(ThemesUtils.getAccentColor());
     }
 
     public static void setExceptions() {
@@ -200,9 +201,4 @@ public class ThemesCore {
     public static boolean isCachedAccents() {
         return cachedAccents;
     }
-
-    public static void init() {
-        setExceptions();
-        setThemedColors(ThemesUtils.getAccentColor());
-    }
-}
+}

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

@@ -10,7 +10,7 @@ import ru.vtosters.lite.utils.NavigatorUtils;
 
 public class InstallGMS {
     public static void alert(final Activity activity) {
-        if (!GmsHook.isAnyServicesInstalled() && !GmsHook.isGmsInstalled() && Preferences.getBoolValue("showAlertGms", true)) {
+        if (!GmsHook.isAnyServicesInstalled() && Preferences.getBoolValue("showAlertGms", true)) {
             new VkAlertDialog.Builder(activity)
                     .setTitle(activity.getString(R.string.warning))
                     .setMessage(activity.getString(R.string.gmsissuesumm))

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

@@ -3,12 +3,9 @@ package ru.vtosters.lite.ui.fragments;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.dto.music.Playlist;
@@ -20,18 +17,13 @@ import ru.vtosters.lite.music.LastFMScrobbler;
 import ru.vtosters.lite.music.cache.MusicCacheImpl;
 import ru.vtosters.lite.music.cache.delegate.PlaylistCacheDbDelegate;
 import ru.vtosters.lite.ui.PreferenceFragmentUtils;
-import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.LifecycleUtils;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import static ru.vtosters.hooks.other.Preferences.getBoolValue;
-import static ru.vtosters.hooks.other.ThemesUtils.getTextAttr;
-
 public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
     private static final ExecutorService executor = Executors.newCachedThreadPool();
 
@@ -56,7 +48,7 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
                     if (MusicCacheImpl.isEmpty()) {
                         AndroidUtils.sendToast(requireContext().getString(com.vtosters.lite.R.string.no_cache_error));
                     } else {
-                        delcache(requireContext(), false);
+                        delcache(requireContext());
                     }
                     return true;
                 }
@@ -74,18 +66,6 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
                         return true;
                     }
             );
-
-            PreferenceFragmentUtils.addPreference(
-                    getPreferenceScreen(),
-                    "cached_playlists",
-                    "Удалить все скачанные плейлисты",
-                    null,
-                    null,
-                    preference -> {
-                        delcache(requireContext(), true);
-                        return true;
-                    }
-            );
         }
 
         PreferenceFragmentUtils.addPreference(
@@ -113,38 +93,15 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
                 }
         ).setEnabled(!MusicCacheImpl.isEmpty());
 
-        PreferenceFragmentUtils.addPreference(
+        PreferenceFragmentUtils.addMaterialSwitchPreference(
                 getPreferenceScreen(),
-                "autocache_params",
+                "autocache",
                 getString(com.vtosters.lite.R.string.autocache_title),
-                getAutocacheSumm(),
+                getString(com.vtosters.lite.R.string.autocache_summ),
                 null,
-                preference -> {
-                    List<String> items = Arrays.asList("Не кешировать", "Только свои", "Все");
-
-                    ArrayAdapter<String> adapter = new ArrayAdapter<>(requireContext(), android.R.layout.simple_list_item_1, items) {
-                        @Override
-                        public View getView(int position, View convertView, ViewGroup parent) {
-                            TextView textView = (TextView) super.getView(position, convertView, parent);
-                            textView.setTextColor(getTextAttr());
-                            return textView;
-                        }
-                    };
-
-                    int selectedItem = Preferences.getPreferences().getInt("autocaching", 0);
-                    if (selectedItem >= 0 && selectedItem < items.size()) {
-                        adapter.getItem(selectedItem);
-                    }
-
-                    new VkAlertDialog.Builder(getActivity())
-                            .setAdapter(adapter, (dialog, which) -> {
-                                adapter.getItem(which);
-                                Preferences.getPreferences().edit().putInt("autocaching", which).apply();
-                                findPreference("autocache_params").setSummary(getAutocacheSumm());
-                                dialog.cancel();
-                            })
-                            .show();
-
+                false,
+                (preference, o) -> {
+                    Preferences.getPreferences().edit().putBoolean("autocache", (boolean) o).apply();
                     return true;
                 }
         );
@@ -160,7 +117,6 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
                 false,
                 (preference, o) -> {
                     Preferences.getPreferences().edit().putBoolean("dldir", (boolean) o).apply();
-                    LifecycleUtils.restartApplicationWithTimer();
                     return true;
                 }
         );
@@ -209,7 +165,6 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
                                     return;
                                 }
                                 Preferences.setMetadataSeparator(separator.getText().toString());
-                                findPreference("metadataSeparator").setSummary(separator.getText().toString());
                             })
                             .setNegativeButton("Отмена", (dialog, which) -> dialog.cancel())
                             .show();
@@ -218,33 +173,6 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
                 }
         );
 
-        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), "Рекомендации музыки");
-        PreferenceFragmentUtils.addMaterialSwitchPreference(
-                getPreferenceScreen(),
-                "sendMusicMetrics",
-                "Отправлять статистику",
-                "Статистика прослушиваний необходима для работы рекомендаций и истории прослушивания музыки",
-                null,
-                true,
-                (preference, o) -> {
-                    Preferences.getPreferences().edit().putBoolean("sendMusicMetrics", (boolean) o).apply();
-                    return true;
-                }
-        );
-
-        PreferenceFragmentUtils.addMaterialSwitchPreference(
-                getPreferenceScreen(),
-                "playStatCatalog",
-                "Список истории прослушиваний",
-                "Показывать вкладку истории прослушиваний в музыкальном разделе\n\nОтключение ускорит открытие музыкального раздела при медленном интернете",
-                null,
-                false,
-                (preference, o) -> {
-                    Preferences.getPreferences().edit().putBoolean("playStatCatalog", (boolean) o).apply();
-                    return true;
-                }
-        ).setVisible(Preferences.sendMusicMetrics() && !getBoolValue("useOldAppVer", false));
-
         if (!Preferences.serverFeaturesDisable()) {
             PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), "Интеграция Genius");
             PreferenceFragmentUtils.addMaterialSwitchPreference(
@@ -352,19 +280,6 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
         list.setVisible(!Preferences.getBoolValue("useOldAppVer", false));
 
         getPreferenceScreen().addPreference(list);
-
-        PreferenceFragmentUtils.addMaterialSwitchPreference(
-                getPreferenceScreen(),
-                "playlistsCatalogs",
-                "Списки плейлистов",
-                "Показывать вкладку плейлистов и альбомов прослушиваний в музыкальном разделе\n\nОтключение ускорит открытие музыкального раздела при медленном интернете",
-                null,
-                true,
-                (preference, o) -> {
-                    Preferences.getPreferences().edit().putBoolean("playlistsCatalogs", (boolean) o).apply();
-                    return true;
-                }
-        ).setVisible(!getBoolValue("useOldAppVer", false));
     }
 
     private void lastfmAuth(Context ctx) {
@@ -404,15 +319,6 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
                 .show();
     }
 
-    private static String getAutocacheSumm() {
-        int autocache = Preferences.autocache();
-        return switch (autocache) {
-            case 1 -> "Только для своих";
-            case 2 -> "Кешировать всё";
-            default -> "Отключено";
-        };
-    }
-
     public void updateLastFmPref() {
         if (LastFMScrobbler.isLoggedIn()) {
             findPreference("lastfm_auth").setSummary(getString(com.vtosters.lite.R.string.lastfm_authorized_as) + " " + LastFMScrobbler.getUserName());
@@ -434,8 +340,7 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
                 .show();
     }
 
-    @SuppressLint("DefaultLocale")
-    private void cachedPlaylistsDialog(Context ctx) {
+    private static void cachedPlaylistsDialog(Context ctx) {
         List<Playlist> playlists = PlaylistCacheDbDelegate.getAllPlaylists(ctx);
         String[] playlistNames = new String[playlists.size()];
 
@@ -450,27 +355,19 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
             String playlistId = selectedPlaylist.v1();
             PlaylistCacheDbDelegate.deletePlaylist(ctx, playlistId);
             AndroidUtils.sendToast("Плейлист удален");
-            findPreference("cached_playlists").setSummary(String.format("Скачано плейлистов: %d", MusicCacheImpl.getPlaylists().size()));
         });
 
         builder.show();
     }
 
-    private void delcache(Context ctx, boolean isPlaylists) {
+    private void delcache(Context ctx) {
         new VkAlertDialog.Builder(ctx)
                 .setTitle(com.vtosters.lite.R.string.warning)
                 .setMessage(com.vtosters.lite.R.string.cached_tracks_remove_confirm)
-                .setPositiveButton(com.vtosters.lite.R.string.yes, (dialog, which) -> {
-                    executor.submit(() -> {
-                        if (isPlaylists) {
-                            PlaylistCacheDbDelegate.removeAllPlaylists(ctx);
-                        } else {
-                            PlaylistCacheDbDelegate.deletePlaylist(ctx, AccountManagerUtils.getUserId() + "_-1");
-                        }
-                    });
-                    findPreference("cached_tracks").setSummary(String.format(requireContext().getString(com.vtosters.lite.R.string.cached_tracks_counter), MusicCacheImpl.getTracksCount()));
-                })
-                .setNeutralButton(com.vtosters.lite.R.string.no, (dialog, which) -> dialog.cancel())
+                .setPositiveButton(com.vtosters.lite.R.string.yes,
+                        (dialog, which) -> executor.submit(MusicCacheImpl::clear))
+                .setNeutralButton(com.vtosters.lite.R.string.no,
+                        (dialog, which) -> dialog.cancel())
                 .show();
     }
 

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

@@ -60,12 +60,12 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("microgsettings").setVisible(GmsHook.isAnyServicesInstalled() && !GmsHook.isGmsInstalled());
+        findPreference("microgsettings").setVisible(GmsHook.isFakeGmsInstalled() && !GmsHook.isGmsInstalled());
 
         findPreference("microgsettings").setOnPreferenceClickListener(preference -> {
             try {
                 Intent intent = new Intent(Intent.ACTION_MAIN);
-                intent.setComponent(new ComponentName(GmsHook.getCurrentGms() + ".android.gms", "org.microg.gms.ui.SettingsActivity"));
+                intent.setComponent(new ComponentName((GmsHook.isFakeGms2Installed() ? "app.revanced.android.gms" : "com.mgoogle.android.gms"), "org.microg.gms.ui.SettingsActivity"));
                 startActivity(intent);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -81,17 +81,6 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("unstableNameChangerDrop").setOnPreferenceClickListener(preference -> {
-            RenameTool.clearDatabase();
-            LifecycleUtils.restartApplicationWithTimer();
-            return true;
-        });
-
-        findPreference("unstableNameChanger").setOnPreferenceChangeListener((preference, o) -> {
-            LifecycleUtils.restartApplicationWithTimer();
-            return true;
-        });
-
         findPreference("copydebuginfo").setOnPreferenceClickListener(preference -> {
             copyText(new DeviceInfoCollector().collect().forLogging());
             Toast.makeText(requireContext(), AndroidUtils.getString("device_info_copied"), Toast.LENGTH_SHORT).show();
@@ -103,11 +92,6 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("batchmessages").setOnPreferenceChangeListener((preference, o) -> {
-            LifecycleUtils.restartApplicationWithTimer();
-            return true;
-        });
-
         findPreference("copyownlink").setOnPreferenceClickListener(preference -> {
             copyText("https://vk.com/id" + AccountManagerUtils.getUserId());
             ToastUtils.a(requireContext().getString(R.string.link_copied));

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

@@ -227,23 +227,6 @@ public class SponsorPostFragment extends TrackedMaterialPreferenceToolbarFragmen
                                 }
                         );
 
-                        if (NetworkUtils.isNetworkConnected()) {
-                            PreferenceFragmentUtils.addPreference(
-                                    getPreferenceScreen(),
-                                    "",
-                                    "Обновить списки фильтров",
-                                    null,
-                                    null,
-                                    preference -> {
-                                        this.requireActivity().runOnUiThread(() -> {
-                                            FiltersPreferences.forceUpdateFilters();
-                                            AndroidUtils.sendToast("Обновлено");
-                                        });
-                                        return false;
-                                    }
-                            );
-                        }
-
                         PreferenceFragmentUtils.addPreference(
                                 getPreferenceScreen(),
                                 "",

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

@@ -13,8 +13,6 @@ import ru.vtosters.lite.ui.PreferenceFragmentUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.VersionReader;
 
-import static ru.vtosters.hooks.GmsHook.isSpoofPackageInstalled;
-
 public class SystemInfo extends TrackedMaterialPreferenceToolbarFragment {
 
     @Override
@@ -48,11 +46,11 @@ public class SystemInfo extends TrackedMaterialPreferenceToolbarFragment {
         boolean isZenUI = OEMDetector.isZenUI();
         boolean isEMUI = OEMDetector.isEMUI();
         boolean hasMiuiIncrCode = OEMDetector.hasMiuiIncrCode();
-        boolean isHyperOS = OEMDetector.isHyperOs();
 
         boolean hasGMS = GmsHook.isGmsInstalled();
-        boolean hasVancedMicroG = GmsHook.isAnyServicesInstalled();
-        String GMSPackageName = hasGMS ? "com.google.android.gms" : hasVancedMicroG ? GmsHook.getCurrentGms() + ".android.gms" : "no gms or microg";
+        boolean hasVancedMicroG = GmsHook.isFakeGmsInstalled();
+        boolean hasReVancedMicroG = GmsHook.isFakeGms2Installed();
+        String GMSPackageName = hasGMS ? "com.google.android.gms" : hasVancedMicroG ? "com.mgoogle.android.gms" : hasReVancedMicroG ? "app.revanced.android.gms" : "no gms or microg";
 
         boolean isValidSignature = Preferences.isValidSignature();
         boolean isTablet = AndroidUtils.isTablet();
@@ -106,7 +104,9 @@ public class SystemInfo extends TrackedMaterialPreferenceToolbarFragment {
 
         PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isInstalledGoogleGMS", "Value: " + hasGMS, 0, null);
 
-        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isInstalledMicroG", "Value: " + hasVancedMicroG, 0, null);
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isInstalledVancedMicroG", "Value: " + hasVancedMicroG, 0, null);
+
+        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isInstalledReVancedMicroG", "Value: " + hasReVancedMicroG, 0, null);
 
         PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "Product Name", productName, 0, preference -> {
             ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", productName));
@@ -194,8 +194,6 @@ public class SystemInfo extends TrackedMaterialPreferenceToolbarFragment {
 
         PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isMiui", "Value: " + isMiui, 0, null);
 
-        PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isHyperOS", "Value: " + isHyperOS, 0, null);
-
         PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isEMUI", "Value: " + isEMUI, 0, null);
 
         PreferenceFragmentUtils.addPreference(getPreferenceScreen(), "", "isFlyme", "Value: " + isFlyme, 0, null);

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

@@ -108,7 +108,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
         boolean isLinksUnverified = AndroidUtils.isLinksUnverified(requireActivity());
         boolean isDozingAvailable = Build.VERSION.SDK_INT >= 23 && !manager.isIgnoringBatteryOptimizations(AndroidUtils.getPackageName());
         boolean areNotificationsDisabled = !AndroidUtils.areNotificationsEnabled() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-        boolean isGMSNotInstalled = !GmsHook.isAnyServicesInstalled() && !GmsHook.isGmsInstalled();
+        boolean isGMSNotInstalled = !GmsHook.isAnyServicesInstalled();
 
         if (AccountManagerUtils.isLogin()) {
             Preference accountSwitcher = PreferenceFragmentUtils.addPreference(
@@ -584,7 +584,7 @@ public class VTSettings extends TrackedMaterialPreferenceToolbarFragment {
                 }
         );
 
-        if (Build.VERSION.SDK_INT >= 33 && (!OEMDetector.isMIUI() || OEMDetector.isHyperOs())) {
+        if (Build.VERSION.SDK_INT >= 33 && !OEMDetector.isMIUI()) {
             PreferenceFragmentUtils.addPreference(
                     getPreferenceScreen(),
                     "",

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

@@ -14,12 +14,10 @@ import com.vtosters.lite.api.ExtendedCommunityProfile;
 import com.vtosters.lite.api.ExtendedUserProfile;
 import kotlin.Unit;
 import kotlin.jvm.b.Functions;
-import ru.vtosters.hooks.RenameHook;
 import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.foaf.FoafBase;
 import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.RenameTool;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -68,12 +66,10 @@ public class MenuBuilder {
                 return Unit.a;
             });
 
-            if (RenameHook.isEnabled()) {
-                addItem(builder, AndroidUtils.getString(R.string.menu_change_name), () -> {
-                    RenameTool.createDialog(eup, ctx);
-                    return Unit.a;
-                });
-            }
+//            addItem(builder, AndroidUtils.getString(R.string.menu_change_name), () -> {
+//                RenameTool.createDialog(eup, ctx);
+//                return Unit.a;
+//            });
 
             addItem(builder, AndroidUtils.getString(isPageWhitelistedFilter ? R.string.remove_from_filter_whitelist : R.string.add_to_filter_whitelist), () -> {
                 setWhitelistedFilter(eup, !isPageWhitelistedFilter);
@@ -87,7 +83,7 @@ public class MenuBuilder {
                 return Unit.a;
             });
         } catch (IllegalAccessException | InvocationTargetException e) {
-            e.fillInStackTrace();
+            e.printStackTrace();
         }
     }
 
@@ -104,12 +100,10 @@ public class MenuBuilder {
                 return Unit.a;
             });
 
-            if (RenameHook.isEnabled()) {
-                addItem(builder, AndroidUtils.getString(R.string.menu_change_name), () -> {
-                    RenameTool.createDialogGroup(ecp, ctx);
-                    return Unit.a;
-                });
-            }
+//            addItem(builder, AndroidUtils.getString(R.string.menu_change_name), () -> {
+//                RenameTool.createDialogGroup(ecp, ctx);
+//                return Unit.a;
+//            });
 
             addItem(builder, AndroidUtils.getString(isPageWhitelistedFilter ? R.string.remove_from_filter_whitelist : R.string.add_to_filter_whitelist), () -> {
                 setWhitelistedFilter(ecp, !isPageWhitelistedFilter);
@@ -129,7 +123,7 @@ public class MenuBuilder {
                 return Unit.a;
             });
         } catch (IllegalAccessException | InvocationTargetException e) {
-            e.fillInStackTrace();
+            e.printStackTrace();
         }
     }
 

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

@@ -1,107 +0,0 @@
-package ru.vtosters.lite.utils;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.os.Build;
-import android.util.Log;
-import com.vk.core.network.Network;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-import static com.vk.core.network.Network.ClientType.CLIENT_API;
-import static ru.vtosters.hooks.other.Preferences.getBoolValue;
-import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
-import static ru.vtosters.lite.utils.AccountManagerUtils.getUserToken;
-
-public class Metrics {
-    private static JSONArray events = new JSONArray();
-
-    public static void trackEvents(JSONObject object, boolean isMusic) {
-        if (NetworkUtils.isNetworkConnected()) {
-            handleNetworkConnected(object, isMusic);
-        } else {
-            handleNetworkDisconnected(object, isMusic);
-        }
-    }
-
-    private static void handleNetworkConnected(JSONObject object, boolean isMusic) {
-        if (isMusic || shouldSaveUserTraffic() || events.length() > 0) {
-            trackEventsImmediately(object);
-        } else {
-            trackEventList(object);
-        }
-    }
-
-    private static void handleNetworkDisconnected(JSONObject object, boolean isMusic) {
-        if (!isMusic) {
-            events.put(object);
-        }
-    }
-
-    private static boolean shouldSaveUserTraffic() {
-        return getBoolValue("isRoamingState", false) || isMobileNetwork();
-    }
-
-    private static void trackEventList(JSONObject object) {
-        events.put(object);
-
-        if (events.length() > 2) {
-            trackEventsRequest(events);
-            resetEvents();
-        }
-    }
-
-    private static void trackEventsImmediately(JSONObject object) {
-        JSONArray eventsToTrack = new JSONArray();
-        eventsToTrack.put(object);
-        trackEventsRequest(eventsToTrack);
-    }
-
-    private static void resetEvents() {
-        events = new JSONArray();
-    }
-
-    @SuppressWarnings("deprecation")
-    private static boolean isMobileNetwork() {
-        ConnectivityManager connectivityManager = (ConnectivityManager) AndroidUtils.getGlobalContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            android.net.Network network = connectivityManager.getActiveNetwork();
-            if (network != null) {
-                NetworkCapabilities networkCapabilities = connectivityManager.getNetworkCapabilities(network);
-                return networkCapabilities != null && networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
-            }
-        } else {
-            NetworkInfo networkInfo = connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
-            return networkInfo != null && networkInfo.isConnected();
-        }
-
-        return false;
-    }
-
-    private static void trackEventsRequest(JSONArray object) {
-        Request req = new Request.a()
-                .b("https://" + getApi() + "/method/stats.trackEvents?events=" + object.toString() + "&v=5.119&access_token=" + getUserToken())
-                .a();
-
-        Network.b(CLIENT_API).a(req).a(new Callback() {
-            @Override
-            public void a(Call call, IOException e) {
-                e.fillInStackTrace();
-            }
-
-            @Override
-            public void a(Call call, Response response) throws IOException {
-                Log.d("Metrics", response.a().g());
-            }
-        });
-    }
-}

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

@@ -9,24 +9,24 @@ import static ru.vtosters.lite.foaf.FoafBase.getBypassedOnlineInfo;
 
 public class OnlineBypass {
     public static JSONObject setOnlineInfo(JSONObject json) throws JSONException {
-        int id = json.optInt("id");
+        var id = json.optInt("id");
         if (id == AccountManagerUtils.getUserId()) {
             return json;
         }
-        JSONObject onlineinfo = json.optJSONObject("online_info");
+        var onlineinfo = json.optJSONObject("online_info");
         if (onlineinfo != null && !onlineinfo.optBoolean("visible") && !Preferences.serverFeaturesDisable()) {
             var bypassed = getBypassedOnlineInfo(id);
             if (bypassed.optInt("last_seen", 0) != 0) {
                 json.remove("online_info");
 
-                JSONObject online_info = new JSONObject()
+                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"));
 
-                JSONObject last_seen = new JSONObject()
+                var last_seen = new JSONObject()
                         .put("platform", bypassed.optInt("platform"))
                         .put("time", bypassed.optInt("last_seen"));
 
@@ -37,95 +37,51 @@ public class OnlineBypass {
         return json;
     }
 
-    public static JSONArray setOnlineInfoUsers(JSONArray profiles) {
-        if (shouldReturnProfiles(profiles)) return profiles;
-
+    public static JSONArray setOnlineInfoUsers(JSONArray profiles) throws JSONException {
+        if (profiles == null || profiles.length() == 0 || Preferences.serverFeaturesDisable()) return profiles;
         StringBuilder sb = new StringBuilder();
-        int curVkId = AccountManagerUtils.getUserId();
-
+        var curVkId = AccountManagerUtils.getUserId();
         for (int i = 0; i < profiles.length(); i++) {
-            JSONObject profile = getProfile(profiles, i);
+            JSONObject profile = profiles.getJSONObject(i);
             int id = profile.optInt("id", -1);
             JSONObject onlinfo = profile.optJSONObject("online_info");
-
-            if (shouldSkipProfile(id, curVkId, onlinfo)) continue;
-
-            sb.append(id).append(",");
+            if (id == curVkId || id < 0 || onlinfo == null || onlinfo.optBoolean("visible")) {
+                continue;
+            }
+            sb.append(id);
+            sb.append(",");
+        }
+        var ids = sb.toString();
+        if (!ids.isEmpty()) {
+            ids = ids.substring(0, ids.length() - 1);
+        } else {
+            return profiles;
         }
-
-        String ids = prepareIds(sb);
-        if (ids.isEmpty()) return profiles;
 
         JSONObject bypassedObj = getBypassedOnlineInfo(ids);
         for (int i = 0; i < profiles.length(); i++) {
-            JSONObject profile = getProfile(profiles, 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");
 
-            if (bypassed == null) continue;
-
-            JSONObject online_info = createOnlineInfo(bypassed);
-            JSONObject last_seen = createLastSeen(bypassed);
-
-            updateProfile(profile, online_info, last_seen);
-        }
-
-        return profiles;
-    }
-
-    private static boolean shouldReturnProfiles(JSONArray profiles) {
-        return profiles == null || profiles.length() == 0 || Preferences.serverFeaturesDisable();
-    }
-
-    private static JSONObject getProfile(JSONArray profiles, int i) {
-        try {
-            return profiles.getJSONObject(i);
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static boolean shouldSkipProfile(int id, int curVkId, JSONObject onlinfo) {
-        return id == curVkId || id < 0 || onlinfo == null || onlinfo.optBoolean("visible");
-    }
-
-    private static String prepareIds(StringBuilder sb) {
-        String ids = sb.toString();
-        if (!ids.isEmpty()) {
-            ids = ids.substring(0, ids.length() - 1);
-        }
-        return ids;
-    }
-
-    private static JSONObject createOnlineInfo(JSONObject bypassed) {
-        try {
-            return new JSONObject()
+            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"));
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-    }
 
-    private static JSONObject createLastSeen(JSONObject bypassed) {
-        try {
-            return new JSONObject()
+            var last_seen = new JSONObject()
                     .put("platform", bypassed.optInt("platform"))
                     .put("time", bypassed.optInt("last_seen"));
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-    }
 
-    private static void updateProfile(JSONObject profile, JSONObject online_info, JSONObject last_seen) {
-        try {
-            profile.remove("online_info");
             profile.put("last_seen", last_seen).put("online_info", online_info);
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
         }
+
+        return profiles;
     }
 }

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

@@ -1,6 +1,5 @@
 package ru.vtosters.lite.utils;
 
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
@@ -13,15 +12,15 @@ import android.widget.LinearLayout;
 import androidx.core.util.Pair;
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.dto.user.UserProfile;
+import com.vk.im.engine.models.users.User;
 import com.vtosters.lite.R;
 import com.vtosters.lite.api.ExtendedCommunityProfile;
 import com.vtosters.lite.api.ExtendedUserProfile;
 import ru.vtosters.hooks.other.ThemesUtils;
 
-import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
-import java.util.function.BiConsumer;
 
 import static ru.vtosters.hooks.other.ThemesUtils.getSTextAttr;
 import static ru.vtosters.hooks.other.ThemesUtils.getTextAttr;
@@ -48,40 +47,69 @@ public class RenameTool {
         return helperInstance;
     }
 
+    public static String getCurrentModifiedUser() {
+        Cursor rawQuery = getHelper().getReadableDatabase().rawQuery(String.format("SELECT * FROM %s WHERE %s=%s", TABLE_NAME, COLUMN_VKID, AccountManagerUtils.getUserId()), new String[0]);
+        if (rawQuery.moveToFirst()) {
+            try {
+                String decode = URLDecoder.decode(rawQuery.getString(rawQuery.getColumnIndexOrThrow(COLUMN_FIRSTNAME)), "UTF-8");
+                return decode + " " + URLDecoder.decode(rawQuery.getString(rawQuery.getColumnIndexOrThrow(COLUMN_LASTNAME)), "UTF-8");
+            } catch (java.io.UnsupportedEncodingException | java.lang.IllegalArgumentException e) {
+                e.printStackTrace();
+            } finally {
+                rawQuery.close();
+            }
+        } else rawQuery.close();
+        return null;
+    }
+
+    // Reload all values from DB
     public static void reloadDB() {
         renamedGroups.clear();
         renamedUsers.clear();
         updateRequested = false;
 
-        loadData(TABLE_NAME, (cursor, vkID) -> {
-            String firstName = decode(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_FIRSTNAME)));
-            String lastName = decode(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_LASTNAME)));
-            renamedUsers.put(vkID, new Pair<>(firstName, lastName));
-        });
-
-        loadData(TABLE_NAME_GROUP, (cursor, vkID) -> {
-            String name = decode(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_NAME)));
-            renamedGroups.put(vkID, name);
-        });
-    }
-
-    // Generic method to load data from the database
-    private static void loadData(String tableName, BiConsumer<Cursor, Integer> consumer) {
-        try (Cursor cursor = getHelper().getReadableDatabase().rawQuery("SELECT * FROM " + tableName, null)) {
+        try (Cursor cursor = getHelper().getReadableDatabase().rawQuery(String.format("SELECT * FROM %s", TABLE_NAME), new String[0])) {
             while (cursor.moveToNext()) {
+                String firstName = URLDecoder.decode(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_FIRSTNAME)), "UTF-8");
+                String lastName = URLDecoder.decode(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_LASTNAME)), "UTF-8");
                 int vkID = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_VKID));
-                consumer.accept(cursor, vkID);
+                renamedUsers.put(vkID, new Pair<>(firstName, lastName));
             }
         } catch (Exception e) {
-            throw new RuntimeException("Failed to load data from " + tableName, e);
+            e.printStackTrace();
+        }
+
+        try (Cursor cursor = getHelper().getReadableDatabase().rawQuery(String.format("SELECT * FROM %s", TABLE_NAME_GROUP), new String[0])) {
+            while (cursor.moveToNext()) {
+                String name = URLDecoder.decode(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_NAME)), "UTF-8");
+                int vkID = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_VKID));
+                renamedGroups.put(vkID, name);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
-    private static String decode(String value) {
+    public static void injectIntoChat(User u) {
+        int id = u.getId();
+        if (updateRequested) {
+            reloadDB();
+        }
+
+        Pair<String, String> user = renamedUsers.get(id);
+        if (user == null) return;
+
+        setObject(u, "I", user.first);
+        setObject(u, "J", user.second);
+    }
+
+    public static void setObject(User instance, String name, Object obj) {
         try {
-            return URLDecoder.decode(value, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("UTF-8 encoding not supported", e);
+            Field f = User.class.getDeclaredField(name);
+            f.setAccessible(true);
+            f.set(instance, obj);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -89,7 +117,7 @@ public class RenameTool {
         LinearLayout linearLayout = new LinearLayout(ctx);
         linearLayout.setOrientation(LinearLayout.VERTICAL);
 
-        EditText fn = new EditText(ctx);
+        final EditText fn = new EditText(ctx);
         fn.setHint(R.string.vk_auth_sign_up_first_name);
         fn.setTextColor(getTextAttr());
         fn.setHintTextColor(getSTextAttr());
@@ -100,7 +128,7 @@ public class RenameTool {
         margin.setMargins(dp2px(20f), 0, dp2px(20f), 0);
         fn.setLayoutParams(margin);
 
-        EditText ln = new EditText(ctx);
+        final EditText ln = new EditText(ctx);
         ln.setHint(R.string.vk_auth_sign_up_last_name);
         ln.setTextColor(getTextAttr());
         ln.setHintTextColor(getSTextAttr());
@@ -109,93 +137,69 @@ public class RenameTool {
         ln.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
         ln.setLayoutParams(margin);
 
-        UserProfile profile = AccountManagerUtils.fromEup(eup);
+        final UserProfile profile = AccountManagerUtils.fromEup(eup);
         fn.setText(AccountManagerUtils.getUserFirstName(profile));
         ln.setText(AccountManagerUtils.getUserLastName(profile));
 
         int id = AccountManagerUtils.getUserID(profile);
 
-        VkAlertDialog.Builder builder = new VkAlertDialog.Builder(ctx)
+        var builder = new VkAlertDialog.Builder(ctx)
                 .setTitle(R.string.rename_title)
                 .setMessage(R.string.rename_message)
                 .setView(linearLayout)
-                .setPositiveButton("OK", (dialog, which) -> updateName(ctx, fn.getText().toString(), ln.getText().toString(), id));
-
-        if (isChangedName(id)) {
-            builder.setNeutralButton(R.string.rename_reset, (dialog, which) -> deleteUser(ctx, id));
-        }
+                .setPositiveButton("OK", (dialog, which) -> {
+                    String firstName = fn.getText().toString();
+                    String lastName = ln.getText().toString();
+                    SQLiteDatabase writableDatabase = getHelper().getWritableDatabase();
+                    try {
+                        if (isChangedName(id)) {
+                            writableDatabase.execSQL(
+                                    String.format("UPDATE %s SET %s='%s', %s='%s' WHERE %s='%s'",
+                                            TABLE_NAME,
+                                            COLUMN_FIRSTNAME, URLEncoder.encode(firstName, "UTF-8"),
+                                            COLUMN_LASTNAME, URLEncoder.encode(lastName, "UTF-8"),
+                                            COLUMN_VKID, id));
+                        } else {
+                            writableDatabase.execSQL(
+                                    String.format("INSERT INTO %s (%s, %s, %s) VALUES (%s, '%s', '%s')",
+                                            TABLE_NAME,
+                                            COLUMN_VKID, COLUMN_FIRSTNAME, COLUMN_LASTNAME,
+                                            id, URLEncoder.encode(firstName, "UTF-8"), URLEncoder.encode(lastName, "UTF-8")));
+                        }
+                        updateRequested = true;
+                        if (id == AccountManagerUtils.getUserId()) {
+                            ctx.sendBroadcast(new Intent("com.vkontakte.android.USER_NAME_CHANGED"));
+                        }
+                        ctx.sendBroadcast(new Intent("com.vkontakte.android.ACTION_PROFILE_UPDATED").putExtra("uid", id));
 
+                        sendToast(ctx.getString(R.string.rename_success));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        sendToast(ctx.getString(R.string.rename_error));
+                    }
+                });
+        if (isChangedName(id))
+            builder.setNeutralButton(R.string.rename_reset, (dialog, which) -> {
+                getHelper().getWritableDatabase().execSQL(
+                        String.format(
+                                "DELETE FROM %s WHERE %s='%s'",
+                                TABLE_NAME,
+                                COLUMN_VKID, id));
+                if (id == AccountManagerUtils.getUserId()) {
+                    ctx.sendBroadcast(new Intent("com.vkontakte.android.USER_NAME_CHANGED"));
+                }
+                updateRequested = true;
+                ctx.sendBroadcast(new Intent("com.vkontakte.android.ACTION_PROFILE_UPDATED").putExtra("uid", id));
+                sendToast(ctx.getString(R.string.rename_remove_from_bd_success));
+            });
         builder.show();
     }
 
-    public static void deleteUser(Context ctx, int id) {
-        SQLiteDatabase writableDatabase = getHelper().getWritableDatabase();
-
-        writableDatabase.delete(TABLE_NAME, COLUMN_VKID + "=?", new String[]{String.valueOf(id)});
-
-        updateRequested = true;
-        notifyUser(ctx, id);
-
-        sendToast(ctx.getString(R.string.rename_remove_from_bd_success));
-    }
-
-    public static void clearDatabase() {
-        SQLiteDatabase writableDatabase = getHelper().getWritableDatabase();
-
-        writableDatabase.delete(TABLE_NAME, null, null);
-        writableDatabase.delete(TABLE_NAME_GROUP, null, null);
-
-        renamedGroups.clear();
-        renamedUsers.clear();
-        updateRequested = true;
-    }
-
-    public static void updateName(Context ctx, String firstName, String lastName, int id) {
-        SQLiteDatabase writableDatabase = getHelper().getWritableDatabase();
-
-        try {
-            ContentValues values = new ContentValues();
-            values.put(COLUMN_FIRSTNAME, encode(firstName));
-            values.put(COLUMN_LASTNAME, encode(lastName));
-
-            if (isChangedName(id)) {
-                // Update existing record
-                writableDatabase.update(TABLE_NAME, values, COLUMN_VKID + "=?", new String[]{String.valueOf(id)});
-            } else {
-                // Insert new record
-                values.put(COLUMN_VKID, id);
-                writableDatabase.insert(TABLE_NAME, null, values);
-            }
-
-            updateRequested = true;
-            notifyUser(ctx, id);
-
-            sendToast(ctx.getString(R.string.rename_success));
-        } catch (Exception e) {
-            throw new RuntimeException("Database operation failed", e);
-        }
-    }
-
-    private static String encode(String value) {
-        try {
-            return URLEncoder.encode(value, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("UTF-8 encoding not supported", e);
-        }
-    }
-
-    private static void notifyUser(Context ctx, int id) {
-        if (id == AccountManagerUtils.getUserId()) {
-            ctx.sendBroadcast(new Intent("com.vkontakte.android.USER_NAME_CHANGED"));
-        }
-        ctx.sendBroadcast(new Intent("com.vkontakte.android.ACTION_PROFILE_UPDATED").putExtra("uid", id));
-    }
-
     public static void createDialogGroup(ExtendedCommunityProfile eup, final Context ctx) {
         LinearLayout linearLayout = new LinearLayout(ctx);
         linearLayout.setOrientation(LinearLayout.VERTICAL);
 
-        EditText fn = new EditText(ctx);
+        final EditText fn = new EditText(ctx);
         fn.setHint(R.string.vk_auth_sign_up_first_name);
         fn.setHintTextColor(getSTextAttr());
         fn.setTextColor(getTextAttr());
@@ -206,61 +210,52 @@ public class RenameTool {
         margin.setMargins(dp2px(20f), 0, dp2px(20f), 0);
         fn.setLayoutParams(margin);
 
-        UserProfile profile = AccountManagerUtils.fromEup(eup);
+        final UserProfile profile = AccountManagerUtils.fromEup(eup);
         fn.setText(AccountManagerUtils.getGroupName(profile));
 
         int fid = AccountManagerUtils.getUserID(profile);
-
         if (fid < 0) fid = -fid;
 
-        int id = fid;
+        final int id = fid;
 
-        VkAlertDialog.Builder builder = new VkAlertDialog.Builder(ctx)
+        var builder = new VkAlertDialog.Builder(ctx)
                 .setTitle(R.string.rename_title)
                 .setMessage(R.string.rename_message)
                 .setView(linearLayout)
-                .setPositiveButton("OK", (dialog, which) -> updateGroupName(ctx, fn.getText().toString(), id));
-
-        if (isChangedNameGroup(id)) {
-            builder.setNeutralButton(R.string.rename_reset, (dialog, which) -> deleteGroupName(ctx, id));
-        }
-
+                .setPositiveButton("OK", (dialog, which) -> {
+                    String firstName = fn.getText().toString();
+                    SQLiteDatabase writableDatabase = getHelper().getWritableDatabase();
+                    try {
+                        if (isChangedNameGroup(id)) {
+                            writableDatabase.execSQL(
+                                    String.format(
+                                            "UPDATE %s SET %s='%s' WHERE %s='%s'",
+                                            TABLE_NAME_GROUP,
+                                            COLUMN_NAME, URLEncoder.encode(firstName, "UTF-8"),
+                                            COLUMN_VKID, id));
+                        } else {
+                            writableDatabase.execSQL(
+                                    String.format(
+                                            "INSERT INTO %s (%s, %s) VALUES (%s, '%s')",
+                                            TABLE_NAME_GROUP,
+                                            COLUMN_VKID, COLUMN_NAME,
+                                            id, URLEncoder.encode(firstName, "UTF-8")));
+                        }
+                        updateRequested = true;
+                        sendToast(AndroidUtils.getString(R.string.rename_group_success));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                });
+        if (isChangedNameGroup(id))
+            builder.setNeutralButton(R.string.rename_reset, (dialog, which) -> {
+                getHelper().getWritableDatabase().execSQL(String.format("DELETE FROM %s WHERE %s='%s'", TABLE_NAME_GROUP, COLUMN_VKID, id));
+                updateRequested = true;
+                sendToast(ctx.getString(R.string.rename_remove_group_from_bd_success));
+            });
         builder.show();
     }
 
-    public static void deleteGroupName(Context ctx, int id) {
-        SQLiteDatabase writableDatabase = getHelper().getWritableDatabase();
-
-        writableDatabase.delete(TABLE_NAME_GROUP, COLUMN_VKID + "=?", new String[]{String.valueOf(id)});
-
-        updateRequested = true;
-
-        sendToast(ctx.getString(R.string.rename_remove_group_from_bd_success));
-    }
-
-    public static void updateGroupName(Context ctx, String groupName, int id) {
-        SQLiteDatabase writableDatabase = getHelper().getWritableDatabase();
-
-        try {
-            ContentValues values = new ContentValues();
-            values.put(COLUMN_NAME, encode(groupName));
-
-            if (isChangedNameGroup(id)) {
-                // Update existing record
-                writableDatabase.update(TABLE_NAME_GROUP, values, COLUMN_VKID + "=?", new String[]{String.valueOf(id)});
-            } else {
-                // Insert new record
-                values.put(COLUMN_VKID, id);
-                writableDatabase.insert(TABLE_NAME_GROUP, null, values);
-            }
-
-            updateRequested = true;
-            sendToast(AndroidUtils.getString(R.string.rename_group_success));
-        } catch (Exception e) {
-            throw new RuntimeException("Database operation failed", e);
-        }
-    }
-
     public static boolean isChangedName(int uid) {
         return renamedUsers.get(uid) != null;
     }
@@ -269,6 +264,10 @@ public class RenameTool {
         return renamedGroups.get(uid) != null;
     }
 
+    public static boolean isIdInList(UserProfile profile) {
+        return true;
+    }
+
     private static class DbHelper extends SQLiteOpenHelper {
         public DbHelper(Context context) {
             super(context, DB_NAME, null, DB_VERSION);

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

@@ -9,6 +9,7 @@ import static ru.vtosters.hooks.other.ThemesUtils.*;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 
 public class WebViewColoringUtils {
+    public static boolean isLoaded = false;
     public static String loadedCSS = "";
     public static String loadedCSSAmoled = "";
 
@@ -52,6 +53,7 @@ public class WebViewColoringUtils {
     public static void load() {
         loadedCSS = readCSS("vt_ui_accent.css");
         loadedCSSAmoled = readCSS("vt_ui_oled.css");
+        isLoaded = true;
     }
 
     public static void inject(WebView webView, String str) {

app/src/main/java/ru/vtosters/sponsorpost/internal/VotesPreferences.java

@@ -3,7 +3,6 @@ package ru.vtosters.sponsorpost.internal;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
-import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 import java.util.HashSet;
@@ -23,7 +22,7 @@ public class VotesPreferences {
     }
 
     public static boolean isEnabled() {
-        return preferences.getBoolean("sponsortesting", false) && !Preferences.serverFeaturesDisable();
+        return preferences.getBoolean("sponsortesting", false);
     }
 
     public static void setEnabled(boolean status) {

app/src/main/java/ru/vtosters/sponsorpost/utils/FiltersPreferences.java

@@ -61,18 +61,6 @@ public class FiltersPreferences {
         editor.apply();
     }
 
-    public static void forceUpdateFilters() {
-        SharedPreferences.Editor editor = preferences.edit();
-
-        preferences.getAll().keySet().stream()
-                .filter(key -> key.endsWith(":" + PREF_KEY_VERSION))
-                .forEach(key -> editor.putString(key, "0"));
-
-        editor.apply();
-
-        Updates.updateFilters();
-    }
-
     public static boolean getSavedKeyValue(int id) {
         return getFilter(id) != null;
     }

app/src/main/java/ru/vtosters/sponsorpost/utils/PostsPreferences.java

@@ -3,7 +3,6 @@ package ru.vtosters.sponsorpost.utils;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
-import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.sponsorpost.data.Post;
 
@@ -24,7 +23,7 @@ public class PostsPreferences {
     }
 
     public static boolean isEnabled() {
-        return preferences.getBoolean("sponsorpost", true) && !Preferences.serverFeaturesDisable();
+        return preferences.getBoolean("sponsorpost", true);
     }
 
     public static void setEnabled(boolean status) {

app/src/main/java/ru/vtosters/sponsorpost/utils/Updates.java

@@ -1,6 +1,5 @@
 package ru.vtosters.sponsorpost.utils;
 
-import android.util.Log;
 import ru.vtosters.lite.utils.NetworkUtils;
 import ru.vtosters.lite.utils.newsfeed.NewsFeedFiltersUtils;
 import ru.vtosters.sponsorpost.data.Filter;
@@ -32,17 +31,14 @@ public class Updates {
             for (Filter filter : filters) {
                 Filter localFilter = findLocalFilterById(localFilters, filter.getId());
                 if (localFilter == null) {
-                    Log.d("Updates", "local filter is not exist, adding new: " + filter.getId());
                     FiltersPreferences.saveFilter(filter);
                 } else {
                     String remoteVersion = filter.getVersion();
                     String localVersion = localFilter.getVersion();
                     if (Objects.equals(remoteVersion, localVersion)) {
-                        Log.d("Updates", "saved local filter: " + localFilter.getId());
-                        FiltersPreferences.saveFilter(localFilter);
-                    } else {
-                        Log.d("Updates", "saved remote filter: " + filter.getId());
                         FiltersPreferences.saveFilter(filter);
+                    } else {
+                        FiltersPreferences.saveFilter(localFilter);
                     }
                 }
             }

smali/assets/vt_ui_accent.css

@@ -75,7 +75,6 @@
     --header_tint: %header_text% !important;
     --header_tint_alternate: %header_text% !important;
     --vkui--color_icon_accent_themed: %header_text% !important;
-    --vkui--color_text_accent_themed: %header_text% !important;
 }
 
 
@@ -140,7 +139,6 @@
     --header_tint: %header_text% !important;
     --header_tint_alternate: %header_text% !important;
     --vkui--color_icon_accent_themed: %header_text% !important;
-    --vkui--color_text_accent_themed: %header_text% !important;
     --color_field_border: %field_border% !important;
     --vkui--color_field_border: %field_border% !important;
     --color_field_background: %field_background% !important;

smali/res/values-ru/strings.xml

@@ -6437,7 +6437,7 @@
     <string name="update_latest">У вас установлена последняя версия приложения</string>
     <string name="update_err">Ошибка проверки обновления</string>
     <string name="serverFeaturesDisable">Отключить все внешние подключения</string>
-    <string name="serverFeaturesDisable_summ">Отключает галочки и все дополнительные функции связанные с получением данных с сервера ВТостерс.\n\nАктуально для тех у кого безлимитный интернет на ВКонтакте</string>
+    <string name="serverFeaturesDisable_summ">Отключает галочки и все дополнительные функции связанные с получением данных с сервера ВТостерс.\n\nАктульно для тех у кого безлимитный интернет на ВКонтакте</string>
 
     <string name="tgs_token_missing">Токен отсутствует</string>
     <string name="tgs_token_reset_dialog">Сбросить токен бота?</string>

smali/res/xml/preferences_media.xml

@@ -31,11 +31,6 @@
                 android:key="__dbg_disable_video_feed"
                 android:summary="@string/interfacevideorecsum"
                 android:title="@string/interfacevideorec"/>
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-                android:defaultValue="true"
-                android:key="sendVideoMetrics"
-                android:summary="Статистика необходима для работы рекомендаций и истории видео"
-                android:title="Отправлять статистику"/>
         <Preference
                 android:key="clearvideohistory"
                 android:summary="@string/clearvideohistory_summ"

smali/res/xml/preferences_other.xml

@@ -9,21 +9,6 @@
                 android:key="microgsettings"
                 android:title="@string/microgsett"/>
     </PreferenceCategory>
-    <PreferenceCategory android:title="Экспериментальные функции">
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-                android:defaultValue="false"
-                android:key="batchmessages"
-                android:summary="Поможет исправить скорость загрузки сообщений, но работает нестабильно"
-                android:title="Альтернативная загрузка сообщений"/>
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-                android:defaultValue="true"
-                android:key="unstableNameChanger"
-                android:title="Редактор имен"
-                android:summary="Редактор имен групп и профилей людей\n\nПри проблемах с работой сообщений лучше отключить данную функцию"/>
-        <Preference
-                android:key="unstableNameChangerDrop"
-                android:title="Сбросить информацию о переименованиях"/>
-    </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtverify">
         <Preference
                 android:key="updateverifdata"

smali/smali_classes2/com/vk/api/account/AccountGetBanned.smali

@@ -82,6 +82,10 @@
 
     move-result-object p1
 
+    invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject;
+
+    move-result-object p1
+
     const-string v0, "items"
 
     .line 3

smali/smali_classes2/com/vk/api/audio/AudioSendStartEvent.smali

@@ -40,33 +40,31 @@
 .method public a(Lorg/json/JSONObject;)Lcom/vk/dto/music/CurrentAccountInformation;
     .locals 1
 
-    # const-string v0, "response"
+    const-string v0, "response"
 
-    # .line 2
-    # invoke-virtual {p1, v0}, Lorg/json/JSONObject;->getJSONObject(Ljava/lang/String;)Lorg/json/JSONObject;
+    .line 2
+    invoke-virtual {p1, v0}, Lorg/json/JSONObject;->getJSONObject(Ljava/lang/String;)Lorg/json/JSONObject;
 
-    # move-result-object p1
+    move-result-object p1
 
-    # const-string v0, "has_music_subscription"
+    const-string v0, "has_music_subscription"
 
-    # .line 3
-    # invoke-virtual {p1, v0}, Lorg/json/JSONObject;->optInt(Ljava/lang/String;)I
+    .line 3
+    invoke-virtual {p1, v0}, Lorg/json/JSONObject;->optInt(Ljava/lang/String;)I
 
-    # move-result p1
+    move-result p1
 
-    # const/4 v0, 0x1
-
-    # if-ne p1, v0, :cond_0
-
-    # goto :goto_0
-
-    # :cond_0
-    # const/4 v0, 0x1
-
-    # .line 4
-    # :goto_0
     const/4 v0, 0x1
 
+    if-ne p1, v0, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v0, 0x1
+
+    .line 4
+    :goto_0
     new-instance p1, Lcom/vk/dto/music/CurrentAccountInformation;
 
     invoke-direct {p1, v0}, Lcom/vk/dto/music/CurrentAccountInformation;-><init>(Z)V

smali/smali_classes2/com/vk/dto/newsfeed/Owner.smali

@@ -390,8 +390,6 @@
 .method public static final b(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/Owner;
     .locals 1
 
-    invoke-static {p0}, Lru/vtosters/hooks/RenameHook;->injectIntoJsonGroup(Lorg/json/JSONObject;)V
-
     sget-object v0, Lcom/vk/dto/newsfeed/Owner;->h:Lcom/vk/dto/newsfeed/Owner$b;
 
     invoke-virtual {v0, p0}, Lcom/vk/dto/newsfeed/Owner$b;->b(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/Owner;
@@ -404,8 +402,6 @@
 .method public static final c(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/Owner;
     .locals 1
 
-    invoke-static {p0}, Lru/vtosters/hooks/RenameHook;->injectIntoJson(Lorg/json/JSONObject;)V
-
     sget-object v0, Lcom/vk/dto/newsfeed/Owner;->h:Lcom/vk/dto/newsfeed/Owner$b;
 
     invoke-virtual {v0, p0}, Lcom/vk/dto/newsfeed/Owner$b;->c(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/Owner;

smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationMembersApiCmd$a.smali

@@ -50,6 +50,10 @@
 
     move-result-object p1
 
+    invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject;
+
+    move-result-object p1
+
     const-string v0, "items"
 
     .line 2

smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd$a.smali

@@ -50,6 +50,9 @@
 
     move-result-object p1
 
+    invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject;
+    move-result-object p1
+
     const-string v0, "items"
 
     .line 2

smali/smali_classes3/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsByIdApiCmd$a.smali

@@ -50,6 +50,10 @@
 
     move-result-object p1
 
+    invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject;
+
+    move-result-object p1
+
     const-string v0, "items"
 
     .line 2

smali/smali_classes3/com/vk/im/engine/internal/api_parsers/ProfilesParser.smali

@@ -60,10 +60,6 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject;
-
-    move-result-object p1
-    
     const-string v0, "JSONObject(response).getJSONObject(\"response\")"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
@@ -80,10 +76,6 @@
 
     move-object/from16 v0, p1
 
-    invoke-static {v0}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookProfiles(Lorg/json/JSONObject;)Lorg/json/JSONObject;
-
-    move-result-object v0
-
     .line 3
     new-instance v1, Lcom/vk/im/engine/models/ProfilesSimpleInfo;
 

smali/smali_classes3/com/vk/im/engine/internal/api_parsers/UserApiParser.smali

@@ -164,10 +164,6 @@
 
     invoke-static {v0}, Lru/vtosters/hooks/RenameHook;->injectIntoJson(Lorg/json/JSONObject;)V
 
-    invoke-static {v0}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHook(Lorg/json/JSONObject;)Lorg/json/JSONObject;
-
-    move-result-object v0
-
     const-string v2, ""
 
     .line 1

smali/smali_classes3/com/vk/im/engine/internal/f/h/UsersGetByIdApiCmd$b.smali

@@ -52,11 +52,79 @@
         }
     .end annotation
 
-    invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookList(Ljava/lang/String;)Landroid/util/SparseArray;
+    .line 2
+    :try_start_0
+    new-instance v0, Lorg/json/JSONObject;
 
-    move-result-object v0
+    invoke-direct {v0, p1}, Lorg/json/JSONObject;-><init>(Ljava/lang/String;)V
 
+    const-string p1, "response"
+
+    invoke-virtual {v0, p1}, Lorg/json/JSONObject;->getJSONArray(Ljava/lang/String;)Lorg/json/JSONArray;
+
+    move-result-object p1
+
+    invoke-static {p1}, Lru/vtosters/hooks/OnlineFormatterHook;->onlineHookList(Lorg/json/JSONArray;)Lorg/json/JSONArray;
+
+    move-result-object p1
+
+    .line 3
+    new-instance v0, Landroid/util/SparseArray;
+
+    invoke-virtual {p1}, Lorg/json/JSONArray;->length()I
+
+    move-result v1
+
+    invoke-direct {v0, v1}, Landroid/util/SparseArray;-><init>(I)V
+
+    const/4 v1, 0x0
+
+    .line 4
+    invoke-virtual {p1}, Lorg/json/JSONArray;->length()I
+
+    move-result v2
+
+    :goto_0
+    if-ge v1, v2, :cond_0
+
+    .line 5
+    invoke-virtual {p1, v1}, Lorg/json/JSONArray;->getJSONObject(I)Lorg/json/JSONObject;
+
+    move-result-object v3
+
+    const-string v4, "ja.getJSONObject(i)"
+
+    invoke-static {v3, v4}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v3}, Lcom/vk/im/engine/internal/api_parsers/UserApiParser;->b(Lorg/json/JSONObject;)Lcom/vk/im/engine/models/users/User;
+
+    move-result-object v3
+
+    .line 6
+    invoke-virtual {v3}, Lcom/vk/im/engine/models/users/User;->getId()I
+
+    move-result v4
+
+    invoke-virtual {v0, v4, v3}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V
+    :try_end_0
+    .catch Lorg/json/JSONException; {:try_start_0 .. :try_end_0} :catch_0
+
+    add-int/lit8 v1, v1, 0x1
+
+    goto :goto_0
+
+    :cond_0
     return-object v0
+
+    :catch_0
+    move-exception p1
+
+    .line 7
+    new-instance v0, Lcom/vk/api/sdk/exceptions/VKApiIllegalResponseException;
+
+    invoke-direct {v0, p1}, Lcom/vk/api/sdk/exceptions/VKApiIllegalResponseException;-><init>(Ljava/lang/Throwable;)V
+
+    throw v0
 .end method
 
 .method public bridge synthetic a(Ljava/lang/String;)Ljava/lang/Object;

smali/smali_classes3/com/vk/im/engine/models/dialogs/Dialog.smali

@@ -1196,9 +1196,7 @@
     .locals 1
 
     .line 1
-    invoke-static {}, Lru/vtosters/hooks/other/ThemesUtils;->getDialogTheme()Lcom/vk/im/engine/models/dialogs/DialogTheme;
-
-    move-result-object v0
+    iget-object v0, p0, Lcom/vk/im/engine/models/dialogs/Dialog;->theme:Lcom/vk/im/engine/models/dialogs/DialogTheme;
 
     return-object v0
 .end method

smali/smali_classes3/com/vk/libvideo/VideoTracker$FullscreenTransition.smali

@@ -0,0 +1,118 @@
+.class public final enum Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+.super Ljava/lang/Enum;
+.source "VideoTracker.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/vk/libvideo/VideoTracker;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "FullscreenTransition"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/vk/libvideo/VideoTracker$FullscreenTransition;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+.field public static final enum SCREEN_ROTATION:Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+.field public static final enum TAP:Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 4
+
+    .line 1
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    const/4 v1, 0x0
+
+    const-string v2, "TAP"
+
+    invoke-direct {v0, v2, v1}, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;->TAP:Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    const/4 v2, 0x1
+
+    const-string v3, "SCREEN_ROTATION"
+
+    invoke-direct {v0, v3, v2}, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;->SCREEN_ROTATION:Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    const/4 v0, 0x2
+
+    new-array v0, v0, [Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    .line 2
+    sget-object v3, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;->TAP:Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    aput-object v3, v0, v1
+
+    sget-object v1, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;->SCREEN_ROTATION:Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;->$VALUES:[Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    return-void
+.end method
+
+.method private constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    .line 1
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+    .locals 1
+
+    .line 1
+    const-class v0, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+    .locals 1
+
+    .line 1
+    sget-object v0, Lcom/vk/libvideo/VideoTracker$FullscreenTransition;->$VALUES:[Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    invoke-virtual {v0}, [Lcom/vk/libvideo/VideoTracker$FullscreenTransition;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/vk/libvideo/VideoTracker$FullscreenTransition;
+
+    return-object v0
+.end method

smali/smali_classes3/com/vk/libvideo/VideoTracker$PlayerType.smali

@@ -0,0 +1,134 @@
+.class public final enum Lcom/vk/libvideo/VideoTracker$PlayerType;
+.super Ljava/lang/Enum;
+.source "VideoTracker.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/vk/libvideo/VideoTracker;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "PlayerType"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/vk/libvideo/VideoTracker$PlayerType;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+.field public static final enum CAROUSEL:Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+.field public static final enum FULLSCREEN:Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+.field public static final enum INLINE:Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 5
+
+    .line 1
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    const/4 v1, 0x0
+
+    const-string v2, "INLINE"
+
+    invoke-direct {v0, v2, v1}, Lcom/vk/libvideo/VideoTracker$PlayerType;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$PlayerType;->INLINE:Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    const/4 v2, 0x1
+
+    const-string v3, "CAROUSEL"
+
+    invoke-direct {v0, v3, v2}, Lcom/vk/libvideo/VideoTracker$PlayerType;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$PlayerType;->CAROUSEL:Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    const/4 v3, 0x2
+
+    const-string v4, "FULLSCREEN"
+
+    invoke-direct {v0, v4, v3}, Lcom/vk/libvideo/VideoTracker$PlayerType;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$PlayerType;->FULLSCREEN:Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    const/4 v0, 0x3
+
+    new-array v0, v0, [Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    .line 2
+    sget-object v4, Lcom/vk/libvideo/VideoTracker$PlayerType;->INLINE:Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    aput-object v4, v0, v1
+
+    sget-object v1, Lcom/vk/libvideo/VideoTracker$PlayerType;->CAROUSEL:Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Lcom/vk/libvideo/VideoTracker$PlayerType;->FULLSCREEN:Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    aput-object v1, v0, v3
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$PlayerType;->$VALUES:[Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    return-void
+.end method
+
+.method private constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    .line 1
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lcom/vk/libvideo/VideoTracker$PlayerType;
+    .locals 1
+
+    .line 1
+    const-class v0, Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/vk/libvideo/VideoTracker$PlayerType;
+    .locals 1
+
+    .line 1
+    sget-object v0, Lcom/vk/libvideo/VideoTracker$PlayerType;->$VALUES:[Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    invoke-virtual {v0}, [Lcom/vk/libvideo/VideoTracker$PlayerType;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/vk/libvideo/VideoTracker$PlayerType;
+
+    return-object v0
+.end method

smali/smali_classes3/com/vk/libvideo/VideoTracker$ResizeAction.smali

@@ -0,0 +1,118 @@
+.class public final enum Lcom/vk/libvideo/VideoTracker$ResizeAction;
+.super Ljava/lang/Enum;
+.source "VideoTracker.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/vk/libvideo/VideoTracker;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "ResizeAction"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/vk/libvideo/VideoTracker$ResizeAction;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+.field public static final enum BUTTON:Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+.field public static final enum GESTURE:Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 4
+
+    .line 1
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    const/4 v1, 0x0
+
+    const-string v2, "BUTTON"
+
+    invoke-direct {v0, v2, v1}, Lcom/vk/libvideo/VideoTracker$ResizeAction;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$ResizeAction;->BUTTON:Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    const/4 v2, 0x1
+
+    const-string v3, "GESTURE"
+
+    invoke-direct {v0, v3, v2}, Lcom/vk/libvideo/VideoTracker$ResizeAction;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$ResizeAction;->GESTURE:Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    const/4 v0, 0x2
+
+    new-array v0, v0, [Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    .line 2
+    sget-object v3, Lcom/vk/libvideo/VideoTracker$ResizeAction;->BUTTON:Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    aput-object v3, v0, v1
+
+    sget-object v1, Lcom/vk/libvideo/VideoTracker$ResizeAction;->GESTURE:Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$ResizeAction;->$VALUES:[Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    return-void
+.end method
+
+.method private constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    .line 1
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lcom/vk/libvideo/VideoTracker$ResizeAction;
+    .locals 1
+
+    .line 1
+    const-class v0, Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/vk/libvideo/VideoTracker$ResizeAction;
+    .locals 1
+
+    .line 1
+    sget-object v0, Lcom/vk/libvideo/VideoTracker$ResizeAction;->$VALUES:[Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    invoke-virtual {v0}, [Lcom/vk/libvideo/VideoTracker$ResizeAction;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/vk/libvideo/VideoTracker$ResizeAction;
+
+    return-object v0
+.end method

smali/smali_classes3/com/vk/libvideo/VideoTracker$RewindType.smali

@@ -0,0 +1,118 @@
+.class public final enum Lcom/vk/libvideo/VideoTracker$RewindType;
+.super Ljava/lang/Enum;
+.source "VideoTracker.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/vk/libvideo/VideoTracker;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "RewindType"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/vk/libvideo/VideoTracker$RewindType;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/vk/libvideo/VideoTracker$RewindType;
+
+.field public static final enum DOUBLE_TAP:Lcom/vk/libvideo/VideoTracker$RewindType;
+
+.field public static final enum SLIDER:Lcom/vk/libvideo/VideoTracker$RewindType;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 4
+
+    .line 1
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    const/4 v1, 0x0
+
+    const-string v2, "SLIDER"
+
+    invoke-direct {v0, v2, v1}, Lcom/vk/libvideo/VideoTracker$RewindType;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$RewindType;->SLIDER:Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    const/4 v2, 0x1
+
+    const-string v3, "DOUBLE_TAP"
+
+    invoke-direct {v0, v3, v2}, Lcom/vk/libvideo/VideoTracker$RewindType;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$RewindType;->DOUBLE_TAP:Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    const/4 v0, 0x2
+
+    new-array v0, v0, [Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    .line 2
+    sget-object v3, Lcom/vk/libvideo/VideoTracker$RewindType;->SLIDER:Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    aput-object v3, v0, v1
+
+    sget-object v1, Lcom/vk/libvideo/VideoTracker$RewindType;->DOUBLE_TAP:Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    aput-object v1, v0, v2
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$RewindType;->$VALUES:[Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    return-void
+.end method
+
+.method private constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    .line 1
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lcom/vk/libvideo/VideoTracker$RewindType;
+    .locals 1
+
+    .line 1
+    const-class v0, Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/vk/libvideo/VideoTracker$RewindType;
+    .locals 1
+
+    .line 1
+    sget-object v0, Lcom/vk/libvideo/VideoTracker$RewindType;->$VALUES:[Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    invoke-virtual {v0}, [Lcom/vk/libvideo/VideoTracker$RewindType;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/vk/libvideo/VideoTracker$RewindType;
+
+    return-object v0
+.end method

smali/smali_classes3/com/vk/libvideo/VideoTracker$Screen.smali

@@ -0,0 +1,150 @@
+.class public final enum Lcom/vk/libvideo/VideoTracker$Screen;
+.super Ljava/lang/Enum;
+.source "VideoTracker.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/vk/libvideo/VideoTracker;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x4019
+    name = "Screen"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+    value = {
+        "Ljava/lang/Enum<",
+        "Lcom/vk/libvideo/VideoTracker$Screen;",
+        ">;"
+    }
+.end annotation
+
+
+# static fields
+.field private static final synthetic $VALUES:[Lcom/vk/libvideo/VideoTracker$Screen;
+
+.field public static final enum CAROUSEL:Lcom/vk/libvideo/VideoTracker$Screen;
+
+.field public static final enum INLINE:Lcom/vk/libvideo/VideoTracker$Screen;
+
+.field public static final enum LANDSCAPE:Lcom/vk/libvideo/VideoTracker$Screen;
+
+.field public static final enum PORTRAIT:Lcom/vk/libvideo/VideoTracker$Screen;
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 6
+
+    .line 1
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$Screen;
+
+    const/4 v1, 0x0
+
+    const-string v2, "INLINE"
+
+    invoke-direct {v0, v2, v1}, Lcom/vk/libvideo/VideoTracker$Screen;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$Screen;->INLINE:Lcom/vk/libvideo/VideoTracker$Screen;
+
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$Screen;
+
+    const/4 v2, 0x1
+
+    const-string v3, "CAROUSEL"
+
+    invoke-direct {v0, v3, v2}, Lcom/vk/libvideo/VideoTracker$Screen;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$Screen;->CAROUSEL:Lcom/vk/libvideo/VideoTracker$Screen;
+
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$Screen;
+
+    const/4 v3, 0x2
+
+    const-string v4, "PORTRAIT"
+
+    invoke-direct {v0, v4, v3}, Lcom/vk/libvideo/VideoTracker$Screen;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$Screen;->PORTRAIT:Lcom/vk/libvideo/VideoTracker$Screen;
+
+    new-instance v0, Lcom/vk/libvideo/VideoTracker$Screen;
+
+    const/4 v4, 0x3
+
+    const-string v5, "LANDSCAPE"
+
+    invoke-direct {v0, v5, v4}, Lcom/vk/libvideo/VideoTracker$Screen;-><init>(Ljava/lang/String;I)V
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$Screen;->LANDSCAPE:Lcom/vk/libvideo/VideoTracker$Screen;
+
+    const/4 v0, 0x4
+
+    new-array v0, v0, [Lcom/vk/libvideo/VideoTracker$Screen;
+
+    .line 2
+    sget-object v5, Lcom/vk/libvideo/VideoTracker$Screen;->INLINE:Lcom/vk/libvideo/VideoTracker$Screen;
+
+    aput-object v5, v0, v1
+
+    sget-object v1, Lcom/vk/libvideo/VideoTracker$Screen;->CAROUSEL:Lcom/vk/libvideo/VideoTracker$Screen;
+
+    aput-object v1, v0, v2
+
+    sget-object v1, Lcom/vk/libvideo/VideoTracker$Screen;->PORTRAIT:Lcom/vk/libvideo/VideoTracker$Screen;
+
+    aput-object v1, v0, v3
+
+    sget-object v1, Lcom/vk/libvideo/VideoTracker$Screen;->LANDSCAPE:Lcom/vk/libvideo/VideoTracker$Screen;
+
+    aput-object v1, v0, v4
+
+    sput-object v0, Lcom/vk/libvideo/VideoTracker$Screen;->$VALUES:[Lcom/vk/libvideo/VideoTracker$Screen;
+
+    return-void
+.end method
+
+.method private constructor <init>(Ljava/lang/String;I)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()V"
+        }
+    .end annotation
+
+    .line 1
+    invoke-direct {p0, p1, p2}, Ljava/lang/Enum;-><init>(Ljava/lang/String;I)V
+
+    return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lcom/vk/libvideo/VideoTracker$Screen;
+    .locals 1
+
+    .line 1
+    const-class v0, Lcom/vk/libvideo/VideoTracker$Screen;
+
+    invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+    move-result-object p0
+
+    check-cast p0, Lcom/vk/libvideo/VideoTracker$Screen;
+
+    return-object p0
+.end method
+
+.method public static values()[Lcom/vk/libvideo/VideoTracker$Screen;
+    .locals 1
+
+    .line 1
+    sget-object v0, Lcom/vk/libvideo/VideoTracker$Screen;->$VALUES:[Lcom/vk/libvideo/VideoTracker$Screen;
+
+    invoke-virtual {v0}, [Lcom/vk/libvideo/VideoTracker$Screen;->clone()Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, [Lcom/vk/libvideo/VideoTracker$Screen;
+
+    return-object v0
+.end method

smali/smali_classes3/com/vk/music/notifications/restriction/MusicRestrictionModelImpl.smali

@@ -196,21 +196,6 @@
 .method public a(Lcom/vk/dto/music/MusicTrack;)V
     .locals 3
 
-    invoke-static {}, Lru/vtosters/hooks/other/Preferences;->sendMusicMetrics()Z
-
-    move-result v1
-
-    if-nez v1, :cond_228
-
-    const/4 v0, 0x1
-
-    new-instance p1, Lcom/vk/dto/music/CurrentAccountInformation;
-
-    invoke-direct {p1, v0}, Lcom/vk/dto/music/CurrentAccountInformation;-><init>(Z)V
-    
-    return-void
-
-    :cond_228
     const/4 v0, 0x2
 
     new-array v0, v0, [Ljava/lang/Object;
@@ -239,41 +224,41 @@
 
     .line 14
     :cond_0
-    new-instance v0, Lcom/vk/api/audio/AudioSendStartEvent;
+    # new-instance v0, Lcom/vk/api/audio/AudioSendStartEvent;
 
-    invoke-virtual {p1}, Lcom/vk/dto/music/MusicTrack;->y1()Ljava/lang/String;
+    # invoke-virtual {p1}, Lcom/vk/dto/music/MusicTrack;->y1()Ljava/lang/String;
 
-    move-result-object p1
+    # move-result-object p1
 
-    sget-object v2, Lcom/vk/api/base/ApiConfig;->d:Lcom/vk/api/base/ApiConfig$a;
+    # sget-object v2, Lcom/vk/api/base/ApiConfig;->d:Lcom/vk/api/base/ApiConfig$a;
 
-    invoke-interface {v2}, Lcom/vk/api/base/ApiConfig$a;->O1()Ljava/lang/String;
+    # invoke-interface {v2}, Lcom/vk/api/base/ApiConfig$a;->O1()Ljava/lang/String;
 
-    move-result-object v2
+    # move-result-object v2
 
-    invoke-direct {v0, p1, v2}, Lcom/vk/api/audio/AudioSendStartEvent;-><init>(Ljava/lang/String;Ljava/lang/String;)V
+    # invoke-direct {v0, p1, v2}, Lcom/vk/api/audio/AudioSendStartEvent;-><init>(Ljava/lang/String;Ljava/lang/String;)V
 
-    const/4 p1, 0x0
+    # const/4 p1, 0x0
 
-    .line 15
-    invoke-static {v0, p1, v1, p1}, Lcom/vk/api/base/ApiRequest;->d(Lcom/vk/api/base/ApiRequest;Lcom/vk/api/base/ApiThreadHolder;ILjava/lang/Object;)Lio/reactivex/Observable;
+    # .line 15
+    # invoke-static {v0, p1, v1, p1}, Lcom/vk/api/base/ApiRequest;->d(Lcom/vk/api/base/ApiRequest;Lcom/vk/api/base/ApiThreadHolder;ILjava/lang/Object;)Lio/reactivex/Observable;
 
-    move-result-object p1
+    # move-result-object p1
 
-    .line 16
-    new-instance v0, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$d;
+    # .line 16
+    # new-instance v0, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$d;
 
-    invoke-direct {v0, p0}, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$d;-><init>(Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl;)V
+    # invoke-direct {v0, p0}, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$d;-><init>(Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl;)V
 
-    .line 17
-    sget-object v1, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$e;->a:Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$e;
+    # .line 17
+    # sget-object v1, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$e;->a:Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl$e;
 
-    .line 18
-    invoke-virtual {p1, v0, v1}, Lio/reactivex/Observable;->a(Lio/reactivex/functions/Consumer;Lio/reactivex/functions/Consumer;)Lio/reactivex/disposables/Disposable;
+    # .line 18
+    # invoke-virtual {p1, v0, v1}, Lio/reactivex/Observable;->a(Lio/reactivex/functions/Consumer;Lio/reactivex/functions/Consumer;)Lio/reactivex/disposables/Disposable;
 
-    move-result-object p1
+    # move-result-object p1
 
-    iput-object p1, p0, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl;->a:Lio/reactivex/disposables/Disposable;
+    # iput-object p1, p0, Lcom/vk/music/notifications/restriction/MusicRestrictionModelImpl;->a:Lio/reactivex/disposables/Disposable;
 
     return-void
 .end method

smali/smali_classes3/com/vk/music/stats/VKMusicStatsTracker$a.smali

@@ -0,0 +1,70 @@
+.class public final Lcom/vk/music/stats/VKMusicStatsTracker$a;
+.super Ljava/lang/Object;
+.source "VKMusicStatsTracker.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lcom/vk/music/stats/VKMusicStatsTracker;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "a"
+.end annotation
+
+
+# direct methods
+.method private constructor <init>()V
+    .locals 0
+
+    .line 1
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+.method public synthetic constructor <init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+    .locals 0
+
+    .line 2
+    invoke-direct {p0}, Lcom/vk/music/stats/VKMusicStatsTracker$a;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final a(Lcom/vtosters/lite/data/Analytics$l;)V
+    .locals 3
+    .annotation build Landroidx/annotation/VisibleForTesting;
+    .end annotation
+
+    const/4 v0, 0x3
+
+    new-array v0, v0, [Ljava/lang/Object;
+
+    const/4 v1, 0x0
+
+    const-string v2, "MusicStats"
+
+    aput-object v2, v0, v1
+
+    const/4 v1, 0x1
+
+    const-string v2, "[VK_TRACKER]"
+
+    aput-object v2, v0, v1
+
+    const/4 v1, 0x2
+
+    aput-object p1, v0, v1
+
+    .line 1
+    invoke-static {v0}, Lcom/vk/music/logger/MusicLogger;->a([Ljava/lang/Object;)V
+
+    .line 2
+    invoke-virtual {p1}, Lcom/vtosters/lite/data/Analytics$l;->b()Lcom/vtosters/lite/data/Analytics$l;
+
+    return-void
+.end method

smali/smali_classes3/com/vk/music/stats/VKMusicStatsTracker.smali

@@ -0,0 +1,841 @@
+.class public final Lcom/vk/music/stats/VKMusicStatsTracker;
+.super Ljava/lang/Object;
+.source "VKMusicStatsTracker.kt"
+
+# interfaces
+.implements Lcom/vk/music/stats/MusicStatsTracker;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+    value = {
+        Lcom/vk/music/stats/VKMusicStatsTracker$a;
+    }
+.end annotation
+
+
+# static fields
+.field public static final c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+
+# instance fields
+.field private a:Ljava/lang/String;
+
+.field private final b:Lkotlin/jvm/b/Functions2;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lkotlin/jvm/b/Functions2<",
+            "Ljava/lang/String;",
+            "Lcom/vtosters/lite/data/Analytics$l;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+
+# direct methods
+.method static constructor <clinit>()V
+    .locals 2
+
+    new-instance v0, Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    const/4 v1, 0x0
+
+    invoke-direct {v0, v1}, Lcom/vk/music/stats/VKMusicStatsTracker$a;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+    sput-object v0, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    return-void
+.end method
+
+.method public constructor <init>(Lkotlin/jvm/b/Functions2;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "(",
+            "Lkotlin/jvm/b/Functions2<",
+            "-",
+            "Ljava/lang/String;",
+            "+",
+            "Lcom/vtosters/lite/data/Analytics$l;",
+            ">;)V"
+        }
+    .end annotation
+
+    .line 1
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    iput-object p1, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->b:Lkotlin/jvm/b/Functions2;
+
+    return-void
+.end method
+
+.method private final a(Lcom/vk/music/stats/i/MusicPlaybackParams;Ljava/lang/String;)Lcom/vtosters/lite/data/Analytics$l;
+    .locals 4
+
+    .line 16
+    iget-object v0, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->b:Lkotlin/jvm/b/Functions2;
+
+    invoke-interface {v0, p2}, Lkotlin/jvm/b/Functions2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 17
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->c()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "audio_id"
+
+    invoke-virtual {v0, v2, v1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 18
+    invoke-static {}, Ljava/util/UUID;->randomUUID()Ljava/util/UUID;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Ljava/util/UUID;->hashCode()I
+
+    move-result v1
+
+    invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v1
+
+    const-string v2, "uuid"
+
+    invoke-virtual {v0, v2, v1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 19
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->l()Z
+
+    move-result v1
+
+    invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object v1
+
+    const-string v2, "shuffle"
+
+    invoke-virtual {v0, v2, v1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 20
+    invoke-direct {p0, p1}, Lcom/vk/music/stats/VKMusicStatsTracker;->e(Lcom/vk/music/stats/i/MusicPlaybackParams;)Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "reason"
+
+    invoke-virtual {v0, v2, v1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 21
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->i()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    const-string v2, "start_time"
+
+    invoke-virtual {v0, v2, v1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 22
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->d()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    const-string v2, "playback_started_at"
+
+    invoke-virtual {v0, v2, v1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 23
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->j()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "track_code"
+
+    invoke-virtual {v0, v2, v1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v1, "music_start_playback"
+
+    .line 24
+    invoke-static {v1, p2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result p2
+
+    const/4 v1, 0x1
+
+    xor-int/2addr p2, v1
+
+    if-eqz p2, :cond_0
+
+    .line 25
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->a()J
+
+    move-result-wide v2
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p2
+
+    const-string v2, "duration"
+
+    invoke-virtual {v0, v2, p2}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 26
+    :cond_0
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->b()Lcom/vk/music/player/LoopMode;
+
+    move-result-object p2
+
+    sget-object v2, Lcom/vk/music/stats/h;->$EnumSwitchMapping$0:[I
+
+    invoke-virtual {p2}, Ljava/lang/Enum;->ordinal()I
+
+    move-result p2
+
+    aget p2, v2, p2
+
+    const-string v2, "repeat"
+
+    if-eq p2, v1, :cond_2
+
+    const/4 v1, 0x2
+
+    if-eq p2, v1, :cond_1
+
+    goto :goto_0
+
+    :cond_1
+    const-string p2, "all"
+
+    .line 27
+    invoke-virtual {v0, v2, p2}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    goto :goto_0
+
+    :cond_2
+    const-string p2, "one"
+
+    .line 28
+    invoke-virtual {v0, v2, p2}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 29
+    :goto_0
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->m()Ljava/lang/String;
+
+    move-result-object p2
+
+    const-string v1, "state"
+
+    invoke-virtual {v0, v1, p2}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 30
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->h()Lcom/vk/music/common/MusicPlaybackLaunchContext;
+
+    move-result-object p2
+
+    .line 31
+    invoke-virtual {p2}, Lcom/vk/music/common/MusicPlaybackLaunchContext;->v0()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "source"
+
+    invoke-virtual {v0, v2, v1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 32
+    invoke-virtual {p2}, Lcom/vk/music/common/MusicPlaybackLaunchContext;->v1()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_3
+
+    .line 33
+    invoke-virtual {p2}, Lcom/vk/music/common/MusicPlaybackLaunchContext;->u1()Ljava/lang/String;
+
+    move-result-object v1
+
+    const-string v2, "playlist_id"
+
+    invoke-virtual {v0, v2, v1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    :cond_3
+    const/4 v1, 0x4
+
+    .line 34
+    invoke-virtual {p2, v1}, Lcom/vk/music/common/MusicPlaybackLaunchContext;->i(I)Z
+
+    move-result v2
+
+    if-nez v2, :cond_4
+
+    const/16 v2, 0x8
+
+    invoke-virtual {p2, v2}, Lcom/vk/music/common/MusicPlaybackLaunchContext;->i(I)Z
+
+    move-result v2
+
+    if-eqz v2, :cond_5
+
+    .line 35
+    :cond_4
+    invoke-virtual {p2, v1}, Lcom/vk/music/common/MusicPlaybackLaunchContext;->i(I)Z
+
+    move-result p2
+
+    invoke-static {p2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p2
+
+    const-string v1, "expanded"
+
+    invoke-virtual {v0, v1, p2}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 36
+    :cond_5
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->e()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-static {p2}, Lcom/vk/core/extensions/StringExt;->a(Ljava/lang/CharSequence;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_6
+
+    .line 37
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->e()Ljava/lang/String;
+
+    move-result-object p2
+
+    const-string v1, "prev_audio_id"
+
+    invoke-virtual {v0, v1, p2}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 38
+    :cond_6
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->f()Ljava/lang/String;
+
+    move-result-object p2
+
+    invoke-static {p2}, Lcom/vk/core/extensions/StringExt;->a(Ljava/lang/CharSequence;)Z
+
+    move-result p2
+
+    if-eqz p2, :cond_7
+
+    .line 39
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->f()Ljava/lang/String;
+
+    move-result-object p1
+
+    const-string p2, "prev_playlist_id"
+
+    invoke-virtual {v0, p2, p1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    :cond_7
+    return-object v0
+.end method
+
+.method private final e(Lcom/vk/music/stats/i/MusicPlaybackParams;)Ljava/lang/String;
+    .locals 0
+
+    .line 1
+    invoke-virtual {p1}, Lcom/vk/music/stats/i/MusicPlaybackParams;->g()Ljava/lang/String;
+
+    move-result-object p1
+
+    if-nez p1, :cond_0
+
+    .line 2
+    iget-object p1, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->a:Ljava/lang/String;
+
+    :cond_0
+    if-nez p1, :cond_1
+
+    const-string p1, "auto"
+
+    .line 3
+    :cond_1
+    iput-object p1, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->a:Ljava/lang/String;
+
+    return-object p1
+.end method
+
+
+# virtual methods
+.method public a()V
+    .locals 4
+
+    .line 46
+    sget-object v0, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    iget-object v1, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->b:Lkotlin/jvm/b/Functions2;
+
+    const-string v2, "music_subscription"
+
+    invoke-interface {v1, v2}, Lkotlin/jvm/b/Functions2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v2, "popup"
+
+    const-string v3, "background_v2"
+
+    .line 47
+    invoke-virtual {v1, v2, v3}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v2, "action"
+
+    const-string v3, "link"
+
+    .line 48
+    invoke-virtual {v1, v2, v3}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v2, "newEventBuilder.invoke(T\u2026ION_POPUP_ACTION, \"link\")"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
+
+    .line 49
+    invoke-virtual {v0, v1}, Lcom/vk/music/stats/VKMusicStatsTracker$a;->a(Lcom/vtosters/lite/data/Analytics$l;)V
+
+    return-void
+.end method
+
+.method public a(J)V
+    .locals 0
+
+    .line 3
+    invoke-static {p0, p1, p2}, Lcom/vk/music/stats/MusicStatsTracker$a;->a(Lcom/vk/music/stats/MusicStatsTracker;J)V
+
+    return-void
+.end method
+
+.method public a(Landroid/content/Intent;Ljava/lang/String;)V
+    .locals 0
+
+    .line 2
+    invoke-static {p0, p1, p2}, Lcom/vk/music/stats/MusicStatsTracker$a;->a(Lcom/vk/music/stats/MusicStatsTracker;Landroid/content/Intent;Ljava/lang/String;)V
+
+    return-void
+.end method
+
+.method public a(Lcom/vk/music/stats/PlayerStateChangedParams;)V
+    .locals 4
+
+    .line 8
+    sget-object v0, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    iget-object v1, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->b:Lkotlin/jvm/b/Functions2;
+
+    const-string v2, "audio_player"
+
+    invoke-interface {v1, v2}, Lkotlin/jvm/b/Functions2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 9
+    invoke-virtual {p1}, Lcom/vk/music/stats/PlayerStateChangedParams;->a()Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "state"
+
+    invoke-virtual {v1, v3, v2}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 10
+    invoke-virtual {p1}, Lcom/vk/music/stats/PlayerStateChangedParams;->c()Ljava/lang/String;
+
+    move-result-object v2
+
+    const-string v3, "prev_state"
+
+    invoke-virtual {v1, v3, v2}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 11
+    invoke-virtual {p1}, Lcom/vk/music/stats/PlayerStateChangedParams;->b()J
+
+    move-result-wide v2
+
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object p1
+
+    const-string v2, "duration"
+
+    invoke-virtual {v1, v2, p1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string p1, "newEventBuilder.invoke(T\u2026TION, params.durationSec)"
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
+
+    .line 12
+    invoke-virtual {v0, v1}, Lcom/vk/music/stats/VKMusicStatsTracker$a;->a(Lcom/vtosters/lite/data/Analytics$l;)V
+
+    return-void
+.end method
+
+.method public a(Lcom/vk/music/stats/i/MusicPlaybackParams;)V
+    .locals 2
+
+    .line 7
+    sget-object v0, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    const-string v1, "music_stop_playback"
+
+    invoke-direct {p0, p1, v1}, Lcom/vk/music/stats/VKMusicStatsTracker;->a(Lcom/vk/music/stats/i/MusicPlaybackParams;Ljava/lang/String;)Lcom/vtosters/lite/data/Analytics$l;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lcom/vk/music/stats/VKMusicStatsTracker$a;->a(Lcom/vtosters/lite/data/Analytics$l;)V
+
+    return-void
+.end method
+
+.method public a(Ljava/lang/String;)V
+    .locals 3
+
+    .line 13
+    sget-object v0, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    iget-object v1, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->b:Lkotlin/jvm/b/Functions2;
+
+    const-string v2, "playlist_start"
+
+    invoke-interface {v1, v2}, Lkotlin/jvm/b/Functions2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v2, "type"
+
+    .line 14
+    invoke-virtual {v1, v2, p1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string p1, "newEventBuilder.invoke(T\u2026ING_STARTED_TYPE, source)"
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
+
+    .line 15
+    invoke-virtual {v0, v1}, Lcom/vk/music/stats/VKMusicStatsTracker$a;->a(Lcom/vtosters/lite/data/Analytics$l;)V
+
+    return-void
+.end method
+
+.method public a(Ljava/lang/String;Lcom/vk/music/stats/MusicStatsRefer;)V
+    .locals 2
+
+    .line 4
+    sget-object p2, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    iget-object v0, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->b:Lkotlin/jvm/b/Functions2;
+
+    const-string v1, "music_subscription_show"
+
+    invoke-interface {v0, v1}, Lkotlin/jvm/b/Functions2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v1, "popup"
+
+    .line 5
+    invoke-virtual {v0, v1, p1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string p1, "newEventBuilder.invoke(T\u2026ION_POPUP_SOURCE, source)"
+
+    invoke-static {v0, p1}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
+
+    .line 6
+    invoke-virtual {p2, v0}, Lcom/vk/music/stats/VKMusicStatsTracker$a;->a(Lcom/vtosters/lite/data/Analytics$l;)V
+
+    return-void
+.end method
+
+.method public a(Ljava/lang/String;Ljava/lang/String;)V
+    .locals 4
+
+    const-string v0, "success"
+
+    .line 40
+    invoke-static {v0, p2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v1
+
+    .line 41
+    iget-object v2, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->b:Lkotlin/jvm/b/Functions2;
+
+    const-string v3, "music_subscription_purchase_result"
+
+    invoke-interface {v2, v3}, Lkotlin/jvm/b/Functions2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v3, "popup"
+
+    .line 42
+    invoke-virtual {v2, v3, p1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    if-eqz v1, :cond_0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "fail"
+
+    :goto_0
+    const-string p1, "status"
+
+    .line 43
+    invoke-virtual {v2, p1, v0}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    if-nez v1, :cond_1
+
+    const-string p1, "reason"
+
+    .line 44
+    invoke-virtual {v2, p1, p2}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    .line 45
+    :cond_1
+    sget-object p1, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    const-string p2, "builder"
+
+    invoke-static {v2, p2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1, v2}, Lcom/vk/music/stats/VKMusicStatsTracker$a;->a(Lcom/vtosters/lite/data/Analytics$l;)V
+
+    return-void
+.end method
+
+.method public a(Z)V
+    .locals 0
+
+    .line 1
+    invoke-static {p0, p1}, Lcom/vk/music/stats/MusicStatsTracker$a;->a(Lcom/vk/music/stats/MusicStatsTracker;Z)V
+
+    return-void
+.end method
+
+.method public b()V
+    .locals 4
+
+    .line 6
+    sget-object v0, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    iget-object v1, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->b:Lkotlin/jvm/b/Functions2;
+
+    const-string v2, "music_subscription_push"
+
+    invoke-interface {v1, v2}, Lkotlin/jvm/b/Functions2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v2, "action"
+
+    const-string v3, "send"
+
+    .line 7
+    invoke-virtual {v1, v2, v3}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v2, "newEventBuilder.invoke(T\u2026ION_POPUP_ACTION, \"send\")"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
+
+    .line 8
+    invoke-virtual {v0, v1}, Lcom/vk/music/stats/VKMusicStatsTracker$a;->a(Lcom/vtosters/lite/data/Analytics$l;)V
+
+    return-void
+.end method
+
+.method public b(Lcom/vk/music/stats/i/MusicPlaybackParams;)V
+    .locals 2
+
+    .line 1
+    sget-object v0, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    const-string v1, "music_start_playback"
+
+    invoke-direct {p0, p1, v1}, Lcom/vk/music/stats/VKMusicStatsTracker;->a(Lcom/vk/music/stats/i/MusicPlaybackParams;Ljava/lang/String;)Lcom/vtosters/lite/data/Analytics$l;
+
+    move-result-object p1
+
+    invoke-virtual {v0, p1}, Lcom/vk/music/stats/VKMusicStatsTracker$a;->a(Lcom/vtosters/lite/data/Analytics$l;)V
+
+    return-void
+.end method
+
+.method public b(Ljava/lang/String;)V
+    .locals 3
+
+    .line 9
+    sget-object v0, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    iget-object v1, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->b:Lkotlin/jvm/b/Functions2;
+
+    const-string v2, "music_subscription_free_displayed"
+
+    invoke-interface {v1, v2}, Lkotlin/jvm/b/Functions2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v2, "popup"
+
+    .line 10
+    invoke-virtual {v1, v2, p1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string p1, "newEventBuilder.invoke(T\u2026ION_POPUP_SOURCE, source)"
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
+
+    .line 11
+    invoke-virtual {v0, v1}, Lcom/vk/music/stats/VKMusicStatsTracker$a;->a(Lcom/vtosters/lite/data/Analytics$l;)V
+
+    return-void
+.end method
+
+.method public b(Ljava/lang/String;Ljava/lang/String;)V
+    .locals 3
+
+    .line 2
+    sget-object v0, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    iget-object v1, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->b:Lkotlin/jvm/b/Functions2;
+
+    const-string v2, "music_subscription_action"
+
+    invoke-interface {v1, v2}, Lkotlin/jvm/b/Functions2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v2, "popup"
+
+    .line 3
+    invoke-virtual {v1, v2, p1}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string p1, "action"
+
+    .line 4
+    invoke-virtual {v1, p1, p2}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string p1, "newEventBuilder.invoke(T\u2026ION_POPUP_ACTION, action)"
+
+    invoke-static {v1, p1}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
+
+    .line 5
+    invoke-virtual {v0, v1}, Lcom/vk/music/stats/VKMusicStatsTracker$a;->a(Lcom/vtosters/lite/data/Analytics$l;)V
+
+    return-void
+.end method
+
+.method public b(Z)V
+    .locals 0
+
+    return-void
+.end method
+
+.method public c()V
+    .locals 4
+
+    .line 3
+    sget-object v0, Lcom/vk/music/stats/VKMusicStatsTracker;->c:Lcom/vk/music/stats/VKMusicStatsTracker$a;
+
+    iget-object v1, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->b:Lkotlin/jvm/b/Functions2;
+
+    const-string v2, "music_subscription_push"
+
+    invoke-interface {v1, v2}, Lkotlin/jvm/b/Functions2;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v1
+
+    check-cast v1, Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v2, "action"
+
+    const-string v3, "open"
+
+    .line 4
+    invoke-virtual {v1, v2, v3}, Lcom/vtosters/lite/data/Analytics$l;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vtosters/lite/data/Analytics$l;
+
+    const-string v2, "newEventBuilder.invoke(T\u2026ION_POPUP_ACTION, \"open\")"
+
+    invoke-static {v1, v2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
+
+    .line 5
+    invoke-virtual {v0, v1}, Lcom/vk/music/stats/VKMusicStatsTracker$a;->a(Lcom/vtosters/lite/data/Analytics$l;)V
+
+    return-void
+.end method
+
+.method public c(Lcom/vk/music/stats/i/MusicPlaybackParams;)V
+    .locals 0
+
+    .line 1
+    invoke-static {p0, p1}, Lcom/vk/music/stats/MusicStatsTracker$a;->b(Lcom/vk/music/stats/MusicStatsTracker;Lcom/vk/music/stats/i/MusicPlaybackParams;)V
+
+    return-void
+.end method
+
+.method public c(Z)V
+    .locals 0
+
+    .line 2
+    invoke-static {p0, p1}, Lcom/vk/music/stats/MusicStatsTracker$a;->b(Lcom/vk/music/stats/MusicStatsTracker;Z)V
+
+    return-void
+.end method
+
+.method public d()V
+    .locals 0
+
+    .line 1
+    invoke-static {p0}, Lcom/vk/music/stats/MusicStatsTracker$a;->a(Lcom/vk/music/stats/MusicStatsTracker;)V
+
+    return-void
+.end method
+
+.method public d(Lcom/vk/music/stats/i/MusicPlaybackParams;)V
+    .locals 2
+
+    .line 2
+    iget-object v0, p0, Lcom/vk/music/stats/VKMusicStatsTracker;->a:Ljava/lang/String;
+
+    const-string v1, "pause"
+
+    invoke-static {v1, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    .line 3
+    invoke-virtual {p0, p1}, Lcom/vk/music/stats/VKMusicStatsTracker;->a(Lcom/vk/music/stats/i/MusicPlaybackParams;)V
+
+    :cond_0
+    return-void
+.end method

smali/smali_classes5/me/leolin/shortcutbadger/ShortcutBadger.smali

@@ -43,9 +43,103 @@
 
     sput-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->c:Ljava/lang/Object;
 
+    .line 3
     sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
 
-    invoke-static {v0}, Lru/vtosters/hooks/ShortcutBadgerHook;->init(Ljava/util/List;)V
+    const-class v1, Lme/leolin/shortcutbadger/impl/AdwHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 4
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/ApexHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 5
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/DefaultBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 6
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/NewHtcHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 7
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/NovaHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 8
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/SonyHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 9
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/AsusHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 10
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/HuaweiHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 11
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/OPPOHomeBader;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 12
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/SamsungHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 13
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/ZukHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 14
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/VivoHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 15
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/ZTEHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+    .line 16
+    sget-object v0, Lme/leolin/shortcutbadger/ShortcutBadger;->a:Ljava/util/List;
+
+    const-class v1, Lme/leolin/shortcutbadger/impl/EverythingMeHomeBadger;
+
+    invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
 
     return-void
 .end method