front end fragments for recovery

briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java

@@ -81,19 +81,17 @@ import org.briarproject.briar.android.sharing.ShareForumActivity;
 import org.briarproject.briar.android.sharing.ShareForumFragment;
 import org.briarproject.briar.android.sharing.SharingModule;
 //import org.briarproject.briar.android.socialbackup.CustodianDisplayFragment;
+import org.briarproject.briar.android.socialbackup.CustodianHelpRecoverActivity;
 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.OwnerRecoveryModeExplainerFragment;
 import org.briarproject.briar.android.socialbackup.RecoverActivity;
 import org.briarproject.briar.android.socialbackup.ShardsSentFragment;
 import org.briarproject.briar.android.socialbackup.ThresholdSelectorFragment;
-import org.briarproject.briar.android.socialbackup.creation.CreateBackupController;
 import org.briarproject.briar.android.socialbackup.creation.CreateBackupModule;
 import org.briarproject.briar.android.splash.SplashScreenActivity;
 import org.briarproject.briar.android.test.TestDataActivity;
-import org.h2.util.New;
 
 import dagger.Component;
 
@@ -200,6 +198,8 @@ public interface ActivityComponent {
 
 	void inject(NewOrRecoverActivity newOrRecoverActivity);
 
+	void inject(CustodianHelpRecoverActivity custodianHelpRecoverActivity);
+
 	// Fragments
 
 	void inject(AuthorNameFragment fragment);
@@ -273,6 +273,4 @@ public interface ActivityComponent {
 	void inject(ExistingBackupFragment existingBackupFragment);
 
 	void inject(NewOrRecoverFragment newOrRecoverFragment);
-
-	void inject(OldDistributedBackupActivity oldDistributedBackupActivity);
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java

@@ -52,6 +52,7 @@ import org.briarproject.briar.android.conversation.ConversationVisitor.TextCache
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
+import org.briarproject.briar.android.socialbackup.CustodianHelpRecoverActivity;
 import org.briarproject.briar.android.util.BriarSnackbarBuilder;
 import org.briarproject.briar.android.view.BriarRecyclerView;
 import org.briarproject.briar.android.view.ImagePreview;
@@ -396,6 +397,12 @@ public class ConversationActivity extends BriarActivity
 			case R.id.action_social_remove_person:
 				askToRemoveContact();
 				return true;
+			case R.id.action_help_recover_account:
+				if (contactId == null) return false;
+				Intent i = new Intent(this, CustodianHelpRecoverActivity.class);
+				i.putExtra(CONTACT_ID, contactId.getInt());
+				startActivity(i);
+				return true;
 			default:
 				return super.onOptionsItemSelected(item);
 		}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/CustodianHelpRecoverActivity.java

@@ -0,0 +1,27 @@
+package org.briarproject.briar.android.socialbackup;
+
+import android.os.Bundle;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+public class CustodianHelpRecoverActivity extends BriarActivity implements
+		BaseFragment.BaseFragmentListener {
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_recover); // TODO change this
+        // TODO check if we have a shard for this secret owner
+		// if not we should not even display the menu item
+		CustodianRecoveryModeExplainerFragment fragment =
+				new CustodianRecoveryModeExplainerFragment();
+		showInitialFragment(fragment);
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/CustodianRecoveryModeExplainerFragment.java

@@ -0,0 +1,40 @@
+package org.briarproject.briar.android.socialbackup;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import org.briarproject.briar.R;
+
+public class CustodianRecoveryModeExplainerFragment extends BaseFragment {
+
+	public static final String TAG = CustodianRecoveryModeExplainerFragment.class.getName();
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		requireActivity().setTitle(R.string.title_help_recover);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable
+			ViewGroup container, @Nullable Bundle savedInstanceState) {
+		View view = inflater.inflate(R.layout.fragment_recovery_custodian_explainer,
+				container, false);
+
+		return view;
+	}
+
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+}
+

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/OldDistributedBackupActivity.java

@@ -1,39 +0,0 @@
-package org.briarproject.briar.android.socialbackup;
-
-import android.os.Bundle;
-import android.widget.Toast;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.briar.R;
-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 java.util.Collection;
-
-public class OldDistributedBackupActivity extends BriarActivity
-		implements BaseFragment.BaseFragmentListener, ContactSelectorListener {
-
-	@Override
-	public void injectActivity(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_distributed_backup);
-
-//		CustodianDisplayFragment fragment =
-//				CustodianDisplayFragment.newInstance();
-//
-//		showInitialFragment(fragment);
-	}
-
-	@Override
-	public void contactsSelected(Collection<ContactId> contacts) {
-		// do nothing
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/OwnerRecoveryModeMainFragment.java

@@ -0,0 +1,73 @@
+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.Button;
+import android.widget.TextView;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class OwnerRecoveryModeMainFragment extends BaseFragment {
+
+	protected ScanQrButtonListener listener;
+
+	public static final String NUM_RECOVERED = "num_recovered";
+
+	public static final String TAG =
+			OwnerRecoveryModeMainFragment.class.getName();
+
+	public static OwnerRecoveryModeMainFragment newInstance(int numRecovered) {
+		Bundle args = new Bundle();
+		args.putInt(NUM_RECOVERED, numRecovered);
+		OwnerRecoveryModeMainFragment fragment =
+				new OwnerRecoveryModeMainFragment();
+		fragment.setArguments(args);
+		return fragment;
+	}
+
+	private int numShards;
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		requireActivity().setTitle(R.string.title_recovery_mode);
+
+		Bundle args = requireArguments();
+		numShards = args.getInt(NUM_RECOVERED);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		View view = inflater.inflate(R.layout.fragment_recovery_owner_main,
+				container, false);
+
+		TextView textViewCount = view.findViewById(R.id.textViewShardCount);
+		textViewCount.setText(String.format("%d", numShards));
+
+		Button button = view.findViewById(R.id.button);
+		button.setOnClickListener(e -> listener.scanQrButtonClicked());
+		return view;
+	}
+
+	@Override
+	public void onAttach(Context context) {
+		super.onAttach(context);
+		listener = (ScanQrButtonListener) context;
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/RecoverActivity.java

@@ -6,18 +6,31 @@ import android.widget.Toast;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BaseActivity;
-import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.fragment.BaseFragment;
 
 public class RecoverActivity extends BaseActivity implements
-		BaseFragment.BaseFragmentListener, ExplainerDismissedListener {
+		BaseFragment.BaseFragmentListener, ExplainerDismissedListener,
+		ScanQrButtonListener {
+
+	private int numRecovered;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_recover);
-		OwnerRecoveryModeExplainerFragment fragment = new OwnerRecoveryModeExplainerFragment();
-		showInitialFragment(fragment);
+
+		numRecovered = 0; // TODO - retrieve this from somewhere
+
+		// only show the explainer if we have no shards
+		if (numRecovered == 0) {
+			OwnerRecoveryModeExplainerFragment fragment =
+					new OwnerRecoveryModeExplainerFragment();
+			showInitialFragment(fragment);
+		} else {
+			OwnerRecoveryModeMainFragment fragment =
+					OwnerRecoveryModeMainFragment.newInstance(numRecovered);
+			showInitialFragment(fragment);
+		}
 	}
 
 	@Override
@@ -26,11 +39,18 @@ public class RecoverActivity extends BaseActivity implements
 	}
 
 	@Override
-	public void explainerDismissed () {
+	public void explainerDismissed() {
+		OwnerRecoveryModeMainFragment fragment =
+				OwnerRecoveryModeMainFragment.newInstance(numRecovered);
+		showNextFragment(fragment);
+	}
+
+	@Override
+	public void scanQrButtonClicked() {
+		// TODO
 		Toast.makeText(this,
 				"coming soon...",
 				Toast.LENGTH_SHORT).show();
-		// TODO go to the next screen in the recover process
 		finish();
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ScanQrButtonListener.java

@@ -0,0 +1,8 @@
+package org.briarproject.briar.android.socialbackup;
+
+import androidx.annotation.UiThread;
+
+public interface ScanQrButtonListener {
+	@UiThread
+	void scanQrButtonClicked();
+}