Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed notification race condition

Browse Source
This commit is contained in:
M66B
2019-09-18 21:36:10 +02:00
parent a233a1c9a4
commit ebf783e159
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2083,8 +2083,11 @@ class Core {
if (message.notifying != 0) {
long id = message.id * message.notifying;
if (!groupNotifying.get(group).contains(id))
if (!groupNotifying.get(group).contains(id) &&
!groupNotifying.get(group).contains(-id)) {
Log.i("Notify database=" + id);
groupNotifying.get(group).add(id);
}
}
if (!(message.ui_seen || message.ui_ignored || message.ui_hide != 0)) {
@@ -2143,7 +2146,7 @@ class Core {
for (Long id : remove) {
String tag = "unseen." + group + "." + Math.abs(id);
Log.i("Notify cancel tag=" + tag);
Log.i("Notify cancel tag=" + tag + " id=" + id);
nm.cancel(tag, 1);
groupNotifying.get(group).remove(id);
@@ -2154,7 +2157,7 @@ class Core {
long id = notification.extras.getLong("id", 0);
if ((id == 0 && add.size() + remove.size() > 0) || add.contains(id)) {
String tag = "unseen." + group + "." + Math.abs(id);
Log.i("Notifying tag=" + tag +
Log.i("Notifying tag=" + tag + " id=" + id +
(Build.VERSION.SDK_INT < Build.VERSION_CODES.O ? "" : " channel=" + notification.getChannelId()));
nm.notify(tag, 1, notification);

4
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@@ -169,13 +169,13 @@ public class ServiceSynchronize extends ServiceBase {
if (tag != null && tag.startsWith("unseen.")) {
String[] p = tag.split(("\\."));
long group = Long.parseLong(p[1]);
long id = Long.parseLong(p[2]);
long id = sbn.getNotification().extras.getLong("id", 0);
if (!groupNotifying.containsKey(group))
groupNotifying.put(group, new ArrayList<>());
if (id > 0) {
Log.i("Notify restore " + tag);
Log.i("Notify restore " + tag + " id=" + id);
groupNotifying.get(group).add(id);
}
}