Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
briar
Briar Mailbox
Commits
62fd6388
Verified
Commit
62fd6388
authored
Jun 20, 2022
by
Sebastian
Browse files
Address review feedback
parent
8cfb05d1
Pipeline
#11293
passed with stage
in 6 minutes and 24 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt
View file @
62fd6388
...
...
@@ -174,7 +174,7 @@ class MailboxService : Service() {
startActivity
(
this
)
}
LOG
.
info
(
"Exiting"
)
exitProcess
(
0
)
exitProcess
(
1
)
}
}
}
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/StartupFailureActivity.kt
View file @
62fd6388
...
...
@@ -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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment