From 1b5db9da1f5273ff09ee791e709a74127189b317 Mon Sep 17 00:00:00 2001
From: tzugen <tzugen@riseup.net>
Date: Fri, 21 May 2021 22:37:43 +0200
Subject: [PATCH] Make ExternalStorageMonitor context-free

---
 .../ultrasonic/service/ExternalStorageMonitor.java  | 13 +++++--------
 .../org/moire/ultrasonic/di/MediaPlayerModule.kt    |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/ExternalStorageMonitor.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ExternalStorageMonitor.java
index f1a7256a..a2813758 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/ExternalStorageMonitor.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/ExternalStorageMonitor.java
@@ -4,6 +4,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+
+import org.moire.ultrasonic.app.UApp;
+
 import timber.log.Timber;
 
 /**
@@ -11,15 +14,9 @@ import timber.log.Timber;
  */
 public class ExternalStorageMonitor
 {
-    private Context context;
     private BroadcastReceiver ejectEventReceiver;
     private boolean externalStorageAvailable = true;
 
-    public ExternalStorageMonitor(Context context)
-    {
-        this.context = context;
-    }
-
     public void onCreate(final Runnable ejectedCallback)
     {
         // Stop when SD card is ejected.
@@ -44,12 +41,12 @@ public class ExternalStorageMonitor
         IntentFilter ejectFilter = new IntentFilter(Intent.ACTION_MEDIA_EJECT);
         ejectFilter.addAction(Intent.ACTION_MEDIA_MOUNTED);
         ejectFilter.addDataScheme("file");
-        context.registerReceiver(ejectEventReceiver, ejectFilter);
+        UApp.Companion.applicationContext().registerReceiver(ejectEventReceiver, ejectFilter);
     }
 
     public void onDestroy()
     {
-        context.unregisterReceiver(ejectEventReceiver);
+        UApp.Companion.applicationContext().unregisterReceiver(ejectEventReceiver);
     }
 
     public boolean isExternalStorageAvailable() { return externalStorageAvailable; }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MediaPlayerModule.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MediaPlayerModule.kt
index de18fda7..54cd70ee 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MediaPlayerModule.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MediaPlayerModule.kt
@@ -19,7 +19,7 @@ val mediaPlayerModule = module {
     single { JukeboxMediaPlayer(androidContext(), get()) }
     single { MediaPlayerLifecycleSupport(get(), get(), get()) }
     single { DownloadQueueSerializer(androidContext()) }
-    single { ExternalStorageMonitor(androidContext()) }
+    single { ExternalStorageMonitor() }
     single { ShufflePlayBuffer(androidContext()) }
     single { Downloader(androidContext(), get(), get(), get()) }
     single { LocalMediaPlayer(get(), androidContext()) }