From 1f989b249980af4bf56b8fa280eb768d8b0985cd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 18 Jun 2019 20:14:42 +0200
Subject: [PATCH] Revert "Catch parse exception of disposition and filename
 only"

This reverts commit f7e5de7fe3ccdef85f8afeb36bc6f22e56ca972d.
---
 .../main/java/eu/faircode/email/MessageHelper.java   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index e6d7c2430f..c2ddd1850d 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1035,7 +1035,7 @@ public class MessageHelper {
                     disposition = part.getDisposition();
                     if (disposition != null)
                         disposition = disposition.toLowerCase();
-                } catch (ParseException ex) {
+                } catch (MessagingException ex) {
                     Log.w(ex);
                     parts.warnings.add(Helper.formatThrowable(ex));
                     disposition = null;
@@ -1045,13 +1045,9 @@ public class MessageHelper {
                 try {
                     filename = part.getFileName();
                 } catch (MessagingException ex) {
-                    if (ex instanceof ParseException ||
-                            ex.getCause() instanceof UnsupportedEncodingException) {
-                        Log.w(ex);
-                        parts.warnings.add(Helper.formatThrowable(ex));
-                        filename = null;
-                    } else
-                        throw ex;
+                    Log.w(ex);
+                    parts.warnings.add(Helper.formatThrowable(ex));
+                    filename = null;
                 }
 
                 //Log.i("Part" +