Commit 1efdc3dc authored by clairehurst's avatar clairehurst 🌱
Browse files

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

Bug 43570: Add tor exit prompt

# Conflicts:
#	mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/ProviderStoppedViewModel.kt
parent 45aace81

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

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ package org.mozilla.fenix.tor 
import androidx.annotation.ColorRes

import androidx.annotation.DrawableRes

import androidx.annotation.StringRes

import mozilla.components.lib.crash.R as crashR

import org.mozilla.fenix.R

import mozilla.components.lib.crash.R as crashR



enum class ConnectAssistUiState(

    val progressBarVisible: Boolean,
@@ -324,5 +324,5 @@ enum class ConnectAssistUiState( 
        torBootstrapButton2TextStringResource = null,

        torBootstrapButton2ShouldOpenSettings = false,

        torBootstrapButton2ShouldRestartApp = false,

    ),;

    ),

}

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

+2 −2
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ class ProviderStoppedViewModel( 
                Log.d(TAG, "ProviderStopped detected")

                providerStoppedStateFlow.value = true

            }

            TorConnectStageName.Start -> {



            else -> {

                providerStoppedStateFlow.value = false

            }

            else -> {}

        }



        _maybeConfigIssue.value = stage.providerStatus.maybeConfigIssue