mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-19 13:48:58 +00:00
Code Issues Releases Wiki Activity

Collect keywords

Browse source
This commit is contained in:
M66B 2018-11-29 16:15:03 +01:00
parent e9d9278129
commit fa90cf96b6
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View file

@ -874,8 +874,6 @@ public class ServiceSynchronize extends LifecycleService {
db.folder().setFolderState(folder.id, "connected"); db.folder().setFolderState(folder.id, "connected");
db.folder().setFolderError(folder.id, null); db.folder().setFolderError(folder.id, null);
updateKeywords(db, folder, ifolder.getPermanentFlags().getUserFlags());
Log.i(Helper.TAG, account.name + " folder " + folder.name + " flags=" + ifolder.getPermanentFlags()); Log.i(Helper.TAG, account.name + " folder " + folder.name + " flags=" + ifolder.getPermanentFlags());
// Synchronize folder // Synchronize folder
@ -1316,17 +1314,6 @@ 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 { private void processOperations(EntityFolder folder, Session isession, IMAPStore istore, IMAPFolder ifolder, ServiceState state) throws MessagingException, JSONException, IOException {
synchronized (lock) { synchronized (lock) {
try { try {
@ -1524,10 +1511,6 @@ public class ServiceSynchronize extends LifecycleService {
} else } else
keywords.remove(keyword); keywords.remove(keyword);
db.message().setMessageKeywords(message.id, DB.Converters.fromStringArray(keywords.toArray(new String[0]))); 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 { private void doAdd(EntityFolder folder, Session isession, IMAPFolder ifolder, EntityMessage message, JSONArray jargs, DB db) throws MessagingException, JSONException, IOException {
@ -2193,6 +2176,19 @@ public class ServiceSynchronize extends LifecycleService {
db.message().updateMessage(message); db.message().updateMessage(message);
} }
List<String> fkeywords = new ArrayList<>(Arrays.asList(folder.keywords));
for (String keyword : keywords)
if (!fkeywords.contains(keyword)) {
Log.i(Helper.TAG, folder.name + " adding keyword=" + keyword);
fkeywords.add(keyword);
}
if (folder.keywords.length != fkeywords.size()) {
Collections.sort(fkeywords);
db.folder().setFolderKeywords(folder.id, DB.Converters.fromStringArray(fkeywords.toArray(new String[0])));
}
return message.id; return message.id;
} }