Refactoring

pull/194/merge
M66B 4 years ago
parent 6234c43de4
commit 75fcc16c8b

@ -395,7 +395,12 @@ class Core {
Log.w(folder.name + " ignored=" + op.name); Log.w(folder.name + " ignored=" + op.name);
} }
else { else {
List<EntityMessage> messages = new ArrayList<>();
messages.add(message);
if (similar.size() == 0)
ensureUid(context, account, folder, message, op, (IMAPFolder) ifolder); ensureUid(context, account, folder, message, op, (IMAPFolder) ifolder);
else
messages.addAll(similar.values());
switch (op.name) { switch (op.name) {
case EntityOperation.SEEN: case EntityOperation.SEEN:
@ -422,13 +427,9 @@ class Core {
onAdd(context, jargs, account, folder, message, (IMAPStore) istore, (IMAPFolder) ifolder, state); onAdd(context, jargs, account, folder, message, (IMAPStore) istore, (IMAPFolder) ifolder, state);
break; break;
case EntityOperation.MOVE: { case EntityOperation.MOVE:
List<EntityMessage> messages = new ArrayList<>();
messages.add(message);
messages.addAll(similar.values());
onMove(context, jargs, false, account, folder, messages, (IMAPStore) istore, (IMAPFolder) ifolder, state); onMove(context, jargs, false, account, folder, messages, (IMAPStore) istore, (IMAPFolder) ifolder, state);
break; break;
}
case EntityOperation.COPY: case EntityOperation.COPY:
onMove(context, jargs, true, account, folder, Arrays.asList(message), (IMAPStore) istore, (IMAPFolder) ifolder, state); onMove(context, jargs, true, account, folder, Arrays.asList(message), (IMAPStore) istore, (IMAPFolder) ifolder, state);
@ -438,13 +439,9 @@ class Core {
onFetch(context, jargs, folder, (IMAPStore) istore, (IMAPFolder) ifolder, state); onFetch(context, jargs, folder, (IMAPStore) istore, (IMAPFolder) ifolder, state);
break; break;
case EntityOperation.DELETE: { case EntityOperation.DELETE:
List<EntityMessage> messages = new ArrayList<>();
messages.add(message);
messages.addAll(similar.values());
onDelete(context, jargs, account, folder, messages, (IMAPFolder) ifolder); onDelete(context, jargs, account, folder, messages, (IMAPFolder) ifolder);
break; break;
}
case EntityOperation.HEADERS: case EntityOperation.HEADERS:
onHeaders(context, jargs, folder, message, (IMAPFolder) ifolder); onHeaders(context, jargs, folder, message, (IMAPFolder) ifolder);

Loading…
Cancel
Save