From 3b1035b5e12e902e96a3aea0ce7820aa3f2299de Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Sun, 22 May 2022 12:02:23 +0200
Subject: [PATCH] Reset the action bar subtitle when the back button is pressed

---
 .../beemdevelopment/aegis/ui/MainActivity.java  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
index 9416e73a..8351d129 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
@@ -14,7 +14,6 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -526,6 +525,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
 
             collapseSearchView();
             setTitle(R.string.app_name);
+            getSupportActionBar().setSubtitle(null);
             return;
         }
 
@@ -546,8 +546,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         saveAndBackupVault();
     }
 
-
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         _menu = menu;
@@ -581,8 +579,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                 return false;
             }
 
-
-
             @Override
             public boolean onQueryTextChange(String s) {
                 if (_submittedSearchSubtitle == null) {
@@ -593,6 +589,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                 return false;
             }
         });
+
         _searchView.setOnSearchClickListener(v -> {
             if (_submittedSearchSubtitle != null) {
                 _entryListView.setSearchFilter(null);
@@ -600,16 +597,20 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
                 _submittedSearchSubtitle = null;
             }
         });
-        if(_submittedSearchSubtitle != null) {
+
+        if (_submittedSearchSubtitle != null) {
             getSupportActionBar().setSubtitle(_submittedSearchSubtitle);
         }
-        if(_activeSearchFilter != null) {
+
+        if (_activeSearchFilter != null) {
             _entryListView.setSearchFilter(_activeSearchFilter);
         }
-        if(_searchQueryInputText != null) {
+
+        if (_searchQueryInputText != null) {
             _searchView.setQuery(_searchQueryInputText, false);
             _searchView.setIconified(false);
         }
+
         return true;
     }