|
|
@ -714,13 +714,17 @@ class Core {
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
|
|
|
|
|
|
|
|
if (!set && label.equals(folder.name)) {
|
|
|
|
if (!set && label.equals(folder.name)) {
|
|
|
|
if (TextUtils.isEmpty(message.msgid))
|
|
|
|
if (TextUtils.isEmpty(message.msgid)) {
|
|
|
|
throw new IllegalArgumentException("label/msgid");
|
|
|
|
Log.w("label/msgid");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Prevent deleting message
|
|
|
|
// Prevent deleting message
|
|
|
|
EntityFolder archive = db.folder().getFolderByType(message.account, EntityFolder.ARCHIVE);
|
|
|
|
EntityFolder archive = db.folder().getFolderByType(message.account, EntityFolder.ARCHIVE);
|
|
|
|
if (archive == null)
|
|
|
|
if (archive == null) {
|
|
|
|
throw new IllegalArgumentException("label/archive");
|
|
|
|
Log.w("label/archive");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Message[] imessages;
|
|
|
|
Message[] imessages;
|
|
|
|
Folder iarchive = istore.getFolder(archive.name);
|
|
|
|
Folder iarchive = istore.getFolder(archive.name);
|
|
|
@ -740,8 +744,10 @@ class Core {
|
|
|
|
} catch (MessagingException ex) {
|
|
|
|
} catch (MessagingException ex) {
|
|
|
|
Log.w(ex);
|
|
|
|
Log.w(ex);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else {
|
|
|
|
throw new IllegalArgumentException("label/delete folder=" + folder.name);
|
|
|
|
Log.w("label/delete folder=" + folder.name);
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
Message imessage = ifolder.getMessageByUID(message.uid);
|
|
|
|
Message imessage = ifolder.getMessageByUID(message.uid);
|
|
|
|