Check swipe target

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -761,18 +761,19 @@ public class FragmentMessages extends FragmentBase {
                         db.beginTransaction();
 
                         EntityFolder target = db.folder().getFolder(tid);
-                        if (target != null) {
+                        if (target == null)
-                            EntityAccount account = db.account().getAccount(target.account);
+                            throw new IllegalArgumentException(context.getString(R.string.title_no_folder));
-                            EntityMessage message = db.message().getMessage(id);
+
-                            if (message != null) {
+                        EntityAccount account = db.account().getAccount(target.account);
-                                List<EntityMessage> messages = db.message().getMessageByThread(
+                        EntityMessage message = db.message().getMessage(id);
-                                        message.account, message.thread, threading && thread ? null : id, message.folder);
+                        if (message != null) {
-                                for (EntityMessage threaded : messages) {
+                            List<EntityMessage> messages = db.message().getMessageByThread(
-                                    result.add(new MessageTarget(threaded, account, target));
+                                    message.account, message.thread, threading && thread ? null : id, message.folder);
-                                    db.message().setMessageUiHide(threaded.id, true);
+                            for (EntityMessage threaded : messages) {
-                                    // Prevent new message notification on undo
+                                result.add(new MessageTarget(threaded, account, target));
-                                    db.message().setMessageUiIgnored(threaded.id, true);
+                                db.message().setMessageUiHide(threaded.id, true);
-                                }
+                                // Prevent new message notification on undo
+                                db.message().setMessageUiIgnored(threaded.id, true);
                             }
                         }
 

app/src/main/res/values/strings.xml

@@ -328,6 +328,7 @@
     <string name="title_no_stream">An outdated app sent a file path instead of a file stream</string>
     <string name="title_no_contacts">Contact picker not available</string>
     <string name="title_no_internet">No internet connection</string>
+    <string name="title_no_folder">Folder does not exist</string>
     <string name="title_accross_remark">Messages moved across accounts will be downloaded again resulting in extra data usage</string>
     <string name="title_raw_saved">Raw message saved</string>
     <string name="title_attachment_saved">Attachment saved</string>