Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-28 19:56:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

POP support

Browse Source
This commit is contained in:
M66B
2019-02-10 19:22:35 +00:00
parent 5c37918bb9
commit 02696710ae
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1226,12 +1226,15 @@ public class ServiceSynchronize extends LifecycleService {
if (db.operation().getOperationCount(folder.id, null) == 0)
return;
db.folder().setFolderState(folder.id, "connecting");
if (!account.pop || EntityFolder.INBOX.equals(folder.type)) {
db.folder().setFolderState(folder.id, "connecting");
ifolder = istore.getFolder(folder.name);
ifolder.open(Folder.READ_WRITE);
ifolder = istore.getFolder(folder.name);
ifolder.open(Folder.READ_WRITE);
db.folder().setFolderState(folder.id, "connected");
}
db.folder().setFolderState(folder.id, "connected");
db.folder().setFolderError(folder.id, null);
}
@@ -1618,7 +1621,7 @@ public class ServiceSynchronize extends LifecycleService {
if (message.seen.equals(seen))
return;
Log.i("Setting POP message=" + message.id + " seen=" + seen);
Log.i(folder.name + " setting POP message=" + message.id + " seen=" + seen);
db.message().setMessageSeen(message.id, seen);
}
@@ -1905,19 +1908,21 @@ public class ServiceSynchronize extends LifecycleService {
}
private void doDelete(EntityFolder folder, POP3Folder ifolder, EntityMessage message, JSONArray jargs, DB db) throws MessagingException {
Log.i("Deleting POP message=" + message.id + " msgid=" + message.msgid);
Log.i(folder.name + " deleting POP message=" + message.id + " msgid=" + message.msgid);
// Delete message
if (TextUtils.isEmpty(message.msgid))
throw new IllegalArgumentException("Message ID missing");
if (EntityFolder.INBOX.equals(folder.type)) {
// Delete message
if (TextUtils.isEmpty(message.msgid))
throw new IllegalArgumentException("Message ID missing");
Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid));
for (Message imessage : imessages) {
Log.i(folder.name + " deleting uid=" + message.uid + " msgid=" + message.msgid);
imessage.setFlag(Flags.Flag.DELETED, true);
Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid));
for (Message imessage : imessages) {
Log.i(folder.name + " deleting uid=" + message.uid + " msgid=" + message.msgid);
imessage.setFlag(Flags.Flag.DELETED, true);
}
ifolder.close();
ifolder.open(Folder.READ_WRITE);
}
ifolder.close();
ifolder.open(Folder.READ_WRITE);
db.message().deleteMessage(message.id);
}
@@ -2349,6 +2354,12 @@ public class ServiceSynchronize extends LifecycleService {
private void synchronizeMessages(EntityAccount account, final EntityFolder folder, POP3Folder ifolder, JSONArray jargs, ServiceState state) throws JSONException, MessagingException, IOException {
DB db = DB.getInstance(this);
if (!EntityFolder.INBOX.equals(folder.type)) {
db.folder().setFolderSyncState(folder.id, null);
return;
}
try {
db.folder().setFolderSyncState(folder.id, "syncing");