Merge pull request #1122 from mozilla/fix-back-button-crasher

Fixes #1037: Fix back button crasher
This commit is contained in:
Danny Coates 2019-01-23 09:10:54 -08:00 committed by GitHub
commit 831e39c113
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -127,7 +127,7 @@ class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
super.onDestroy()
}
override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent) {
override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
super.onActivityResult(requestCode, resultCode, intent)
mWebView!!.onActivityResult(requestCode, resultCode, intent)
// ...