diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
index 49b126217..50e70e1a2 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
@@ -42,6 +42,7 @@ import org.briarproject.briar.android.privategroup.list.GroupListModule;
import org.briarproject.briar.android.reporting.DevReportModule;
import org.briarproject.briar.android.settings.SettingsModule;
import org.briarproject.briar.android.sharing.SharingModule;
+import org.briarproject.briar.android.socialbackup.SocialBackupSetupModule;
import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardModule;
import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardModule;
import org.briarproject.briar.android.test.TestAvatarCreatorImpl;
@@ -94,7 +95,8 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
GroupConversationModule.class,
SharingModule.class,
OwnerReturnShardModule.class,
- CustodianReturnShardModule.class
+ CustodianReturnShardModule.class,
+ SocialBackupSetupModule.class
})
public class AppModule {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupModule.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupModule.java
new file mode 100644
index 000000000..7d7f8f7b2
--- /dev/null
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupModule.java
@@ -0,0 +1,20 @@
+package org.briarproject.briar.android.socialbackup;
+
+import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardViewModel;
+import org.briarproject.briar.android.viewmodel.ViewModelKey;
+
+import androidx.lifecycle.ViewModel;
+import dagger.Binds;
+import dagger.Module;
+import dagger.multibindings.IntoMap;
+
+@Module
+public abstract class SocialBackupSetupModule {
+
+ @Binds
+ @IntoMap
+ @ViewModelKey(SocialBackupSetupViewModel.class)
+ abstract ViewModel bindSocialBackupSetupViewModel(
+ SocialBackupSetupViewModel socialBackupSetupViewModel);
+
+}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ThresholdDefinedListener.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ThresholdDefinedListener.java
deleted file mode 100644
index ee99b999a..000000000
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ThresholdDefinedListener.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import org.briarproject.bramble.api.db.DbException;
-
-import androidx.annotation.UiThread;
-
-public interface ThresholdDefinedListener {
-
- @UiThread
- void thresholdDefined(int threshold) throws DbException;
-
-}
\ No newline at end of file
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ThresholdSelectorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ThresholdSelectorFragment.java
index c152f7773..954cd1784 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ThresholdSelectorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ThresholdSelectorFragment.java
@@ -11,7 +11,6 @@ import android.view.ViewGroup;
import android.widget.SeekBar;
import android.widget.TextView;
-import org.briarproject.bramble.api.db.DbException;
import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.fragment.BaseFragment;
@@ -28,8 +27,6 @@ public class ThresholdSelectorFragment extends BaseFragment {
public static final String TAG = ThresholdSelectorFragment.class.getName();
private static final String NUMBER_CUSTODIANS = "numberCustodians";
- protected ThresholdDefinedListener listener;
-
private int numberOfCustodians;
private int threshold;
private int recommendedThreshold;
@@ -109,7 +106,6 @@ public class ThresholdSelectorFragment extends BaseFragment {
@Override
public void onAttach(Context context) {
super.onAttach(context);
- listener = (ThresholdDefinedListener) context;
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianRecoveryModeExplainerFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianRecoveryModeExplainerFragment.java
index 49df13ebf..9cd889fd4 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianRecoveryModeExplainerFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianRecoveryModeExplainerFragment.java
@@ -32,11 +32,6 @@ public class CustodianRecoveryModeExplainerFragment extends BaseFragment {
viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
.get(CustodianReturnShardViewModel.class);
}
-// @Override
-// public void onCreate(@Nullable Bundle savedInstanceState) {
-// super.onCreate(savedInstanceState);
-// requireActivity().setTitle(R.string.title_help_recover);
-// }
@Nullable
@Override
diff --git a/briar-android/src/main/res/layout/fragment_social_backup_setup_explainer.xml b/briar-android/src/main/res/layout/fragment_social_backup_setup_explainer.xml
index 914c808ca..181b6a991 100644
--- a/briar-android/src/main/res/layout/fragment_social_backup_setup_explainer.xml
+++ b/briar-android/src/main/res/layout/fragment_social_backup_setup_explainer.xml
@@ -1,6 +1,60 @@
+xmlns:app="http://schemas.android.com/apk/res-auto"
+xmlns:tools="http://schemas.android.com/tools"
+android:id="@+id/linearLayout"
+android:layout_width="match_parent"
+android:layout_height="match_parent"
+android:paddingLeft="@dimen/margin_large"
+android:paddingTop="@dimen/margin_medium"
+android:paddingRight="@dimen/margin_large"
+android:paddingBottom="@dimen/margin_medium"
+tools:ignore="VectorDrawableCompat"
+tools:showIn="@layout/activity_preview_recovery_custodian1">
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index c124efcab..49ac3e11f 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -671,6 +671,9 @@
Backup created 1/6/2020
+ setup social backup
+ choose some trusted contacts
+
You need to meet your trusted contacts in-person to receive pieces