Fix townhall loading (#1603)

* Fix townhall loading

* Clean up logs

* Remove extra imports

* Optimize imports

* Fix query test

1 files changed, 16 insertions, 0 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt
index 0a3884ff..a6b4eae7 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt
@@ -60,4 +60,20 @@ class WebFragment : BaseFragment() {
         }
         super.updateFab(contract)
     }
+
+    override fun onBackPressed(): Boolean {
+        if (baseEnum == FbItem.MENU) {
+            val core = core
+            val web = core as? WebView
+            if (web != null && web.canGoBack() && !web.canGoBackOrForward(-2)) {
+                // If menu item + we are at the second last entry, reload the base
+                // To properly inflate the menu
+                // Related to https://github.com/AllanWang/Frost-for-Facebook/issues/1593
+                core.clearHistory()
+                core.reloadBase(true)
+                return true
+            }
+        }
+        return super.onBackPressed()
+    }
 }