From da802b4248998584c9233a1b268020f8df2696af Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 9 Jul 2018 21:55:00 +0200
Subject: persist muc avatar and show in bookmarks

---
 .../messenger/services/XmppConnectionService.java      | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/services/XmppConnectionService.java')

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index f45a5ac8e..bf760949a 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -3223,10 +3223,12 @@ public class XmppConnectionService extends Service {
                             updateAccountUi();
                         } else {
                             Contact contact = a.getRoster().getContact(avatar.owner);
-                            contact.setAvatar(avatar);
-                            getAvatarService().clear(contact);
-                            updateConversationUi();
-                            updateRosterUi();
+                            if (contact.setAvatar(avatar)) {
+                                syncRoster(account);
+                                getAvatarService().clear(contact);
+                                updateConversationUi();
+                                updateRosterUi();
+                            }
                         }
                         if (callback != null) {
                             callback.success(avatar);
@@ -3278,9 +3280,11 @@ public class XmppConnectionService extends Service {
                                     updateAccountUi();
                                 } else {
                                     Contact contact = account.getRoster().getContact(avatar.owner);
-                                    contact.setAvatar(avatar);
-                                    getAvatarService().clear(contact);
-                                    updateRosterUi();
+                                    if (contact.setAvatar(avatar)) {
+                                        syncRoster(account);
+                                        getAvatarService().clear(contact);
+                                        updateRosterUi();
+                                    }
                                 }
                                 updateConversationUi();
                             } else {
-- 
cgit v1.2.3