Switch context ref to lambda ref

Sharing an Activity instance through a static property of a receiver is a memory leak, so instead of doing that, this shares a reference to a lambda
MarmadileManteater · Feb 1, 2024 · 536f313 · 536f313
1 parent 2ef439c
commit 536f313
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/android/app/src/main/java/io/freetubeapp/freetube/MainActivity.kt b/android/app/src/main/java/io/freetubeapp/freetube/MainActivity.kt
@@ -29,7 +29,10 @@ class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback {
   @Suppress("DEPRECATION")
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    MediaControlsReceiver.Static.main = this
+    MediaControlsReceiver.notifyMediaSessionListeners = {
+      action ->
+      webView.loadUrl(String.format("javascript: window.notifyMediaSessionListeners('%s')", action))
+    }
     // this keeps android from shutting off the app to conserve battery
     keepAliveService = KeepAliveService()
     keepAliveIntent = Intent(this, keepAliveService.javaClass)

diff --git a/android/app/src/main/java/io/freetubeapp/freetube/MediaControlsReceiver.kt b/android/app/src/main/java/io/freetubeapp/freetube/MediaControlsReceiver.kt
@@ -9,12 +9,12 @@ open class MediaControlsReceiver : BroadcastReceiver {
   constructor() {
   }
   companion object Static {
-    lateinit var main: MainActivity
+    lateinit var notifyMediaSessionListeners: (String) -> Unit
   }
 
 
   override fun onReceive(context: Context?, intent: Intent?) {
     val action = intent!!.action
-    main.webView.loadUrl(String.format("javascript: window.notifyMediaSessionListeners('%s')", action))
+    notifyMediaSessionListeners(action!!)
   }
 }