From 019d036f698799e26b5a53937937706fc594f94e Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 22 Oct 2019 13:01:42 -0400
Subject: [PATCH] Fix soft nav color in conversation list.

Going in and out of multi-select mode would screw it up.

This fixes it by setting the flags correctly instead of blasting them
all away.
---
 .../thoughtcrime/securesms/ConversationListFragment.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index ecf651c631..6d31f508e4 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -467,7 +467,8 @@ public class ConversationListFragment extends Fragment
     }
 
     if (Build.VERSION.SDK_INT >= 23) {
-      getActivity().getWindow().getDecorView().setSystemUiVisibility(0);
+      int current = getActivity().getWindow().getDecorView().getSystemUiVisibility();
+      getActivity().getWindow().getDecorView().setSystemUiVisibility(current & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
     }
 
     return true;
@@ -500,7 +501,8 @@ public class ConversationListFragment extends Fragment
     }
 
     if (Build.VERSION.SDK_INT >= 23) {
-      getActivity().getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+      int current = getActivity().getWindow().getDecorView().getSystemUiVisibility();
+      getActivity().getWindow().getDecorView().setSystemUiVisibility(current | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
     }
 
     actionMode = null;