From b14341952081de5eaa762cc7b574cd3fd6223d2e Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Thu, 21 Apr 2022 19:47:24 +0530
Subject: [PATCH] Code Cleanup

---
 .../retromusic/repository/PlaylistSongsLoader.kt    | 13 -------------
 .../name/monkey/retromusic/util/CalendarUtil.kt     |  1 -
 .../monkey/retromusic/volume/AudioVolumeObserver.kt |  3 ++-
 .../code/name/monkey/appthemehelper/ATHActivity.kt  |  3 ++-
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistSongsLoader.kt b/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistSongsLoader.kt
index 0c3c17255..b90af455f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistSongsLoader.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistSongsLoader.kt
@@ -24,8 +24,6 @@ import code.name.monkey.retromusic.extensions.getInt
 import code.name.monkey.retromusic.extensions.getLong
 import code.name.monkey.retromusic.extensions.getString
 import code.name.monkey.retromusic.extensions.getStringOrNull
-import code.name.monkey.retromusic.model.AbsCustomPlaylist
-import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.model.PlaylistSong
 import code.name.monkey.retromusic.model.Song
 
@@ -35,17 +33,6 @@ import code.name.monkey.retromusic.model.Song
 
 object PlaylistSongsLoader {
 
-    fun getPlaylistSongList(
-        context: Context,
-        playlist: Playlist
-    ): List<Song> {
-        return if (playlist is AbsCustomPlaylist) {
-            return playlist.songs()
-        } else {
-            getPlaylistSongList(context, playlist.id)
-        }
-    }
-
     @JvmStatic
     fun getPlaylistSongList(context: Context, playlistId: Long): List<Song> {
         val songs = mutableListOf<Song>()
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.kt
index 188f26f3c..777b63842 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.kt
@@ -88,7 +88,6 @@ class CalendarUtil {
             // Today + rest of this month + previous months until January
             var elapsed = elapsedMonth
             var month = calendar[Calendar.MONTH] - 1
-            val year = calendar[Calendar.YEAR]
             while (month > Calendar.JANUARY) {
                 elapsed += getDaysInMonth(month) * MS_PER_DAY
                 month--
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.kt b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.kt
index ad8247866..5b69f31b8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.kt
@@ -16,6 +16,7 @@ package code.name.monkey.retromusic.volume
 import android.content.Context
 import android.media.AudioManager
 import android.os.Handler
+import android.os.Looper
 import android.provider.Settings
 import androidx.core.content.getSystemService
 
@@ -25,7 +26,7 @@ class AudioVolumeObserver(private val context: Context) {
     private var contentObserver: AudioVolumeContentObserver? = null
 
     fun register(audioStreamType: Int, listener: OnAudioVolumeChangedListener) {
-        val handler = Handler()
+        val handler = Handler(Looper.getMainLooper())
         // with this handler AudioVolumeContentObserver#onChange()
         //   will be executed in the main thread
         // To execute in another thread you can use a Looper
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.kt
index be2a65569..826550823 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.kt
@@ -2,6 +2,7 @@ package code.name.monkey.appthemehelper
 
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import androidx.appcompat.app.AppCompatActivity
 
 /**
@@ -30,6 +31,6 @@ open class ATHActivity : AppCompatActivity() {
     fun postRecreate() {
         // hack to prevent java.lang.RuntimeException: Performing pause of activity that is not resumed
         // makes sure recreate() is called right after and not in onResume()
-        Handler().post { recreate() }
+        Handler(Looper.getMainLooper()).post { recreate() }
     }
 }
\ No newline at end of file