From daf78b31b5e161a8ae5fff0f10b0a132a748260c Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 27 Sep 2022 15:24:54 -0300 Subject: [PATCH] Fix hide dialog dismissal. --- .../securesms/stories/landing/StoriesLandingFragment.kt | 1 - .../securesms/stories/viewer/page/StoryViewerPageFragment.kt | 2 +- .../securesms/webrtc/audio/FullSignalAudioManagerApi31.kt | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt index fbd759dd9..6f988c903 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt @@ -17,7 +17,6 @@ import androidx.core.view.ViewCompat import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.google.android.material.snackbar.BaseTransientBottomBar import com.google.android.material.snackbar.Snackbar import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Single diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt index 7d8547e87..9e43a2162 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt @@ -1049,7 +1049,7 @@ class StoryViewerPageFragment : }, onHide = { viewModel.setIsDisplayingHideDialog(true) - StoryDialogs.hideStory(requireContext(), Recipient.resolved(storyViewerPageArgs.recipientId).getDisplayName(requireContext()), { viewModel.setIsDisplayingHideDialog(true) }) { + StoryDialogs.hideStory(requireContext(), Recipient.resolved(storyViewerPageArgs.recipientId).getDisplayName(requireContext()), { viewModel.setIsDisplayingHideDialog(false) }) { lifecycleDisposable += viewModel.hideStory().subscribe { callback.onStoryHidden(storyViewerPageArgs.recipientId) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt index a7bb165a4..064074ad7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/FullSignalAudioManagerApi31.kt @@ -61,7 +61,6 @@ class FullSignalAudioManagerApi31(context: Context, eventListener: EventListener return AudioDevice.NONE } - override fun setDefaultAudioDevice(recipientId: RecipientId?, newDefaultDevice: AudioDevice, clearUserEarpieceSelection: Boolean) { defaultDevice = newDefaultDevice } @@ -144,4 +143,4 @@ class FullSignalAudioManagerApi31(context: Context, eventListener: EventListener } outgoingRinger.start(OutgoingRinger.Type.RINGING) } -} \ No newline at end of file +}