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

Keep used keywords

This commit is contained in:
M66B 2018-11-29 14:00:46 +01:00
parent f96f6cae91
commit e9d9278129
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
@ -872,7 +873,8 @@ public class ServiceSynchronize extends LifecycleService {
db.folder().setFolderState(folder.id, "connected");
db.folder().setFolderError(folder.id, null);
db.folder().setFolderKeywords(folder.id, DB.Converters.fromStringArray(ifolder.getPermanentFlags().getUserFlags()));
updateKeywords(db, folder, ifolder.getPermanentFlags().getUserFlags());
Log.i(Helper.TAG, account.name + " folder " + folder.name + " flags=" + ifolder.getPermanentFlags());
@ -1314,6 +1316,17 @@ public class ServiceSynchronize extends LifecycleService {
}
}
private void updateKeywords(DB db, EntityFolder folder, String[] merge) {
List<String> keywords = new ArrayList<>(Arrays.asList(folder.keywords));
for (String keyword : merge)
if (!keywords.contains(keyword))
keywords.add(keyword);
Collections.sort(keywords);
db.folder().setFolderKeywords(folder.id, DB.Converters.fromStringArray(keywords.toArray(new String[0])));
}
private void processOperations(EntityFolder folder, Session isession, IMAPStore istore, IMAPFolder ifolder, ServiceState state) throws MessagingException, JSONException, IOException {
synchronized (lock) {
try {
@ -1511,6 +1524,10 @@ public class ServiceSynchronize extends LifecycleService {
} else
keywords.remove(keyword);
db.message().setMessageKeywords(message.id, DB.Converters.fromStringArray(keywords.toArray(new String[0])));
if (!set)
keywords.add(keyword);
updateKeywords(db, folder, keywords.toArray(new String[0]));
}
private void doAdd(EntityFolder folder, Session isession, IMAPFolder ifolder, EntityMessage message, JSONArray jargs, DB db) throws MessagingException, JSONException, IOException {