From 1bca2f06bda77ba11bb645dfb09a9fb4d7c77166 Mon Sep 17 00:00:00 2001 From: gitstart Date: Fri, 2 Dec 2022 10:46:41 -0500 Subject: [PATCH] Pause voice memos when you open a video. Fixes #11156. Signed-off-by: Nicholas Tinsley --- .../securesms/mediapreview/MediaPreviewV2Activity.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Activity.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Activity.kt index 82b535207d..bd5cf3e40e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Activity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Activity.kt @@ -8,8 +8,12 @@ import androidx.appcompat.app.AppCompatDelegate import androidx.core.content.ContextCompat import androidx.fragment.app.commit import org.thoughtcrime.securesms.R +import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController +import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner -class MediaPreviewV2Activity : AppCompatActivity(R.layout.activity_mediapreview_v2) { +class MediaPreviewV2Activity : AppCompatActivity(R.layout.activity_mediapreview_v2), VoiceNoteMediaControllerOwner { + + override lateinit var voiceNoteMediaController: VoiceNoteMediaController override fun attachBaseContext(newBase: Context) { delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES @@ -19,6 +23,9 @@ class MediaPreviewV2Activity : AppCompatActivity(R.layout.activity_mediapreview_ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setTheme(R.style.TextSecure_MediaPreview) + + voiceNoteMediaController = VoiceNoteMediaController(this) + if (Build.VERSION.SDK_INT >= 21) { val systemBarColor = ContextCompat.getColor(this, R.color.signal_dark_colorSurface) window.statusBarColor = systemBarColor