Verified Commit 62fd6388 authored by Sebastian's avatar Sebastian
Browse files

Address review feedback

parent 8cfb05d1
Pipeline #11293 passed with stage
in 6 minutes and 24 seconds
......@@ -174,7 +174,7 @@ class MailboxService : Service() {
startActivity(this)
}
LOG.info("Exiting")
exitProcess(0)
exitProcess(1)
}
}
}
......@@ -29,6 +29,7 @@ import org.briarproject.mailbox.android.MailboxService.Companion.EXTRA_START_RES
import org.briarproject.mailbox.core.lifecycle.LifecycleManager.StartResult
import org.briarproject.mailbox.core.lifecycle.LifecycleManager.StartResult.LIFECYCLE_REUSE
import org.briarproject.mailbox.core.lifecycle.LifecycleManager.StartResult.SERVICE_ERROR
import org.briarproject.mailbox.core.lifecycle.LifecycleManager.StartResult.SUCCESS
@AndroidEntryPoint
class StartupFailureActivity : AppCompatActivity() {
......@@ -45,7 +46,8 @@ class StartupFailureActivity : AppCompatActivity() {
val errorRes = when (i.getSerializableExtra(EXTRA_START_RESULT) as StartResult) {
SERVICE_ERROR -> R.string.startup_failed_service_error
LIFECYCLE_REUSE -> R.string.startup_failed_lifecycle_reuse
else -> throw IllegalArgumentException()
// It is an error if SUCCESS gets passed as an extra from MailboxService
SUCCESS -> throw IllegalArgumentException()
}
val msg: TextView = findViewById(R.id.errorMessage)
msg.text = getString(errorRes)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment