From 07ca91d8a2b7bf0a7a70737ddd3f741fc6093933 Mon Sep 17 00:00:00 2001 From: aliveoutside <53598473+aliveoutside@users.noreply.github.com> Date: Sun, 18 Sep 2022 18:49:12 +0300 Subject: [PATCH] [music] move notifySavingToCache to MusicNotificationBuilder --- .../lite/downloaders/AudioDownloader.java | 18 +----------------- .../notification/MusicNotificationBuilder.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java index ed5138a68..24a31411a 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/AudioDownloader.java @@ -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()); - } } diff --git a/app/src/main/java/ru/vtosters/lite/music/notification/MusicNotificationBuilder.java b/app/src/main/java/ru/vtosters/lite/music/notification/MusicNotificationBuilder.java index 915ea3208..820758810 100644 --- a/app/src/main/java/ru/vtosters/lite/music/notification/MusicNotificationBuilder.java +++ b/app/src/main/java/ru/vtosters/lite/music/notification/MusicNotificationBuilder.java @@ -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()); + } }