From 93fd6e7a55b5bf37c9f4c53d2f0680d7e07634d5 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 21 Sep 2021 10:09:43 -0300 Subject: [PATCH] Fix issue with media controller lifecycle. We were connecting and disconnecting in onStart and onStop, which can get called in different orders depending on what the system does. This results in sometimes trying to connect to an already connected media session. --- .../components/voice/VoiceNoteMediaController.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 61d244386..afe9351f5 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 @@ -105,19 +105,16 @@ public class VoiceNoteMediaController implements DefaultLifecycleObserver { } @Override - public void onStart(@NonNull LifecycleOwner owner) { + public void onResume(@NonNull LifecycleOwner owner) { if (!mediaBrowser.isConnected()) { mediaBrowser.connect(); } - } - @Override - public void onResume(@NonNull LifecycleOwner owner) { activity.setVolumeControlStream(AudioManager.STREAM_MUSIC); } @Override - public void onStop(@NonNull LifecycleOwner owner) { + public void onPause(@NonNull LifecycleOwner owner) { clearProgressEventHandler(); if (MediaControllerCompat.getMediaController(activity) != null) {