From bdf317a1bc939e37a91f5b41d84ff8c9a0b699f7 Mon Sep 17 00:00:00 2001
From: IllusionMan1212 <hisham.abourgheba@gmail.com>
Date: Sat, 26 Feb 2022 19:53:07 +0200
Subject: [PATCH] fix/feat: fix some exceptions and add album art to
 notification

---
 android/app/src/main/AndroidManifest.xml      |  2 +-
 .../lyricsgrabbr/lyricsgrabbr/MainActivity.kt | 11 +++++++--
 .../lyricsgrabbr/NotificationListener.kt      | 24 ++++++++++++-------
 .../lyricsgrabbr/NotificationStreamHandler.kt |  6 +++--
 lib/main.dart                                 |  8 +++----
 lib/notification_listener.dart                |  4 ----
 6 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 103811b..00b3eb0 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.illusionware.lyricsgrabbr.lyricsgrabbr">
    <application
-        android:label="lyricsgrabbr"
+        android:label="Lyrics Grabbr"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/MainActivity.kt b/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/MainActivity.kt
index 2a57bd1..66cd08d 100644
--- a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/MainActivity.kt
@@ -9,6 +9,8 @@ import io.flutter.plugin.common.EventChannel
 import io.flutter.plugin.common.MethodChannel
 
 class MainActivity: FlutterActivity() {
+    private var streamHandler : NotificationStreamHandler? = null
+
     companion object {
         private const val ACTION_NOTIFICATION_LISTENER_SETTINGS = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS"
         private const val EVENT_CHANNEL_NAME = "notifications.eventChannel"
@@ -32,12 +34,17 @@ class MainActivity: FlutterActivity() {
         }
 
         val eventChannel = EventChannel(flutterEngine.dartExecutor.binaryMessenger, EVENT_CHANNEL_NAME)
-        val streamHandler = NotificationStreamHandler(context)
+        streamHandler = NotificationStreamHandler(context)
         eventChannel.setStreamHandler(streamHandler)
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        streamHandler?.cleanUp()
+    }
+
     private fun isPermissionGranted(): Boolean {
-        val packageName = context.packageName
+        val packageName = packageName
         val pkgs = NotificationManagerCompat.getEnabledListenerPackages(context)
         for (name in pkgs) {
             if (TextUtils.equals(packageName, name)) {
diff --git a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationListener.kt b/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationListener.kt
index dee2d7f..2d8f4ac 100644
--- a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationListener.kt
+++ b/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationListener.kt
@@ -12,8 +12,8 @@ import android.service.notification.StatusBarNotification
 import org.json.JSONException
 import org.json.JSONObject
 import android.os.Bundle
-import android.util.Base64
-import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.FileOutputStream
 
 /**
  * Notification listening service. Intercepts notifications if permission is given to do so.
@@ -49,10 +49,18 @@ class NotificationListener : NotificationListenerService() {
         val duration = mediaCtrl?.metadata?.getLong(MediaMetadata.METADATA_KEY_DURATION)?.div(1000)
         val playbackState = mediaCtrl?.playbackState?.state
 
-        val albumArt = mediaCtrl?.metadata?.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART)
-        val outputStream = ByteArrayOutputStream()
-        albumArt?.compress(Bitmap.CompressFormat.PNG, 75, outputStream)
-        val artB64 = Base64.encodeToString(outputStream.toByteArray(), Base64.NO_WRAP)
+        var albumArtPath = ""
+
+        if (sbn.packageName == "com.spotify.music") {
+            val albumArt = mediaCtrl?.metadata?.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART)
+            val tempArtFile = File(cacheDir, "albumart_temp.png")
+            tempArtFile.createNewFile()
+            val fileOutputStream = FileOutputStream(tempArtFile)
+            albumArt?.compress(Bitmap.CompressFormat.PNG, 100, fileOutputStream)
+            fileOutputStream.flush()
+            fileOutputStream.close()
+            albumArtPath = tempArtFile.absolutePath
+        }
 
         // Retrieve package name to set as title.
         val packageName = sbn.packageName
@@ -60,14 +68,12 @@ class NotificationListener : NotificationListenerService() {
         val extras = sbn.notification.extras
         val packageMessage = extras?.getCharSequence(Notification.EXTRA_TEXT).toString()
         val packageText = extras?.getCharSequence("android.title").toString()
-        val packageExtra = convertBundleToJsonString(sbn.notification.extras)
         // Pass data from one activity to another.
         val intent = Intent(NOTIFICATION_INTENT)
         intent.putExtra(NOTIFICATION_PACKAGE_NAME, packageName)
         intent.putExtra(NOTIFICATION_PACKAGE_MESSAGE, packageMessage)
         intent.putExtra(NOTIFICATION_PACKAGE_TEXT, packageText)
-        intent.putExtra(NOTIFICATION_PACKAGE_EXTRA, packageExtra)
-        intent.putExtra(NOTIFICATION_PACKAGE_ART, artB64)
+        intent.putExtra(NOTIFICATION_PACKAGE_ART, albumArtPath)
         intent.putExtra(NOTIFICATION_PACKAGE_DURATION, duration)
         intent.putExtra(NOTIFICATION_PACKAGE_PLAYBACK_STATE, playbackState)
         sendBroadcast(intent)
diff --git a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationStreamHandler.kt b/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationStreamHandler.kt
index 3d1b6b9..b719da1 100644
--- a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationStreamHandler.kt
+++ b/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationStreamHandler.kt
@@ -29,12 +29,15 @@ class NotificationStreamHandler(private val context: Context) : StreamHandler {
     context.unregisterReceiver(receiver)
   }
 
+   fun cleanUp() {
+    context.unregisterReceiver(receiver)
+  }
+
   internal inner class NotificationReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
       val packageName = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_NAME)
       val packageMessage = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_MESSAGE)
       val packageText = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_TEXT)
-      val packageExtra = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_EXTRA)
       val packageArt = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_ART)
       val packagePlaybackState = intent.getIntExtra(NotificationListener.NOTIFICATION_PACKAGE_PLAYBACK_STATE, -1)
       val packageDuration = intent.getLongExtra(NotificationListener.NOTIFICATION_PACKAGE_DURATION, -1)
@@ -42,7 +45,6 @@ class NotificationStreamHandler(private val context: Context) : StreamHandler {
       map["packageName"] = packageName!!
       map["packageMessage"] = packageMessage!!
       map["packageText"] = packageText!!
-      map["packageExtra"] = packageExtra!!
       map["packageArt"] = packageArt!!
       map["packagePlaybackState"] = packagePlaybackState
       map["packageDuration"] = packageDuration
diff --git a/lib/main.dart b/lib/main.dart
index 031c01f..2099a48 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -65,8 +65,8 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
   @override
   void initState() {
     WidgetsBinding.instance?.addObserver(this);
-    initPlatformState();
     super.initState();
+    initPlatformState();
   }
 
   @override
@@ -103,7 +103,6 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
               SystemNavigator.pop();
               return Future.value(false);
             },
-            child: Expanded(
               child: AlertDialog(
                 title: const Text(
                   'Notifications Access Permission',
@@ -122,7 +121,6 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
                       child: const Text("OK")),
                 ],
               ),
-            ),
           );
         });
   }
@@ -159,7 +157,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
       showWhen: false,
       ongoing: true,
       playSound: false,
-      largeIcon: ByteArrayAndroidBitmap.fromBase64String(notification.art),
+      largeIcon: FilePathAndroidBitmap(notification.art),
     );
 
     final NotificationDetails notificationDetails =
@@ -167,7 +165,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
 
     await flutterLocalNotificationsPlugin.show(
       notificationId,
-      '${notification.songTitle} - ${notification.artist}',
+      'Playing [${notification.songTitle}] By [${notification.artist}]',
       'Tap to get lyrics',
       notificationDetails,
     );
diff --git a/lib/notification_listener.dart b/lib/notification_listener.dart
index cb1f2cb..c745704 100644
--- a/lib/notification_listener.dart
+++ b/lib/notification_listener.dart
@@ -22,7 +22,6 @@ abstract class PlaybackState {
 class NotificationEvent {
   final String artist;
   final String packageName;
-  final String packageExtra;
   final String songTitle;
   final String art;
   final int playbackState;
@@ -34,7 +33,6 @@ class NotificationEvent {
     required this.packageName,
     required this.artist,
     required this.timeStamp,
-    required this.packageExtra,
     required this.songTitle,
     required this.art,
     required this.playbackState,
@@ -46,7 +44,6 @@ class NotificationEvent {
     String name = map['packageName'];
     String message = map['packageMessage'];
     String text = map['packageText'];
-    String extra =  map['packageExtra'];
     String icon = map['packageArt'];
     int playbackState = map['packagePlaybackState'];
     int duration = map['packageDuration'];
@@ -56,7 +53,6 @@ class NotificationEvent {
         artist: message,
         timeStamp: time,
         songTitle: text,
-        packageExtra: extra,
         art: icon,
         playbackState: playbackState,
         duration: duration