diff --git a/src/calladapter.cpp b/src/calladapter.cpp index caefa31fbb017da5390b09824783fcd23c525030..c765615070aee8b087b5286c5ce08ebcf27cd3b3 100644 --- a/src/calladapter.cpp +++ b/src/calladapter.cpp @@ -821,7 +821,7 @@ CallAdapter::participantIsHost(const QString& uri) const return uri == accInfo.profileInfo.uri; } else { auto call = callModel->getCall(convInfo.callId); - auto peer = call.peerUri.remove("ring:"); + auto peer = call.peerUri.remove("jami:").remove("ring:"); return (uri == peer); } } catch (...) { diff --git a/src/utils.cpp b/src/utils.cpp index ef00633e99388d8e5efd4991a3610316e9d2b91d..880a0c562ff715558a45151e76282eb75885b001 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -336,7 +336,7 @@ Utils::accountPhoto(LRCInstance* instance, const QString& accountId, const QSize } else { auto bestName = instance->accountModel().bestNameForAccount(accInfo.id); QString name = bestName == accInfo.profileInfo.uri ? QString() : bestName; - QString prefix = accInfo.profileInfo.type == profile::Type::JAMI ? "ring:" : "sip:"; + QString prefix = accInfo.profileInfo.type == profile::Type::JAMI ? "jami:" : "sip:"; photo = fallbackAvatar(prefix + accInfo.profileInfo.uri, name, size); } } catch (const std::exception& e) { @@ -369,11 +369,11 @@ Utils::contactPhoto(LRCInstance* instance, photo = imageFromBase64String(contactPhoto); if (photo.isNull()) { auto avatarName = contactInfo.profileInfo.uri == bestName ? QString() : bestName; - photo = Utils::fallbackAvatar("ring:" + contactInfo.profileInfo.uri, avatarName); + photo = Utils::fallbackAvatar("jami:" + contactInfo.profileInfo.uri, avatarName); } } else { auto avatarName = contactInfo.profileInfo.uri == bestName ? QString() : bestName; - photo = Utils::fallbackAvatar("ring:" + contactInfo.profileInfo.uri, avatarName); + photo = Utils::fallbackAvatar("jami:" + contactInfo.profileInfo.uri, avatarName); } } catch (const std::exception& e) { qDebug() << e.what() << "; Using default avatar";