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

Notification delete with expunge off

This commit is contained in:
M66B 2022-01-12 19:21:57 +01:00
parent fa8e8ee011
commit c2a56ab69b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4859,6 +4859,7 @@ class Core {
boolean light = prefs.getBoolean("light", false);
String sound = prefs.getString("sound", null);
boolean alert_once = prefs.getBoolean("alert_once", true);
boolean perform_expunge = prefs.getBoolean("perform_expunge", true);
// Get contact info
Map<Long, Address[]> messageFrom = new HashMap<>();
@ -5138,6 +5139,7 @@ class Core {
List<NotificationCompat.Action> wactions = new ArrayList<>();
if (notify_trash &&
perform_expunge &&
message.accountProtocol == EntityAccount.TYPE_IMAP &&
db.folder().getFolderByType(message.account, EntityFolder.TRASH) != null) {
Intent trash = new Intent(context, ServiceUI.class)
@ -5158,8 +5160,8 @@ class Core {
}
if (notify_trash &&
message.accountProtocol == EntityAccount.TYPE_POP &&
message.accountLeaveDeleted) {
((message.accountProtocol == EntityAccount.TYPE_POP && message.accountLeaveDeleted) ||
(message.accountProtocol == EntityAccount.TYPE_IMAP && !perform_expunge))) {
Intent delete = new Intent(context, ServiceUI.class)
.setAction("delete:" + message.id)
.putExtra("group", group);

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

@ -412,6 +412,10 @@ public class EntityOperation {
} else {
message.ui_deleted = !message.ui_deleted;
db.message().setMessageUiDeleted(message.id, message.ui_deleted);
if (message.ui_deleted) {
message.ui_ignored = true;
db.message().setMessageUiIgnored(message.id, message.ui_ignored);
}
}
/*
if (message.hash != null) {