Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-24 00:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Dont use onBackPressed when retrying after error

Browse Source
This commit is contained in:
ameba23
2021-04-27 13:07:45 +02:00
parent 68f135adad
commit 26a35b3212
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java
View File

@@ -81,7 +81,7 @@ public class OwnerReturnShardActivity extends BaseActivity
if (success) onSuccessDismissed(); if (success) onSuccessDismissed();
}); });
viewModel.getErrorTryAgain().observeEvent(this, tryAgain -> { viewModel.getErrorTryAgain().observeEvent(this, tryAgain -> {
if (tryAgain) onBackPressed(); if (tryAgain) showNextFragment(new OwnerRecoveryModeMainFragment());
}); });
viewModel.getState() viewModel.getState()
.observe(this, this::onReturnShardStateChanged); .observe(this, this::onReturnShardStateChanged);

1
briar-core/src/test/java/org/briarproject/briar/socialbackup/recovery/ReturnShardIntegrationTest.java
View File

@@ -22,7 +22,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static junit.framework.TestCase.fail; import static junit.framework.TestCase.fail;
import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory; import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
import static org.briarproject.bramble.test.TestUtils.getTestDirectory; import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
public class ReturnShardIntegrationTest extends BrambleTestCase { public class ReturnShardIntegrationTest extends BrambleTestCase {