Illusion/lyrics-grabbr
1
0
Fork 0
mirror of https://github.com/IllusionMan1212/lyrics-grabbr.git synced 2026-10-24 02:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix receiver not being started on subsequent app launches

Browse Source
This commit is contained in:
Illusion
2024-01-19 02:27:30 +02:00
parent 6f3555b1d3
commit a3980c803c
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/illusionman1212/lyricsgrabbr/MainActivity.kt
+4 -4
View File
@@ -51,7 +51,8 @@ data class NotificationEvent(
) )
class MainActivity : ComponentActivity() { class MainActivity : ComponentActivity() {
var lastNotification: MutableStateFlow<NotificationEvent?> = MutableStateFlow(null) private var lastNotification: MutableStateFlow<NotificationEvent?> = MutableStateFlow(null)
private var isReceiverRunning = false
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
installSplashScreen() installSplashScreen()
@@ -163,9 +164,7 @@ class MainActivity : ComponentActivity() {
} }
private fun startListening() { private fun startListening() {
val isServiceRunning = NotificationListener.isRunning.value if (!isPermissionGranted() || isReceiverRunning) {
if (!isPermissionGranted() || isServiceRunning) {
return return
} }
@@ -176,6 +175,7 @@ class MainActivity : ComponentActivity() {
filter.addAction(NotificationListener.NOTIFICATION_INTENT) filter.addAction(NotificationListener.NOTIFICATION_INTENT)
LocalBroadcastManager.getInstance(applicationContext).registerReceiver(NotificationReceiver(), filter) LocalBroadcastManager.getInstance(applicationContext).registerReceiver(NotificationReceiver(), filter)
ContextCompat.startForegroundService(applicationContext, listenerIntent) ContextCompat.startForegroundService(applicationContext, listenerIntent)
isReceiverRunning = true
} }
inner class NotificationReceiver: BroadcastReceiver() { inner class NotificationReceiver: BroadcastReceiver() {
app/src/main/java/com/illusionman1212/lyricsgrabbr/NotificationListener.kt
+1 -10
View File
@@ -19,9 +19,6 @@ import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.localbroadcastmanager.content.LocalBroadcastManager
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
class NotificationListener: NotificationListenerService() { class NotificationListener: NotificationListenerService() {
private var notificationManager : NotificationManagerCompat? = null private var notificationManager : NotificationManagerCompat? = null
@@ -60,13 +57,10 @@ class NotificationListener: NotificationListenerService() {
private fun getStopServiceNotificationAction(): PendingIntent { private fun getStopServiceNotificationAction(): PendingIntent {
val intent = Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) val intent = Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
val pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE) return PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE)
return pendingIntent
} }
private fun startForegroundService() { private fun startForegroundService() {
_isRunning.update { true }
startForeground(NOTIFICATION_ID, getInitialNotification()) startForeground(NOTIFICATION_ID, getInitialNotification())
} }
@@ -167,9 +161,6 @@ class NotificationListener: NotificationListenerService() {
} }
companion object { companion object {
private val _isRunning = MutableStateFlow(false)
val isRunning = _isRunning.asStateFlow()
const val NOTIFICATION_INTENT = "notification_event" const val NOTIFICATION_INTENT = "notification_event"
const val NOTIFICATION_PACKAGE_NAME = "package_name" const val NOTIFICATION_PACKAGE_NAME = "package_name"
const val NOTIFICATION_PACKAGE_ARTIST = "package_artist" const val NOTIFICATION_PACKAGE_ARTIST = "package_artist"