msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Fixed multiple busy messages

Browse Source
pull/155/head
M66B 5 years ago
parent a6377486ba
commit 6b7a3c8b37
3 changed files with 1804 additions and 93 deletions
Show Stats Download Patch File Download Diff File

1699
app/schemas/eu.faircode.email.DB/70.json
View File

File diff suppressed because it is too large Load Diff

189
app/src/main/java/eu/faircode/email/Core.java
Unescape View File

@ -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
if (folder.id.equals(message.folder)) { // Delete previous message(s) with same ID
// Prevent adding/deleting message if (folder.id.equals(message.folder)) {
db.message().setMessageUid(message.id, -1L); // Prevent adding/deleting message
db.message().setMessageUid(message.id, -1L);
Message[] ideletes = ifolder.search(new MessageIDTerm(message.msgid));
for (Message idelete : ideletes) { Message[] ideletes = ifolder.search(new MessageIDTerm(message.msgid));
long uid = ifolder.getUID(idelete); for (Message idelete : ideletes) {
Log.i(folder.name + " deleting previous uid=" + uid + " msgid=" + message.msgid); long uid = ifolder.getUID(idelete);
try { Log.i(folder.name + " deleting previous uid=" + uid + " msgid=" + message.msgid);
idelete.setFlag(Flags.Flag.DELETED, true); try {
} catch (MessageRemovedException ignored) { idelete.setFlag(Flags.Flag.DELETED, true);
} 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 =
(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); EntityIdentity identity =
try (InputStream is = new BufferedInputStream(new FileInputStream(file))) { (message.identity == null ? null : db.identity().getIdentity(message.identity));
imessage = new MimeMessage(isession, is);
} 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");
// Handle auto read Log.i(folder.name + " reading " + file);
boolean autoread = false; try (InputStream is = new BufferedInputStream(new FileInputStream(file))) {
if (jargs.length() > 1) { imessage = new MimeMessage(isession, is);
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 // Handle auto read
long uid = -1; boolean autoread = false;
if (istore.hasCapability("UIDPLUS")) { if (jargs.length() > 1) {
AppendUID[] uids = ifolder.appendUIDMessages(new Message[]{imessage}); autoread = jargs.getBoolean(1);
if (uids != null && uids.length > 0) { if (ifolder.getPermanentFlags().contains(Flags.Flag.SEEN)) {
Log.i("Appended uid=" + uids[0].uid); if (autoread && !imessage.isSet(Flags.Flag.SEEN)) {
uid = uids[0].uid; Log.i(folder.name + " autoread");
imessage.setFlag(Flags.Flag.SEEN, true);
}
}
} }
} else
ifolder.appendMessages(new Message[]{imessage}); // Handle draft
if (EntityFolder.DRAFTS.equals(folder.type))
// Lookup uid if (ifolder.getPermanentFlags().contains(Flags.Flag.DRAFT))
if (uid <= 0) { imessage.setFlag(Flags.Flag.DRAFT, true);
Log.i("Searching for appended msgid=" + message.msgid);
Message[] messages = ifolder.search(new MessageIDTerm(message.msgid)); // Add message
if (messages != null) long uid = -1;
for (Message iappended : messages) { if (istore.hasCapability("UIDPLUS")) {
long muid = ifolder.getUID(iappended); AppendUID[] uids = ifolder.appendUIDMessages(new Message[]{imessage});
Log.i("Found appended uid=" + muid); if (uids != null && uids.length > 0) {
// RFC3501: Unique identifiers are assigned in a strictly ascending fashion Log.i("Appended uid=" + uids[0].uid);
if (muid > uid) uid = uids[0].uid;
uid = muid;
} }
} } 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) if (uid <= 0)
throw new IllegalArgumentException("uid not found"); throw new IllegalArgumentException("uid not found");
Log.i(folder.name + " appended id=" + message.id + " uid=" + uid); Log.i(folder.name + " appended id=" + message.id + " uid=" + uid);
db.message().setMessageUid(message.id, uid); db.message().setMessageUid(message.id, uid);
if (!folder.id.equals(message.folder)) if (!folder.id.equals(message.folder))
try { try {
db.beginTransaction(); db.beginTransaction();
// Cross account move // Cross account move
if (autoread) { if (autoread) {
Log.i(folder.name + " queuing SEEN id=" + message.id); Log.i(folder.name + " queuing SEEN id=" + message.id);
EntityOperation.queue(context, db, message, EntityOperation.SEEN, true); EntityOperation.queue(context, db, message, EntityOperation.SEEN, true);
} }
Log.i(folder.name + " queuing DELETE id=" + message.id); Log.i(folder.name + " queuing DELETE id=" + message.id);
EntityOperation.queue(context, db, message, EntityOperation.DELETE); EntityOperation.queue(context, db, message, EntityOperation.DELETE);
db.setTransactionSuccessful(); db.setTransactionSuccessful();
} finally { } finally {
db.endTransaction(); 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 {

9
app/src/main/java/eu/faircode/email/DB.java
Unescape View File

@ -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();
} }

Write Preview
Loading…
Cancel
Save