From 5374a27bff5a63a192afb5da48d786204128c890 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Thu, 24 Feb 2022 13:46:03 +0100 Subject: [PATCH] Delete old remote wipe setup fragment --- .../android/activity/ActivityComponent.java | 4 -- .../remotewipe/RemoteWipeSetupActivity.java | 2 - .../remotewipe/RemoteWipeSuccessFragment.java | 54 ------------------- .../fragment_remote_wipe_setup_success.xml | 50 ----------------- 4 files changed, 110 deletions(-) delete mode 100644 briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSuccessFragment.java delete mode 100644 briar-android/src/main/res/layout/fragment_remote_wipe_setup_success.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 4bb9c0caf..092031d87 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 @@ -67,13 +67,11 @@ import org.briarproject.briar.android.remotewipe.RemoteWipeActivatedActivity; import org.briarproject.briar.android.remotewipe.RemoteWipeDisplayFragment; import org.briarproject.briar.android.remotewipe.RemoteWipeSetupActivity; import org.briarproject.briar.android.remotewipe.RemoteWipeSetupExplainerFragment; -import org.briarproject.briar.android.remotewipe.RemoteWipeSuccessFragment; import org.briarproject.briar.android.remotewipe.WiperSelectorFragment; import org.briarproject.briar.android.remotewipe.activate.ActivateRemoteWipeActivity; import org.briarproject.briar.android.remotewipe.activate.ActivateRemoteWipeExplainerFragment; import org.briarproject.briar.android.remotewipe.activate.ActivateRemoteWipeSuccessFragment; import org.briarproject.briar.android.remotewipe.revoke.RevokeRemoteWipeActivity; -import org.briarproject.briar.android.remotewipe.revoke.RevokeRemoteWipeState; import org.briarproject.briar.android.remotewipe.revoke.RevokeRemoteWipeSuccessFragment; import org.briarproject.briar.android.reporting.CrashFragment; import org.briarproject.briar.android.reporting.CrashReportActivity; @@ -319,8 +317,6 @@ public interface ActivityComponent { void inject(RemoteWipeDisplayFragment remoteWipeDisplayFragment); - void inject(RemoteWipeSuccessFragment remoteWipeSuccessFragment); - void inject(ActivateRemoteWipeExplainerFragment activateRemoteWipeExplainerFragment); void inject(ActivateRemoteWipeSuccessFragment activateRemoteWipeSuccessFragment); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java index d0e73a6c9..6bc917593 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSetupActivity.java @@ -60,8 +60,6 @@ public class RemoteWipeSetupActivity extends BriarActivity implements } private void onStateChanged(RemoteWipeSetupState state) { -// if (state.equals(RemoteWipeSetupState.SUCCESS)) { -// showNextFragment(new RemoteWipeSuccessFragment()); if (state.equals(RemoteWipeSetupState.FAILED)) { Toast.makeText(this, R.string.remote_wipe_setup_failed, diff --git a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSuccessFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSuccessFragment.java deleted file mode 100644 index e6a1db096..000000000 --- a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeSuccessFragment.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.briarproject.briar.android.remotewipe; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; - -import org.briarproject.briar.R; -import org.briarproject.briar.android.activity.ActivityComponent; -import org.briarproject.briar.android.fragment.BaseFragment; -import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardViewModel; - -import javax.inject.Inject; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.lifecycle.ViewModelProvider; - -public class RemoteWipeSuccessFragment extends BaseFragment { - - public static final String TAG = RemoteWipeSuccessFragment.class.getName(); - - @Inject - ViewModelProvider.Factory viewModelFactory; - - private RemoteWipeSetupViewModel viewModel; - - @Override - public void injectFragment(ActivityComponent component) { - component.inject(this); - viewModel = new ViewModelProvider(requireActivity(), viewModelFactory) - .get(RemoteWipeSetupViewModel.class); - } - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, - @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_remote_wipe_setup_success, - 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/res/layout/fragment_remote_wipe_setup_success.xml b/briar-android/src/main/res/layout/fragment_remote_wipe_setup_success.xml deleted file mode 100644 index 107ff1bfa..000000000 --- a/briar-android/src/main/res/layout/fragment_remote_wipe_setup_success.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - -