From 8e4b309a12dd0327bd0c7d218deeb4d30de91a8d Mon Sep 17 00:00:00 2001 From: ameba23 Date: Tue, 9 Mar 2021 11:33:33 +0100 Subject: [PATCH] Existing backup fragment --- .../android/activity/ActivityComponent.java | 3 + .../DistributedBackupActivity.java | 3 +- .../socialbackup/ExistingBackupFragment.java | 71 +++++++++++++++++++ .../res/layout/fragment_existing_backup.xml | 27 +++++++ 4 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ExistingBackupFragment.java create mode 100644 briar-android/src/main/res/layout/fragment_existing_backup.xml diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java index 63ce7f935..836452a60 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java @@ -81,6 +81,7 @@ import org.briarproject.briar.android.sharing.SharingModule; //import org.briarproject.briar.android.socialbackup.CustodianDisplayFragment; import org.briarproject.briar.android.socialbackup.CustodianSelectorFragment; import org.briarproject.briar.android.socialbackup.DistributedBackupActivity; +import org.briarproject.briar.android.socialbackup.ExistingBackupFragment; import org.briarproject.briar.android.socialbackup.OldDistributedBackupActivity; import org.briarproject.briar.android.socialbackup.ShardsSentFragment; import org.briarproject.briar.android.socialbackup.ThresholdSelectorFragment; @@ -260,5 +261,7 @@ public interface ActivityComponent { void inject(ShardsSentFragment shardsSentFragment); + void inject(ExistingBackupFragment existingBackupFragment); + void inject(OldDistributedBackupActivity oldDistributedBackupActivity); } 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 04ff0aa8a..a061c5d4a 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 @@ -53,8 +53,7 @@ public class DistributedBackupActivity extends BriarActivity implements CustodianSelectorFragment.newInstance(); showInitialFragment(fragment); } else { - // TODO make a fragment to display the backup metadata - ShardsSentFragment fragment = new ShardsSentFragment(); + ExistingBackupFragment fragment = ExistingBackupFragment.newInstance(backupMetadata); showInitialFragment(fragment); } }); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ExistingBackupFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ExistingBackupFragment.java new file mode 100644 index 000000000..6d73801fa --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ExistingBackupFragment.java @@ -0,0 +1,71 @@ +package org.briarproject.briar.android.socialbackup; + +import android.content.Context; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import org.briarproject.briar.R; +import org.briarproject.briar.android.activity.ActivityComponent; +import org.briarproject.briar.android.fragment.BaseFragment; +import org.briarproject.briar.api.socialbackup.BackupMetadata; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +public class ExistingBackupFragment extends BaseFragment { + + private static final String THRESHOLD = "threshold"; + public static final String TAG = ExistingBackupFragment.class.getName(); + private TextView textViewBackupMetadata; + + + public static ExistingBackupFragment newInstance( + BackupMetadata backupMetadata) { + Bundle bundle = new Bundle(); +// backupMetadata.getCustodians(); + bundle.putInt(THRESHOLD, backupMetadata.getThreshold()); + ExistingBackupFragment fragment = new ExistingBackupFragment(); + fragment.setArguments(bundle); + return fragment; + } + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + requireActivity().setTitle(R.string.title_distributed_backup); + + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable + ViewGroup container, @Nullable Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_existing_backup, + container, false); + Bundle args = requireArguments(); + + textViewBackupMetadata = view.findViewById(R.id.textViewBackupMetadata); + textViewBackupMetadata.setText(String.format("Threshold is %d", args.getInt(THRESHOLD))); + return view; + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); +// listener = (ShardsSentDismissedListener) context; + } + + + @Override + public String getUniqueTag() { + return TAG; + } + + @Override + public void injectFragment(ActivityComponent component) { + component.inject(this); + } + +} diff --git a/briar-android/src/main/res/layout/fragment_existing_backup.xml b/briar-android/src/main/res/layout/fragment_existing_backup.xml new file mode 100644 index 000000000..b6572d0d5 --- /dev/null +++ b/briar-android/src/main/res/layout/fragment_existing_backup.xml @@ -0,0 +1,27 @@ + + + + + \ No newline at end of file