From 8a1333e8f2078ea9102aa9a0f7725517d806ea01 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Tue, 9 Mar 2021 09:47:48 +0100 Subject: [PATCH] display a different fragment when a backup already exists --- .../DistributedBackupActivity.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java index 42308599d..04ff0aa8a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java @@ -13,6 +13,8 @@ import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.contactselection.ContactSelectorListener; import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.briar.api.socialbackup.BackupMetadata; +import org.briarproject.briar.api.socialbackup.Shard; import org.briarproject.briar.api.socialbackup.SocialBackupManager; import java.util.Collection; @@ -42,13 +44,23 @@ public class DistributedBackupActivity extends BriarActivity implements super.onCreate(savedInstanceState); setContentView(R.layout.activity_distributed_backup); // TODO here we should check if we already have a backup - // BackupMetadata backupMetadata = socialBackupManager.getBackupMetadata(); - // if (backupMetadata == null) { - CustodianSelectorFragment fragment = - CustodianSelectorFragment.newInstance(); - // } else { - // display the backup metadata - showInitialFragment(fragment); + + try { + db.transaction(false, txn -> { + BackupMetadata backupMetadata = socialBackupManager.getBackupMetadata(txn); + if (backupMetadata == null) { + CustodianSelectorFragment fragment = + CustodianSelectorFragment.newInstance(); + showInitialFragment(fragment); + } else { + // TODO make a fragment to display the backup metadata + ShardsSentFragment fragment = new ShardsSentFragment(); + showInitialFragment(fragment); + } + }); + } catch (DbException e) { + e.printStackTrace(); + } } @Override