Issue #762 - Prevent menu button from closing overlay on homescreen.

mozilla-mobile · Apr 20, 2018 · 7f2fcd4 · 7f2fcd4
1 parent bfd5963
commit 7f2fcd4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/src/main/java/org/mozilla/focus/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/focus/browser/BrowserFragment.kt
@@ -73,6 +73,8 @@ class BrowserFragment : IWebViewLifecycleFragment() {
     var url: String? = null
         private set
 
+    val isUrlEqualToHomepage: Boolean get() = url == APP_URL_HOME
+
     private val sessionManager = SessionManager.getInstance()
 
     /**
@@ -223,8 +225,7 @@ class BrowserFragment : IWebViewLifecycleFragment() {
         val actionIsDown = event.action == KeyEvent.ACTION_DOWN
         val isOverlayToggleKey = (keyCodeIsMenu || (keyCodeIsBack && browserOverlay.isVisible))
 
-        if (isOverlayToggleKey) {
-            // TODO: prevent hiding overlay on Homepage.
+        if (isOverlayToggleKey && !isUrlEqualToHomepage) {
             if (actionIsDown) {
                 val toShow = !browserOverlay.isVisible
                 setOverlayVisibleByUser(toShow)