Commit d4636969 authored by ekager's avatar ekager Committed by Emily Kager
Browse files

For #10718 - Finish activity after removing external session

parent 28a6b1f9

app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt

+2 −7
Original line number Diff line number Diff line
@@ -131,9 +131,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session 


    private var browserInitialized: Boolean = false

    private var initUIJob: Job? = null



    // We need this so we don't accidentally remove all external sessions on back press

    private var sessionRemoved = false

    private var enteredPip = false



    private val sharedViewModel: SharedViewModel by activityViewModels()
@@ -587,8 +584,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session 


    @CallSuper

    override fun onBackPressed(): Boolean {

        return sessionRemoved ||

                findInPageIntegration.onBackPressed() ||

        return findInPageIntegration.onBackPressed() ||

                fullScreenFeature.onBackPressed() ||

                sessionFeature.onBackPressed() ||

                removeSessionIfNeeded()
@@ -647,8 +643,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session 
            val sessionManager = requireComponents.core.sessionManager

            if (session.source == Session.Source.ACTION_VIEW) {

                sessionManager.remove(session)

                sessionRemoved = true

                activity?.onBackPressed()

                activity?.finish()

            } else {

                val isLastSession =

                    sessionManager.sessionsOfType(private = session.private).count() == 1