From 451ce74fa4e45567132855e832c899bdcd997fb2 Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Thu, 17 Aug 2023 11:17:19 -0400
Subject: [PATCH] Safely run VoiceNoteProximityWakeLockManager cleanup.

---
 .../securesms/components/voice/VoiceNoteMediaController.kt  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.kt b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.kt
index 5daeb41fc6..cf426eb759 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.kt
@@ -117,8 +117,10 @@ class VoiceNoteMediaController(val activity: FragmentActivity, private var postp
   }
 
   override fun onDestroy(owner: LifecycleOwner) {
-    voiceNoteProximityWakeLockManager.unregisterCallbacksAndRelease()
-    voiceNoteProximityWakeLockManager.unregisterFromLifecycle()
+    if (this::voiceNoteProximityWakeLockManager.isInitialized) {
+      voiceNoteProximityWakeLockManager.unregisterCallbacksAndRelease()
+      voiceNoteProximityWakeLockManager.unregisterFromLifecycle()
+    }
     activity.lifecycle.removeObserver(this)
     super.onDestroy(owner)
   }