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

d880b14e

Commit d880b14e authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '1134-old-qr-code-error' into 'master'

Show an error fragment when an unsupported QR code is scanned

Closes #1134

See merge request akwizgran/briar!675

parents f88c68ef 9cce0d8e

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java 9 additions, 0 deletions

...briarproject/bramble/api/UnsupportedVersionException.java
bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java 4 additions, 1 deletion

.../briarproject/bramble/keyagreement/PayloadParserImpl.java
briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java 1 addition, 1 deletion

...org/briarproject/briar/android/fragment/BaseFragment.java
briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java 65 additions, 0 deletions

...rg/briarproject/briar/android/fragment/ErrorFragment.java
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java 9 additions, 1 deletion

...roject/briar/android/keyagreement/ShowQrCodeFragment.java
briar-android/src/main/res/drawable/alerts_and_states_error.xml 8 additions, 4 deletions

...android/src/main/res/drawable/alerts_and_states_error.xml
briar-android/src/main/res/layout/fragment_error.xml 51 additions, 0 deletions

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

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

with 149 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