From 5235b4485f974256f20d5af6f0945d036c5d48b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 24 Aug 2022 16:01:17 -0400
Subject: [PATCH] namedirectory: use accountId
Avoid to add a nameserver manually and use settings
Change-Id: If31cb67d75ae6e71a9afbcf0bd7b80283e5ffeb7
GitLab: #789
---
src/app/commoncomponents/UsernameLineEdit.qml | 3 ++-
src/app/mainview/components/ParticipantsLayer.qml | 2 +-
src/app/wizardview/components/CreateAccountPage.qml | 1 +
src/libclient/namedirectory.cpp | 8 ++++----
src/libclient/namedirectory.h | 4 ++--
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/app/commoncomponents/UsernameLineEdit.qml b/src/app/commoncomponents/UsernameLineEdit.qml
index 3f3afbe35..7a7058dfc 100644
--- a/src/app/commoncomponents/UsernameLineEdit.qml
+++ b/src/app/commoncomponents/UsernameLineEdit.qml
@@ -44,6 +44,7 @@ EditableLineEdit {
}
property int nameRegistrationState: UsernameLineEdit.NameRegistrationState.BLANK
+ property string accountId: CurrentAccount.id
selectByMouse: true
font.pointSize: JamiTheme.usernameLineEditPointSize
@@ -85,7 +86,7 @@ EditableLineEdit {
onTriggered: {
if (text.length !== 0 && readOnly === false) {
nameRegistrationState = UsernameLineEdit.NameRegistrationState.SEARCHING
- NameDirectory.lookupName("", text)
+ NameDirectory.lookupName(root.accountId, text)
} else {
nameRegistrationState = UsernameLineEdit.NameRegistrationState.BLANK
}
diff --git a/src/app/mainview/components/ParticipantsLayer.qml b/src/app/mainview/components/ParticipantsLayer.qml
index f939deb87..b4d28eef3 100644
--- a/src/app/mainview/components/ParticipantsLayer.qml
+++ b/src/app/mainview/components/ParticipantsLayer.qml
@@ -67,7 +67,7 @@ Item {
participantIsModerator: isModerator_
bestName: {
if (bestName_ === uri_)
- NameDirectory.lookupAddress(CurrentAccount.uri_RingNS, uri_)
+ NameDirectory.lookupAddress(CurrentAccount.id, uri_)
return bestName_
}
videoMuted: videoMuted_
diff --git a/src/app/wizardview/components/CreateAccountPage.qml b/src/app/wizardview/components/CreateAccountPage.qml
index c79dfa584..3e7238372 100644
--- a/src/app/wizardview/components/CreateAccountPage.qml
+++ b/src/app/wizardview/components/CreateAccountPage.qml
@@ -130,6 +130,7 @@ Rectangle {
id: usernameEdit
objectName: "usernameEdit"
+ accountId: "" // During creation
Layout.topMargin: 15
Layout.alignment: Qt.AlignHCenter
diff --git a/src/libclient/namedirectory.cpp b/src/libclient/namedirectory.cpp
index 809190087..c496f6b6e 100644
--- a/src/libclient/namedirectory.cpp
+++ b/src/libclient/namedirectory.cpp
@@ -105,16 +105,16 @@ NameDirectoryPrivate::slotExportOnRingEnded(const QString& accountId, int status
// Lookup a name
bool
-NameDirectory::lookupName(const QString& nameServiceURL, const QString& name) const
+NameDirectory::lookupName(const QString& accountId, const QString& name, const QString& nameServiceURL) const
{
- return ConfigurationManager::instance().lookupName("", nameServiceURL, name);
+ return ConfigurationManager::instance().lookupName(accountId, nameServiceURL, name);
}
// Lookup an address
bool
-NameDirectory::lookupAddress(const QString& nameServiceURL, const QString& address) const
+NameDirectory::lookupAddress(const QString& accountId, const QString& address, const QString& nameServiceURL) const
{
- return ConfigurationManager::instance().lookupAddress("", nameServiceURL, address);
+ return ConfigurationManager::instance().lookupAddress(accountId, nameServiceURL, address);
}
NameDirectory::~NameDirectory()
diff --git a/src/libclient/namedirectory.h b/src/libclient/namedirectory.h
index 946150b9b..c0c75e8e1 100644
--- a/src/libclient/namedirectory.h
+++ b/src/libclient/namedirectory.h
@@ -49,8 +49,8 @@ public:
static NameDirectory& instance();
// Lookup
- Q_INVOKABLE bool lookupName(const QString& nameServiceURL, const QString& name) const;
- Q_INVOKABLE bool lookupAddress(const QString& nameServiceURL, const QString& address) const;
+ Q_INVOKABLE bool lookupName(const QString& accountId, const QString& name, const QString& nameServiceURL = "") const;
+ Q_INVOKABLE bool lookupAddress(const QString& accountId, const QString& address, const QString& nameServiceURL = "") const;
private:
// Constructors & Destructors
--
GitLab