#72 fix back button behavior

plateaukao · Jan 7, 2022 · 6ceff7e · 6ceff7e
1 parent 974308c
commit 6ceff7e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt b/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt
@@ -488,7 +488,7 @@ open class BrowserActivity : ComponentActivity(), BrowserController, OnClickList
             R.id.omnibox_back -> if (ninjaWebView.canGoBack()) {
                 ninjaWebView.goBack()
             } else {
-                removeAlbum(currentAlbumController!!)
+                NinjaToast.show(this, getString(R.string.no_previous_page))
             }
             R.id.toolbar_forward -> if (ninjaWebView.canGoForward()) {
                 ninjaWebView.goForward()
@@ -944,7 +944,7 @@ open class BrowserActivity : ComponentActivity(), BrowserController, OnClickList
             "03" -> if (ninjaWebView.canGoBack()) {
                 ninjaWebView.goBack()
             } else {
-                removeAlbum(currentAlbumController!!)
+                NinjaToast.show(this, getString(R.string.no_previous_page))
             }
             "04" -> ninjaWebView.jumpToTop()
             "05" -> ninjaWebView.pageDownWithNoAnimation()

diff --git a/app/src/main/java/de/baumann/browser/view/NinjaWebView.kt b/app/src/main/java/de/baumann/browser/view/NinjaWebView.kt
@@ -361,16 +361,6 @@ class NinjaWebView : WebView, AlbumController, KoinComponent {
         requestFocusNodeHref(click)
     }
 
-    private fun prepareRecord(): Boolean {
-        val title = title
-        val url = url
-        return !(title == null || title.isEmpty()
-                || url == null || url.isEmpty()
-                || url.startsWith(BrowserUnit.URL_SCHEME_ABOUT)
-                || url.startsWith(BrowserUnit.URL_SCHEME_MAIL_TO)
-                || url.startsWith(BrowserUnit.URL_SCHEME_INTENT))
-    }
-
     fun jumpToTop() {
         scrollTo(0, 0)
     }

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -335,4 +335,5 @@
     <string name="setting_summary_dark_mode">支援黑暗模式</string>
     <string name="hie_touch_area_when_input">輸入時隱藏點擊區域</string>
     <string name="switch_touch_area_action">點擊翻頁功能互換</string>
+    <string name="no_previous_page">沒有前一頁</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -467,4 +467,5 @@
     <string name="setting_summary_dark_mode">Support dark mode</string>
     <string name="hie_touch_area_when_input">hide touch area when typing</string>
     <string name="switch_touch_area_action">switch touch area action</string>
+    <string name="no_previous_page">no previous page!</string>
 </resources>