Fix restore track again

maxrave-dev · Oct 11, 2023 · 7d9b233 · 7d9b233
1 parent afe570a
commit 7d9b233
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -149,4 +149,12 @@
             <action android:name="android.media.action.DISPLAY_AUDIO_EFFECT_CONTROL_PANEL" />
         </intent>
     </queries>
+    <queries>
+        <package android:name="com.maxrave.simpmusic" />
+    </queries>
+    <queries>
+        <intent>
+            <action android:name="androidx.media3.session.MediaSessionService"/>
+        </intent>
+    </queries>
 </manifest>
diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/MainActivity.kt b/app/src/main/java/com/maxrave/simpmusic/ui/MainActivity.kt
@@ -554,11 +554,13 @@ class MainActivity : AppCompatActivity() {
                     value = it ?: listOf()
                 }
             }
+            binding.miniplayer.visibility = View.GONE
             result.observe(this) {data ->
                 val queueData = data
+                Log.w("Check queue saved", queueData.toString())
+                binding.miniplayer.visibility = View.VISIBLE
                 if (queueData.isNotEmpty()) {
                     Log.w("Check queue saved", queueData.toString())
-                    binding.miniplayer.visibility = View.VISIBLE
                     Queue.clear()
                     Queue.addAll(queueData)
                     viewModel.removeSaveQueue()
@@ -569,6 +571,7 @@ class MainActivity : AppCompatActivity() {
             }
         }
         else {
+            binding.miniplayer.visibility = View.GONE
             checkForUpdate()
         }
     }
@@ -579,13 +582,11 @@ class MainActivity : AppCompatActivity() {
         Log.w("MainActivity", "onDestroy: ")
     }
     private fun startMusicService() {
-        if (viewModel.isServiceRunning.value == false) {
-            if (!isMyServiceRunning(SimpleMediaService::class.java)) {
-                val intent = Intent(this, SimpleMediaService::class.java)
-                bindService(intent, serviceConnection, BIND_AUTO_CREATE)
-                viewModel.isServiceRunning.postValue(true)
-                Log.d("Service", "Service started")
-            }
+        if (viewModel.isServiceRunning.value != true) {
+            val intent = Intent(this, SimpleMediaService::class.java)
+            bindService(intent, serviceConnection, BIND_AUTO_CREATE)
+            viewModel.isServiceRunning.postValue(true)
+            Log.d("Service", "Service started")
         }
     }
     private fun stopService(){