From 7b63471205a292a454978fedc9f52387751ba283 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Tue, 15 Jun 2021 16:29:06 +0200 Subject: [PATCH 1/2] Fix bug with qrCodeRead flag --- .../briar/socialbackup/recovery/CustodianTaskImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/briar-core/src/main/java/org/briarproject/briar/socialbackup/recovery/CustodianTaskImpl.java b/briar-core/src/main/java/org/briarproject/briar/socialbackup/recovery/CustodianTaskImpl.java index 70c2bd36e..7a6e5dc4e 100644 --- a/briar-core/src/main/java/org/briarproject/briar/socialbackup/recovery/CustodianTaskImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/socialbackup/recovery/CustodianTaskImpl.java @@ -25,7 +25,6 @@ import static java.util.logging.Logger.getLogger; public class CustodianTaskImpl extends ReturnShardTaskImpl implements CustodianTask { - private boolean cancelled = false; private Observer observer; private final ClientHelper clientHelper; private InetSocketAddress remoteSocketAddress; @@ -54,7 +53,6 @@ public class CustodianTaskImpl extends ReturnShardTaskImpl @Override public void cancel() { - cancelled = true; if (socket != null && !socket.isClosed()) { try { socket.close(); From f524af893d98c8cd8662120b75579be031389b7e Mon Sep 17 00:00:00 2001 From: ameba23 Date: Tue, 15 Jun 2021 16:29:39 +0200 Subject: [PATCH 2/2] Fix bug with qrCodeRead flag --- .../socialbackup/recover/CustodianReturnShardViewModel.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardViewModel.java index d68915362..cad5dd495 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardViewModel.java @@ -127,6 +127,7 @@ public class CustodianReturnShardViewModel extends AndroidViewModel public void onQrCodeDecoded(Result result) { LOG.info("Got result from decoder"); if (qrCodeRead) return; + qrCodeRead = true; try { byte[] payloadBytes = result.getText().getBytes(ISO_8859_1); if (LOG.isLoggable(INFO)) @@ -197,9 +198,6 @@ public class CustodianReturnShardViewModel extends AndroidViewModel public void onStateChanged(CustodianTask.State state) { this.state.postValue(state); // Connecting, SendingShard, ReceivingAck, Success, Failure - if (state instanceof CustodianTask.State.SendingShard) { - qrCodeRead = true; - } } public MutableLiveEvent getErrorTryAgain() {