From 0d37013481ec485134e3d96e4a4776676ed9f776 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Thu, 12 Sep 2024 15:05:24 -0400
Subject: [PATCH] Fix more voice note playback NPEs.

---
 .../components/voice/VoiceNotePlaybackService.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java
index 1a92f759ac..24cdc1388a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java
@@ -108,17 +108,25 @@ public class VoiceNotePlaybackService extends MediaSessionService {
   @Override
   public void onDestroy() {
     AppDependencies.getDatabaseObserver().unregisterObserver(attachmentDeletionObserver);
-    player.release();
 
-    final MediaSession session = mediaSession;
+    final VoiceNotePlayer voiceNotePlayer = player;
+    if (voiceNotePlayer != null) {
+      voiceNotePlayer.release();
+    }
+
+    MediaSession session = mediaSession;
     if (session != null) {
       session.release();
       mediaSession = null;
     }
 
+    KeyClearedReceiver receiver = keyClearedReceiver;
+    if (receiver != null) {
+      receiver.unregister();
+    }
+
     clearListener();
     super.onDestroy();
-    keyClearedReceiver.unregister();
   }
 
   @Nullable