🐛 Bug Squashing

* Fixed spotify songs not getting detected at startup #40
shub39 · Oct 15, 2024 · c6ddc33 · c6ddc33
1 parent 7ae0837
commit c6ddc33
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/app/beta/app-beta.apk b/app/beta/app-beta.apk
diff --git a/app/beta/baselineProfiles/0/app-beta.dm b/app/beta/baselineProfiles/0/app-beta.dm
diff --git a/app/beta/baselineProfiles/1/app-beta.dm b/app/beta/baselineProfiles/1/app-beta.dm
diff --git a/app/src/main/java/com/shub39/rush/MainActivity.kt b/app/src/main/java/com/shub39/rush/MainActivity.kt
@@ -7,7 +7,6 @@ import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.navigation.compose.rememberNavController
 import com.shub39.rush.database.SettingsDataStore
 import com.shub39.rush.listener.MediaListener
 import com.shub39.rush.ui.page.RushApp
@@ -20,10 +19,11 @@ class MainActivity : ComponentActivity() {
         val splashScreen = installSplashScreen()
         super.onCreate(savedInstanceState)
 
+        MediaListener.init(this)
+
         enableEdgeToEdge()
         setContent {
 
-            MediaListener.init(this)
 
             val theme by SettingsDataStore.getToggleThemeFlow(this)
                 .collectAsState(initial = "")

diff --git a/app/src/main/java/com/shub39/rush/RushApplication.kt b/app/src/main/java/com/shub39/rush/RushApplication.kt
@@ -1,7 +1,6 @@
 package com.shub39.rush
 
 import android.app.Application
-import com.shub39.rush.listener.MediaListener
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
@@ -10,13 +9,14 @@ class RushApplication: Application() {
     override fun onCreate() {
         super.onCreate()
 
-        startKoin {
-            androidLogger()
-            androidContext(this@RushApplication)
-            modules(rushModules)
+        if (packageName == getProcessName()) {
+            startKoin {
+                androidLogger()
+                androidContext(this@RushApplication)
+                modules(rushModules)
+            }
         }
 
-        MediaListener.init(this)
     }
 
 }
diff --git a/app/src/main/java/com/shub39/rush/listener/MediaListener.kt b/app/src/main/java/com/shub39/rush/listener/MediaListener.kt
@@ -13,6 +13,7 @@ import androidx.core.content.getSystemService
 import com.shub39.rush.logic.UILogic.getMainTitle
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 
@@ -70,9 +71,11 @@ object MediaListener {
             Log.d(TAG, "Session: $controller (${controller.sessionToken})")
 
             // Workaround for spotify, HELP NEEDED!
-            if (controller.packageName.contains("spotify")) {
-                controller.transportControls.pause()
-                controller.transportControls.play()
+            if (controller.packageName == "com.spotify.music") {
+                coroutineScope.launch {
+                    delay(2000)
+                    setActiveMediaSession(controller)
+                }
             }
 
             if (internalCallbacks.containsKey(controller.sessionToken)) {

diff --git a/app/src/main/java/com/shub39/rush/viewmodel/RushViewModel.kt b/app/src/main/java/com/shub39/rush/viewmodel/RushViewModel.kt
@@ -283,6 +283,11 @@ class RushViewModel(
 
     fun toggleAutoChange() {
         _autoChange.value = !_autoChange.value
+
+        if (_autoChange.value) {
+            val info = "${_currentPlayingSongInfo.value?.first} ${_currentPlayingSongInfo.value?.second}".trim()
+            searchSong(info)
+        }
     }
 
     fun toggleSearchSheet() {