Merge branch '696-npe-key-agreement-task' into 'master'
Fix NPE when stopping KeyAgreementTask, improve thread safety This branch fixes #696 and improves the thread safety of the camera code, mostly by adding @UiThread annotations and occasionally by moving stuff onto the UI thread that might have happened on other threads before. Closes #696 See merge request !345
Showing
- briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java 16 additions, 8 deletions...briarproject/android/keyagreement/ShowQrCodeFragment.java
- briar-android/src/org/briarproject/android/util/PreviewConsumer.java 3 additions, 0 deletions...id/src/org/briarproject/android/util/PreviewConsumer.java
- briar-android/src/org/briarproject/android/util/QrCodeDecoder.java 9 additions, 3 deletions...roid/src/org/briarproject/android/util/QrCodeDecoder.java
- briar-android/src/org/briarproject/android/view/CameraView.java 55 additions, 10 deletions...android/src/org/briarproject/android/view/CameraView.java
- briar-core/src/org/briarproject/keyagreement/KeyAgreementTaskImpl.java 1 addition, 1 deletion...c/org/briarproject/keyagreement/KeyAgreementTaskImpl.java
Loading
Please register or sign in to comment