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

Added notification log type

Browse Source
This commit is contained in:
M66B
2021-08-16 13:18:24 +02:00
parent 0b3b3e6d2a
commit e1557dc040
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4190,7 +4190,9 @@ class Core {
for (Long id : remove) {
String tag = "unseen." + group + "." + Math.abs(id);
EntityLog.log(context, "Notify cancel tag=" + tag + " id=" + id);
EntityLog.log(context, EntityLog.Type.Notification,
null, null, id == 0 ? null : Math.abs(id),
"Notify cancel tag=" + tag + " id=" + id);
nm.cancel(tag, NotificationHelper.NOTIFICATION_TAGGED);
data.groupNotifying.get(group).remove(id);
@@ -4199,7 +4201,8 @@ class Core {
if (notifications.size() == 0) {
String tag = "unseen." + group + "." + 0;
EntityLog.log(context, "Notify cancel tag=" + tag);
EntityLog.log(context, EntityLog.Type.Notification,
"Notify cancel tag=" + tag);
nm.cancel(tag, NotificationHelper.NOTIFICATION_TAGGED);
}
@@ -4223,12 +4226,14 @@ class Core {
String tag = "unseen." + group + "." + Math.abs(id);
Notification notification = builder.build();
EntityLog.log(context, "Notifying tag=" + tag +
" id=" + id + " group=" + notification.getGroup() +
(Build.VERSION.SDK_INT < Build.VERSION_CODES.O
? " sdk=" + Build.VERSION.SDK_INT
: " channel=" + notification.getChannelId()) +
" sort=" + notification.getSortKey());
EntityLog.log(context, EntityLog.Type.Notification,
null, null, id == 0 ? null : Math.abs(id),
"Notifying tag=" + tag +
" id=" + id + " group=" + notification.getGroup() +
(Build.VERSION.SDK_INT < Build.VERSION_CODES.O
? " sdk=" + Build.VERSION.SDK_INT
: " channel=" + notification.getChannelId()) +
" sort=" + notification.getSortKey());
try {
nm.notify(tag, NotificationHelper.NOTIFICATION_TAGGED, notification);
// https://github.com/leolin310148/ShortcutBadger/wiki/Xiaomi-Device-Support
@@ -5266,7 +5271,8 @@ class Core {
groupNotifying.put(group, new ArrayList<>());
if (id > 0) {
EntityLog.log(context, "Notify restore " + tag + " id=" + id);
EntityLog.log(context, null, null, null, id,
"Notify restore " + tag + " id=" + id);
groupNotifying.get(group).add(id);
}
}

2
app/src/main/java/eu/faircode/email/EntityLog.java
View File

@@ -62,7 +62,7 @@ public class EntityLog {
@NonNull
public String data;
enum Type {General, Statistics, Scheduling, Network, Account, Protocol, Classification}
enum Type {General, Statistics, Scheduling, Network, Account, Protocol, Classification, Notification}
private static final ExecutorService executor =
Helper.getBackgroundExecutor(1, "log");