Add cancelMediaNotification function which is called on app close o…

…r on unmount of `Watch`
MarmadileManteater · Feb 4, 2024 · 3669a05 · 3669a05
1 parent edd3d3f
commit 3669a05
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/android/app/src/main/java/io/freetubeapp/freetube/FreeTubeJavaScriptInterface.kt b/android/app/src/main/java/io/freetubeapp/freetube/FreeTubeJavaScriptInterface.kt
@@ -17,6 +17,8 @@ import androidx.core.app.NotificationManagerCompat
 import java.io.File
 import java.io.FileInputStream
 import java.net.URL
+import java.util.UUID.*
+
 class FreeTubeJavaScriptInterface {
   private var context: MainActivity
   private var mediaSession: MediaSession?
@@ -27,7 +29,8 @@ class FreeTubeJavaScriptInterface {
   companion object {
     private const val DATA_DIRECTORY = "data://"
     private const val CHANNEL_ID = "media_controls"
-    private const val NOTIFICATION_ID = 1
+    private val NOTIFICATION_ID = (2..1000).random()
+    private val NOTIFICATION_TAG = String.format("%s", randomUUID())
   }
 
   constructor(main: MainActivity) {
@@ -135,7 +138,10 @@ class FreeTubeJavaScriptInterface {
    */
   @SuppressLint("MissingPermission")
   private fun pushNotification(notification: Notification) {
-    NotificationManagerCompat.from(context).notify(NOTIFICATION_ID, notification)
+    val manager = NotificationManagerCompat.from(context)
+    // cancel any existing notifications
+    manager.cancel(NOTIFICATION_ID)
+    manager.notify(NOTIFICATION_TAG, NOTIFICATION_ID, notification)
     lastNotification = notification
   }
 
@@ -322,6 +328,12 @@ class FreeTubeJavaScriptInterface {
     setMetadata(mediaSession!!, trackName, artist, duration, art)
   }
 
+  @JavascriptInterface
+  fun cancelMediaNotification() {
+    val manager = NotificationManagerCompat.from(context)
+    manager.cancel(NOTIFICATION_TAG, NOTIFICATION_ID)
+  }
+
   @JavascriptInterface
   fun readFile(basedir: String, filename: String): String {
     try {

diff --git a/android/app/src/main/java/io/freetubeapp/freetube/MainActivity.kt b/android/app/src/main/java/io/freetubeapp/freetube/MainActivity.kt
@@ -138,5 +138,7 @@ class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback {
   override fun onDestroy() {
     super.onDestroy()
     stopService(keepAliveIntent)
+    jsInterface.cancelMediaNotification()
+    webView.destroy()
   }
 }
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
@@ -39,6 +39,7 @@ import {
 import {
   createMediaSession
 } from '../../helpers/android'
+import android from 'android'
 
 /**
  * @typedef {object} AudioSource
@@ -340,6 +341,7 @@ export default defineComponent({
   },
   beforeDestroy() {
     window.clearAllMediaSessionEventListeners()
+    android.cancelMediaNotification()
   },
   methods: {
     onMountedDependOnLocalStateLoading() {