From 28d2697e38a4904d5ffe8f0a26e20ac414b9fb64 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Tue, 9 Mar 2021 11:47:11 +0100 Subject: [PATCH] add custodian names to Existing backup fragment --- .../socialbackup/ExistingBackupFragment.java | 20 ++++++++++++++++--- .../res/layout/fragment_existing_backup.xml | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) 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 index 6d73801fa..9a36b16fa 100644 --- 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 @@ -7,17 +7,22 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import org.briarproject.bramble.api.identity.Author; 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 java.util.ArrayList; +import java.util.List; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; public class ExistingBackupFragment extends BaseFragment { private static final String THRESHOLD = "threshold"; + private static final String CUSTODIANS = "custodians"; public static final String TAG = ExistingBackupFragment.class.getName(); private TextView textViewBackupMetadata; @@ -25,7 +30,12 @@ public class ExistingBackupFragment extends BaseFragment { public static ExistingBackupFragment newInstance( BackupMetadata backupMetadata) { Bundle bundle = new Bundle(); -// backupMetadata.getCustodians(); + List custodians = backupMetadata.getCustodians(); + ArrayList custodianNames = new ArrayList(); + for (Author custodian : custodians) { + custodianNames.add(custodian.getName()); + } + bundle.putStringArrayList(CUSTODIANS, custodianNames); bundle.putInt(THRESHOLD, backupMetadata.getThreshold()); ExistingBackupFragment fragment = new ExistingBackupFragment(); fragment.setArguments(bundle); @@ -45,9 +55,13 @@ public class ExistingBackupFragment extends BaseFragment { View view = inflater.inflate(R.layout.fragment_existing_backup, container, false); Bundle args = requireArguments(); - + ArrayList custodianNames = args.getStringArrayList(CUSTODIANS); + String custodianNamesString = ""; + for (String custodianName : custodianNames) { + custodianNamesString += custodianName + " "; + } textViewBackupMetadata = view.findViewById(R.id.textViewBackupMetadata); - textViewBackupMetadata.setText(String.format("Threshold is %d", args.getInt(THRESHOLD))); + textViewBackupMetadata.setText(String.format("Threshold is %d", args.getInt(THRESHOLD)) + custodianNamesString); return view; } diff --git a/briar-android/src/main/res/layout/fragment_existing_backup.xml b/briar-android/src/main/res/layout/fragment_existing_backup.xml index b6572d0d5..f706570bc 100644 --- a/briar-android/src/main/res/layout/fragment_existing_backup.xml +++ b/briar-android/src/main/res/layout/fragment_existing_backup.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:gravity="center" android:text="@string/backup_done_info" - android:textSize="30sp" + android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent"