Verified Commit fe3c5da7 authored by Dan Ballard's avatar Dan Ballard Committed by ma1
Browse files

fixup! [android] Implement Android-native Connection Assist UI 

Bug 41188: Add staging event wiring
parent b559be9d

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ import org.mozilla.fenix.components.FenixSnackbar 
import org.mozilla.fenix.home.HomeFragment

import org.mozilla.fenix.tor.UrlQuickLoadViewModel

import org.mozilla.geckoview.TorAndroidIntegration

import org.mozilla.geckoview.TorConnectStage



/**

 * The main activity of the application. The application is primarily a single Activity (this one)
@@ -1513,6 +1514,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn 
    }



    override fun onBootstrapStateChange(state: String) = Unit

    override fun onBootstrapStageChange(stage: TorConnectStage) = Unit

    override fun onBootstrapProgress(progress: Double, hasWarnings: Boolean) = Unit

    override fun onBootstrapComplete() {

        if (settings().useHtmlConnectionUi) {

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapProgressViewModel.kt

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import androidx.lifecycle.AndroidViewModel 
import androidx.lifecycle.MutableLiveData

import org.mozilla.fenix.ext.components

import org.mozilla.geckoview.TorAndroidIntegration.BootstrapStateChangeListener

import org.mozilla.geckoview.TorConnectStage



class TorBootstrapProgressViewModel(

    application: Application,
@@ -27,6 +28,7 @@ class TorBootstrapProgressViewModel( 
    }



    override fun onBootstrapStateChange(state: String?) {}

    override fun onBootstrapStageChange(stage: TorConnectStage) = Unit



    override fun onBootstrapProgress(progress: Double, hasWarnings: Boolean) {

        this.progress.value = progress.toInt()