From 8066dce73bb6d1b88c6848b26375567713bcc3a2 Mon Sep 17 00:00:00 2001
From: vfsfitvnm <vfsfitvnm@protonmail.com>
Date: Thu, 30 Jun 2022 20:39:35 +0200
Subject: [PATCH] Change equalizer intent logic

---
 app/src/main/AndroidManifest.xml              |  6 ++++
 .../screens/settings/PlayerSettingsScreen.kt  | 33 ++++++++-----------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 65ecf31..31a3e45 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,12 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
+    <queries>
+        <intent>
+            <action android:name="android.media.action.DISPLAY_AUDIO_EFFECT_CONTROL_PANEL" />
+        </intent>
+    </queries>
+
     <application
         android:name=".MainApplication"
         android:allowBackup="true"
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/PlayerSettingsScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/PlayerSettingsScreen.kt
index 8be6f20..8697ee8 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/PlayerSettingsScreen.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/PlayerSettingsScreen.kt
@@ -3,6 +3,7 @@ package it.vfsfitvnm.vimusic.ui.screens.settings
 import android.content.Intent
 import android.media.audiofx.AudioEffect
 import android.text.format.DateUtils
+import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.ExperimentalAnimationApi
@@ -66,15 +67,6 @@ fun PlayerSettingsScreen() {
                 rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
                 }
 
-            val audioSessionId = remember(binder) {
-                val hasEqualizer = context.packageManager.resolveActivity(
-                    Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL),
-                    0
-                ) != null
-
-                if (hasEqualizer) binder?.player?.audioSessionId else null
-            }
-
             val sleepTimerMillisLeft by (binder?.sleepTimerMillisLeft
                 ?: flowOf(null)).collectAsState(initial = null)
 
@@ -252,17 +244,18 @@ fun PlayerSettingsScreen() {
                     title = "Equalizer",
                     text = "Interact with the system equalizer",
                     onClick = {
-                        activityResultLauncher.launch(
-                            Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL).apply {
-                                putExtra(AudioEffect.EXTRA_AUDIO_SESSION, audioSessionId)
-                                putExtra(
-                                    AudioEffect.EXTRA_CONTENT_TYPE,
-                                    AudioEffect.CONTENT_TYPE_MUSIC
-                                )
-                            }
-                        )
-                    },
-                    isEnabled = audioSessionId != null
+                        val intent = Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL).apply {
+                            putExtra(AudioEffect.EXTRA_AUDIO_SESSION, binder?.player?.audioSessionId)
+                            putExtra(AudioEffect.EXTRA_PACKAGE_NAME, context.packageName)
+                            putExtra(AudioEffect.EXTRA_CONTENT_TYPE, AudioEffect.CONTENT_TYPE_MUSIC)
+                        }
+
+                        if (intent.resolveActivity(context.packageManager) != null) {
+                            activityResultLauncher.launch(intent)
+                        } else {
+                            Toast.makeText(context, "No equalizer app found!", Toast.LENGTH_SHORT).show()
+                        }
+                    }
                 )
 
                 SettingsEntry(