From a051d4d040c236a7aab5d64e7ebef544afeee02d Mon Sep 17 00:00:00 2001
From: tzugen <tzugen@riseup.net>
Date: Fri, 20 Aug 2021 20:53:17 +0200
Subject: [PATCH] Clean up Util.kt after conversion (currentSong was assigned
 but never actually used)

---
 .../org/moire/ultrasonic/util/Constants.java  |  2 --
 .../kotlin/org/moire/ultrasonic/util/Util.kt  | 33 ++++---------------
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java
index 880564d8..28404977 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Constants.java
@@ -125,8 +125,6 @@ public final class Constants
 	public static final String PREFERENCES_KEY_DEFAULT_SHARE_GREETING = "sharingDefaultGreeting";
 	public static final String PREFERENCES_KEY_DEFAULT_SHARE_EXPIRATION = "sharingDefaultExpiration";
 	public static final String PREFERENCES_KEY_SHOW_ALL_SONGS_BY_ARTIST = "showAllSongsByArtist";
-	public static final String PREFERENCES_KEY_IMAGE_LOADER_CONCURRENCY = "imageLoaderConcurrency";
-	public static final String PREFERENCES_KEY_FF_IMAGE_LOADER = "ff_new_image_loader";
 	public static final String PREFERENCES_KEY_USE_FIVE_STAR_RATING = "use_five_star_rating";
 	public static final String PREFERENCES_KEY_CATEGORY_NOTIFICATIONS = "notificationsCategory";
 	public static final String PREFERENCES_KEY_FIRST_RUN_EXECUTED = "firstRunExecuted";
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt
index ffcca87e..d59323b3 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt
@@ -96,7 +96,6 @@ object Util {
     private val HEX_DIGITS =
         charArrayOf('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f')
     private var toast: Toast? = null
-    private var currentSong: MusicDirectory.Entry? = null
 
     // Retrieves an instance of the application Context
     fun appContext(): Context {
@@ -717,9 +716,6 @@ object Util {
             avrcpIntent.putExtra("duration", 0.toLong())
             avrcpIntent.putExtra("position", 0.toLong())
         } else {
-            if (song !== currentSong) {
-                currentSong = song
-            }
             val title = song.title
             val artist = song.artist
             val album = song.album
@@ -755,7 +751,7 @@ object Util {
     fun broadcastA2dpPlayStatusChange(
         context: Context,
         state: PlayerState?,
-        currentSong: MusicDirectory.Entry?,
+        newSong: MusicDirectory.Entry?,
         listSize: Int,
         id: Int,
         playerPosition: Int
@@ -763,20 +759,13 @@ object Util {
         if (!shouldSendBluetoothNotifications) {
             return
         }
-        if (currentSong != null) {
+        if (newSong != null) {
             val avrcpIntent = Intent(CM_AVRCP_PLAYSTATE_CHANGED)
-            if (currentSong == null) {
-                return
-            }
 
-            // FIXME This is probably a bug.
-            if (currentSong !== currentSong) {
-                Util.currentSong = currentSong
-            }
-            val title = currentSong.title
-            val artist = currentSong.artist
-            val album = currentSong.album
-            val duration = currentSong.duration
+            val title = newSong.title
+            val artist = newSong.artist
+            val album = newSong.album
+            val duration = newSong.duration
 
             avrcpIntent.putExtra("track", title)
             avrcpIntent.putExtra("track_name", title)
@@ -788,7 +777,7 @@ object Util {
             avrcpIntent.putExtra("album_artist_name", artist)
 
             if (getShouldSendBluetoothAlbumArt()) {
-                val albumArtFile = FileUtil.getAlbumArtFile(currentSong)
+                val albumArtFile = FileUtil.getAlbumArtFile(newSong)
                 avrcpIntent.putExtra("coverart", albumArtFile.absolutePath)
                 avrcpIntent.putExtra("cover", albumArtFile.absolutePath)
             }
@@ -1199,14 +1188,6 @@ object Util {
         appContext().sendBroadcast(scanFileIntent)
     }
 
-    fun imageLoaderConcurrency(): Int {
-        val preferences = getPreferences()
-        return preferences.getString(
-            Constants.PREFERENCES_KEY_IMAGE_LOADER_CONCURRENCY,
-            "5"
-        )!!.toInt()
-    }
-
     fun getResourceFromAttribute(context: Context, resId: Int): Int {
         val typedValue = TypedValue()
         val theme = context.theme