Skip to content
Snippets Groups Projects
Verified Commit b8ffe3e2 authored by Sebastian's avatar Sebastian
Browse files

Map lifecycle/tor plugin state to translatable messages

parent 4e76bf76
No related branches found
No related tags found
1 merge request!67Map lifecycle/tor plugin state to translatable messages
Pipeline #10371 passed
...@@ -33,6 +33,7 @@ import kotlinx.coroutines.flow.StateFlow ...@@ -33,6 +33,7 @@ import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.flowOn
import org.briarproject.android.dontkillmelib.DozeHelper import org.briarproject.android.dontkillmelib.DozeHelper
import org.briarproject.mailbox.R
import org.briarproject.mailbox.android.MailboxService import org.briarproject.mailbox.android.MailboxService
import org.briarproject.mailbox.android.QrCodeUtils import org.briarproject.mailbox.android.QrCodeUtils
import org.briarproject.mailbox.core.lifecycle.LifecycleManager import org.briarproject.mailbox.core.lifecycle.LifecycleManager
...@@ -78,9 +79,16 @@ class MailboxViewModel @Inject constructor( ...@@ -78,9 +79,16 @@ class MailboxViewModel @Inject constructor(
val setupState = combine( val setupState = combine(
lifecycleState, torPluginState, setupManager.setupComplete lifecycleState, torPluginState, setupManager.setupComplete
) { ls, ts, sc -> ) { ls, ts, sc ->
val resources = getApplication<Application>().resources
when { when {
ls != LifecycleState.RUNNING -> Starting(ls.name) ls != LifecycleState.RUNNING -> Starting(
ts != TorPlugin.State.PUBLISHED -> Starting(ts.name + " TOR") resources.getString(R.string.startup_starting_services)
)
ts != TorPlugin.State.PUBLISHED -> when {
ts < TorPlugin.State.ACTIVE ->
Starting(resources.getString(R.string.startup_starting_tor))
else -> Starting(resources.getString(R.string.startup_publishing_onion_service))
}
sc == SetupComplete.FALSE -> { sc == SetupComplete.FALSE -> {
val dm = Resources.getSystem().displayMetrics val dm = Resources.getSystem().displayMetrics
val size = min(dm.widthPixels, dm.heightPixels) val size = min(dm.widthPixels, dm.heightPixels)
......
...@@ -28,4 +28,8 @@ ...@@ -28,4 +28,8 @@
<string name="link_title">Link via QR code</string> <string name="link_title">Link via QR code</string>
<string name="link_description">Scan this QR code with Briar</string> <string name="link_description">Scan this QR code with Briar</string>
<string name="link_cancel">Cancel Setup</string> <string name="link_cancel">Cancel Setup</string>
<string name="startup_starting_services">Starting services</string>
<string name="startup_starting_tor">Starting Tor</string>
<string name="startup_publishing_onion_service">Publishing onion service</string>
</resources> </resources>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment