From 701e51dfc84470f424c5dd5dcdb74be37537ce71 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 20 Mar 2018 11:58:40 +0000
Subject: [PATCH] When resetting, restart camera if we've stopped it.
---
.../briar/android/keyagreement/ShowQrCodeFragment.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java
index b738425c31..1088d78afd 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java
@@ -208,6 +208,15 @@ public class ShowQrCodeFragment extends BaseEventFragment
@UiThread
private void reset() {
+ // If we've stopped the camera view, restart it
+ if (gotRemotePayload) {
+ try {
+ cameraView.start(getScreenRotationDegrees());
+ } catch (CameraException e) {
+ logCameraExceptionAndFinish(e);
+ return;
+ }
+ }
statusView.setVisibility(INVISIBLE);
cameraView.setVisibility(VISIBLE);
gotRemotePayload = false;
--
GitLab