Fixed finding attachments

pull/156/head
M66B 5 years ago
parent b85f41fbc7
commit a475aac754

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -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 = 83, version = 85,
entities = { entities = {
EntityIdentity.class, EntityIdentity.class,
EntityAccount.class, EntityAccount.class,
@ -818,6 +818,20 @@ public abstract class DB extends RoomDatabase {
db.execSQL("ALTER TABLE `message` ADD COLUMN `color` INTEGER"); db.execSQL("ALTER TABLE `message` ADD COLUMN `color` INTEGER");
} }
}) })
.addMigrations(new Migration(83, 84) {
@Override
public void migrate(SupportSQLiteDatabase db) {
Log.i("DB migration from version " + startVersion + " to " + endVersion);
db.execSQL("UPDATE attachment SET disposition = lower(disposition) WHERE NOT disposition IS NULL");
}
})
.addMigrations(new Migration(84, 85) {
@Override
public void migrate(SupportSQLiteDatabase db) {
Log.i("DB migration from version " + startVersion + " to " + endVersion);
db.execSQL("UPDATE attachment SET size = NULL WHERE size = 0");
}
})
.build(); .build();
} }

@ -986,6 +986,8 @@ public class MessageHelper {
String disposition; String disposition;
try { try {
disposition = part.getDisposition(); disposition = part.getDisposition();
if (disposition != null)
disposition = disposition.toLowerCase();
} catch (MessagingException ex) { } catch (MessagingException ex) {
Log.w(ex); Log.w(ex);
parts.warnings.add(Helper.formatThrowable(ex)); parts.warnings.add(Helper.formatThrowable(ex));
@ -1061,7 +1063,7 @@ public class MessageHelper {
} }
} }
if (apart.attachment.size < 0) if (apart.attachment.size <= 0)
apart.attachment.size = null; apart.attachment.size = null;
// https://tools.ietf.org/html/rfc2392 // https://tools.ietf.org/html/rfc2392

Loading…
Cancel
Save