Update preferences_media.xml

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

@@ -2,6 +2,7 @@ package com.vk.libvideo;
 
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
@@ -10,6 +11,7 @@ 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.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.hooks.other.Preferences;
@@ -331,6 +333,6 @@ public class VideoTracker {
         jsonObject.put("position_sec", 0);
         jsonObject.put("cur_quality", "auto");
 
-        Metrics.trackEvents(jsonObject, false);
+        Metrics.trackEvents(jsonObject);
     }
 }

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

@@ -11,6 +11,7 @@ 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.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.hooks.other.Preferences;
@@ -184,7 +185,7 @@ public final class VKMusicStatsTracker implements MusicStatsTracker {
             }
         }
 
-        Metrics.trackEvents(event, true);
+        Metrics.trackEvents(event);
     }
 
     private Analytics.l a(MusicPlaybackParams musicPlaybackParams, String str) {

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() {

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/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/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;
@@ -23,13 +20,10 @@ import ru.vtosters.lite.ui.PreferenceFragmentUtils;
 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.ThemesUtils.getTextAttr;
-
 public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
     private static final ExecutorService executor = Executors.newCachedThreadPool();
 
@@ -99,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;
                 }
         );
@@ -195,7 +166,6 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
                                     return;
                                 }
                                 Preferences.setMetadataSeparator(separator.getText().toString());
-                                findPreference("metadataSeparator").setSummary(separator.getText().toString());
                             })
                             .setNegativeButton("Отмена", (dialog, which) -> dialog.cancel())
                             .show();
@@ -364,15 +334,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());
@@ -394,8 +355,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()];
 
@@ -410,7 +370,6 @@ 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();
@@ -420,11 +379,10 @@ public class MusicFragment extends TrackedMaterialPreferenceToolbarFragment {
         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(MusicCacheImpl::clear);
-                    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/utils/Metrics.java

@@ -24,25 +24,13 @@ 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) {
+    public static void trackEvents(JSONObject object) {
+        if (!NetworkUtils.isNetworkConnected()) {
             events.put(object);
+        } else if (shouldSaveUserTraffic() || events.length() > 0) {
+            trackEventList(object);
+        } else {
+            trackEventsImmediately(object);
         }
     }