From 792f5dd7b5a1419f0095b389e2910ef8e212795b Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 25 May 2023 12:49:36 -0300 Subject: [PATCH] Always display bottom bar. --- .../org/thoughtcrime/securesms/MainActivity.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java index 486ebcdc07..e74dcf16af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java @@ -18,7 +18,6 @@ import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner import org.thoughtcrime.securesms.conversationlist.RelinkDevicesReminderBottomSheetFragment; import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferLockedDialog; import org.thoughtcrime.securesms.keyvalue.SignalStore; -import org.thoughtcrime.securesms.stories.Stories; import org.thoughtcrime.securesms.stories.tabs.ConversationListTabRepository; import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel; import org.thoughtcrime.securesms.util.AppStartup; @@ -26,7 +25,6 @@ import org.thoughtcrime.securesms.util.CachedInflater; import org.thoughtcrime.securesms.util.CommunicationActions; import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.DynamicTheme; -import org.thoughtcrime.securesms.util.FeatureFlags; import org.thoughtcrime.securesms.util.SplashScreenUtil; import org.thoughtcrime.securesms.util.WindowUtil; @@ -149,14 +147,8 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot } private void updateTabVisibility() { - if (Stories.isFeatureEnabled()) { - findViewById(R.id.conversation_list_tabs).setVisibility(View.VISIBLE); - WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_colorSurface2)); - } else { - findViewById(R.id.conversation_list_tabs).setVisibility(View.GONE); - WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_colorBackground)); - conversationListTabsViewModel.onChatsSelected(); - } + findViewById(R.id.conversation_list_tabs).setVisibility(View.VISIBLE); + WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_colorSurface2)); } public @NonNull MainNavigator getNavigator() {