Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-05-19 13:34:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Normalize data/type

Browse Source
This commit is contained in:
M66B
2019-11-16 14:17:59 +01:00
parent d19c0c9e6d
commit 79d230514a
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,7 +227,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
// Build intent
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(uri, type);
intent.setDataAndTypeAndNormalize(uri, type);
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
if (!TextUtils.isEmpty(attachment.name))
intent.putExtra(Intent.EXTRA_TITLE, Helper.sanitizeFilename(attachment.name));

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

@@ -115,7 +115,7 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
// Build intent
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(uri, attachment.type);
intent.setDataAndTypeAndNormalize(uri, attachment.type);
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
if (!TextUtils.isEmpty(attachment.name))
intent.putExtra(Intent.EXTRA_TITLE, attachment.name);

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

@@ -2417,7 +2417,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
Uri lookupUri = ContactsContract.Contacts.getLookupUri(contactId, lookupKey);
edit.setAction(Intent.ACTION_EDIT);
edit.setDataAndType(lookupUri, ContactsContract.Contacts.CONTENT_ITEM_TYPE);
edit.setDataAndTypeAndNormalize(lookupUri, ContactsContract.Contacts.CONTENT_ITEM_TYPE);
} else {
edit.setAction(Intent.ACTION_INSERT);
edit.setType(ContactsContract.Contacts.CONTENT_TYPE);

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

@@ -154,6 +154,8 @@ public class EntityAttachment {
if (encryption != null)
return type;
// https://blogs.msdn.microsoft.com/vsofficedeveloper/2008/05/08/office-2007-file-format-mime-types-for-http-content-streaming-2/
String extension = Helper.getExtension(name);
if (extension == null)
return type;