diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java index ce51c4192..4f8b29ea8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java @@ -21,7 +21,8 @@ import javax.inject.Inject; public class DistributedBackupActivity extends BriarActivity implements BaseFragment.BaseFragmentListener, ContactSelectorListener, - ThresholdDefinedListener, ShardsSentDismissedListener { + ThresholdDefinedListener, + ShardsSentFragment.ShardsSentDismissedListener { private Collection custodians; @@ -73,7 +74,8 @@ public class DistributedBackupActivity extends BriarActivity implements try { db.transaction(false, txn -> { socialBackupManager - .createBackup(txn, (List) custodians, threshold); + .createBackup(txn, (List) custodians, + threshold); ShardsSentFragment fragment = new ShardsSentFragment(); showNextFragment(fragment); }); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentDismissedListener.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentDismissedListener.java deleted file mode 100644 index d7a4e7b36..000000000 --- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ShardsSentDismissedListener.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.briarproject.briar.android.socialbackup; - -import androidx.annotation.UiThread; - -public interface ShardsSentDismissedListener { - - @UiThread - void shardsSentDismissed(); - -} \ No newline at end of file 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 index 79d3d56a5..f450e97a6 100644 --- 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 @@ -13,48 +13,58 @@ 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(); + public static final String TAG = ShardsSentFragment.class.getName(); - protected ShardsSentDismissedListener listener; + interface ShardsSentDismissedListener { - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - requireActivity().setTitle(R.string.title_distributed_backup); - } + @UiThread + void shardsSentDismissed(); - @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(); - }); + protected ShardsSentDismissedListener listener; - return view; - } + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + requireActivity().setTitle(R.string.title_distributed_backup); + } - @Override - public void onAttach(Context context) { - super.onAttach(context); - listener = (ShardsSentDismissedListener) context; - } + @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 String getUniqueTag() { + return TAG; + } - @Override - public void injectFragment(ActivityComponent component) { - component.inject(this); - } + @Override + public void injectFragment(ActivityComponent component) { + component.inject(this); + } }