Merge branch '1136-startup-failure-ux' into 'master' (a8ed8657) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

a8ed8657

Commit a8ed8657 authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '1136-startup-failure-ux' into 'master'

Improve UX for startup failures

Closes #1136

See merge request akwizgran/briar!706

parents 05210257 46406d8d

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java 6 additions, 1 deletion

.../briarproject/bramble/api/lifecycle/LifecycleManager.java
bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java 10 additions, 0 deletions

.../briarproject/bramble/lifecycle/LifecycleManagerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java 29 additions, 8 deletions

...rg/briarproject/briar/android/StartupFailureActivity.java
briar-android/src/main/res/layout/activity_startup_failure.xml 0 additions, 24 deletions

...-android/src/main/res/layout/activity_startup_failure.xml
briar-android/src/main/res/values/strings.xml 4 additions, 2 deletions

briar-android/src/main/res/values/strings.xml

with 49 additions and 35 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