Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-08 18:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show send errors in message lists

Browse Source
This commit is contained in:
M66B
2021-07-03 15:13:20 +02:00
parent fe07b6f954
commit db2128dcd3
3 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -314,6 +314,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private int colorPrimary;
private int colorAccent;
private int colorSeparator;
private int colorWarning;
private long primary;
private boolean connected;
@@ -431,6 +433,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
colorPrimary = Helper.resolveColor(getContext(), R.attr.colorPrimary);
colorAccent = Helper.resolveColor(getContext(), R.attr.colorAccent);
colorSeparator = Helper.resolveColor(getContext(), R.attr.colorSeparator);
colorWarning = Helper.resolveColor(getContext(), R.attr.colorWarning);
if (criteria == null)
if (thread == null) {
@@ -3998,16 +4002,26 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
break;
}
if (send_pending &&
(viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER))
db.message().liveOutboxPending().observe(getViewLifecycleOwner(), new Observer<Integer>() {
if (!EntityFolder.OUTBOX.equals(type) &&
(viewType == AdapterMessage.ViewType.UNIFIED ||
viewType == AdapterMessage.ViewType.FOLDER))
db.message().liveOutboxPending().observe(getViewLifecycleOwner(), new Observer<TupleOutboxStats>() {
@Override
public void onChanged(Integer pending) {
if (pending != null && pending > 10)
public void onChanged(TupleOutboxStats stats) {
int pending = (stats == null || stats.pending == null ? 0 : stats.pending);
int errors = (stats == null || stats.errors == null ? 0 : stats.errors);
int count = (send_pending ? pending : errors);
if (count > 10)
tvOutboxCount.setText("+");
else
tvOutboxCount.setText(pending == null || pending == 0 ? null : NF.format(pending));
grpOutbox.setVisibility(pending == null || pending == 0 ? View.GONE : View.VISIBLE);
tvOutboxCount.setText(count == 0 ? null : NF.format(count));
int color = (errors == 0 ? colorSeparator : colorWarning);
ibOutbox.setImageTintList(ColorStateList.valueOf(color));
tvOutboxCount.setTextColor(color);
grpOutbox.setVisibility(count == 0 ? View.GONE : View.VISIBLE);
}
});