msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Refactoring

Browse Source
pull/152/head
M66B 6 years ago
parent 782c786169
commit 1bfc7f02a8
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File

29
app/src/main/java/eu/faircode/email/Core.java
Unescape View File

@ -792,7 +792,7 @@ class Core {
} }
} }
static void onSynchronizeMessages( private static void onSynchronizeMessages(
Context context, JSONArray jargs, Context context, JSONArray jargs,
EntityAccount account, final EntityFolder folder, EntityAccount account, final EntityFolder folder,
IMAPFolder ifolder, State state) throws JSONException, MessagingException, IOException { IMAPFolder ifolder, State state) throws JSONException, MessagingException, IOException {
@ -1437,43 +1437,40 @@ class Core {
List<Notification> notifications = getNotificationUnseen( List<Notification> notifications = getNotificationUnseen(
context, account, accountName.get(account), accountMessages.get(account)); context, account, accountName.get(account), accountMessages.get(account));
List<Long> all = new ArrayList<>(); List<Long> add = new ArrayList<>();
List<Long> added = new ArrayList<>(); List<Long> remove = notifying.get(account);
List<Long> removed = notifying.get(account);
for (Notification notification : notifications) { for (Notification notification : notifications) {
Long id = notification.extras.getLong("id", 0); Long id = notification.extras.getLong("id", 0);
if (id != 0) { if (id != 0) {
all.add(id); if (remove.contains(id)) {
if (removed.contains(id)) { remove.remove(id);
removed.remove(id); Log.i("Notify existing=" + id);
Log.i("Notify removing=" + id);
} else { } else {
removed.remove(-id); remove.remove(-id);
added.add(id); add.add(id);
Log.i("Notify adding=" + id); Log.i("Notify adding=" + id);
} }
} }
} }
int headers = 0; int headers = 0;
for (Long id : added) for (Long id : add)
if (id < 0) if (id < 0)
headers++; headers++;
Log.i("Notify account=" + account + Log.i("Notify account=" + account + " count=" + notifications.size() +
" count=" + notifications.size() + " all=" + all.size() + " added=" + add.size() + " removed=" + remove.size() + " headers=" + headers);
" added=" + added.size() + " removed=" + removed.size() + " headers=" + headers);
if (notifications.size() == 0 || if (notifications.size() == 0 ||
(Build.VERSION.SDK_INT < Build.VERSION_CODES.O && headers > 0)) (Build.VERSION.SDK_INT < Build.VERSION_CODES.O && headers > 0))
nm.cancel("unseen:" + account + ":0", 1); nm.cancel("unseen:" + account + ":0", 1);
for (Long id : removed) for (Long id : remove)
nm.cancel("unseen:" + account + ":" + Math.abs(id), 1); nm.cancel("unseen:" + account + ":" + Math.abs(id), 1);
for (Notification notification : notifications) { for (Notification notification : notifications) {
long id = notification.extras.getLong("id", 0); long id = notification.extras.getLong("id", 0);
if ((id == 0 && added.size() + removed.size() > 0) || added.contains(id)) if ((id == 0 && add.size() + remove.size() > 0) || add.contains(id))
nm.notify("unseen:" + account + ":" + Math.abs(id), 1, notification); nm.notify("unseen:" + account + ":" + Math.abs(id), 1, notification);
} }
} }

Write Preview
Loading…
Cancel
Save