From 0affd9e1f3a7e15bf8ffb8796dffacac0f99a5bb Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 30 Jul 2019 14:46:02 +0200
Subject: [PATCH] Fixed long attachment names

---
 app/src/main/java/eu/faircode/email/EntityAttachment.java | 2 ++
 app/src/main/java/eu/faircode/email/Helper.java           | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index b81926aa03..f3ef3b021d 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -114,6 +114,8 @@ public class EntityAttachment {
         String filename = Long.toString(id);
         if (!TextUtils.isEmpty(name))
             filename += "." + Helper.sanitizeFilename(name);
+        if (filename.length() > 255)
+            filename = filename.substring(0, 255);
         return new File(dir, filename);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index e1c15f0981..e344be75b5 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -529,13 +529,7 @@ public class Helper {
         if (name == null)
             return null;
 
-        name = name.replaceAll("[?:\"*|/\\\\<>]", "_");
-
-        // Both the name and extension can be long
-        if (name.length() > 255)
-            name = name.substring(0, 255);
-
-        return name;
+        return name.replaceAll("[?:\"*|/\\\\<>]", "_");
     }
 
     static String getExtension(String filename) {