jlelse
/
teleposter
mirror of https://github.com/jlelse/teleposter
1
Fork 0
Code Releases Wiki Activity

Add missing onBackPressed

This commit is contained in:
Jan-Lk Else 2016-11-26 10:15:37 +01:00
parent 77d45a4d37
commit e5fa595bbf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/telegra/ph/MainActivity.kt
View File

@ -27,10 +27,6 @@ class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
addPermittedHostname("telegra.ph")
}
webView?.settings?.apply {
}
// Check if app is opened to show special page
var urlToLoad = TELEGRAPH
if (intent.action == Intent.ACTION_VIEW && !intent.dataString.isNullOrBlank() && intent.dataString.contains("telegra.ph"))
@ -76,6 +72,11 @@ class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
webView?.onActivityResult(requestCode, resultCode, data)
}
override fun onBackPressed() {
if (webView?.onBackPressed() == false) return
else super.onBackPressed()
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
super.onCreateOptionsMenu(menu)
menuInflater.inflate(R.menu.activity_main, menu)