From f4d667f50a100a88a0afa6504198c23ea0d890e5 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Thu, 15 Apr 2021 21:25:13 +0200 Subject: [PATCH] give and retrieve shard payload --- .../socialbackup/recover/CustodianReturnShardViewModel.java | 2 +- .../socialbackup/recover/OwnerReturnShardActivity.java | 5 +++-- 2 files changed, 4 insertions(+), 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 0ba6f54d0..4142d6d47 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 @@ -71,7 +71,7 @@ public class CustodianReturnShardViewModel extends AndroidViewModel this.task = task; qrCodeDecoder = new QrCodeDecoder(androidExecutor, ioExecutor, this); task.cancel(); - task.start(this); + task.start(this, "replace this with the shard".getBytes()); } @IoExecutor diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java index 2d82c6e7f..c963ca564 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java @@ -137,12 +137,13 @@ public class OwnerReturnShardActivity extends BaseActivity private void onReturnShardStateChanged(SecretOwnerTask.State state) { if (state instanceof SecretOwnerTask.State.Success) { + byte[] shardPayload = ((SecretOwnerTask.State.Success) state).getRemotePayload(); Toast.makeText(this, - "Success - got shard", + "Success - got shard " + shardPayload.length, Toast.LENGTH_SHORT).show(); finish(); } else if (state instanceof SecretOwnerTask.State.Failure) { - // TODO error screen + // TODO error screen, handle reason Toast.makeText(this, "Shard return failed!", Toast.LENGTH_SHORT).show();