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

Fixed Gravatar caching

This commit is contained in:
M66B 2020-04-30 13:59:55 +02:00
parent 3d2572cf7a
commit 45a6930068
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/ContactInfo.java
View File

@ -189,18 +189,19 @@ public class ContactInfo {
if (info.bitmap == null) { if (info.bitmap == null) {
if (gravatars) { if (gravatars) {
String gkey = address.getAddress().toLowerCase(Locale.ROOT);
boolean lookup; boolean lookup;
synchronized (emailGravatar) { synchronized (emailGravatar) {
Avatar avatar = emailGravatar.get(address.getAddress()); Avatar avatar = emailGravatar.get(gkey);
lookup = (avatar == null || avatar.isExpired() || avatar.isAvailable()); lookup = (avatar == null || avatar.isExpired() || avatar.isAvailable());
} }
if (lookup) { if (lookup) {
HttpURLConnection urlConnection = null; HttpURLConnection urlConnection = null;
try { try {
String hash = Helper.md5(address.getAddress().toLowerCase(Locale.ROOT).getBytes()); String hash = Helper.md5(gkey.getBytes());
URL url = new URL("https://www.gravatar.com/avatar/" + hash + "?d=404"); URL url = new URL("https://www.gravatar.com/avatar/" + hash + "?d=404");
Log.i("Gravatar url=" + url); Log.i("Gravatar key=" + gkey + " url=" + url);
urlConnection = (HttpURLConnection) url.openConnection(); urlConnection = (HttpURLConnection) url.openConnection();
urlConnection.setRequestMethod("GET"); urlConnection.setRequestMethod("GET");
@ -214,12 +215,12 @@ public class ContactInfo {
info.bitmap = BitmapFactory.decodeStream(urlConnection.getInputStream()); info.bitmap = BitmapFactory.decodeStream(urlConnection.getInputStream());
// Positive reply // Positive reply
synchronized (emailGravatar) { synchronized (emailGravatar) {
emailGravatar.put(address.getAddress(), new Avatar(true)); emailGravatar.put(gkey, new Avatar(true));
} }
} else if (status == HttpURLConnection.HTTP_NOT_FOUND) { } else if (status == HttpURLConnection.HTTP_NOT_FOUND) {
// Negative reply // Negative reply
synchronized (emailGravatar) { synchronized (emailGravatar) {
emailGravatar.put(address.getAddress(), new Avatar(false)); emailGravatar.put(gkey, new Avatar(false));
} }
} else } else
throw new IOException("HTTP status=" + status); throw new IOException("HTTP status=" + status);