Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-02 07:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved error message

Browse Source
This commit is contained in:
M66B
2022-03-12 08:05:16 +01:00
parent 540669a7df
commit 52a3eb7371
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -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;
}
}