mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Ignore new messages notifications for disabled notification channels

This commit is contained in:
M66B 2023-11-05 11:23:56 +01:00
parent 187101b1ee
commit 653c04b82d
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5525,6 +5525,8 @@ class Core {
for (long group : data.groupNotifying.keySet())
groupMessages.put(group, new ArrayList<>());
Map<String, Boolean> channelIdDisabled = new HashMap<>();
// Current
for (TupleMessageEx message : messages) {
if (message.notifying == EntityMessage.NOTIFYING_IGNORE) {
@ -5534,14 +5536,36 @@ class Core {
// Check if notification channel enabled
if (message.notifying == 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && pro) {
String channelId = message.getNotificationChannelId();
if (channelId != null) {
NotificationChannel channel = nm.getNotificationChannel(channelId);
if (channel != null && channel.getImportance() == NotificationManager.IMPORTANCE_NONE) {
db.message().setMessageUiIgnored(message.id, true);
Log.i("Notify disabled=" + message.id + " channel=" + channelId);
continue;
}
String mChannelId = message.getNotificationChannelId();
if (mChannelId != null && !channelIdDisabled.containsKey(mChannelId)) {
NotificationChannel channel = nm.getNotificationChannel(mChannelId);
channelIdDisabled.put(mChannelId,
channel != null && channel.getImportance() == NotificationManager.IMPORTANCE_NONE);
}
String fChannelId = EntityFolder.getNotificationChannelId(message.folder);
if (!channelIdDisabled.containsKey(fChannelId)) {
NotificationChannel channel = nm.getNotificationChannel(fChannelId);
channelIdDisabled.put(fChannelId,
channel != null && channel.getImportance() == NotificationManager.IMPORTANCE_NONE);
}
String aChannelId = EntityAccount.getNotificationChannelId(message.account);
if (!channelIdDisabled.containsKey(aChannelId)) {
NotificationChannel channel = nm.getNotificationChannel(aChannelId);
channelIdDisabled.put(aChannelId,
channel != null && channel.getImportance() == NotificationManager.IMPORTANCE_NONE);
}
if (Boolean.TRUE.equals(channelIdDisabled.get(aChannelId)) ||
Boolean.TRUE.equals(channelIdDisabled.get(fChannelId)) ||
(mChannelId != null && Boolean.TRUE.equals(channelIdDisabled.get(mChannelId)))) {
db.message().setMessageUiIgnored(message.id, true);
Log.i("Notify disabled=" + message.id +
" " + aChannelId + "=" + channelIdDisabled.get(aChannelId) +
" " + mChannelId + "=" + channelIdDisabled.get(fChannelId) +
" " + aChannelId + "=" + channelIdDisabled.get(mChannelId));
continue;
}
}