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

Guess attached image file suffix

This commit is contained in:
M66B 2022-06-02 13:18:45 +02:00
parent 2a0df760b6
commit 8ae6e1b793
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -96,6 +96,7 @@ import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.MimeTypeMap;
import android.widget.AdapterView;
import android.widget.Button;
import android.widget.CheckBox;
@ -4236,6 +4237,16 @@ public class FragmentCompose extends FragmentBase {
EntityAttachment attachment = new EntityAttachment();
UriInfo info = getInfo(uri, context);
String ext = Helper.getExtension(info.name);
if (info.name != null && ext == null &&
info.type != null && ImageHelper.isImage(info.type.toLowerCase(Locale.ROOT))) {
String guessed = MimeTypeMap.getSingleton().getExtensionFromMimeType(info.type.toLowerCase(Locale.ROOT));
if (!TextUtils.isEmpty(guessed)) {
ext = guessed;
info.name += '.' + ext;
}
}
DB db = DB.getInstance(context);
try {
db.beginTransaction();
@ -4248,10 +4259,9 @@ public class FragmentCompose extends FragmentBase {
attachment.message = draft.id;
attachment.sequence = db.attachment().getAttachmentSequence(draft.id) + 1;
if (privacy) {
String ext = Helper.getExtension(info.name);
if (privacy)
attachment.name = "img" + attachment.sequence + (ext == null ? "" : "." + ext);
} else
else
attachment.name = info.name;
attachment.type = info.type;
attachment.disposition = (image ? Part.INLINE : Part.ATTACHMENT);