From 20c32ccdab6ccd9aaf0ad8e270797e2d3c0158a7 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 2 May 2019 15:44:12 +0200
Subject: [PATCH] Fixed hide_tab_bar_on_secondary_level_screens custom option

---
 .../org/linphone/activities/MainActivity.java | 19 ++++++++++++++++++-
 .../linphone/chat/ChatMessagesFragment.java   |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/MainActivity.java b/app/src/main/java/org/linphone/activities/MainActivity.java
index 0d4a00bb2..a2288f70a 100644
--- a/app/src/main/java/org/linphone/activities/MainActivity.java
+++ b/app/src/main/java/org/linphone/activities/MainActivity.java
@@ -298,7 +298,10 @@ public abstract class MainActivity extends LinphoneGenericActivity
         super.onResume();
 
         hideTopBar();
-        showTabBar();
+        if (getFragmentManager().getBackStackEntryCount() == 0
+                || !getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) {
+            showTabBar();
+        }
 
         mHistorySelected.setVisibility(View.GONE);
         mContactsSelected.setVisibility(View.GONE);
@@ -384,6 +387,10 @@ public abstract class MainActivity extends LinphoneGenericActivity
     public boolean popBackStack() {
         if (getFragmentManager().getBackStackEntryCount() > 0) {
             getFragmentManager().popBackStackImmediate();
+            if (getFragmentManager().getBackStackEntryCount() == 0
+                    && getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) {
+                showTabBar();
+            }
             return true;
         }
         return false;
@@ -597,6 +604,16 @@ public abstract class MainActivity extends LinphoneGenericActivity
             }
         }
 
+        if (getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) {
+            if (isChild) {
+                if (!isTablet()) {
+                    hideTabBar();
+                }
+            } else {
+                showTabBar();
+            }
+        }
+
         Compatibility.setFragmentTransactionReorderingAllowed(transaction, false);
         if (isChild && isTablet()) {
             transaction.replace(R.id.fragmentContainer2, fragment, name);
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index 183ee503c..4a1b5fca1 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -644,7 +644,7 @@ public class ChatMessagesFragment extends Fragment
     }
 
     private void hideKeyboardVisibleMode() {
-        if (getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) {
+        if (!getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) {
             ((ChatActivity) getActivity()).showTabBar();
         }
         ((ChatActivity) getActivity()).showStatusBar();