some mbsh updates

This commit is contained in:
gdlbo
2022-12-07 16:49:58 +03:00
parent 4005ac2ef1
commit 5373002666
2 changed files with 22 additions and 3 deletions
@@ -23,6 +23,7 @@ import ru.vtosters.lite.music.downloader.PlaylistDownloader;
import ru.vtosters.lite.music.downloader.TrackDownloader;
import ru.vtosters.lite.music.notification.MusicNotificationBuilder;
import ru.vtosters.lite.utils.AccountManagerUtils;
import ru.vtosters.lite.utils.AndroidUtils;
import ru.vtosters.lite.utils.IOUtils;
/**
@@ -63,6 +64,7 @@ public class AudioDownloader {
if (CacheDatabaseDelegate.isCached(trackId)) {
CacheDatabaseDelegate.removeTrackFromCache(LibVKXClient.asId(track));
AndroidUtils.sendToast("Трек удален из кеша");
return;
}
@@ -22,6 +22,8 @@ import java.util.ArrayList;
import bruhcollective.itaysonlab.libvkx.client.LibVKXClientImpl;
import ru.vtosters.lite.downloaders.AudioDownloader;
import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
import ru.vtosters.lite.utils.AndroidUtils;
public class MusicBottomSheetHook {
public static ArrayList<MusicAction> hook(ArrayList<MusicAction> actions, MusicTrack musicTrack) {
@@ -36,9 +38,15 @@ public class MusicBottomSheetHook {
if (isIntegrationEnabled()) {
if (isVkxCached(trackid)) {
actions.add(getRemoveCacheTrackVkxAction());
} else {
} else if (isNetworkConnected()){
actions.add(addToCacheTrackVkxAction());
}
} else {
if (isCached(trackid)) {
actions.add(getRemoveCacheTrackAction());
} else if (isNetworkConnected()){
actions.add(addToCacheTrackAction());
}
}
if (isNetworkConnected()) {
@@ -85,10 +93,10 @@ public class MusicBottomSheetHook {
if (isIntegrationEnabled()) {
if (isVkxCached(playlist.a, playlist.b)) {
actions.add(getRemoveCacheTrackVkxAction());
} else {
} else if (isNetworkConnected()){
actions.add(addToCacheTrackVkxAction());
}
} else {
} else if (isNetworkConnected()){
actions.add(addToCacheTrackAction());
}
@@ -121,6 +129,15 @@ public class MusicBottomSheetHook {
return true;
}
if (actionId == R.id.remove_from_cache) {
CacheDatabaseDelegate.removeTrackFromCache(asId(track));
AndroidUtils.sendToast("Трек удален из кеша");
return true;
} else if (actionId == R.id.add_to_cache) {
AudioDownloader.cacheTrack(track);
return true;
}
if (actionId == R.id.download_mp3) {
if (isIntegrationEnabled()) {
getInstance().runOnService(service -> {