Merge branch '720-camera-surface-illegal-state-exception' into 'master'
Don't crash if camera is reopened or surface is recreated This branch fixes the crash is described in #720, which can be reproduced easily by scanning a QR code and failing to connect (for example, scan a screenshot of a QR code from a device that's no longer listening). When the camera view becomes visible again after trying to connect, its surfaceCreated() callback is called again with the same surface. An IllegalStateException added in !340 causes the crash. Closes #720 See merge request !397
Showing
- briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java 3 additions, 43 deletions...briarproject/android/keyagreement/ShowQrCodeFragment.java
- briar-android/src/org/briarproject/android/util/QrCodeDecoder.java 11 additions, 13 deletions...roid/src/org/briarproject/android/util/QrCodeDecoder.java
- briar-android/src/org/briarproject/android/view/CameraView.java 48 additions, 19 deletions...android/src/org/briarproject/android/view/CameraView.java
Loading
Please register or sign in to comment