From d3da6d42feafc700385e439fb452ea6be8f8752f Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 14 Jul 2021 07:25:46 +0200 Subject: [PATCH] Refactoring --- app/src/main/java/eu/faircode/email/ContactInfo.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java index 5b94113261..7f058d06fc 100644 --- a/app/src/main/java/eu/faircode/email/ContactInfo.java +++ b/app/src/main/java/eu/faircode/email/ContactInfo.java @@ -96,7 +96,7 @@ public class ContactInfo { private static Map emailLookup = new ConcurrentHashMap<>(); private static final Map emailContactInfo = new HashMap<>(); - private static final Map emailGravatar = new HashMap<>(); + private static final Map emailGravatar = new HashMap<>(); private static final ExecutorService executorLookup = Helper.getBackgroundExecutor(1, "contact"); @@ -304,7 +304,7 @@ public class ContactInfo { String gkey = info.email.toLowerCase(Locale.ROOT); boolean lookup; synchronized (emailGravatar) { - Avatar avatar = emailGravatar.get(gkey); + Gravatar avatar = emailGravatar.get(gkey); lookup = (avatar == null || avatar.isExpired() || avatar.isAvailable()); } @@ -328,12 +328,12 @@ public class ContactInfo { info.bitmap = BitmapFactory.decodeStream(urlConnection.getInputStream()); // Positive reply synchronized (emailGravatar) { - emailGravatar.put(gkey, new Avatar(true)); + emailGravatar.put(gkey, new Gravatar(true)); } } else if (status == HttpURLConnection.HTTP_NOT_FOUND) { // Negative reply synchronized (emailGravatar) { - emailGravatar.put(gkey, new Avatar(false)); + emailGravatar.put(gkey, new Gravatar(false)); } } else throw new IOException("HTTP status=" + status); @@ -1089,11 +1089,11 @@ public class ContactInfo { } } - private static class Avatar { + private static class Gravatar { private boolean available; private long time; - Avatar(boolean available) { + Gravatar(boolean available) { this.available = available; this.time = new Date().getTime(); }