From afa70ee42d280d34fb804ec5e5332b5e2eba899c Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <s.gillicuddy@gmail.com>
Date: Fri, 13 Sep 2019 09:53:57 +0100
Subject: [PATCH] #1464 Impossible to filter by author with Gutenberg

---
 .../kiwix/kiwixmobile/main/MainActivity.java  | 44 +++++++------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
index f44f3bf37..f6ba8b78e 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
@@ -44,7 +44,6 @@ import android.text.style.ForegroundColorSpan;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ActionMode;
-import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -398,7 +397,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     searchFiles();
     tabRecyclerView.setAdapter(tabsAdapter);
     new ItemTouchHelper(tabCallback).attachToRecyclerView(tabRecyclerView);
-    drawerLayout.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
   }
 
   //End of onCreate
@@ -587,6 +585,23 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     drawerLayout.openDrawer(GravityCompat.END);
   }
 
+  @Override public void onBackPressed() {
+    if (tabSwitcherRoot.getVisibility() == View.VISIBLE) {
+      selectTab(currentWebViewIndex);
+      hideTabSwitcher();
+    } else if (getCurrentWebView().canGoBack()) {
+      getCurrentWebView().goBack();
+    } else if (isFullscreenOpened) {
+      closeFullScreen();
+    } else if (compatCallback.mIsActive) {
+      compatCallback.finish();
+    } else if (drawerLayout.isDrawerOpen(GravityCompat.END)) {
+      drawerLayout.closeDrawers();
+    } else {
+      super.onBackPressed();
+    }
+  }
+
   private void checkForRateDialog() {
     isFirstRun = sharedPreferenceUtil.getPrefIsFirstRun();
     visitCounterPref = new RateAppCounter(this);
@@ -1223,31 +1238,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     }
   }
 
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    if (event.getAction() == KeyEvent.ACTION_DOWN) {
-      switch (keyCode) {
-        case KeyEvent.KEYCODE_BACK:
-          if (tabSwitcherRoot.getVisibility() == View.VISIBLE) {
-            selectTab(currentWebViewIndex);
-            hideTabSwitcher();
-          } else if (getCurrentWebView().canGoBack()) {
-            getCurrentWebView().goBack();
-          } else if (isFullscreenOpened) {
-            closeFullScreen();
-          } else if (compatCallback.mIsActive) {
-            compatCallback.finish();
-          } else {
-            finish();
-          }
-          return true;
-        case KeyEvent.KEYCODE_MENU:
-          openOptionsMenu();
-          return true;
-      }
-    }
-    return false;
-  }
-
   @OnClick(R.id.tab_switcher_close_all_tabs)
   void closeAllTabs() {
     rotate(closeAllTabsButton);