From 783bdd68ed6905a08095e4440deeb32f24b70146 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 4 Feb 2019 16:10:13 +0000
Subject: [PATCH] Check swipe target

---
 .../eu/faircode/email/FragmentMessages.java   | 25 ++++++++++---------
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index bdc83a197d..06a5f7caf6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/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) {
-                            EntityAccount account = db.account().getAccount(target.account);
-                            EntityMessage message = db.message().getMessage(id);
-                            if (message != null) {
-                                List<EntityMessage> messages = db.message().getMessageByThread(
-                                        message.account, message.thread, threading && thread ? null : id, message.folder);
-                                for (EntityMessage threaded : messages) {
-                                    result.add(new MessageTarget(threaded, account, target));
-                                    db.message().setMessageUiHide(threaded.id, true);
-                                    // Prevent new message notification on undo
-                                    db.message().setMessageUiIgnored(threaded.id, true);
-                                }
+                        if (target == null)
+                            throw new IllegalArgumentException(context.getString(R.string.title_no_folder));
+
+                        EntityAccount account = db.account().getAccount(target.account);
+                        EntityMessage message = db.message().getMessage(id);
+                        if (message != null) {
+                            List<EntityMessage> messages = db.message().getMessageByThread(
+                                    message.account, message.thread, threading && thread ? null : id, message.folder);
+                            for (EntityMessage threaded : messages) {
+                                result.add(new MessageTarget(threaded, account, target));
+                                db.message().setMessageUiHide(threaded.id, true);
+                                // Prevent new message notification on undo
+                                db.message().setMessageUiIgnored(threaded.id, true);
                             }
                         }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b5ff1c7bc4..4fe84b1669 100644
--- a/app/src/main/res/values/strings.xml
+++ b/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>