From 52a3eb7371a2ed37207ca60a2ba277f1670bff4d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 12 Mar 2022 08:05:16 +0100
Subject: [PATCH] Improved error message

---
 .../main/java/eu/faircode/email/MessageHelper.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 90ca262171..14a7bef3bb 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -3806,7 +3806,7 @@ public class MessageHelper {
                             }
                         }
                     } else
-                        throw new MessagingStructureException(content);
+                        throw new MessagingStructureException(content, "multipart/mixed");
                 }
 
                 if (part.isMimeType("multipart/signed")) {
@@ -3851,7 +3851,7 @@ public class MessageHelper {
                                 Log.e(sb.toString());
                             }
                         } else
-                            throw new MessagingStructureException(content);
+                            throw new MessagingStructureException(content, "multipart/signed");
                     } else
                         Log.e(ct.toString());
                 } else if (part.isMimeType("multipart/encrypted")) {
@@ -3873,7 +3873,7 @@ public class MessageHelper {
                                 Log.e(sb.toString());
                             }
                         } else
-                            throw new MessagingStructureException(content);
+                            throw new MessagingStructureException(content, "multipart/encrypted");
                     } else
                         Log.e(ct.toString());
                 } else if (part.isMimeType("application/pkcs7-mime") ||
@@ -3956,7 +3956,7 @@ public class MessageHelper {
                 if (content instanceof Multipart)
                     multipart = (Multipart) part.getContent();
                 else
-                    throw new MessagingStructureException(content);
+                    throw new MessagingStructureException(content, "multipart/*");
 
                 int count = multipart.getCount();
                 for (int i = 0; i < count; i++)
@@ -4436,17 +4436,19 @@ public class MessageHelper {
 
     static class MessagingStructureException extends MessagingException {
         private String className;
+        private String expected;
 
-        MessagingStructureException(Object content) {
+        MessagingStructureException(Object content, String expected) {
             super();
             if (content != null)
                 this.className = content.getClass().getName();
+            this.expected = expected;
         }
 
         @Nullable
         @Override
         public String getMessage() {
-            return className;
+            return className + " expected: " + expected;
         }
     }