From 2454b2e0dbbd5d46a6a70f44555673852174a259 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 25 Apr 2022 10:29:30 -0300
Subject: [PATCH] Fix crash when trying to access media controller after
 activity is destroyed and reference is nullified.

---
 .../components/voice/VoiceNoteMediaController.java          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.java b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.java
index c689171473..617d22b04f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.java
@@ -146,7 +146,11 @@ public class VoiceNoteMediaController implements DefaultLifecycleObserver {
   }
 
   private @Nullable MediaControllerCompat getMediaController() {
-    return MediaControllerCompat.getMediaController(activity);
+    if (activity != null) {
+      return MediaControllerCompat.getMediaController(activity);
+    } else {
+      return null;
+    }
   }
 
 
-- 
GitLab