mirror of https://github.com/M66B/FairEmail.git
Map uidl/msgid
This commit is contained in:
parent
f8c6487940
commit
33800c221b
|
@ -13,8 +13,8 @@ android {
|
||||||
applicationId "eu.faircode.email"
|
applicationId "eu.faircode.email"
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
versionCode 1148
|
versionCode 1149
|
||||||
versionName "1.1148"
|
versionName "1.1149"
|
||||||
archivesBaseName = "FairEmail-v$versionName"
|
archivesBaseName = "FairEmail-v$versionName"
|
||||||
|
|
||||||
// https://en.wikipedia.org/wiki/List_of_dinosaur_genera
|
// https://en.wikipedia.org/wiki/List_of_dinosaur_genera
|
||||||
|
|
|
@ -1529,8 +1529,13 @@ class Core {
|
||||||
|
|
||||||
db.folder().setFolderSyncState(folder.id, "downloading");
|
db.folder().setFolderSyncState(folder.id, "downloading");
|
||||||
|
|
||||||
List<String> uidls = db.message().getUidls(folder.id);
|
List<TupleUidl> ids = db.message().getUidls(folder.id);
|
||||||
Log.i(folder.name + " POP existing=" + uidls.size());
|
Log.i(folder.name + " POP existing=" + ids.size());
|
||||||
|
|
||||||
|
Map<String, TupleUidl> uidls = new HashMap<>();
|
||||||
|
for (TupleUidl id : ids)
|
||||||
|
if (id.uidl != null)
|
||||||
|
uidls.put(id.uidl, id);
|
||||||
|
|
||||||
for (Message imessage : imessages)
|
for (Message imessage : imessages)
|
||||||
try {
|
try {
|
||||||
|
@ -1547,7 +1552,7 @@ class Core {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (uidls.contains(uidl)) {
|
if (uidls.containsKey(uidl)) {
|
||||||
uidls.remove(uidl);
|
uidls.remove(uidl);
|
||||||
Log.i(folder.name + " POP having=" + uidl);
|
Log.i(folder.name + " POP having=" + uidl);
|
||||||
continue;
|
continue;
|
||||||
|
@ -1671,9 +1676,9 @@ class Core {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!account.leave_on_device)
|
if (!account.leave_on_device)
|
||||||
for (String msgid : uidls) {
|
for (TupleUidl id : uidls.values()) {
|
||||||
Log.i(folder.name + " POP deleted=" + msgid);
|
Log.i(folder.name + " POP deleting=" + id.msgid);
|
||||||
db.message().deleteMessage(folder.id, msgid);
|
db.message().deleteMessage(folder.id, id.msgid);
|
||||||
}
|
}
|
||||||
|
|
||||||
Log.i(folder.name + " POP done");
|
Log.i(folder.name + " POP done");
|
||||||
|
|
|
@ -483,9 +483,9 @@ public interface DaoMessage {
|
||||||
" AND NOT uid IS NULL")
|
" AND NOT uid IS NULL")
|
||||||
List<Long> getUids(long folder, Long received);
|
List<Long> getUids(long folder, Long received);
|
||||||
|
|
||||||
@Query("SELECT uidl FROM message" +
|
@Query("SELECT uidl, msgid FROM message" +
|
||||||
" WHERE folder = :folder")
|
" WHERE folder = :folder")
|
||||||
List<String> getUidls(long folder);
|
List<TupleUidl> getUidls(long folder);
|
||||||
|
|
||||||
@Query("SELECT * FROM message" +
|
@Query("SELECT * FROM message" +
|
||||||
" WHERE folder = :folder" +
|
" WHERE folder = :folder" +
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
package eu.faircode.email;
|
||||||
|
|
||||||
|
/*
|
||||||
|
This file is part of FairEmail.
|
||||||
|
|
||||||
|
FairEmail is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
FairEmail is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with FairEmail. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Copyright 2018-2020 by Marcel Bokhorst (M66B)
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class TupleUidl {
|
||||||
|
String uidl;
|
||||||
|
String msgid;
|
||||||
|
}
|
Loading…
Reference in New Issue