Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-29 21:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show account errors warning

Browse Source
This commit is contained in:
M66B
2022-02-18 21:14:43 +01:00
parent f672fe9977
commit 59f0db8d25
4 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -1380,7 +1380,19 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
fabError.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onMenuFolders(account);
if (Boolean.TRUE.equals(v.getTag())) {
Bundle args = new Bundle();
args.putBoolean("settings", false);
FragmentAccounts fragment = new FragmentAccounts();
fragment.setArguments(args);
FragmentManager fm = getParentFragmentManager();
FragmentTransaction fragmentTransaction = fm.beginTransaction();
fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("unified");
fragmentTransaction.commit();
} else
onMenuFolders(account);
}
});
@@ -5410,18 +5422,25 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
// Get state
int unseen = 0;
boolean errors = false;
boolean refreshing = false;
boolean folderErrors = false;
boolean accountErrors = false;
for (TupleFolderEx folder : folders) {
unseen += folder.unseen;
if (folder.error != null && folder.account != null /* outbox */)
errors = true;
if (folder.sync_state != null &&
!"downloading".equals(folder.sync_state) &&
(folder.account == null ||
"connecting".equals(folder.accountState) ||
"connected".equals(folder.accountState)))
refreshing = true;
if (folder.account != null) { // Outbox
if (folder.error != null)
folderErrors = true;
if (!BuildConfig.PLAY_STORE_RELEASE && folder.accountError != null)
accountErrors = true;
}
}
// Get name
@@ -5448,7 +5467,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
else
setSubtitle(getString(R.string.title_name_count, name, NF.format(unseen)));
if (errors)
fabError.setTag(accountErrors);
if (folderErrors || accountErrors)
fabError.show();
else
fabError.hide();