Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Briar Mailbox
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

d61251e4

Commit d61251e4 authored 2 years ago by Sebastian

Downloads
- Plain Diff

Merge branch '187-cancel-start-button' into 'main'

Add cancel button in STARTING state

Closes #187

See merge request !164

parents d3bcd0f2 5ab273ca

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

mailbox-android/src/main/java/org/briarproject/mailbox/android/MailboxService.kt 7 additions, 2 deletions

...n/java/org/briarproject/mailbox/android/MailboxService.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/StatusManager.kt 17 additions, 5 deletions

...in/java/org/briarproject/mailbox/android/StatusManager.kt
mailbox-android/src/main/java/org/briarproject/mailbox/android/ui/StartupFragment.kt 14 additions, 0 deletions

...va/org/briarproject/mailbox/android/ui/StartupFragment.kt
mailbox-android/src/main/res/layout/fragment_startup.xml 14 additions, 0 deletions

mailbox-android/src/main/res/layout/fragment_startup.xml

with 52 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment