From 1edfdaeaf08f6e8d6c917bf0316bfa072247cd39 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Wed, 9 Feb 2022 11:57:06 +0100 Subject: [PATCH] Remove original custodian return shard success fragment --- .../android/activity/ActivityComponent.java | 3 - .../CustodianReturnShardSuccessFragment.java | 59 ------------------- .../recover/OwnerReturnShardActivity.java | 10 +--- .../recover/OwnerReturnShardFragment.java | 2 - .../fragment_recovery_custodian_done.xml | 50 ---------------- 5 files changed, 2 insertions(+), 122 deletions(-) delete mode 100644 briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardSuccessFragment.java delete mode 100644 briar-android/src/main/res/layout/fragment_recovery_custodian_done.xml diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java index 5b8887e3a..7e6141508 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java +++ b/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); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardSuccessFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardSuccessFragment.java deleted file mode 100644 index b058d1bb7..000000000 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardSuccessFragment.java +++ /dev/null @@ -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; - } -} diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java index 3ea98fcc4..fc38b9a2a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java +++ b/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 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(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java index d66043907..b2bc2297d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java +++ b/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(); } - } diff --git a/briar-android/src/main/res/layout/fragment_recovery_custodian_done.xml b/briar-android/src/main/res/layout/fragment_recovery_custodian_done.xml deleted file mode 100644 index 8daec3c6b..000000000 --- a/briar-android/src/main/res/layout/fragment_recovery_custodian_done.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - -