Merge branch '1177-blank-viewfinder' into 'maintenance-0.16'

Backport: Show viewfinder again after connection fails

See merge request akwizgran/briar!736

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java

@@ -9,6 +9,7 @@ import android.content.IntentFilter;
 import android.os.Bundle;
 import android.support.annotation.UiThread;
 import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog.Builder;
 import android.support.v7.widget.Toolbar;
@@ -206,11 +207,14 @@ public class KeyAgreementActivity extends BriarActivity implements
 
 	private void showQrCodeFragment() {
 		// FIXME #824
-		BaseFragment f = ShowQrCodeFragment.newInstance();
+		FragmentManager fm = getSupportFragmentManager();
-		getSupportFragmentManager().beginTransaction()
+		if (fm.findFragmentByTag(ShowQrCodeFragment.TAG) == null) {
-				.replace(R.id.fragmentContainer, f, f.getUniqueTag())
+			BaseFragment f = ShowQrCodeFragment.newInstance();
-				.addToBackStack(f.getUniqueTag())
+			fm.beginTransaction()
-				.commit();
+					.replace(R.id.fragmentContainer, f, f.getUniqueTag())
+					.addToBackStack(f.getUniqueTag())
+					.commit();
+		}
 	}
 
 	private boolean checkPermissions() {

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java

@@ -65,7 +65,6 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 	@Override
 	public void onPreviewFrame(byte[] data, Camera camera) {
 		if (camera == this.camera) {
-			LOG.info("Got preview frame");
 			try {
 				Size size = camera.getParameters().getPreviewSize();
 				// The preview should be in NV21 format: width * height bytes of
@@ -103,19 +102,12 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 
 		@Override
 		protected Void doInBackground(Void... params) {
-			long now = System.currentTimeMillis();
 			BinaryBitmap bitmap = binarize(data, width, height, orientation);
-			Result result = null;
+			Result result;
 			try {
 				result = reader.decode(bitmap);
-				long duration = System.currentTimeMillis() - now;
-				if (LOG.isLoggable(INFO))
-					LOG.info("Decoding barcode took " + duration + " ms");
 			} catch (ReaderException e) {
 				// No barcode found
-				long duration = System.currentTimeMillis() - now;
-				if (LOG.isLoggable(INFO))
-					LOG.info("No barcode found after " + duration + " ms");
 				return null;
 			} catch (RuntimeException e) {
 				LOG.warning("Invalid preview frame");

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java

@@ -59,7 +59,8 @@ import static java.util.logging.Level.WARNING;
 public class ShowQrCodeFragment extends BaseEventFragment
 		implements QrCodeDecoder.ResultCallback {
 
-	private static final String TAG = ShowQrCodeFragment.class.getName();
+	static final String TAG = ShowQrCodeFragment.class.getName();
+
 	private static final Logger LOG = Logger.getLogger(TAG);
 
 	@Inject
@@ -204,6 +205,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;
@@ -218,12 +228,17 @@ public class ShowQrCodeFragment extends BaseEventFragment
 			if (LOG.isLoggable(INFO))
 				LOG.info("Remote payload is " + encoded.length + " bytes");
 			Payload remotePayload = payloadParser.parse(encoded);
+			gotRemotePayload = true;
+			cameraView.stop();
 			cameraView.setVisibility(INVISIBLE);
 			statusView.setVisibility(VISIBLE);
 			status.setText(R.string.connecting_to_device);
 			task.connectAndRunProtocol(remotePayload);
+		} catch (CameraException e) {
+			logCameraExceptionAndFinish(e);
 		} catch (IOException | IllegalArgumentException e) {
-			// TODO show failure
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, "QR Code Invalid", e);
+			reset();
 			Toast.makeText(getActivity(), R.string.qr_code_invalid,
 					LENGTH_LONG).show();
 		}
@@ -261,6 +276,7 @@ public class ShowQrCodeFragment extends BaseEventFragment
 		new AsyncTask<Void, Void, Bitmap>() {
 
 			@Override
+			@Nullable
 			protected Bitmap doInBackground(Void... params) {
 				byte[] encoded = payloadEncoder.encode(payload);
 				if (LOG.isLoggable(INFO))
@@ -325,13 +341,8 @@ public class ShowQrCodeFragment extends BaseEventFragment
 		runOnUiThreadUnlessDestroyed(() -> {
 			LOG.info("Got result from decoder");
 			// Ignore results until the KeyAgreementTask is ready
-			if (!gotLocalPayload) {
+			if (!gotLocalPayload) return;
-				return;
+			if (!gotRemotePayload) qrCodeScanned(result.getText());
-			}
-			if (!gotRemotePayload) {
-				gotRemotePayload = true;
-				qrCodeScanned(result.getText());
-			}
 		});
 	}