From 26a35b3212f92975035880ae8020cda32a6f4895 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Tue, 27 Apr 2021 13:07:45 +0200 Subject: [PATCH] Dont use onBackPressed when retrying after error --- .../android/socialbackup/recover/OwnerReturnShardActivity.java | 2 +- .../briar/socialbackup/recovery/ReturnShardIntegrationTest.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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 ac88c52ac..298334408 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 @@ -81,7 +81,7 @@ public class OwnerReturnShardActivity extends BaseActivity if (success) onSuccessDismissed(); }); viewModel.getErrorTryAgain().observeEvent(this, tryAgain -> { - if (tryAgain) onBackPressed(); + if (tryAgain) showNextFragment(new OwnerRecoveryModeMainFragment()); }); viewModel.getState() .observe(this, this::onReturnShardStateChanged); diff --git a/briar-core/src/test/java/org/briarproject/briar/socialbackup/recovery/ReturnShardIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/socialbackup/recovery/ReturnShardIntegrationTest.java index 0fc17af5a..09d7e86cc 100644 --- a/briar-core/src/test/java/org/briarproject/briar/socialbackup/recovery/ReturnShardIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/socialbackup/recovery/ReturnShardIntegrationTest.java @@ -22,7 +22,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import static junit.framework.TestCase.fail; import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory; import static org.briarproject.bramble.test.TestUtils.getTestDirectory; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class ReturnShardIntegrationTest extends BrambleTestCase {