From 45fa12c0b385be5053eeb72be05a98b4be555002 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 9 Feb 2023 13:10:02 -0300 Subject: [PATCH] Show mailbox version issues before connection failures --- .../mailbox/MailboxStatusFragment.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java index 6f3db3e58..86510c4e8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java @@ -145,19 +145,7 @@ public class MailboxStatusFragment extends Fragment { @DrawableRes int iconRes; String title; String message = null; - if (status.hasProblem(System.currentTimeMillis())) { - tintRes = R.color.briar_red_500; - title = getString(R.string.mailbox_status_failure_title); - iconRes = R.drawable.alerts_and_states_error; - showUnlinkWarning = false; - wizardButton.setVisibility(VISIBLE); - } else if (status.getAttemptsSinceSuccess() > 0) { - iconRes = R.drawable.ic_help_outline_white; - title = getString(R.string.mailbox_status_problem_title); - tintRes = R.color.briar_orange_500; - showUnlinkWarning = false; - wizardButton.setVisibility(VISIBLE); - } else if (status.getMailboxCompatibility() < 0) { + if (status.getMailboxCompatibility() < 0) { tintRes = R.color.briar_red_500; if (status.getMailboxCompatibility() == API_CLIENT_TOO_OLD) { title = getString(R.string.mailbox_status_app_too_old_title); @@ -172,6 +160,18 @@ public class MailboxStatusFragment extends Fragment { iconRes = R.drawable.alerts_and_states_error; showUnlinkWarning = true; wizardButton.setVisibility(GONE); + } else if (status.hasProblem(System.currentTimeMillis())) { + tintRes = R.color.briar_red_500; + title = getString(R.string.mailbox_status_failure_title); + iconRes = R.drawable.alerts_and_states_error; + showUnlinkWarning = false; + wizardButton.setVisibility(VISIBLE); + } else if (status.getAttemptsSinceSuccess() > 0) { + iconRes = R.drawable.ic_help_outline_white; + title = getString(R.string.mailbox_status_problem_title); + tintRes = R.color.briar_orange_500; + showUnlinkWarning = false; + wizardButton.setVisibility(VISIBLE); } else { iconRes = R.drawable.ic_check_circle_outline; title = getString(R.string.mailbox_status_connected_title);