Improved avatar/identicon caching

app/src/main/java/eu/faircode/email/AdapterMessage.java

@@ -32,7 +32,6 @@ import android.database.Cursor;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -75,7 +74,6 @@ import org.xml.sax.XMLReader;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.text.Collator;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -130,18 +128,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     private boolean threading;
     private boolean contacts;
     private boolean avatars;
-    private boolean identicons;
     private boolean preview;
     private boolean confirm;
     private boolean debug;
 
-    private int dp24;
     private float textSize;
     private int colorPrimary;
     private int colorAccent;
     private int textColorSecondary;
     private int colorUnread;
-    private String theme;
     private boolean hasWebView;
 
     private SelectionTracker<Long> selectionTracker = null;
@@ -484,82 +479,58 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             boolean outgoing = (viewType != ViewType.THREAD && EntityFolder.isOutgoing(message.folderType));
 
-            if (avatars || identicons) {
+            final Address[] addresses = (outgoing ? message.to : message.from);
+
+            ContactInfo info = ContactInfo.get(context, addresses, true);
+            if (info == null) {
                 Bundle aargs = new Bundle();
                 aargs.putLong("id", message.id);
-                aargs.putSerializable("addresses", outgoing ? message.to : message.from);
+                aargs.putSerializable("addresses", addresses);
 
                 new SimpleTask<ContactInfo>() {
                     @Override
                     protected void onPreExecute(Bundle args) {
                         ivAvatar.setTag(message.id);
-                        ivAvatar.setVisibility(View.INVISIBLE);
                         tvFrom.setTag(message.id);
 
-                        Address[] addresses = (Address[]) args.getSerializable("addresses");
+                        ivAvatar.setVisibility(avatars ? View.INVISIBLE : View.GONE);
-                        ContactInfo info = ContactInfo.get(context, addresses, true);
+                        tvFrom.setText(MessageHelper.formatAddresses(addresses, !compact, false));
-                        if (info != null && info.hasDisplayName())
-                            setFrom(info, addresses);
-                        else
-                            tvFrom.setText(MessageHelper.formatAddresses(addresses, !compact, false));
                     }
 
                     @Override
                     protected ContactInfo onExecute(Context context, Bundle args) {
                         Address[] addresses = (Address[]) args.getSerializable("addresses");
-
+                        return ContactInfo.get(context, addresses, false);
-                        ContactInfo info = ContactInfo.get(context, addresses, false);
-
-                        if ((info == null || !info.hasPhoto()) &&
-                                identicons && addresses != null && addresses.length > 0) {
-                            Drawable ident = new BitmapDrawable(
-                                    context.getResources(),
-                                    Identicon.generate(addresses[0].toString(),
-                                            dp24, 5, "light".equals(theme)));
-                            info = new ContactInfo(ident, (info == null ? null : info.getDisplayName()));
-                        }
-
-                        return info;
                     }
 
                     @Override
                     protected void onExecuted(Bundle args, ContactInfo info) {
-                        long id = args.getLong("id");
+                        Long id = args.getLong("id");
 
-                        if ((long) ivAvatar.getTag() == id) {
+                        if (id.equals(ivAvatar.getTag())) {
-                            if (info == null || !info.hasPhoto())
+                            if (info.hasPhoto())
-                                ivAvatar.setImageResource(R.drawable.baseline_person_24);
+                                ivAvatar.setImageBitmap(info.getPhotoBitmap());
                             else
-                                ivAvatar.setImageDrawable(info.getPhotoDrawable());
+                                ivAvatar.setImageResource(R.drawable.baseline_person_24);
-                            ivAvatar.setVisibility(View.VISIBLE);
+                            ivAvatar.setVisibility(avatars ? View.VISIBLE : View.GONE);
                         }
 
-                        if ((long) tvFrom.getTag() == id) {
+                        if (id.equals(tvFrom.getTag()))
-                            if (info != null && info.hasDisplayName()) {
+                            tvFrom.setText(info.getDisplayName(compact));
-                                Address[] addresses = (Address[]) args.getSerializable("addresses");
-                                setFrom(info, addresses);
-                            }
-                        }
                     }
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
                         Helper.unexpectedError(context, owner, ex);
                     }
-
-
-                    private void setFrom(ContactInfo info, Address[] addresses) {
-                        try {
-                            ((InternetAddress) addresses[0]).setPersonal(info.getDisplayName());
-                            tvFrom.setText(MessageHelper.formatAddresses(addresses, !compact, false));
-                        } catch (UnsupportedEncodingException ex) {
-                            Log.w(ex);
-                        }
-                    }
                 }.execute(context, owner, aargs, "message:avatar");
             } else {
-                ivAvatar.setVisibility(View.GONE);
+                if (info.hasPhoto())
-                tvFrom.setText(MessageHelper.formatAddresses(outgoing ? message.to : message.from, !compact, false));
+                    ivAvatar.setImageBitmap(info.getPhotoBitmap());
+                else
+                    ivAvatar.setImageResource(R.drawable.baseline_person_24);
+                ivAvatar.setVisibility(avatars ? View.VISIBLE : View.GONE);
+                tvFrom.setText(info.getDisplayName(compact));
             }
 
             vwColor.setBackgroundColor(message.accountColor == null ? Color.TRANSPARENT : message.accountColor);
@@ -2174,19 +2145,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         this.threading = prefs.getBoolean("threading", true);
         this.contacts = (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS)
                 == PackageManager.PERMISSION_GRANTED);
-        this.avatars = prefs.getBoolean("avatars", true);
+        this.avatars = (prefs.getBoolean("avatars", true) ||
-        this.identicons = prefs.getBoolean("identicons", false);
+                prefs.getBoolean("identicons", false));
         this.preview = prefs.getBoolean("preview", false);
         this.confirm = prefs.getBoolean("confirm", false);
         this.debug = prefs.getBoolean("debug", false);
 
-        this.dp24 = Helper.dp2pixels(context, 24);
         this.textSize = Helper.getTextSize(context, zoom);
         this.colorPrimary = Helper.resolveColor(context, R.attr.colorPrimary);
         this.colorAccent = Helper.resolveColor(context, R.attr.colorAccent);
         this.textColorSecondary = Helper.resolveColor(context, android.R.attr.textColorSecondary);
         this.colorUnread = Helper.resolveColor(context, R.attr.colorUnread);
-        this.theme = prefs.getString("theme", "light");
 
         PackageManager pm = context.getPackageManager();
         this.hasWebView = pm.hasSystemFeature("android.software.webview");

app/src/main/java/eu/faircode/email/ContactInfo.java

@@ -3,12 +3,13 @@ package eu.faircode.email;
 import android.Manifest;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.preference.PreferenceManager;
 import android.provider.ContactsContract;
 
 import java.io.InputStream;
@@ -22,8 +23,8 @@ import javax.mail.internet.InternetAddress;
 import androidx.core.content.ContextCompat;
 
 public class ContactInfo {
-    private InputStream is;
+    private String email;
-    private Drawable photo;
+    private Bitmap bitmap;
     private String displayName;
     private Uri lookupUri;
     private long time;
@@ -32,118 +33,124 @@ public class ContactInfo {
 
     private static final long CACHE_DURATION = 60 * 1000L;
 
-    ContactInfo() {
+    private ContactInfo() {
-    }
-
-    ContactInfo(String displayName) {
-        this.displayName = displayName;
-    }
-
-    ContactInfo(Drawable photo, String displayName) {
-        this.photo = photo;
-        this.displayName = displayName;
-    }
-
-    Bitmap getPhotoBitmap() {
-        return BitmapFactory.decodeStream(is);
-    }
-
-    Drawable getPhotoDrawable() {
-        if (photo != null)
-            return photo;
-
-        if (is == null)
-            return null;
-
-        return Drawable.createFromStream(is, displayName == null ? "Photo" : displayName);
     }
 
     boolean hasPhoto() {
-        return (is != null || photo != null);
+        return (bitmap != null);
     }
 
-    String getDisplayName() {
+    Bitmap getPhotoBitmap() {
-        return displayName;
+        return bitmap;
     }
 
-    boolean hasDisplayName() {
+    String getDisplayName(boolean compact) {
-        return (displayName != null);
+        if (compact && displayName != null)
-    }
+            return displayName;
-
+        else if (displayName == null)
-    Uri getLookupUri() {
+            return (email == null ? "" : email);
-        return lookupUri;
+        else
+            return displayName + " <" + email + ">";
     }
 
     boolean hasLookupUri() {
         return (lookupUri != null);
     }
 
+    Uri getLookupUri() {
+        return lookupUri;
+    }
+
     private boolean isExpired() {
         return (new Date().getTime() - time > CACHE_DURATION);
     }
 
-    static ContactInfo get(Context context, Address[] addresses, boolean cached) {
+    static void clearCache() {
+        synchronized (emailContactInfo) {
+            emailContactInfo.clear();
+        }
+    }
+
+    static ContactInfo get(Context context, Address[] addresses, boolean cacheOnly) {
         if (addresses == null || addresses.length == 0)
-            return null;
+            return new ContactInfo();
-
+        InternetAddress address = (InternetAddress) addresses[0];
-        if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS)
-                != PackageManager.PERMISSION_GRANTED)
-            return null;
-
-        String email = ((InternetAddress) addresses[0]).getAddress();
 
+        String email = address.getAddress();
         synchronized (emailContactInfo) {
             ContactInfo info = emailContactInfo.get(email);
             if (info != null && !info.isExpired())
                 return info;
         }
-        if (cached)
+
+        if (cacheOnly)
             return null;
 
-        try {
+        ContactInfo info = new ContactInfo();
-            Cursor cursor = null;
+        info.email = email;
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+        if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS)
+                == PackageManager.PERMISSION_GRANTED)
             try {
-                ContentResolver resolver = context.getContentResolver();
+                Cursor cursor = null;
-                cursor = resolver.query(ContactsContract.CommonDataKinds.Email.CONTENT_URI,
+                try {
-                        new String[]{
+                    ContentResolver resolver = context.getContentResolver();
-                                ContactsContract.CommonDataKinds.Photo.CONTACT_ID,
+                    cursor = resolver.query(ContactsContract.CommonDataKinds.Email.CONTENT_URI,
-                                ContactsContract.Contacts.LOOKUP_KEY,
+                            new String[]{
-                                ContactsContract.Contacts.DISPLAY_NAME
+                                    ContactsContract.CommonDataKinds.Photo.CONTACT_ID,
-                        },
+                                    ContactsContract.Contacts.LOOKUP_KEY,
-                        ContactsContract.CommonDataKinds.Email.ADDRESS + " = ?",
+                                    ContactsContract.Contacts.DISPLAY_NAME
-                        new String[]{
+                            },
-                                email
+                            ContactsContract.CommonDataKinds.Email.ADDRESS + " = ?",
-                        }, null);
+                            new String[]{
+                                    email
+                            }, null);
 
-                if (cursor != null && cursor.moveToNext()) {
+                    if (cursor != null && cursor.moveToNext()) {
-                    int colContactId = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Photo.CONTACT_ID);
+                        int colContactId = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Photo.CONTACT_ID);
-                    int colLookupKey = cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY);
+                        int colLookupKey = cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY);
-                    int colDisplayName = cursor.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME);
+                        int colDisplayName = cursor.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME);
 
-                    long contactId = cursor.getLong(colContactId);
+                        long contactId = cursor.getLong(colContactId);
-                    String lookupKey = cursor.getString(colLookupKey);
+                        String lookupKey = cursor.getString(colLookupKey);
-                    Uri lookupUri = ContactsContract.Contacts.getLookupUri(contactId, lookupKey);
+                        Uri lookupUri = ContactsContract.Contacts.getLookupUri(contactId, lookupKey);
 
-                    ContactInfo info = new ContactInfo();
+                        boolean avatars = prefs.getBoolean("avatars", true);
-                    info.is = ContactsContract.Contacts.openContactPhotoInputStream(resolver, lookupUri);
+                        if (avatars) {
-                    info.displayName = cursor.getString(colDisplayName);
+                            InputStream is = ContactsContract.Contacts.openContactPhotoInputStream(resolver, lookupUri);
-                    info.lookupUri = lookupUri;
+                            info.bitmap = BitmapFactory.decodeStream(is);
-                    info.time = new Date().getTime();
+                        }
 
-                    synchronized (emailContactInfo) {
+                        info.displayName = cursor.getString(colDisplayName);
-                        emailContactInfo.put(email, info);
+                        info.lookupUri = lookupUri;
                     }
-
+                } finally {
-                    return info;
+                    if (cursor != null)
+                        cursor.close();
                 }
-            } finally {
+            } catch (Throwable ex) {
-                if (cursor != null)
+                Log.e(ex);
-                    cursor.close();
+            }
+
+        if (info.bitmap == null) {
+            boolean identicons = prefs.getBoolean("identicons", false);
+            if (identicons) {
+                String theme = prefs.getString("theme", "light");
+                int dp = Helper.dp2pixels(context, 48);
+                info.bitmap = Identicon.generate(email, dp, 5, "light".equals(theme));
             }
-        } catch (Throwable ex) {
-            Log.e(ex);
         }
 
-        return null;
+        if (info.displayName == null)
+            info.displayName = address.getPersonal();
+
+        synchronized (emailContactInfo) {
+            emailContactInfo.put(email, info);
+        }
+
+        info.time = new Date().getTime();
+        return info;
     }
 }

app/src/main/java/eu/faircode/email/FragmentOptions.java

@@ -240,6 +240,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("avatars", checked).apply();
+                ContactInfo.clearCache();
             }
         });
 
@@ -247,6 +248,7 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("identicons", checked).apply();
+                ContactInfo.clearCache();
             }
         });
 

app/src/main/java/eu/faircode/email/ServiceSynchronize.java

@@ -488,14 +488,9 @@ public class ServiceSynchronize extends LifecycleService {
 
         // Get contact info
         Map<TupleMessageEx, ContactInfo> messageContact = new HashMap<>();
-        for (TupleMessageEx message : messages) {
+        for (TupleMessageEx message : messages)
-            ContactInfo info = ContactInfo.get(this, message.from, true);
+            messageContact.put(message,
-            if (info == null)
+                    ContactInfo.get(this, message.from, false));
-                info = ContactInfo.get(this, message.from, false);
-            if (info == null)
-                info = new ContactInfo(MessageHelper.formatAddressesShort(message.from));
-            messageContact.put(message, info);
-        }
 
         // Build pending intent
         Intent view = new Intent(this, ActivityView.class);
@@ -574,7 +569,7 @@ public class ServiceSynchronize extends LifecycleService {
             DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.SHORT, SimpleDateFormat.SHORT);
             StringBuilder sb = new StringBuilder();
             for (EntityMessage message : messages) {
-                sb.append("<strong>").append(messageContact.get(message).getDisplayName()).append("</strong>");
+                sb.append("<strong>").append(messageContact.get(message).getDisplayName(true)).append("</strong>");
                 if (!TextUtils.isEmpty(message.subject))
                     sb.append(": ").append(message.subject);
                 sb.append(" ").append(df.format(message.received));
@@ -647,7 +642,7 @@ public class ServiceSynchronize extends LifecycleService {
             mbuilder
                     .addExtras(args)
                     .setSmallIcon(R.drawable.baseline_email_white_24)
-                    .setContentTitle(info.getDisplayName())
+                    .setContentTitle(info.getDisplayName(true))
                     .setSubText(message.accountName + " · " + folderName)
                     .setContentIntent(piContent)
                     .setWhen(message.received)