mirror of
https://github.com/M66B/FairEmail.git
synced 2025-03-20 19:05:32 +00:00
Fixed multiple busy messages
This commit is contained in:
M66B
parent
a6377486ba
commit
6b7a3c8b37
3 changed files with 1810 additions and 99 deletions
1699
app/schemas/eu.faircode.email.DB/70.json
Normal file
1699
app/schemas/eu.faircode.email.DB/70.json
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -396,114 +396,119 @@ class Core {
|
||||||
// Add message
|
// Add message
|
||||||
DB db = DB.getInstance(context);
|
DB db = DB.getInstance(context);
|
||||||
|
|
||||||
if (TextUtils.isEmpty(message.msgid))
|
try {
|
||||||
throw new IllegalArgumentException("Message ID missing");
|
if (TextUtils.isEmpty(message.msgid))
|
||||||
|
throw new IllegalArgumentException("Message ID missing");
|
||||||
|
|
||||||
// Delete previous message(s) with same ID
|
// Delete previous message(s) with same ID
|
||||||
if (folder.id.equals(message.folder)) {
|
if (folder.id.equals(message.folder)) {
|
||||||
// Prevent adding/deleting message
|
// Prevent adding/deleting message
|
||||||
db.message().setMessageUid(message.id, -1L);
|
db.message().setMessageUid(message.id, -1L);
|
||||||
|
|
||||||
Message[] ideletes = ifolder.search(new MessageIDTerm(message.msgid));
|
Message[] ideletes = ifolder.search(new MessageIDTerm(message.msgid));
|
||||||
for (Message idelete : ideletes) {
|
for (Message idelete : ideletes) {
|
||||||
long uid = ifolder.getUID(idelete);
|
long uid = ifolder.getUID(idelete);
|
||||||
Log.i(folder.name + " deleting previous uid=" + uid + " msgid=" + message.msgid);
|
Log.i(folder.name + " deleting previous uid=" + uid + " msgid=" + message.msgid);
|
||||||
try {
|
try {
|
||||||
idelete.setFlag(Flags.Flag.DELETED, true);
|
idelete.setFlag(Flags.Flag.DELETED, true);
|
||||||
} catch (MessageRemovedException ignored) {
|
} catch (MessageRemovedException ignored) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
ifolder.expunge();
|
||||||
}
|
}
|
||||||
ifolder.expunge();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get message
|
// Get message
|
||||||
MimeMessage imessage;
|
MimeMessage imessage;
|
||||||
if (folder.id.equals(message.folder)) {
|
if (folder.id.equals(message.folder)) {
|
||||||
// Pre flight checks
|
// Pre flight checks
|
||||||
if (!message.content)
|
if (!message.content)
|
||||||
throw new IllegalArgumentException("Message body missing");
|
throw new IllegalArgumentException("Message body missing");
|
||||||
|
|
||||||
EntityIdentity identity =
|
EntityIdentity identity =
|
||||||
(message.identity == null ? null : db.identity().getIdentity(message.identity));
|
(message.identity == null ? null : db.identity().getIdentity(message.identity));
|
||||||
|
|
||||||
imessage = MessageHelper.from(context, message, identity, isession);
|
|
||||||
} else {
|
|
||||||
// Cross account move
|
|
||||||
File file = message.getRawFile(context);
|
|
||||||
if (!file.exists())
|
|
||||||
throw new IllegalArgumentException("raw message file not found");
|
|
||||||
|
|
||||||
Log.i(folder.name + " reading " + file);
|
|
||||||
try (InputStream is = new BufferedInputStream(new FileInputStream(file))) {
|
|
||||||
imessage = new MimeMessage(isession, is);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle auto read
|
|
||||||
boolean autoread = false;
|
|
||||||
if (jargs.length() > 1) {
|
|
||||||
autoread = jargs.getBoolean(1);
|
|
||||||
if (ifolder.getPermanentFlags().contains(Flags.Flag.SEEN)) {
|
|
||||||
if (autoread && !imessage.isSet(Flags.Flag.SEEN)) {
|
|
||||||
Log.i(folder.name + " autoread");
|
|
||||||
imessage.setFlag(Flags.Flag.SEEN, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle draft
|
|
||||||
if (EntityFolder.DRAFTS.equals(folder.type))
|
|
||||||
if (ifolder.getPermanentFlags().contains(Flags.Flag.DRAFT))
|
|
||||||
imessage.setFlag(Flags.Flag.DRAFT, true);
|
|
||||||
|
|
||||||
// Add message
|
|
||||||
long uid = -1;
|
|
||||||
if (istore.hasCapability("UIDPLUS")) {
|
|
||||||
AppendUID[] uids = ifolder.appendUIDMessages(new Message[]{imessage});
|
|
||||||
if (uids != null && uids.length > 0) {
|
|
||||||
Log.i("Appended uid=" + uids[0].uid);
|
|
||||||
uid = uids[0].uid;
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
ifolder.appendMessages(new Message[]{imessage});
|
|
||||||
|
|
||||||
// Lookup uid
|
|
||||||
if (uid <= 0) {
|
|
||||||
Log.i("Searching for appended msgid=" + message.msgid);
|
|
||||||
Message[] messages = ifolder.search(new MessageIDTerm(message.msgid));
|
|
||||||
if (messages != null)
|
|
||||||
for (Message iappended : messages) {
|
|
||||||
long muid = ifolder.getUID(iappended);
|
|
||||||
Log.i("Found appended uid=" + muid);
|
|
||||||
// RFC3501: Unique identifiers are assigned in a strictly ascending fashion
|
|
||||||
if (muid > uid)
|
|
||||||
uid = muid;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (uid <= 0)
|
|
||||||
throw new IllegalArgumentException("uid not found");
|
|
||||||
|
|
||||||
Log.i(folder.name + " appended id=" + message.id + " uid=" + uid);
|
|
||||||
db.message().setMessageUid(message.id, uid);
|
|
||||||
|
|
||||||
if (!folder.id.equals(message.folder))
|
|
||||||
try {
|
|
||||||
db.beginTransaction();
|
|
||||||
|
|
||||||
|
imessage = MessageHelper.from(context, message, identity, isession);
|
||||||
|
} else {
|
||||||
// Cross account move
|
// Cross account move
|
||||||
if (autoread) {
|
File file = message.getRawFile(context);
|
||||||
Log.i(folder.name + " queuing SEEN id=" + message.id);
|
if (!file.exists())
|
||||||
EntityOperation.queue(context, db, message, EntityOperation.SEEN, true);
|
throw new IllegalArgumentException("raw message file not found");
|
||||||
|
|
||||||
|
Log.i(folder.name + " reading " + file);
|
||||||
|
try (InputStream is = new BufferedInputStream(new FileInputStream(file))) {
|
||||||
|
imessage = new MimeMessage(isession, is);
|
||||||
}
|
}
|
||||||
|
|
||||||
Log.i(folder.name + " queuing DELETE id=" + message.id);
|
|
||||||
EntityOperation.queue(context, db, message, EntityOperation.DELETE);
|
|
||||||
|
|
||||||
db.setTransactionSuccessful();
|
|
||||||
} finally {
|
|
||||||
db.endTransaction();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Handle auto read
|
||||||
|
boolean autoread = false;
|
||||||
|
if (jargs.length() > 1) {
|
||||||
|
autoread = jargs.getBoolean(1);
|
||||||
|
if (ifolder.getPermanentFlags().contains(Flags.Flag.SEEN)) {
|
||||||
|
if (autoread && !imessage.isSet(Flags.Flag.SEEN)) {
|
||||||
|
Log.i(folder.name + " autoread");
|
||||||
|
imessage.setFlag(Flags.Flag.SEEN, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle draft
|
||||||
|
if (EntityFolder.DRAFTS.equals(folder.type))
|
||||||
|
if (ifolder.getPermanentFlags().contains(Flags.Flag.DRAFT))
|
||||||
|
imessage.setFlag(Flags.Flag.DRAFT, true);
|
||||||
|
|
||||||
|
// Add message
|
||||||
|
long uid = -1;
|
||||||
|
if (istore.hasCapability("UIDPLUS")) {
|
||||||
|
AppendUID[] uids = ifolder.appendUIDMessages(new Message[]{imessage});
|
||||||
|
if (uids != null && uids.length > 0) {
|
||||||
|
Log.i("Appended uid=" + uids[0].uid);
|
||||||
|
uid = uids[0].uid;
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
ifolder.appendMessages(new Message[]{imessage});
|
||||||
|
|
||||||
|
// Lookup uid
|
||||||
|
if (uid <= 0) {
|
||||||
|
Log.i("Searching for appended msgid=" + message.msgid);
|
||||||
|
Message[] messages = ifolder.search(new MessageIDTerm(message.msgid));
|
||||||
|
if (messages != null)
|
||||||
|
for (Message iappended : messages) {
|
||||||
|
long muid = ifolder.getUID(iappended);
|
||||||
|
Log.i("Found appended uid=" + muid);
|
||||||
|
// RFC3501: Unique identifiers are assigned in a strictly ascending fashion
|
||||||
|
if (muid > uid)
|
||||||
|
uid = muid;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (uid <= 0)
|
||||||
|
throw new IllegalArgumentException("uid not found");
|
||||||
|
|
||||||
|
Log.i(folder.name + " appended id=" + message.id + " uid=" + uid);
|
||||||
|
db.message().setMessageUid(message.id, uid);
|
||||||
|
|
||||||
|
if (!folder.id.equals(message.folder))
|
||||||
|
try {
|
||||||
|
db.beginTransaction();
|
||||||
|
|
||||||
|
// Cross account move
|
||||||
|
if (autoread) {
|
||||||
|
Log.i(folder.name + " queuing SEEN id=" + message.id);
|
||||||
|
EntityOperation.queue(context, db, message, EntityOperation.SEEN, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i(folder.name + " queuing DELETE id=" + message.id);
|
||||||
|
EntityOperation.queue(context, db, message, EntityOperation.DELETE);
|
||||||
|
|
||||||
|
db.setTransactionSuccessful();
|
||||||
|
} finally {
|
||||||
|
db.endTransaction();
|
||||||
|
}
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
db.message().setMessageUid(message.id, null);
|
||||||
|
throw ex;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void onMove(Context context, JSONArray jargs, boolean copy, EntityFolder folder, EntityMessage message, Session isession, IMAPStore istore, IMAPFolder ifolder) throws JSONException, MessagingException, IOException {
|
private static void onMove(Context context, JSONArray jargs, boolean copy, EntityFolder folder, EntityMessage message, Session isession, IMAPStore istore, IMAPFolder ifolder) throws JSONException, MessagingException, IOException {
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory;
|
||||||
// https://developer.android.com/topic/libraries/architecture/room.html
|
// https://developer.android.com/topic/libraries/architecture/room.html
|
||||||
|
|
||||||
@Database(
|
@Database(
|
||||||
version = 69,
|
version = 70,
|
||||||
entities = {
|
entities = {
|
||||||
EntityIdentity.class,
|
EntityIdentity.class,
|
||||||
EntityAccount.class,
|
EntityAccount.class,
|
||||||
|
|
@ -731,6 +731,13 @@ public abstract class DB extends RoomDatabase {
|
||||||
db.execSQL("ALTER TABLE `message` ADD COLUMN `receipt_to` TEXT");
|
db.execSQL("ALTER TABLE `message` ADD COLUMN `receipt_to` TEXT");
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
.addMigrations(new Migration(69, 70) {
|
||||||
|
@Override
|
||||||
|
public void migrate(SupportSQLiteDatabase db) {
|
||||||
|
Log.i("DB migration from version " + startVersion + " to " + endVersion);
|
||||||
|
db.execSQL("UPDATE message SET uid = NULL WHERE uid < 0");
|
||||||
|
}
|
||||||
|
})
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue