Skip to content
Snippets Groups Projects
Commit 6d0c1255 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

misc: remove some uses of the "ring" uri prefix

Change-Id: I3c9e065264b551eb0d28de743b4568116b1e0ec0
parent 9914d496
No related branches found
No related tags found
No related merge requests found
......@@ -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 (...) {
......
......@@ -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";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment