From 11c0401795beb32d14b0f50a00c0dde01d907e29 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 14 Aug 2020 13:28:20 +0200 Subject: [PATCH] Prevent moving out of read-only folder --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 1d77658bc4..5a12437c5e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -2211,7 +2211,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. message.account, message.thread, threading && thread ? null : id, message.folder); for (EntityMessage threaded : messages) { EntityFolder sourceFolder = db.folder().getFolder(threaded.folder); - if (sourceFolder == null) + if (sourceFolder == null || sourceFolder.read_only) continue; 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); for (EntityMessage threaded : messages) { EntityFolder sourceFolder = db.folder().getFolder(threaded.folder); - if (sourceFolder == null) + if (sourceFolder == null || sourceFolder.read_only) continue; 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); for (EntityMessage threaded : messages) { EntityFolder sourceFolder = db.folder().getFolder(threaded.folder); - if (sourceFolder == null) + if (sourceFolder == null || sourceFolder.read_only) continue; 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); else { EntityFolder sourceFolder = db.folder().getFolder(threaded.folder); - if (sourceFolder == null) + if (sourceFolder == null || sourceFolder.read_only) continue; result.add(new MessageTarget(context, threaded, sourceAccount, sourceFolder, targetAccount, targetFolder)); }