Merge branch 'checked-camera-exceptions' into 'master' (3197dcf9) · 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

3197dcf9

Commit 3197dcf9 authored 7 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch 'checked-camera-exceptions' into 'master'

Throw checked exceptions for camera errors

See merge request !580

parents 35aad409 0d6983b4

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraException.java 14 additions, 0 deletions

...arproject/briar/android/keyagreement/CameraException.java
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraView.java 93 additions, 45 deletions

...g/briarproject/briar/android/keyagreement/CameraView.java
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java 20 additions, 2 deletions

...roject/briar/android/keyagreement/ShowQrCodeFragment.java
briar-android/src/main/res/values/strings.xml 1 addition, 0 deletions

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

with 128 additions and 47 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