Merge branch '583-npe-org-briarproject-android-util-qrcodeutils-createqrcode' into 'master'
Fix two crashes when scanning QR codes One crash was two due the `Context` being `null` and the other due to the camera being opened within an `AsyncTask`. Closes #583 See merge request !282
No related branches found
No related tags found
Showing
- briar-android/res/values/strings.xml 1 addition, 0 deletionsbriar-android/res/values/strings.xml
- briar-android/src/org/briarproject/android/BriarFragmentActivity.java 1 addition, 2 deletions...d/src/org/briarproject/android/BriarFragmentActivity.java
- briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java 26 additions, 7 deletions...iarproject/android/keyagreement/KeyAgreementActivity.java
- briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java 23 additions, 41 deletions...briarproject/android/keyagreement/ShowQrCodeFragment.java
- briar-android/src/org/briarproject/android/util/QrCodeUtils.java 3 additions, 4 deletions...ndroid/src/org/briarproject/android/util/QrCodeUtils.java
Loading
Please register or sign in to comment