blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #613 - Do not close activity for normal tabs on back press

master
Emily Kager 2019-02-28 16:25:16 -08:00 committed by Colin Lee
parent e05f0894e8
commit 2df5fa2e52
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -200,13 +200,14 @@ class BrowserFragment : Fragment(), BackHandler {
} }
} }
@SuppressWarnings("ReturnCount")
override fun onBackPressed(): Boolean { override fun onBackPressed(): Boolean {
if (findInPageIntegration.onBackPressed()) return true return when {
if (sessionFeature.onBackPressed()) return true findInPageIntegration.onBackPressed() -> true
if (customTabsToolbarFeature.onBackPressed()) return true sessionFeature.onBackPressed() -> true
requireComponents.core.sessionManager.selectedSession?.isCustomTabSession()
return false ?: false && customTabsToolbarFeature.onBackPressed() -> true
else -> false
}
} }
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) { override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {