Code Cleanup

app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt

@@ -9,6 +9,7 @@ import android.media.MediaPlayer
 import android.media.audiofx.AudioEffect
 import android.net.Uri
 import android.os.PowerManager
+import android.util.Log
 import android.widget.Toast
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
@@ -296,6 +297,7 @@ class CrossFadePlayer(val context: Context) : Playback, MediaPlayer.OnCompletion
             Toast.LENGTH_SHORT
         )
             .show()
+        Log.e(TAG, what.toString() + extra)
         return false
     }
 
@@ -354,6 +356,10 @@ class CrossFadePlayer(val context: Context) : Playback, MediaPlayer.OnCompletion
     override fun setCrossFadeDuration(duration: Int) {
         crossFadeDuration = duration
     }
+
+    companion object {
+        val TAG: String = CrossFadePlayer::class.java.simpleName
+    }
 }
 
 internal fun crossFadeScope(): CoroutineScope = CoroutineScope(Job() + Dispatchers.Main)

app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java

@@ -330,6 +330,7 @@ public class MultiPlayer
                     context.getResources().getString(R.string.unplayable_file),
                     Toast.LENGTH_SHORT)
                     .show();
+            Log.e(TAG, String.valueOf(what) + extra);
         }
         return false;
     }

app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt

@@ -48,7 +48,7 @@ import androidx.media.AudioManagerCompat
 import androidx.media.MediaBrowserServiceCompat
 import androidx.media.session.MediaButtonReceiver.handleIntent
 import androidx.preference.PreferenceManager
-import code.name.monkey.appthemehelper.util.VersionUtils.hasQ
+import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.*
 import code.name.monkey.retromusic.activities.LockScreenActivity
 import code.name.monkey.retromusic.appwidgets.*
@@ -93,10 +93,8 @@ import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener
 import com.bumptech.glide.RequestBuilder
 import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition
-import com.google.android.gms.cast.framework.media.MediaIntentReceiver
 import org.koin.java.KoinJavaComponent.get
 import java.util.*
-import kotlin.collections.ArrayList
 
 /**
  * @author Karim Abou Zeid (kabouzeid), Andrew Neal. Modified by Prathamesh More
@@ -824,8 +822,8 @@ class MusicService : MediaBrowserServiceCompat(),
         }
     }
 
+    @Synchronized
     fun openTrackAndPrepareNextAt(position: Int): Boolean {
-        synchronized(this) {
         this.position = position
         val prepared = openCurrent()
         if (prepared) {
@@ -835,7 +833,6 @@ class MusicService : MediaBrowserServiceCompat(),
         notHandledMetaChangedForCurrentTrack = false
         return prepared
     }
-    }
 
     fun pause() {
         Log.i(TAG, "Paused")
@@ -858,8 +855,8 @@ class MusicService : MediaBrowserServiceCompat(),
         }
     }
 
+    @Synchronized
     fun play() {
-        synchronized(this) {
         if (requestFocus()) {
             if (playback != null && !playback!!.isPlaying) {
                 if (!playback!!.isInitialized) {
@@ -901,7 +898,6 @@ class MusicService : MediaBrowserServiceCompat(),
                 .show()
         }
     }
-    }
 
     fun playNextSong(force: Boolean) {
         playSongAt(getNextPosition(force))
@@ -949,8 +945,8 @@ class MusicService : MediaBrowserServiceCompat(),
         }
     }
 
+    @Synchronized
     fun prepareNextImpl() {
-        synchronized(this) {
         try {
             val nextPosition = getNextPosition(false)
             playback?.setNextDataSource(getTrackUri(getSongAt(nextPosition)))
@@ -958,7 +954,6 @@ class MusicService : MediaBrowserServiceCompat(),
         } catch (ignored: Exception) {
         }
     }
-    }
 
     fun quit() {
         pause()
@@ -1075,8 +1070,8 @@ class MusicService : MediaBrowserServiceCompat(),
         savePositionInTrack()
     }
 
+    @Synchronized
     fun seek(millis: Int): Int {
-        synchronized(this) {
         return try {
             var newPosition = 0
             if (playback != null) {
@@ -1088,7 +1083,6 @@ class MusicService : MediaBrowserServiceCompat(),
             -1
         }
     }
-    }
 
     // to let other apps know whats playing. i.E. last.fm (scrobbling) or musixmatch
     fun sendPublicIntent(what: String) {
@@ -1251,19 +1245,19 @@ class MusicService : MediaBrowserServiceCompat(),
 
     private fun startForegroundOrNotify() {
         if (playingNotification != null && currentSong.id != -1L) {
-            val isPlaying = isPlaying
-            if (isForeground != isPlaying && !isPlaying) {
+            if (!VersionUtils.hasS()) {
+                if (isForeground && !isPlaying) {
                     // This makes the notification dismissible
                     // We can't call stopForeground(false) on A12 though, which may result in crashes
-                // when we call startForeground after that e.g. when Alarm goes off,
-                if (VERSION.SDK_INT < VERSION_CODES.S) {
+                    // when we call startForeground after that e.g. when Alarm goes off
+
                     stopForeground(false)
                     isForeground = false
                 }
             }
-            if (!isForeground && isPlaying) {
+            if (!isForeground) {
                 // Specify that this is a media service, if supported.
-                if (hasQ()) {
+                if (VersionUtils.hasQ()) {
                     startForeground(
                         PlayingNotification.NOTIFICATION_ID, playingNotification!!.build(),
                         ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
@@ -1282,7 +1276,6 @@ class MusicService : MediaBrowserServiceCompat(),
                 )
             }
         }
-        return
     }
 
     private fun stopForegroundAndNotification() {
@@ -1291,9 +1284,9 @@ class MusicService : MediaBrowserServiceCompat(),
         isForeground = false
     }
 
+    @Synchronized
     private fun openCurrent(): Boolean {
-        synchronized(this) {
-            try {
+        return try {
             if (playback != null) {
                 return playback!!.setDataSource(
                     getTrackUri(
@@ -1302,14 +1295,12 @@ class MusicService : MediaBrowserServiceCompat(),
                         )
                     )
                 )
-                }
+            } else false
         } catch (e: Exception) {
             e.printStackTrace()
-                return false
+            false
         }
     }
-        return false
-    }
 
     private fun playFromPlaylist(intent: Intent) {
         val playlist: AbsSmartPlaylist? = intent.getParcelableExtra(INTENT_EXTRA_PLAYLIST)

app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt

@@ -46,7 +46,10 @@ import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroColorUtil
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @SuppressLint("RestrictedApi")
 class PlayingNotificationImpl24(