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

Prevent moving out of read-only folder

Browse Source
pull/184/head
M66B 5 years ago
parent d65eec34e8
commit 11c0401795
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -2211,7 +2211,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
message.account, message.thread, threading && thread ? null : id, message.folder); message.account, message.thread, threading && thread ? null : id, message.folder);
for (EntityMessage threaded : messages) { for (EntityMessage threaded : messages) {
EntityFolder sourceFolder = db.folder().getFolder(threaded.folder); EntityFolder sourceFolder = db.folder().getFolder(threaded.folder);
if (sourceFolder == null) if (sourceFolder == null || sourceFolder.read_only)
continue; continue;
result.add(new MessageTarget(context, threaded, sourceAccount, sourceFolder, targetAccount, targetFolder)); result.add(new MessageTarget(context, threaded, sourceAccount, sourceFolder, targetAccount, targetFolder));
@ -3105,7 +3105,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
message.account, message.thread, threading ? null : id, message.folder); message.account, message.thread, threading ? null : id, message.folder);
for (EntityMessage threaded : messages) { for (EntityMessage threaded : messages) {
EntityFolder sourceFolder = db.folder().getFolder(threaded.folder); EntityFolder sourceFolder = db.folder().getFolder(threaded.folder);
if (sourceFolder == null) if (sourceFolder == null || sourceFolder.read_only)
continue; continue;
result.add(new MessageTarget(context, threaded, account, sourceFolder, account, targetFolder)); result.add(new MessageTarget(context, threaded, account, sourceFolder, account, targetFolder));
@ -3185,7 +3185,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
message.account, message.thread, threading ? null : id, message.folder); message.account, message.thread, threading ? null : id, message.folder);
for (EntityMessage threaded : messages) { for (EntityMessage threaded : messages) {
EntityFolder sourceFolder = db.folder().getFolder(threaded.folder); EntityFolder sourceFolder = db.folder().getFolder(threaded.folder);
if (sourceFolder == null) if (sourceFolder == null || sourceFolder.read_only)
continue; continue;
result.add(new MessageTarget(context, threaded, sourceAccount, sourceFolder, targetAccount, targetFolder, copy)); result.add(new MessageTarget(context, threaded, sourceAccount, sourceFolder, targetAccount, targetFolder, copy));
@ -6871,7 +6871,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
EntityOperation.queue(context, message, EntityOperation.COPY, tid); EntityOperation.queue(context, message, EntityOperation.COPY, tid);
else { else {
EntityFolder sourceFolder = db.folder().getFolder(threaded.folder); EntityFolder sourceFolder = db.folder().getFolder(threaded.folder);
if (sourceFolder == null) if (sourceFolder == null || sourceFolder.read_only)
continue; continue;
result.add(new MessageTarget(context, threaded, sourceAccount, sourceFolder, targetAccount, targetFolder)); result.add(new MessageTarget(context, threaded, sourceAccount, sourceFolder, targetAccount, targetFolder));
} }

Write Preview
Loading…
Cancel
Save