aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-11-15 03:48:56 -0500
committerAllan Wang <me@allanwang.ca>2017-11-15 03:48:56 -0500
commit0b60ad9b70be8cac67913c9e6438a5bb812cbd37 (patch)
tree5ec577af73537aa598ed6d5f8196fadf1b897933 /app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
parent5a6bf455cb2e550c18f94d8aeaaa91c2260cb75a (diff)
downloadfrost-0b60ad9b70be8cac67913c9e6438a5bb812cbd37.tar.gz
frost-0b60ad9b70be8cac67913c9e6438a5bb812cbd37.tar.bz2
frost-0b60ad9b70be8cac67913c9e6438a5bb812cbd37.zip
Fix some logic
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
index ce4bffb5..c41964cd 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
@@ -172,6 +172,12 @@ open class WebOverlayActivityBase(private val forceBasicAgent: Boolean) : BaseAc
}
}
+ override fun backConsumer(): Boolean {
+ if (!frostWeb.onBackPressed())
+ finishSlideOut()
+ return true
+ }
+
/**
* Our theme for the overlay should be fully opaque
*/
@@ -190,12 +196,6 @@ open class WebOverlayActivityBase(private val forceBasicAgent: Boolean) : BaseAc
kauSwipeOnDestroy()
}
- override fun onBackPressed() {
- if (!frostWeb.onBackPressed()) {
- finishSlideOut()
- }
- }
-
override fun openFileChooser(filePathCallback: ValueCallback<Array<Uri>?>, fileChooserParams: WebChromeClient.FileChooserParams) {
openMediaPicker(filePathCallback, fileChooserParams)
}