From a3b64e796eb32b0b27aef7c7b259591684203c24 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 15 Apr 2020 20:26:04 +0200 Subject: [PATCH] Prevent resetting avatars This can happen when revoking contacts permissions --- app/src/main/java/eu/faircode/email/Core.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 3629f93b9d..2cb2c71090 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -2522,11 +2522,13 @@ class Core { } Uri uri = ContactInfo.getLookupUri(context, message.from); - String avatar = (uri == null ? null : uri.toString()); - if (!Objects.equals(message.avatar, avatar)) { - update = true; - message.avatar = avatar; - Log.i(folder.name + " updated id=" + message.id + " uid=" + message.uid + " avatar=" + avatar); + if (uri != null) { + String avatar = uri.toString(); + if (!Objects.equals(message.avatar, avatar)) { + update = true; + message.avatar = avatar; + Log.i(folder.name + " updated id=" + message.id + " uid=" + message.uid + " avatar=" + avatar); + } } if (update || process)