From 30c97119d8caaaf04e1331fa025510c67f68599e Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 5 Oct 2020 17:49:57 +0300 Subject: [PATCH] ComposeActivity: fix ignoring opened preview when back pressed --- .../tusky/components/compose/ComposeActivity.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt index 36f68b7c..c1d42868 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt @@ -148,7 +148,7 @@ class ComposeActivity : BaseActivity(), // do not do anything when not logged in, activity will be finished in super.onCreate() anyway val activeAccount = accountManager.activeAccount ?: return - viewModel.tryFetchStickers = preferences.getBoolean("stickers", false) + viewModel.tryFetchStickers = preferences.getBoolean(PrefKeys.STICKERS, false) viewModel.anonymizeNames = preferences.getBoolean(PrefKeys.ANONYMIZE_FILENAMES, false) setupAvatar(preferences, activeAccount) val mediaAdapter = MediaPreviewAdapter( @@ -1161,7 +1161,8 @@ class ComposeActivity : BaseActivity(), addMediaBehavior.state == BottomSheetBehavior.STATE_EXPANDED || emojiBehavior.state == BottomSheetBehavior.STATE_EXPANDED || scheduleBehavior.state == BottomSheetBehavior.STATE_EXPANDED || - stickerBehavior.state == BottomSheetBehavior.STATE_EXPANDED) { + stickerBehavior.state == BottomSheetBehavior.STATE_EXPANDED || + previewBehavior.state == BottomSheetBehavior.STATE_HIDDEN) { composeOptionsBehavior.state = BottomSheetBehavior.STATE_HIDDEN addMediaBehavior.state = BottomSheetBehavior.STATE_HIDDEN emojiBehavior.state = BottomSheetBehavior.STATE_HIDDEN