Allow moving onto self when multiple selecting

pull/187/head
M66B 4 years ago
parent 9dc3c92658
commit cbb0ad289e

@ -948,6 +948,9 @@ class Core {
EntityFolder target = db.folder().getFolder(id);
if (target == null)
throw new FolderNotFoundException();
if (folder.id.equals(target.id))
return;
IMAPFolder itarget = (IMAPFolder) istore.getFolder(target.name);
// Get source messages
@ -1105,6 +1108,8 @@ class Core {
EntityFolder target = db.folder().getFolder(id);
if (target == null)
throw new FolderNotFoundException();
if (folder.id.equals(target.id))
return;
// Move from trash/drafts only
if (!EntityFolder.TRASH.equals(folder.type) &&

@ -2698,6 +2698,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (account.protocol == EntityAccount.TYPE_IMAP)
result.accounts.add(account);
if (result.folders.size() > 1)
result.folders = new ArrayList<>();
return result;
}
@ -7188,7 +7191,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
Log.i("Print queue job=" + jobName);
PrintDocumentAdapter adapter = printWebView.createPrintDocumentAdapter(jobName);
PrintJob job = printManager.print(jobName, adapter, new PrintAttributes.Builder().build());
EntityLog.log(context,"Print queued job=" + job.getInfo());
EntityLog.log(context, "Print queued job=" + job.getInfo());
} catch (Throwable ex) {
Log.unexpectedError(getParentFragmentManager(), ex);
} finally {

Loading…
Cancel
Save