y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[music] move notifySavingToCache to MusicNotificationBuilder

Browse Source
This commit is contained in:
aliveoutside
2022-09-18 18:59:19 +03:00
parent 4443f69056
commit 07ca91d8a2
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java
+1 -17
View File
@@ -3,8 +3,6 @@ package ru.vtosters.lite.downloaders;
import static ru.vtosters.lite.music.cache.FileCacheImplementation.getTrackFolder;
import static ru.vtosters.lite.utils.AndroidUtils.getString;
import android.app.Notification;
import android.os.Build;
import android.os.Environment;
import com.vk.core.util.ToastUtils;
@@ -26,7 +24,6 @@ import ru.vtosters.lite.music.converter.playlist.PlaylistConverter;
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.AndroidUtils;
import ru.vtosters.lite.utils.IOUtils;
/**
@@ -90,7 +87,7 @@ public class AudioDownloader {
if (!trackFile.exists())
trackFile.getParentFile().mkdirs();
downloadM3U8(track, true);
notifySavingToCache(track);
MusicNotificationBuilder.notifySavingToCache(track);
CacheDatabaseDelegate.insertTrack(track);
NotificationChannels.getNotificationManager().cancel(trackId.hashCode());
}
@@ -104,18 +101,5 @@ public class AudioDownloader {
}
}
private static void notifySavingToCache(MusicTrack track) {
Notification.Builder builder;
if (Build.VERSION.SDK_INT >= 26) {
builder = new Notification.Builder(AndroidUtils.getGlobalContext(), NotificationChannels.MUSIC_DOWNLOAD_CHANNEL_ID);
builder.setVisibility(Notification.VISIBILITY_PUBLIC);
} else builder = new Notification.Builder(AndroidUtils.getGlobalContext());
builder.setSmallIcon(com.vtosters.lite.R.drawable.ic_download_outline_28)
.setShowWhen(false)
.setContentTitle(getString("cached_track") + ": " + track.toString());
NotificationChannels.getNotificationManager().notify(track.y1().hashCode(), builder.build());
}
}
app/src/main/java/ru/vtosters/lite/music/notification/MusicNotificationBuilder.java
+18
View File
@@ -2,6 +2,9 @@ package ru.vtosters.lite.music.notification;
import static ru.vtosters.lite.utils.AndroidUtils.getString;
import android.app.Notification;
import android.os.Build;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
@@ -38,4 +41,19 @@ public class MusicNotificationBuilder {
notificationManager.notify(id, notificationBuilder.build());
return notificationBuilder;
}
public static void notifySavingToCache(MusicTrack track) {
Notification.Builder builder;
if (Build.VERSION.SDK_INT >= 26) {
builder = new Notification.Builder(AndroidUtils.getGlobalContext(), NotificationChannels.MUSIC_DOWNLOAD_CHANNEL_ID);
builder.setVisibility(Notification.VISIBILITY_PUBLIC);
} else builder = new Notification.Builder(AndroidUtils.getGlobalContext());
builder.setSmallIcon(com.vtosters.lite.R.drawable.ic_download_outline_28)
.setShowWhen(false)
.setContentTitle(getString("cached_track") + ": " + track.toString());
notificationManager.notify(track.y1().hashCode(), builder.build());
}
}