mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed long attachment names

This commit is contained in:
M66B 2019-07-30 14:46:02 +02:00
parent d9dd78e3a7
commit 0affd9e1f3
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/EntityAttachment.java
View File

@ -114,6 +114,8 @@ public class EntityAttachment {
String filename = Long.toString(id); String filename = Long.toString(id);
if (!TextUtils.isEmpty(name)) if (!TextUtils.isEmpty(name))
filename += "." + Helper.sanitizeFilename(name); filename += "." + Helper.sanitizeFilename(name);
if (filename.length() > 255)
filename = filename.substring(0, 255);
return new File(dir, filename); return new File(dir, filename);
} }

8
app/src/main/java/eu/faircode/email/Helper.java
View File

@ -529,13 +529,7 @@ public class Helper {
if (name == null) if (name == null)
return null; return null;
name = name.replaceAll("[?:\"*|/\\\\<>]", "_"); return name.replaceAll("[?:\"*|/\\\\<>]", "_");
// Both the name and extension can be long
if (name.length() > 255)
name = name.substring(0, 255);
return name;
} }
static String getExtension(String filename) { static String getExtension(String filename) {