Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 05:09:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2340-unlink-offline-crash' into 'master'

Browse Source 
Don't crash when offline while unlink dialog gets shown

Closes #2340

See merge request briar/briar!1676
This commit is contained in:
akwizgran
2022-06-22 16:41:26 +00:00
parent 6bfd7bcc4f 28f3ab1310
commit f2f356cbd4
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
View File

@@ -63,6 +63,8 @@ public class MailboxStatusFragment extends Fragment {
private Button wizardButton; private Button wizardButton;
private Button unlinkButton; private Button unlinkButton;
private ProgressBar unlinkProgress; private ProgressBar unlinkProgress;
@Nullable
private AlertDialog dialog = null;
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
@@ -129,6 +131,15 @@ public class MailboxStatusFragment extends Fragment {
refresher = null; refresher = null;
} }
@Override
public void onDetach() {
super.onDetach();
if (dialog != null) {
dialog.dismiss();
dialog = null;
}
}
private void onMailboxStateChanged(MailboxStatus status) { private void onMailboxStateChanged(MailboxStatus status) {
@ColorRes int tintRes; @ColorRes int tintRes;
@DrawableRes int iconRes; @DrawableRes int iconRes;
@@ -216,12 +227,15 @@ public class MailboxStatusFragment extends Fragment {
(dialog, which) -> dialog.cancel()); (dialog, which) -> dialog.cancel());
builder.setNegativeButton(R.string.mailbox_status_unlink_button, builder.setNegativeButton(R.string.mailbox_status_unlink_button,
(dialog, which) -> { (dialog, which) -> {
beginDelayedTransition((ViewGroup) requireView()); ViewGroup v = (ViewGroup) getView();
if (v != null) beginDelayedTransition(v);
unlinkButton.setVisibility(INVISIBLE); unlinkButton.setVisibility(INVISIBLE);
unlinkProgress.setVisibility(VISIBLE); unlinkProgress.setVisibility(VISIBLE);
viewModel.unlink(); viewModel.unlink();
}); });
builder.show(); builder.setOnDismissListener(dialog ->
MailboxStatusFragment.this.dialog = null);
dialog = builder.show();
} }
} }