Ignore vcard's photo in infodlg. just take it from avatar factory

psi-im · Jun 13, 2024 · 5d12929 · 5d12929
1 parent dccdff2
commit 5d12929
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 26 deletions.
diff --git a/src/infodlg.cpp b/src/infodlg.cpp
@@ -452,32 +452,17 @@ void InfoWidget::setData(const VCard4::VCard &i)
     m_ui.le_role->setText(i.role());
     m_ui.te_desc->setPlainText(i.note());
 
-    d->photo = i.photo();
-    if (!d->photo.isEmpty()) {
-        if (!updatePhoto()) {
-            clearPhoto();
-        }
+    auto pix = d->pa->avatarFactory()->getAvatar(d->jid);
+    if (pix.isNull()) {
+        clearPhoto();
     } else {
-        bool usePubsubAvatar
-            = (d->type == Contact && d->pa->client()->capsManager()->features(d->jid).hasAvatarConversion())
-            || (d->type == Self && d->pa->client()->serverInfoManager()->accountFeatures().hasAvatarConversion());
-        if (usePubsubAvatar) {
-            // it has to be always updated in avatars cache
-            auto pix = d->pa->avatarFactory()->getAvatar(d->jid);
-            if (pix.isNull()) {
-                clearPhoto();
-            } else {
-                // yes we could use pixmap directly. let's keep it for future code optimization
-                QByteArray ba;
-                QBuffer    b(&ba);
-                b.open(QIODevice::WriteOnly);
-                pix.toImage().save(&b, "PNG");
-                d->photo = ba;
-                updatePhoto();
-            }
-        } else {
-            clearPhoto();
-        }
+        // yes we could use pixmap directly. let's keep it for future code optimization
+        QByteArray ba;
+        QBuffer    b(&ba);
+        b.open(QIODevice::WriteOnly);
+        pix.toImage().save(&b, "PNG");
+        d->photo = ba;
+        updatePhoto();
     }
 
     setEdited(false);

diff --git a/src/vcardfactory.cpp b/src/vcardfactory.cpp
@@ -236,7 +236,7 @@ VCard4::VCard VCardFactory::vcard(const Jid &j, Flags flags)
  */
 Task *VCardFactory::setVCard(PsiAccount *account, const VCard4::VCard &v, const Jid &targetJid, Flags flags)
 {
-    if ((flags & MucRoom) || !account->client()->serverInfoManager()->hasPersistentStorage()) {
+    if ((flags & MucRoom)) { // || !account->client()->serverInfoManager()->hasPersistentStorage()) {
         JT_VCard *jtVCard_ = new JT_VCard(account->client()->rootTask());
         connect(jtVCard_, &JT_VCard::finished, this, [this, v, jtVCard_, flags]() {
             if (jtVCard_->success()) {