Closes #2518 - Fix back button in PairFragment

nightly-build-test
Vlad Filippov 5 years ago committed by Emily Kager
parent 1404da92bd
commit e52157d358

@ -12,6 +12,7 @@ import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.navigation.fragment.NavHostFragment.findNavController
import mozilla.components.feature.qr.QrFeature import mozilla.components.feature.qr.QrFeature
import mozilla.components.support.base.feature.BackHandler import mozilla.components.support.base.feature.BackHandler
import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
@ -61,10 +62,9 @@ class PairFragment : Fragment(), BackHandler {
} }
override fun onBackPressed(): Boolean { override fun onBackPressed(): Boolean {
return when { qrFeature.onBackPressed()
qrFeature.onBackPressed() -> true findNavController(this@PairFragment).navigateUp()
else -> false return true
}
} }
companion object { companion object {

Loading…
Cancel
Save