Remove original custodian return shard success fragment

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

@@ -86,7 +86,6 @@ import org.briarproject.briar.android.socialbackup.ExistingBackupFragment;
 import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardActivity;
 import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardErrorFragment;
 import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardFragment;
-import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardSuccessFragment;
 import org.briarproject.briar.android.socialbackup.recover.OwnerRecoveryModeErrorFragment;
 import org.briarproject.briar.android.socialbackup.recover.OwnerRecoveryModeExplainerFragment;
 import org.briarproject.briar.android.socialbackup.recover.OwnerRecoveryModeMainFragment;
@@ -286,8 +285,6 @@ public interface ActivityComponent {
 
 	void inject(OwnerReturnShardFragment ownerReturnShardFragment);
 
-	void inject(CustodianReturnShardSuccessFragment custodianReturnShardSuccessFragment);
-
 	void inject(RestoreAccountSetPasswordFragment restoreAccountSetPasswordFragment);
 
 	void inject(RestoreAccountDozeFragment restoreAccountDozeFragment);

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

@@ -1,59 +0,0 @@
-package org.briarproject.briar.android.socialbackup.recover;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-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.fragment.BaseFragment;
-
-import javax.inject.Inject;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.ViewModelProvider;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public class CustodianReturnShardSuccessFragment extends
-		BaseFragment {
-
-	public static final String TAG =
-			CustodianReturnShardFragment.class.getName();
-
-	@Inject
-	ViewModelProvider.Factory viewModelFactory;
-
-	private CustodianReturnShardViewModel viewModel;
-
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
-				.get(CustodianReturnShardViewModel.class);
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_recovery_custodian_done,
-				container, false);
-
-		Button button = view.findViewById(R.id.button);
-		button.setOnClickListener(e -> viewModel.onSuccessDismissed());
-
-		return view;
-	}
-
-	@Override
-	public String getUniqueTag() {
-		return TAG;
-	}
-}

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

@@ -44,13 +44,6 @@ public class OwnerReturnShardActivity extends BaseActivity
 
 	private OwnerReturnShardViewModel viewModel;
 
-//	private final ActivityResultLauncher<String[]> permissionLauncher =
-//			registerForActivityResult(
-//					new ActivityResultContracts.RequestMultiplePermissions(),
-//					r ->
-//							permissionManager.onRequestPermissionResult(r,
-//									viewModel::showQrCodeFragmentIfAllowed));
-
 	@Override
 	public void injectActivity(ActivityComponent component) {
 		component.inject(this);
@@ -154,7 +147,8 @@ public class OwnerReturnShardActivity extends BaseActivity
 						"WARNING: Mismatched backup piece!",
 						Toast.LENGTH_LONG).show();
 			}
-			boolean added = (result != RestoreAccount.AddReturnShardPayloadResult.DUPLICATE) ? true : false;
+			boolean added = result !=
+					RestoreAccount.AddReturnShardPayloadResult.DUPLICATE;
 			Toast.makeText(this,
 					"Success - got backup piece" + (added ? "" : " duplicate"),
 					Toast.LENGTH_SHORT).show();

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

@@ -27,7 +27,6 @@ import androidx.lifecycle.ViewModelProvider;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
 import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.widget.LinearLayout.HORIZONTAL;
 
@@ -158,5 +157,4 @@ public class OwnerReturnShardFragment extends BaseFragment
 	protected void finish() {
 		requireActivity().getSupportFragmentManager().popBackStack();
 	}
-
 }

briar-android/src/main/res/layout/fragment_recovery_custodian_done.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	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">
-
-	<Button
-		android:id="@+id/button"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="32dp"
-		android:text="@string/ok"
-		android:textSize="24sp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textView2" />
-
-	<TextView
-		android:id="@+id/textView2"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="16dp"
-		android:gravity="center"
-		android:text="@string/custodian_shard_sent"
-		android:textSize="30sp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageView2" />
-
-	<ImageView
-		android:id="@+id/imageView2"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_marginStart="32dp"
-		android:layout_marginLeft="32dp"
-		android:layout_marginTop="8dp"
-		android:layout_marginEnd="32dp"
-		android:layout_marginRight="32dp"
-		app:layout_constraintDimensionRatio="1:1"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:srcCompat="@drawable/ic_baseline_done_outline_24" />
-</androidx.constraintlayout.widget.ConstraintLayout>