fix bugs relating to return shard activity

briar-android/src/main/AndroidManifest.xml

@@ -165,6 +165,15 @@
 				android:value="org.briarproject.briar.android.account.NewOrRecoverActivity" />
 		</activity>
 
+		<activity
+			android:name="org.briarproject.briar.android.socialbackup.recover.ReturnShardActivity"
+			android:label="@string/activity_name_recovery"
+			android:parentActivityName="org.briarproject.briar.android.account.NewOrRecoverActivity">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.account.NewOrRecoverActivity" />
+		</activity>
+
 		<activity
 			android:name="org.briarproject.briar.android.socialbackup.CustodianHelpRecoverActivity"
 			android:label="@string/activity_name_custodian_help_recovery"

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.recover.ReturnShardModule;
 import org.briarproject.briar.android.test.TestAvatarCreatorImpl;
 import org.briarproject.briar.android.viewmodel.ViewModelModule;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
@@ -91,6 +92,7 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		GroupListModule.class,
 		GroupConversationModule.class,
 		SharingModule.class,
+		ReturnShardModule.class
 })
 public class AppModule {
 

briar-android/src/main/java/org/briarproject/briar/android/account/NewOrRecoverActivity.java

@@ -28,6 +28,7 @@ public class NewOrRecoverActivity extends BaseActivity implements
 	public void onCreate(Bundle state) {
 		super.onCreate(state);
 		// fade-in after splash screen instead of default animation
+		// TODO the fade in is not working
 		overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
 		setContentView(R.layout.activity_fragment_container);
 		NewOrRecoverFragment fragment = NewOrRecoverFragment.newInstance();

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerRecoveryModeExplainerFragment.java

@@ -26,24 +26,11 @@ public class OwnerRecoveryModeExplainerFragment extends BaseFragment {
 
 	private ReturnShardViewModel viewModel;
 
-	@Override
+//	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
+//	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+//		super.onCreate(savedInstanceState);
-		requireActivity().setTitle(R.string.title_recovery_mode);
+//		requireActivity().setTitle(R.string.title_recovery_mode);
-	}
+//	}
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_recovery_owner_explainer,
-				container, false);
-		Button button = view.findViewById(R.id.beginButton);
-		button.setOnClickListener(e -> viewModel.onContinueClicked());
-
-		return view;
-	}
 
 	@Override
 	public void injectFragment(ActivityComponent component) {
@@ -53,7 +40,20 @@ public class OwnerRecoveryModeExplainerFragment extends BaseFragment {
 	}
 
 	@Override
-	public String getUniqueTag() {
+	public String getUniqueTag() { return TAG; }
-		return TAG;
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		System.out.println("GOt here *************************************");
+		View view = inflater.inflate(R.layout.fragment_recovery_owner_explainer,
+				container, false);
+		Button button = view.findViewById(R.id.beginButton);
+		button.setOnClickListener(e -> viewModel.onContinueClicked());
+
+		return view;
 	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/ReturnShardActivity.java

@@ -10,7 +10,7 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
-import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.activity.BaseActivity;
 import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactErrorFragment;
 import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactFragment;
 import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactPermissionManager;
@@ -24,25 +24,21 @@ import javax.inject.Inject;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.ViewModelProvider;
 
 import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.widget.Toast.LENGTH_LONG;
-import static java.util.Objects.requireNonNull;
 import static java.util.logging.Logger.getLogger;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public class ReturnShardActivity extends BriarActivity
+public class ReturnShardActivity extends BaseActivity
 		implements BaseFragment.BaseFragmentListener {
 
 	private static final Logger LOG =
-			getLogger(
+			getLogger(ReturnShardActivity.class.getName());
-					org.briarproject.briar.android.contact.add.nearby.AddNearbyContactActivity.class
-							.getName());
 
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
@@ -72,10 +68,8 @@ public class ReturnShardActivity extends BriarActivity
 	@Override
 	public void onCreate(@Nullable Bundle state) {
 		super.onCreate(state);
-		setContentView(R.layout.activity_fragment_container_toolbar);
+
-		Toolbar toolbar = findViewById(R.id.toolbar);
+		setContentView(R.layout.activity_fragment_container);
-		setSupportActionBar(toolbar);
-		requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
 		if (state == null) {
 			showInitialFragment(getExplainerFragment());
 		}
@@ -86,8 +80,6 @@ public class ReturnShardActivity extends BriarActivity
 		viewModel.getShowQrCodeFragment().observeEvent(this, show -> {
 			if (show) showQrCodeFragment();
 		});
-		requireNonNull(getSupportActionBar())
-				.setTitle(R.string.add_contact_title);
 		viewModel.getState()
 				.observe(this, this::onReturnShardStateChanged);
 	}
@@ -235,4 +227,9 @@ public class ReturnShardActivity extends BriarActivity
 		showNextFragment(new AddNearbyContactErrorFragment());
 	}
 
+	@Override
+	@Deprecated
+	public void runOnDbThread(Runnable runnable) {
+		throw new RuntimeException("Don't use this deprecated method here.");
+	}
 }

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/ReturnShardModule.java

@@ -0,0 +1,20 @@
+package org.briarproject.briar.android.socialbackup.recover;
+
+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 ReturnShardModule {
+
+	@Binds
+	@IntoMap
+	@ViewModelKey(ReturnShardViewModel.class)
+	abstract ViewModel bindContactExchangeViewModel(
+			ReturnShardViewModel returnShardViewModel);
+
+}