Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 06:38:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed exceptions for outgoing messages

Browse Source
This commit is contained in:
M66B
2018-11-24 17:22:47 +01:00
parent 9b0a7800ac
commit 963c245aab
8 changed files with 55 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/EntityMessage.java
View File

@@ -191,15 +191,13 @@ public class EntityMessage implements Serializable {
}
}
void getAvatar(Context context, boolean outgoing) {
void getAvatar(Context context) {
if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS)
== PackageManager.PERMISSION_GRANTED) {
try {
Address[] addresses = (outgoing ? this.to : this.from);
if (addresses != null)
for (int i = 0; i < addresses.length; i++) {
String email = ((InternetAddress) addresses[i]).getAddress();
if (this.from != null)
for (int i = 0; i < this.from.length; i++) {
String email = ((InternetAddress) this.from[i]).getAddress();
Cursor cursor = null;
try {
ContentResolver resolver = context.getContentResolver();
@@ -223,7 +221,7 @@ public class EntityMessage implements Serializable {
this.avatar = ContactsContract.Contacts.getLookupUri(contactId, lookupKey).toString();
if (!TextUtils.isEmpty(displayName))
((InternetAddress) addresses[i]).setPersonal(displayName);
((InternetAddress) this.from[i]).setPersonal(displayName);
}
} finally {
if (cursor != null)
@@ -239,7 +237,7 @@ public class EntityMessage implements Serializable {
static String getQuote(Context context, long id) throws IOException {
EntityMessage message = DB.getInstance(context).message().getMessage(id);
return String.format("<p>%s %s:</p><blockquote>%s</blockquote>",
Html.escapeHtml(new Date(message.sent == null ? message.received : message.sent).toString()),
Html.escapeHtml(new Date(message.received).toString()),
Html.escapeHtml(MessageHelper.getFormattedAddresses(message.from, true)),
HtmlHelper.sanitize(EntityMessage.read(context, id)));
}