fixed show cached pl

app/src/main/java/ru/vtosters/lite/di/singleton/VtOkHttpClient.java

@@ -0,0 +1,13 @@
+package ru.vtosters.lite.di.singleton;
+
+import okhttp3.OkHttpClient;
+
+public class VtOkHttpClient extends OkHttpClient {
+    private static class LazyHolder {
+        private static final VtOkHttpClient instance = new VtOkHttpClient();
+    }
+
+    public static VtOkHttpClient getInstance() {
+        return LazyHolder.instance;
+    }
+}

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

@@ -9,18 +9,20 @@ import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Environment;
 
+import androidx.core.content.FileProvider;
+
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vtosters.lite.R;
 
 import java.io.File;
 
-import b.h.g.m.FileUtils;
 import ru.vtosters.lite.ui.activities.APKInstallActivity;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class OTADownloader {
 
     private static final BroadcastReceiver callback = new BroadcastReceiver() {
+        @SuppressLint("Range")
         @Override
         public void onReceive(Context context, Intent intent) {
             var extras = intent.getExtras();
@@ -30,24 +32,15 @@ public class OTADownloader {
             var query = new DownloadManager.Query();
             var id = extras.getLong(DownloadManager.EXTRA_DOWNLOAD_ID);
             query.setFilterById(id);
-            var manager = (DownloadManager) AndroidUtils.getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE);
+            var manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
             var cursor = manager.query(query);
             if (cursor.moveToFirst()) {
                 @SuppressLint("Range") var status = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS));
                 if (status == DownloadManager.STATUS_SUCCESSFUL) {
-                    var downloadDir = new File(Environment.getExternalStorageDirectory(), "Download");
-                    if (!downloadDir.exists()) return;
-                    var list = downloadDir.listFiles();
-                    if (list == null || list.length == 0) return;
-                    var maxIndex = -1;
-                    for (File file : list) {
-                        var name = file.getAbsolutePath().substring(file.getAbsolutePath().lastIndexOf("/") + 1);
-                        if (file.isFile()
-                                && name.matches("VTLite-\\d+\\.apk"))
-                            maxIndex = Math.max(maxIndex, Integer.parseInt(name.replaceFirst(".+-(\\d+).+", "$1")));
-                    }
-                    File apk = maxIndex == -1 ? new File(downloadDir, "VTLite.apk") : new File(downloadDir, "VTLite-" + maxIndex + ".apk");
-                    APKInstallActivity.installOta(context, FileUtils.uriFromFile(apk));
+                    var uriStr = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI));
+                    var apk = new File(uriStr.replace("file://", ""));
+                    var uri = FileProvider.getUriForFile(context, "com.vtosters.lite.common.VKFileProvider", apk);
+                    APKInstallActivity.installOta(context, uri);
                 } else if (status == DownloadManager.STATUS_FAILED) {
                     AndroidUtils.sendToast(context.getString(R.string.downloaderr));
                 }
@@ -55,7 +48,7 @@ public class OTADownloader {
         }
     };
 
-    public static void downloadBuild(String url) {
+    public static void downloadBuild(String url, String commitSHA) {
         var context = AndroidUtils.getGlobalContext();
         try {
             var uri = Uri.parse(url);
@@ -64,8 +57,8 @@ public class OTADownloader {
 
             var request = new DownloadManager.Request(uri);
             request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-            request.setTitle("VTLite.apk");
-            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "VTLite_" + System.currentTimeMillis() / 1000 + ".apk");
+            request.setTitle("Скачивание обновления");
+            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, "VTLite-" + commitSHA + ".apk");
 
             var manager = (DownloadManager) AndroidUtils.getGlobalContext().getSystemService(Context.DOWNLOAD_SERVICE);
             manager.enqueue(request);

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

@@ -90,6 +90,14 @@ public class EncryptProvider {
         return (String) decryptMessage(msgBody, peer, showEmoji);
     }
 
+    public static CharSequence decryptMessage(CharSequence msgBody, MsgFromUser msgFromUser, boolean showEmoji) {
+        try {
+            return decryptMessage((String) msgBody, msgFromUser.v1(), showEmoji);
+        } catch (Exception e){
+            return decryptMessage((String) msgBody, 0, showEmoji);
+        }
+    }
+
     // For MentionsFormatter that requires CharSequence
     public static CharSequence decryptMessage(String msgBody, int peer, boolean showEmoji) {
         var decryptedMessage = decryptMessage(msgBody, peer);

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

@@ -31,6 +31,7 @@ import java.util.regex.Pattern;
 
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.net.Request;
 import ru.vtosters.lite.utils.LifecycleUtils;
 
@@ -38,7 +39,7 @@ public class FoafBase {
     private static final Pattern FOAF_REGEX = Pattern.compile("<ya:created dc:date=\"(.+?)\"");
     private static final Pattern FOAF_REGEX_LAST_SEEN = Pattern.compile("<ya:lastLoggedIn dc:date=\"(.*)(((\\+|-)\\d\\d):(\\d\\d))\"");
     private static final String API_VKNEXT = "https://api.vtosters.app/v1/getBypassedOnlineInfo?json=1&ids=";
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
 
     public static long getLastSeen(long origtime, int id) throws ParseException {
         var request = new okhttp3.Request.a()

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

@@ -0,0 +1,15 @@
+package ru.vtosters.lite.hooks;
+
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+
+import b.h.g.g.BuildInfo;
+
+public class AppVerHook {
+    public static int appBuild() {
+        return getBoolValue("useOldAppVer", false) ? 6561 : BuildInfo.i.e();
+    }
+
+    public static String appVer() {
+        return getBoolValue("useOldAppVer", false) ? "6.18.1" : BuildInfo.i.d();
+    }
+}

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

@@ -1,20 +1,13 @@
 package ru.vtosters.lite.hooks;
 
 import static ru.vtosters.lite.foaf.FoafBase.getBypassedOnlineInfo;
-import static ru.vtosters.lite.hooks.DateHook.getLocale;
 import static ru.vtosters.lite.hooks.OnlineFormatterHook.onlineHookProfiles;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogHeader;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogPlaylist;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogSeparator;
-import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getPlaylist;
-import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
 import static ru.vtosters.lite.proxy.ProxyUtils.getStatic;
 import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs;
 import static ru.vtosters.lite.utils.Preferences.dev;
 import static ru.vtosters.lite.utils.Preferences.friendsblock;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.Preferences.hasVerification;
-import static ru.vtosters.lite.utils.Preferences.podcastcatalog;
 import static ru.vtosters.lite.utils.VTVerifications.isDeveloper;
 import static ru.vtosters.lite.utils.VTVerifications.isPrometheus;
 import static ru.vtosters.lite.utils.VTVerifications.isVerified;
@@ -22,8 +15,6 @@ import static ru.vtosters.lite.utils.VTVerifications.isVerified;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.vk.core.network.Network;
-import com.vk.core.util.DeviceIdProvider;
 import com.vk.core.util.LangUtils;
 import com.vtosters.lite.R;
 
@@ -37,16 +28,13 @@ import java.util.LinkedHashSet;
 import java.util.Objects;
 import java.util.Random;
 
-import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
-import okhttp3.Headers;
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class JsonInjectors {
-    private static final OkHttpClient mClient = new OkHttpClient();
+    private static final OkHttpClient mClient = VtOkHttpClient.getInstance();
 
     public static JSONObject profileButton(JSONObject orig) throws JSONException {
         var id = orig.getInt("id");
@@ -165,7 +153,8 @@ public class JsonInjectors {
 
         var isPicture = pic.endsWith(".png") || pic.endsWith(".jpg") || pic.endsWith(".jpeg") || pic.endsWith(".webp");
 
-        if (isVerified(peerid)) text = AndroidUtils.getString(R.string.i_bought) + " VTosters Premium";
+        if (isVerified(peerid))
+            text = AndroidUtils.getString(R.string.i_bought) + " VTosters Premium";
         if (isPrometheus(peerid))
             text = AndroidUtils.getString(R.string.i_bought) + " VTosters Premium Gold Prime Pro Plus";
         if (isDeveloper(peerid)) text = AndroidUtils.getString(R.string.i_created_poop);
@@ -242,19 +231,7 @@ public class JsonInjectors {
         return json.putOpt("items", newItems);
     }
 
-    public static JSONObject musiclink(JSONObject json) {
-        var links = json.optJSONArray("links");
 
-        if (links != null) {
-            if (links.optJSONObject(0).optString("url").contains("?section=recent")) {
-                json.remove("links");
-
-                if (dev()) Log.d("VKMusic", "Removed links buttons");
-            }
-        }
-
-        return json;
-    }
 
     public static JSONObject setOnlineInfo(JSONObject json) throws JSONException {
         var id = json.optInt("id");
@@ -368,159 +345,6 @@ public class JsonInjectors {
         return items;
     }
 
-    public static JSONObject music(JSONObject json) throws JSONException {
-        var catalog = json.optJSONObject("catalog");
-
-        JSONArray oldItems = null;
-
-        if (catalog != null) {
-            oldItems = catalog.optJSONArray("sections");
-        }
-
-        if (oldItems != null && oldItems.optJSONObject(0).optString("url").contains("general")) {
-            json.optJSONArray("playlists").put(getPlaylist());
-
-            if (podcastcatalog()) {
-                var podcasts = fetchCatalogPodcast();
-                if (podcasts != null) {
-                    var catalogarr = podcasts.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
-
-                    var title = catalogarr.optString("title");
-                    var id = catalogarr.optString("id");
-                    var url = catalogarr.optString("url");
-
-                    if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
-
-                    oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
-                }
-            }
-
-            var playlists = fetchCatalogId("https://vk.com/audio?section=my_playlists");
-            if (playlists != null) {
-                var catalogarr = playlists.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
-
-                var title = catalogarr.optString("title");
-                var id = catalogarr.optString("id");
-                var url = catalogarr.optString("url");
-
-                if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
-
-                oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
-            }
-
-            var albums = fetchCatalogId("https://vk.com/audio?section=albums");
-            if (albums != null) {
-                var catalogarr = albums.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
-
-                var title = catalogarr.optString("title");
-                var id = catalogarr.optString("id");
-                var url = catalogarr.optString("url");
-
-                if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
-
-                oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
-            }
-
-            var recent = fetchCatalogId("https://vk.com/audio?section=recent");
-            if (recent != null) {
-                var catalogarr = recent.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
-
-                var title = catalogarr.optString("title");
-                var id = catalogarr.optString("id");
-                var url = catalogarr.optString("url");
-
-                if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
-
-                oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
-            }
-
-            for (int i = 0; i < oldItems.length(); i++) {
-                var item = oldItems.optJSONObject(i);
-                var title = item.optString("title");
-                var id = item.optString("id");
-                var url = item.optString("url");
-                var value = AndroidUtils.getPrefsValue("musicdefcatalog");
-
-                Log.d("VKMusic", "title: " + title + " id: " + id + " url: " + url + " value: " + value);
-
-                if (url.contains(value) && !value.isEmpty()) {
-                    catalog.put("default_section", id);
-                    if (dev()) Log.d("VKMusic", "Added " + title + " as default music section");
-                }
-            }
-
-            if (CacheDatabaseDelegate.hasTracks() && !LibVKXClient.isIntegrationEnabled()){ // inj in playlist list
-                var blocks = oldItems.optJSONObject(0).optJSONArray("blocks");
-                var newBlocks = new JSONArray();
-
-                if (blocks != null){
-                    newBlocks
-                            .put(getCatalogHeader())
-                            .put(getCatalogPlaylist())
-                            .put(getCatalogSeparator());
-
-                    Log.d("VKMusic", "added cache catalog playlist");
-
-                    for (int i = 0; i < blocks.length(); i++) {
-                        newBlocks.put(blocks.optJSONObject(i));
-                    }
-
-                    oldItems.optJSONObject(0).put("blocks", newBlocks);
-                }
-            }
-        }
-
-        return json;
-    }
-
-    public static JSONObject fetchCatalogId(String section) {
-        if (section.isEmpty()) return null;
-
-        var request = new Request.a()
-                .b("https://" + getApi() + "/method/catalog.getAudio"
-                        + "?v=5.119"
-                        + "&https=1"
-                        + "&need_blocks=1"
-                        + "&lang="
-                        + getLocale()
-                        + "&device_id="
-                        + DeviceIdProvider.d(AndroidUtils.getGlobalContext())
-                        + "&url="
-                        + section
-                        + "&access_token="
-                        + AccountManagerUtils.getUserToken())
-                .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
-        try {
-            return new JSONObject(mClient.a(request).execute().a().g()).getJSONObject("response");
-        } catch (JSONException | IOException e) {
-            Log.d("VTLMusic", "Error: " + e.getMessage());
-        }
-
-        return null;
-    }
-
-    public static JSONObject fetchCatalogPodcast() {
-        var request = new Request.a()
-                .b("https://" + getApi() + "/method/catalog.getPodcasts"
-                        + "?v=5.119"
-                        + "&https=1"
-                        + "&need_blocks=1"
-                        + "&lang="
-                        + getLocale()
-                        + "&device_id="
-                        + DeviceIdProvider.d(AndroidUtils.getGlobalContext())
-                        + "&access_token="
-                        + AccountManagerUtils.getUserToken())
-                .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
-        try {
-            return new JSONObject(mClient.a(request).execute().a().g()).getJSONObject("response");
-        } catch (JSONException | IOException e) {
-            Log.d("VTLMusic", "Error: " + e.getMessage());
-        }
-
-        return null;
-    }
-
     public static JSONObject friends(JSONObject json) throws JSONException, ParseException, IOException {
         JSONObject catalog = onlineHookProfiles(json);
         boolean sectionexecute = true;

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

@@ -37,11 +37,12 @@ import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.ThemesUtils;
 
 public class PhotoViewer {
-    static OkHttpClient client = new OkHttpClient();
+    static OkHttpClient client = VtOkHttpClient.getInstance();
 
     public static boolean interceptClick(AttachmentWithMedia attachment, MenuItem item, View view) {
         if (item.getItemId() == R.id.search_photo) {

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

@@ -26,6 +26,7 @@ import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.downloaders.AudioDownloader;
 import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
 import ru.vtosters.lite.utils.AndroidUtils;
@@ -35,7 +36,7 @@ public class LastFMScrobbler {
     private static final String KEY = "5965d63402414776c54c266db0211746";
     private static final String KEY_SECRET = "d982180eed13275bb948e41cf225f88f";
     private static final String URL = "https://ws.audioscrobbler.com/2.0/";
-    private static final OkHttpClient CLIENT = new OkHttpClient();
+    private static final OkHttpClient CLIENT = VtOkHttpClient.getInstance();
     private static final List<String> SCROBBLED_UUIDS = new ArrayList<>();
 
     public static void grabMusicTrack(MusicTrack musictrack) {

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

@@ -17,6 +17,7 @@ import javax.crypto.NoSuchPaddingException;
 import java8.util.concurrent.CompletableFuture;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.music.converter.ts.FFMpeg;
 import ru.vtosters.lite.music.converter.ts.TSMerger;
 import ru.vtosters.lite.music.downloader.ThumbnailDownloader;
@@ -25,7 +26,7 @@ import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.IOUtils;
 
 public class M3UDownloader implements ITrackDownloader {
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
 
     public static M3UDownloader getInstance() {
         return Holder.INSTANCE;

app/src/main/java/ru/vtosters/lite/music/cache/injectors/TracklistInjector.java

@@ -1,6 +1,11 @@
 package ru.vtosters.lite.music.cache.injectors;
 
 import static ru.vtosters.lite.music.cache.CacheDatabaseDelegate.hasTracks;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogHeader;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogPlaylist;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogSeparator;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getPlaylist;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId;
 
 import android.util.Log;
 
@@ -20,9 +25,8 @@ import java.util.UUID;
 import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
-import ru.vtosters.lite.music.cache.helpers.PlaylistHelper;
+import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
 import ru.vtosters.lite.music.cache.helpers.TracklistHelper;
-import ru.vtosters.lite.utils.AccountManagerUtils;
 import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.NetworkUtils;
 
@@ -76,76 +80,67 @@ public class TracklistInjector {
     public static void injectIntoExistingCatalog(JSONObject catalogNode) {
         Log.d("TracklistInjector", "injectIntoExistingCatalog");
 
-        if (!hasTracks()) return;
         try {
-            var sectionsNode = catalogNode.getJSONObject("catalog")
-                    .getJSONArray("sections");
+            var catalog = catalogNode.getJSONObject("catalog");
+            var sectionsNode = catalog.getJSONArray("sections");
             var firstSection = sectionsNode.getJSONObject(0);
-            if (!firstSection.getString("url").equals("https://vk.com/audios" + AccountManagerUtils.getUserId() + "?section=all"))
-                return;
 
-            var foundPlaylistBlock = false;
-            var suitableIndex = 0;
+            if (!firstSection.getString("url").equals("https://vk.com/audios" + getUserId() + "?section=all"))
+                return;
 
             var blocks = firstSection.getJSONArray("blocks");
-            for (int i = 0; i < blocks.length(); i++) {
-                var block = blocks.getJSONObject(i);
-                var dataType = block.getString("data_type");
-                if ("music_audios".equals(dataType)) {
-                    suitableIndex = i - 1;
-                    continue;
+
+            if (CacheDatabaseDelegate.hasTracks() && !LibVKXClient.isIntegrationEnabled()) { // inj in playlist list
+                var noPlaylists = blocks.optJSONObject(0).optJSONArray("buttons").optJSONObject(0).optJSONObject("action").optString("type").equals("create_playlist");
+
+                if (noPlaylists) {
+                    catalogNode.put("playlists", new JSONArray().put(getPlaylist()));
+                    Log.d("catalogInjector", "added new pl");
+
+                    var newBlocks = new JSONArray();
+
+                    newBlocks
+                            .put(getCatalogHeader())
+                            .put(getCatalogPlaylist())
+                            .put(getCatalogSeparator());
+
+                    Log.d("catalogInjector", "added cache catalog playlist");
+
+                    for (int i = 0; i < blocks.length(); i++) {
+                        newBlocks.put(blocks.optJSONObject(i));
+                    }
+
+                    firstSection.put("blocks", newBlocks);
+                } else {
+                    try {
+                        catalogNode.optJSONArray("playlists").put(getPlaylist());
+                        Log.d("catalogInjector", "added to exist pl");
+
+                        for (int i = 0; i < blocks.length(); i++) {
+                            var j = blocks.optJSONObject(i);
+                            var type = j.optString("data_type");
+
+                            if (type.equals("music_playlists") && j.has("playlists_ids")) {
+                                var newarr = new JSONArray();
+                                var playlists_ids = j.optJSONArray("playlists_ids");
+
+                                newarr.put(getUserId() + "_-1");
+
+                                for (int n = 0; n < playlists_ids.length(); n++) {
+                                    newarr.put(playlists_ids.optString(n));
+                                }
+
+                                j.put("playlists_ids", newarr);
+                                break;
+                            }
+                        }
+                    } catch (Exception e) {
+                        Log.d("catalogInjector", e.toString());
+                    }
                 }
-
-                if (!"music_playlists".equals(dataType))
-                    continue;
-
-                var playlistIds = block.getJSONArray("playlists_ids");
-                var newPlaylistIds = new JSONArray()
-                        .put(AccountManagerUtils.getUserId() + "_-1");
-
-                for (int j = 0; j < playlistIds.length(); j++)
-                    newPlaylistIds.put(playlistIds.get(j));
-
-                block.put("playlists_ids", newPlaylistIds);
-
-                // need test
-                blocks.remove(i);
-                blocks.put(i, block);
-
-                foundPlaylistBlock = true;
             }
-
-            if (foundPlaylistBlock) {
-                var playlists = catalogNode.getJSONArray("playlists")
-                        .put(0, PlaylistHelper.createCachedPlaylistMetadata().J());
-                catalogNode.put("playlists", playlists);
-                return;
-            }
-
-            var ids = new JSONArray()
-                    .put(0, AccountManagerUtils.getUserId() + "_-1");
-
-            var playlistsBlock = new JSONObject()
-                    .put("id", getRandomId())
-                    .put("data_type", "music_playlists")
-                    .put("url", "synth:cache:playlists")
-                    .put("playlists_ids", ids);
-
-            var layout = new JSONObject()
-                    .put("name", "large_slider")
-                    .put("owner_id", AccountManagerUtils.getUserId());
-
-            playlistsBlock.put("layout", layout);
-
-            blocks.put(suitableIndex, playlistsBlock);
-
-            firstSection.put("blocks", blocks);
-
-            var playlists = new JSONArray()
-                    .put(0, PlaylistHelper.createCachedPlaylistMetadata().J());
-            catalogNode.put("playlists", playlists);
-        } catch (JSONException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
+            Log.d("TracklistInjector", e.toString());
         }
     }
 
@@ -175,7 +170,7 @@ public class TracklistInjector {
 
         var layout = new JSONObject()
                 .put("name", "list")
-                .put("owner_id", AccountManagerUtils.getUserId());
+                .put("owner_id", getUserId());
 
         audiosBlock.put("layout", layout);
 

app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java

@@ -0,0 +1,294 @@
+package ru.vtosters.lite.music.catalog.inject;
+
+import static ru.vtosters.lite.hooks.DateHook.getLocale;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogHeader;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogPlaylist;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getCatalogSeparator;
+import static ru.vtosters.lite.music.cache.helpers.PlaylistHelper.getPlaylist;
+import static ru.vtosters.lite.proxy.ProxyUtils.getApi;
+import static ru.vtosters.lite.utils.AccountManagerUtils.getUserId;
+import static ru.vtosters.lite.utils.Preferences.dev;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
+import static ru.vtosters.lite.utils.Preferences.podcastcatalog;
+
+import android.util.Log;
+
+import com.vk.core.network.Network;
+import com.vk.core.util.DeviceIdProvider;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+import bruhcollective.itaysonlab.libvkx.client.LibVKXClient;
+import okhttp3.Headers;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
+import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
+import ru.vtosters.lite.utils.AccountManagerUtils;
+import ru.vtosters.lite.utils.AndroidUtils;
+
+public class CatalogJsonInjector {
+    private static final OkHttpClient mClient = VtOkHttpClient.getInstance();
+
+    public static JSONObject music(JSONObject json) throws JSONException {
+        var catalog = json.optJSONObject("catalog");
+
+        JSONArray oldItems = null;
+
+        if (catalog != null) {
+            oldItems = catalog.optJSONArray("sections");
+        }
+
+        var useOldAppVer = getBoolValue("useOldAppVer", false);
+        var isUsersCatalog = oldItems.optJSONObject(0).optString("url").equals("https://vk.com/audios" + getUserId() + "?section=" + (useOldAppVer ? "all" : "general"));
+
+        if (oldItems != null && isUsersCatalog) {
+            var blocks = oldItems.optJSONObject(0).optJSONArray("blocks");
+
+            if (!useOldAppVer) {
+                if (blocks != null) {
+                    for (int i = 0; i < blocks.length(); i++) {
+                        var block = blocks.optJSONObject(i);
+                        var layout = block.optJSONObject("layout");
+                        if (layout != null) {
+                            var name = layout.optString("name");
+                            if (name.equals("header_extended")) {
+                                if (layout.has("top_title")) blocks.remove(i);
+                                try {
+                                    layout.put("name", "header");
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                    }
+                }
+
+                var playlists = fetchCatalogId("https://vk.com/audio?section=my_playlists");
+                if (playlists != null) {
+                    var catalogarr = playlists.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
+
+                    var title = catalogarr.optString("title");
+                    var id = catalogarr.optString("id");
+                    var url = catalogarr.optString("url");
+
+                    if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
+
+                    oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
+                }
+
+                var albums = fetchCatalogId("https://vk.com/audio?section=albums");
+                if (albums != null) {
+                    var catalogarr = albums.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
+
+                    var title = catalogarr.optString("title");
+                    var id = catalogarr.optString("id");
+                    var url = catalogarr.optString("url");
+
+                    if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
+
+                    oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
+                }
+
+                var recent = fetchCatalogId("https://vk.com/audio?section=recent");
+                if (recent != null) {
+                    var catalogarr = recent.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
+
+                    var title = catalogarr.optString("title");
+                    var id = catalogarr.optString("id");
+                    var url = catalogarr.optString("url");
+
+                    if (dev()) Log.d("VKMusic", "Added " + title + " in music sections");
+
+                    oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
+                }
+
+                for (int i = 0; i < oldItems.length(); i++) {
+                    var item = oldItems.optJSONObject(i);
+                    var title = item.optString("title");
+                    var id = item.optString("id");
+                    var url = item.optString("url");
+                    var value = AndroidUtils.getPrefsValue("musicdefcatalog");
+
+                    Log.d("VKMusic", "title: " + title + " id: " + id + " url: " + url + " value: " + value);
+
+                    if (url.contains(value) && !value.isEmpty()) {
+                        catalog.put("default_section", id);
+                        if (dev()) Log.d("VKMusic", "Added " + title + " as default music section");
+                    }
+                }
+            }
+
+            if (CacheDatabaseDelegate.hasTracks() && !LibVKXClient.isIntegrationEnabled()) { // inj in playlist list
+                var noPlaylists = !json.has("playlists");
+
+                if (noPlaylists) {
+                    json.put("playlists", new JSONArray().put(getPlaylist()));
+                    Log.d("catalogInjector", "added new pl");
+                } else {
+                    try {
+                        json.optJSONArray("playlists").put(getPlaylist());
+                        Log.d("catalogInjector", "added to exist pl");
+                    } catch (Exception e) {
+                        Log.d("catalogInjector", e.toString());
+                    }
+                }
+
+                if (blocks != null && (!useOldAppVer || noPlaylists)) {
+                    var newBlocks = new JSONArray();
+
+                    newBlocks
+                            .put(getCatalogHeader())
+                            .put(getCatalogPlaylist())
+                            .put(getCatalogSeparator());
+
+                    Log.d("VKMusic", "added cache catalog playlist");
+
+                    for (int i = 0; i < blocks.length(); i++) {
+                        newBlocks.put(blocks.optJSONObject(i));
+                    }
+
+                    oldItems.optJSONObject(0).put("blocks", newBlocks);
+                }
+            }
+        }
+
+        return json;
+    }
+
+    public static JSONObject catalogInjector(JSONObject json) {
+        try {
+            var section = json.optJSONObject("section");
+            var useOldAppVer = getBoolValue("useOldAppVer", false);
+            var isUsersCatalog = section.optString("url").equals("https://vk.com/audios" + getUserId() + "?section=" + (useOldAppVer ? "all" : "general"));
+
+            if (isUsersCatalog && CacheDatabaseDelegate.hasTracks() && !LibVKXClient.isIntegrationEnabled()) {
+                var blocks = section.getJSONArray("blocks");
+                var noPlaylists = !json.has("playlists");
+
+                // Log.d("catalogInjector", "type: " + blocks.optJSONObject(0).optJSONArray("buttons").optJSONObject(0).optJSONObject("action").optString("type"));
+
+                if (noPlaylists) {
+                    json.put("playlists", new JSONArray().put(getPlaylist()));
+                    Log.d("catalogInjector", "added new pl");
+                } else {
+                    try {
+                        json.optJSONArray("playlists").put(getPlaylist());
+                        Log.d("catalogInjector", "added to exist pl");
+                    } catch (Exception e) {
+                        Log.d("catalogInjector", e.toString());
+                    }
+                }
+
+                if (!useOldAppVer || noPlaylists) {
+                    var newBlocks = new JSONArray();
+
+                    newBlocks
+                            .put(getCatalogHeader())
+                            .put(getCatalogPlaylist())
+                            .put(getCatalogSeparator());
+
+                    Log.d("catalogInjector", "added cache catalog playlist");
+
+                    for (int i = 0; i < blocks.length(); i++) {
+                        newBlocks.put(blocks.optJSONObject(i));
+                    }
+
+                    section.put("blocks", newBlocks);
+                } else {
+                    for (int i = 0; i < blocks.length(); i++) {
+                        var j = blocks.optJSONObject(i);
+                        var type = j.optString("data_type");
+
+                        if (type.equals("music_playlists") && j.has("playlists_ids")) {
+                            var newarr = new JSONArray();
+                            var playlists_ids = j.optJSONArray("playlists_ids");
+
+                            newarr.put(getUserId() + "_-1");
+
+                            for (int n = 0; n < playlists_ids.length(); n++) {
+                                newarr.put(playlists_ids.optString(n));
+                            }
+
+                            Log.d("catalogInjector", "added to pl ids");
+
+                            j.put("playlists_ids", newarr);
+                            break;
+                        }
+                    }
+                }
+            }
+
+        } catch (JSONException e) {
+            Log.d("catalogInjector", e.toString());
+        }
+
+        return json;
+    }
+
+    public static JSONObject musiclink(JSONObject json) {
+        var links = json.optJSONArray("links");
+
+        if (links != null && !getBoolValue("useOldAppVer", false)) {
+            if (links.optJSONObject(0).optString("url").contains("?section=recent")) {
+                json.remove("links");
+
+                if (dev()) Log.d("VKMusic", "Removed links buttons");
+            }
+        }
+
+        var section = json.optJSONObject("section");
+        if (section != null) {
+            var blocks = section.optJSONArray("blocks");
+            if (blocks != null) {
+                for (int i = 0; i < blocks.length(); i++) {
+                    var block = blocks.optJSONObject(i);
+                    var layout = block.optJSONObject("layout");
+                    if (layout != null) {
+                        var name = layout.optString("name");
+                        if (name.equals("header_extended")) {
+                            if (layout.has("top_title")) blocks.remove(i);
+                            try {
+                                layout.put("name", "header");
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return catalogInjector(json);
+    }
+
+    private static JSONObject fetchCatalogId(String section) {
+        if (section.isEmpty()) return null;
+
+        var request = new Request.a()
+                .b("https://" + getApi() + "/method/" + "catalog.getAudio"
+                        + "?v=5.119"
+                        + "&https=1"
+                        + "&need_blocks=1"
+                        + "&lang="
+                        + getLocale()
+                        + "&device_id="
+                        + DeviceIdProvider.d(AndroidUtils.getGlobalContext())
+                        + "&url="
+                        + section
+                        + "&access_token="
+                        + AccountManagerUtils.getUserToken())
+                .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
+        try {
+            return new JSONObject(mClient.a(request).execute().a().g()).getJSONObject("response");
+        } catch (JSONException | IOException e) {
+            Log.d("VTLMusic", "Error: " + e.getMessage());
+        }
+
+        return null;
+    }
+}

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

@@ -8,9 +8,10 @@ import java.util.Arrays;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class GithubList {
-    private static final OkHttpClient mClient = new OkHttpClient();
+    private static final OkHttpClient mClient = VtOkHttpClient.getInstance();
 
     public static ArrayList<String> getProxy(String url, String proxyname) throws IOException {
         Request link = new Request.a()

app/src/main/java/ru/vtosters/lite/translators/DeepLTranslator.java

@@ -16,10 +16,11 @@ import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class DeepLTranslator extends BaseTranslator {
 
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
     private static final Pattern pattern = Pattern.compile("[i]");
     private static final String REQUEST_BODY_FORMAT = "{\n" +
             "    \"method\": \"LMT_handle_texts\",\n" +

app/src/main/java/ru/vtosters/lite/translators/GoogleTranslator.java

@@ -10,10 +10,11 @@ import java.net.URLEncoder;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class GoogleTranslator extends BaseTranslator {
 
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
     private static final String[] devices = new String[]{
             "Linux; U; Android 10; Pixel 4",
             "Linux; U; Android 10; Pixel 4 XL",

app/src/main/java/ru/vtosters/lite/translators/YandexTranslator.java

@@ -13,10 +13,11 @@ import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class YandexTranslator extends BaseTranslator {
 
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
     private static final String uuid = UUID.randomUUID().toString().replace("-", "");
 
     private static YandexTranslator instance;

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

@@ -67,6 +67,7 @@ public class APKInstallActivity extends AppCompatActivity {
 
             startActivity(intent);
         } catch (Exception e) {
+            e.printStackTrace();
             Toast.makeText(this, getString(R.string.apk_install_error) + " " + e.getLocalizedMessage(), Toast.LENGTH_LONG).show();
         }
 

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

@@ -32,7 +32,7 @@ public class OTADialog implements OTAUtils.OTAListener {
                     .setTitle(mActivity.getString(R.string.newversion) + " " + mHelper.getNewVersionName())
                     .setUpdateInfoView(mHelper.getUpdateDescription())
                     .setPositiveButton(mActivity.getString(R.string.updateanddownload), () -> {
-                        OTADownloader.downloadBuild(mHelper.getDownloadUrl());
+                        OTADownloader.downloadBuild(mHelper.getDownloadUrl(), mHelper.getCommitSHA());
                     })
                     .show();
         });

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

@@ -22,10 +22,11 @@ import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 import ru.vtosters.lite.utils.LifecycleUtils;
 
 public class ServerDialog {
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
     public static Boolean showAlert;
     private static String title;
     private static String message;

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

@@ -9,6 +9,7 @@ import static ru.vtosters.lite.utils.AndroidUtils.edit;
 import static ru.vtosters.lite.utils.AndroidUtils.getPreferences;
 import static ru.vtosters.lite.utils.AndroidUtils.sendToast;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
+import static ru.vtosters.lite.utils.Preferences.getBoolValue;
 import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor;
 import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr;
 import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr;
@@ -131,6 +132,12 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment {
             findPreference("vkx_sett").setVisible(false);
         }
 
+        findPreference("musicdefcatalog").setVisible(!getBoolValue("useOldAppVer", false));
+        findPreference("useOldAppVer").setOnPreferenceClickListener(preference -> {
+            restartApplicationWithTimer();
+            return true;
+        });
+
         findPreference("select_photo_search_engine").setOnPreferenceClickListener(preference -> {
             var items = Arrays.asList(
                     new ImagineArrayAdapter.ImagineArrayAdapterItem(R.drawable.yandex, "Yandex"),

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

@@ -251,7 +251,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
                 return true;
             });
 
-            if (dev()) {
+            if (dev() && isValidSignature()) {
                 addMaterialSwitchPreference(this, "autoupdates", requireContext().getString(R.string.checkupdates), "", R.drawable.ic_camera_switch_outline_24, true, (preference, o) -> {
                     boolean value = (boolean) o;
                     edit().putBoolean("autoupdates", value).commit();

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

@@ -25,10 +25,11 @@ import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class ImageUtils {
 
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
 
     public static Bitmap bmp = null;
 

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

@@ -12,15 +12,17 @@ import okhttp3.Callback;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class OTAUtils {
 
     private static final String LATEST_RELEASE_URL = "https://api.github.com/repositories/473685743/releases/latest";
     private static final String LATEST_RELEASE_COMMIT_URL = "https://api.github.com/repositories/473685743/git/ref/tags/%s";
-    private final OkHttpClient mClient = new OkHttpClient();
+    private final OkHttpClient mClient = VtOkHttpClient.getInstance();
     private final OTAListener mListener;
     private JSONObject mReleaseJson;
     private JSONObject mCommitJson;
+    private String mCommitSHA = "";
 
     public OTAUtils(OTAListener listener) {
         this.mListener = listener;
@@ -69,9 +71,11 @@ public class OTAUtils {
             public void a(Call call, Response response) throws IOException {
                 try {
                     mCommitJson = new JSONObject(response.a().g());
+                    mCommitSHA = mCommitJson.getJSONObject("object").getString("sha");
                     if (isNewVersion())
                         mListener.onUpdateApplied();
-                    else mListener.onUpdateCanceled();
+                    else
+                        mListener.onUpdateCanceled();
                 } catch (NullPointerException | JSONException e) {
                     e.printStackTrace();
                     mListener.onUpdateCanceled();
@@ -80,10 +84,13 @@ public class OTAUtils {
         });
     }
 
+    public String getCommitSHA() {
+        return mCommitSHA;
+    }
+
     public boolean isNewVersion() {
         try {
-            String commitSHA = mCommitJson.getJSONObject("object").getString("sha");
-            return !commitSHA.startsWith(About.getBuildNumber());
+            return !mCommitSHA.startsWith(About.getBuildNumber());
         } catch (Exception e) {
             return false;
         }

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

@@ -20,10 +20,11 @@ import java.util.HashMap;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 // Jesus cries
 public class ProfileHider {
-    private static final OkHttpClient client = new OkHttpClient();
+    private static final OkHttpClient client = VtOkHttpClient.getInstance();
 
     public static void injectMap(HashMap<Integer, UserPresenter.a.a> hashMap) {
         if (VTVerifications.isServiceAccount(getUserId())) {

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

@@ -23,13 +23,14 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
+import ru.vtosters.lite.di.singleton.VtOkHttpClient;
 
 public class VTVerifications {
     public static final List<Integer> sVerifications = new ArrayList<>();
     public static final List<Integer> sPrometheuses = new ArrayList<>();
     public static final List<Integer> sDevelopers = new ArrayList<>();
     public static final List<Integer> sServiceAccounts = new ArrayList<>();
-    private static final OkHttpClient sClient = new OkHttpClient();
+    private static final OkHttpClient sClient = VtOkHttpClient.getInstance();
 
     public static void load(Context context) {
         var prefs = context.getSharedPreferences("vt_another_data", 0);

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

smali/res/xml/preferences_media.xml

@@ -59,6 +59,11 @@
             android:key="autocache"
             android:summary="@string/autocache_summ"
             android:title="@string/autocache_title" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="useOldAppVer"
+            android:summary="Работает КАК ЕСТЬ. Могут быть ошибки"
+            android:title="Использовать старый дизайн" />
         <com.vtosters.lite.ui.SummaryListPreference
             android:defaultValue="default"
             android:dialogTitle="@string/musicdefcatalog_dialogTitle"

smali/smali_classes2/com/vk/catalog2/core/api/CatalogGetSection.smali

@@ -136,7 +136,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lru/vtosters/lite/hooks/JsonInjectors;->musiclink(Lorg/json/JSONObject;)Lorg/json/JSONObject;
+    invoke-static {p1}, Lru/vtosters/lite/music/catalog/inject/CatalogJsonInjector;->musiclink(Lorg/json/JSONObject;)Lorg/json/JSONObject;
 
     move-result-object p1
 

smali/smali_classes2/com/vk/catalog2/core/api/music/CatalogGetAudio.smali

@@ -81,7 +81,7 @@
 
     move-result-object p1
 
-    invoke-static {p1}, Lru/vtosters/lite/hooks/JsonInjectors;->music(Lorg/json/JSONObject;)Lorg/json/JSONObject;
+    invoke-static {p1}, Lru/vtosters/lite/music/catalog/inject/CatalogJsonInjector;->music(Lorg/json/JSONObject;)Lorg/json/JSONObject;
 
     move-result-object p1
 

smali/smali_classes2/com/vk/core/network/utils/NetworkUserAgent.smali

@@ -119,17 +119,11 @@
 
     if-nez v0, :cond_0
 
-    .line 2
-    sget-object v0, Lb/h/g/g/BuildInfo;->i:Lb/h/g/g/BuildInfo;
-
-    invoke-virtual {v0}, Lb/h/g/g/BuildInfo;->d()Ljava/lang/String;
+    invoke-static {}, Lru/vtosters/lite/hooks/AppVerHook;->appVer()Ljava/lang/String;
 
     move-result-object v0
 
-    .line 3
-    sget-object v1, Lb/h/g/g/BuildInfo;->i:Lb/h/g/g/BuildInfo;
-
-    invoke-virtual {v1}, Lb/h/g/g/BuildInfo;->e()I
+    invoke-static {}, Lru/vtosters/lite/hooks/AppVerHook;->appBuild()I
 
     move-result v1
 
@@ -153,7 +147,6 @@
 
     const/4 v0, 0x1
 
-    .line 6
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v1

smali/smali_classes2/com/vk/core/view/search/ModernSearchView.smali

@@ -356,10 +356,6 @@
 
     iput-object p3, p0, Lcom/vk/core/view/search/ModernSearchView;->c:Landroid/widget/ImageView;
 
-    const/16 v4, 0x8
-
-    invoke-virtual {p3, v4}, Landroid/widget/ImageView;->setVisibility(I)V
-
     .line 13
     sget v2, Lb/h/z/g;->iv_icon_params:I
 

smali/smali_classes4/com/vtosters/lite/fragments/messages/chat/vc/MsgSendVc.smali

@@ -6346,14 +6346,9 @@
 
     move-object v4, v0
 
-    .line 15
-    invoke-virtual {v5}, Lcom/vk/im/engine/models/messages/Msg;->v1()I
-
-    move-result v7
-
     const/4 v8, 0x0
 
-    invoke-static {v2, v7, v8}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Ljava/lang/CharSequence;IZ)Ljava/lang/CharSequence;
+    invoke-static {v2, v5, v8}, Lru/vtosters/lite/encryption/EncryptProvider;->decryptMessage(Ljava/lang/CharSequence;Lcom/vk/im/engine/models/messages/MsgFromUser;Z)Ljava/lang/CharSequence;
 
     move-result-object v2