From 6d0c125546988b1ff981ea488e17e9e2a9505249 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Tue, 10 Aug 2021 12:10:14 -0400
Subject: [PATCH] misc: remove some uses of the "ring" uri prefix
Change-Id: I3c9e065264b551eb0d28de743b4568116b1e0ec0
---
src/calladapter.cpp | 2 +-
src/utils.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/calladapter.cpp b/src/calladapter.cpp
index caefa31fb..c76561507 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 ef00633e9..880a0c562 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";
--
GitLab