From 1cab11ba9c34591d4ac11c80f8cba1bc2ad1a077 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <alexyx@tutanota.com>
Date: Mon, 2 Nov 2020 19:58:11 -0700
Subject: [PATCH] Fix compatibility

Do some minor compatibility fixes for older versions of android.
---
 .../java/org/oxycblt/auxio/MainActivity.kt    |  8 ++----
 .../auxio/playback/NotificationUtils.kt       | 26 +++++++++++++------
 .../playback/state/PlaybackStateManager.kt    | 18 ++++++-------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index b0b15450c..70a931bd5 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -11,12 +11,8 @@ import org.oxycblt.auxio.theme.accent
 
 // FIXME: Fix bug where fast navigation will break the animations and
 //  lead to nothing being displayed [Possibly Un-fixable]
-// TODO: Test for compatibility
-//  API 30    - No Issues
-//  API 29    - No Issues [Primary Testing Version]
-//  API 28-23 - Not tested yet
-//  API 22    - ProgressBar/SeekBar look wonky, RecyclerView dividers don't show
-//  API 21    - Not tested yet
+// FIXME: Compat issues with Versions 5/6 that cause recyclerview
+//  dividers not to show and for progress bars to look wonky
 class MainActivity : AppCompatActivity(R.layout.activity_main) {
 
     override fun onCreateView(name: String, context: Context, attrs: AttributeSet): View? {
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt b/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt
index cf1d925b7..dd62119f0 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/NotificationUtils.kt
@@ -19,6 +19,8 @@ import org.oxycblt.auxio.playback.state.PlaybackMode
 import org.oxycblt.auxio.playback.state.PlaybackStateManager
 
 object NotificationUtils {
+    val DO_COMPAT_SUBTEXT = Build.VERSION.SDK_INT < Build.VERSION_CODES.O
+
     const val CHANNEL_ID = "CHANNEL_AUXIO_PLAYBACK"
     const val NOTIFICATION_ID = 0xA0A0
     const val REQUEST_CODE = 0xA0C0
@@ -70,7 +72,6 @@ fun NotificationManager.createMediaNotification(
         .addAction(newAction(NotificationUtils.ACTION_SKIP_NEXT, context))
         .addAction(newAction(NotificationUtils.ACTION_EXIT, context))
         .setNotificationSilent()
-        .setSubText(context.getString(R.string.title_playback))
         .setContentIntent(mainIntent)
         .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
 }
@@ -81,6 +82,14 @@ fun NotificationCompat.Builder.setMetadata(song: Song, context: Context, onDone:
         song.album.artist.name,
     )
 
+    // On older versions of android [API <26], show the song's album on the subtext instead of
+    // the current mode, as that makes more sense for the old style of media notifications.
+    if (NotificationUtils.DO_COMPAT_SUBTEXT) {
+        setSubText(song.album.name)
+    }
+
+    // getBitmap() is concurrent, so only call back to the object calling this function when
+    // the loading is over.
     getBitmap(song, context) {
         setLargeIcon(it)
 
@@ -98,15 +107,16 @@ fun NotificationCompat.Builder.updateLoop(context: Context) {
     mActions[0] = newAction(NotificationUtils.ACTION_LOOP, context)
 }
 
-@SuppressLint("RestrictedApi")
 fun NotificationCompat.Builder.updateMode(context: Context) {
-    val playbackManager = PlaybackStateManager.getInstance()
+    if (!NotificationUtils.DO_COMPAT_SUBTEXT) {
+        val playbackManager = PlaybackStateManager.getInstance()
 
-    // If the mode is ALL_SONGS, then just put a string, otherwise put the parent model's name.
-    if (playbackManager.mode == PlaybackMode.ALL_SONGS) {
-        setSubText(context.getString(R.string.title_all_songs))
-    } else {
-        setSubText(playbackManager.parent!!.name)
+        // If the mode is ALL_SONGS, then just put a string, otherwise put the parent model's name.
+        if (playbackManager.mode == PlaybackMode.ALL_SONGS) {
+            setSubText(context.getString(R.string.title_all_songs))
+        } else {
+            setSubText(playbackManager.parent!!.name)
+        }
     }
 }
 
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
index cd281d7f5..b2a0c5a8a 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
@@ -102,10 +102,14 @@ class PlaybackStateManager private constructor() {
 
         val musicStore = MusicStore.getInstance()
 
-        mMode = mode
+        mParent = when (mode) {
+            PlaybackMode.ALL_SONGS -> null
+            PlaybackMode.IN_ARTIST -> song.album.artist
+            PlaybackMode.IN_ALBUM -> song.album
+            PlaybackMode.IN_GENRE -> error("what")
+        }
 
-        resetLoopMode()
-        updatePlayback(song)
+        mMode = mode
 
         mQueue = when (mode) {
             PlaybackMode.ALL_SONGS -> musicStore.songs.toMutableList()
@@ -114,12 +118,8 @@ class PlaybackStateManager private constructor() {
             PlaybackMode.IN_GENRE -> error("what")
         }
 
-        mParent = when (mode) {
-            PlaybackMode.ALL_SONGS -> null
-            PlaybackMode.IN_ARTIST -> song.album.artist
-            PlaybackMode.IN_ALBUM -> song.album
-            PlaybackMode.IN_GENRE -> error("what")
-        }
+        resetLoopMode()
+        updatePlayback(song)
 
         if (mIsShuffling) {
             genShuffle(true)