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

Merge branch 'mailbox-version-mismatch' into 'master'

Browse Source 
Show mailbox version issues before connection failures

See merge request briar/briar!1767
This commit is contained in:
akwizgran
2023-02-10 13:57:36 +00:00
parent 4253bbaaf5 45fa12c0b3
commit 19084d4060
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,19 +145,7 @@ public class MailboxStatusFragment extends Fragment {
@DrawableRes int iconRes; @DrawableRes int iconRes;
String title; String title;
String message = null; String message = null;
if (status.hasProblem(System.currentTimeMillis())) { if (status.getMailboxCompatibility() < 0) {
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) {
tintRes = R.color.briar_red_500; tintRes = R.color.briar_red_500;
if (status.getMailboxCompatibility() == API_CLIENT_TOO_OLD) { if (status.getMailboxCompatibility() == API_CLIENT_TOO_OLD) {
title = getString(R.string.mailbox_status_app_too_old_title); 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; iconRes = R.drawable.alerts_and_states_error;
showUnlinkWarning = true; showUnlinkWarning = true;
wizardButton.setVisibility(GONE); 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 { } else {
iconRes = R.drawable.ic_check_circle_outline; iconRes = R.drawable.ic_check_circle_outline;
title = getString(R.string.mailbox_status_connected_title); title = getString(R.string.mailbox_status_connected_title);