From 705de814298c0b2e38545855d2487e1a0dbd4e6e Mon Sep 17 00:00:00 2001 From: ameba23 Date: Tue, 8 Feb 2022 09:54:38 +0100 Subject: [PATCH] Delete old shards sent fragment --- .../android/activity/ActivityComponent.java | 3 - .../socialbackup/ShardsSentFragment.java | 74 ------------------- .../SocialBackupSetupActivity.java | 17 +---- .../main/res/layout/fragment_shards_sent.xml | 50 ------------- 4 files changed, 2 insertions(+), 142 deletions(-) delete mode 100644 briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentFragment.java delete mode 100644 briar-android/src/main/res/layout/fragment_shards_sent.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 7dfa743ff..5b8887e3a 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 @@ -92,7 +92,6 @@ import org.briarproject.briar.android.socialbackup.recover.OwnerRecoveryModeExpl import org.briarproject.briar.android.socialbackup.recover.OwnerRecoveryModeMainFragment; import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardActivity; import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardFragment; -import org.briarproject.briar.android.socialbackup.ShardsSentFragment; import org.briarproject.briar.android.socialbackup.ThresholdSelectorFragment; import org.briarproject.briar.android.socialbackup.creation.CreateBackupModule; import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardSuccessFragment; @@ -277,8 +276,6 @@ public interface ActivityComponent { void inject(CustodianSelectorFragment custodianSelectorFragment); - void inject(ShardsSentFragment shardsSentFragment); - void inject(OwnerRecoveryModeExplainerFragment ownerRecoveryModeExplainerFragment); void inject(ExistingBackupFragment existingBackupFragment); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentFragment.java deleted file mode 100644 index c6ad906d6..000000000 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentFragment.java +++ /dev/null @@ -1,74 +0,0 @@ -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 org.briarproject.briar.R; -import org.briarproject.briar.android.activity.ActivityComponent; -import org.briarproject.briar.android.fragment.BaseFragment; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; - -public class ShardsSentFragment extends BaseFragment { - - public static final String TAG = ShardsSentFragment.class.getName(); - - interface ShardsSentDismissedListener { - - @UiThread - void shardsSentDismissed(); - - } - - protected ShardsSentDismissedListener listener; - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - requireActivity().setTitle(R.string.title_distributed_backup); - } - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, - @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_shards_sent, - container, false); - - Button button = view.findViewById(R.id.button); - button.setOnClickListener(e -> { - listener.shardsSentDismissed(); - }); - - return view; - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - listener = (ShardsSentDismissedListener) context; - } - - - @Override - public String getUniqueTag() { - return TAG; - } - - @Override - public void injectFragment(ActivityComponent component) { - component.inject(this); - } - - public void onBackPressed() { - listener.shardsSentDismissed(); - } - -} diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupActivity.java index 5847482ba..0c616cb88 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/SocialBackupSetupActivity.java @@ -4,29 +4,21 @@ import android.os.Bundle; import android.widget.Toast; import org.briarproject.bramble.api.contact.ContactId; -import org.briarproject.bramble.api.contact.ContactManager; -import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; 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 org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardViewModel; -import org.briarproject.briar.api.socialbackup.BackupMetadata; -import org.briarproject.briar.api.socialbackup.SocialBackup; -import org.briarproject.briar.api.socialbackup.SocialBackupManager; import java.util.Collection; -import java.util.List; import javax.inject.Inject; import androidx.lifecycle.ViewModelProvider; public class SocialBackupSetupActivity extends BriarActivity implements - BaseFragment.BaseFragmentListener, ContactSelectorListener, - ShardsSentFragment.ShardsSentDismissedListener { + BaseFragment.BaseFragmentListener, ContactSelectorListener { private SocialBackupSetupViewModel viewModel; @@ -69,7 +61,7 @@ public class SocialBackupSetupActivity extends BriarActivity implements } private void onStateChanged(SocialBackupSetupViewModel.State state) { - switch(state) { + switch (state) { case SUCCESS: finish(); break; @@ -98,9 +90,4 @@ public class SocialBackupSetupActivity extends BriarActivity implements showNextFragment(fragment); } - @Override - public void shardsSentDismissed() { - finish(); - } - } diff --git a/briar-android/src/main/res/layout/fragment_shards_sent.xml b/briar-android/src/main/res/layout/fragment_shards_sent.xml deleted file mode 100644 index 06be9a80a..000000000 --- a/briar-android/src/main/res/layout/fragment_shards_sent.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - -