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

Simplification

This commit is contained in:
M66B 2022-01-04 13:13:08 +01:00
parent afa6ac887b
commit a0a6ae2681
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,9 +406,10 @@ public class EntityOperation {
} else if (DELETE.equals(name)) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean perform_expunge = prefs.getBoolean("perform_expunge", true);
if (perform_expunge)
db.message().setMessageUiHide(message.id, true);
else {
if (perform_expunge) {
message.ui_hide = true;
db.message().setMessageUiHide(message.id, message.ui_hide);
} else {
message.ui_deleted = !message.ui_deleted;
db.message().setMessageUiDeleted(message.id, message.ui_deleted);
}

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

@ -943,8 +943,6 @@ public class EntityRule {
private boolean onActionDelete(Context context, EntityMessage message, JSONObject jargs) {
EntityOperation.queue(context, message, EntityOperation.DELETE);
message.ui_hide = true;
return true;
}