Commit 3ddcdd22 authored by Ronan Abhamon's avatar Ronan Abhamon

feat(VcardModel): remove `interpretSipAddress` function, use the `SipAddressesModel` class instead

parent cc456daf
...@@ -93,21 +93,6 @@ static void removeBelcardPhoto (const shared_ptr<belcard::BelCard> &belcard, boo ...@@ -93,21 +93,6 @@ static void removeBelcardPhoto (const shared_ptr<belcard::BelCard> &belcard, boo
} }
} }
static string interpretSipAddress (const QString &sipAddress) {
string out;
shared_ptr<linphone::Address> linphoneAddress = CoreManager::getInstance()->getCore()->interpretUrl(
::Utils::appStringToCoreString(sipAddress)
);
if (!linphoneAddress) {
qWarning() << QStringLiteral("Unable to interpret invalid sip address: `%1`.").arg(sipAddress);
return out;
}
return linphoneAddress->asStringUriOnly();
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
VcardModel::VcardModel (shared_ptr<linphone::Vcard> vcard, bool isReadOnly) { VcardModel::VcardModel (shared_ptr<linphone::Vcard> vcard, bool isReadOnly) {
...@@ -302,7 +287,7 @@ QVariantList VcardModel::getSipAddresses () const { ...@@ -302,7 +287,7 @@ QVariantList VcardModel::getSipAddresses () const {
bool VcardModel::addSipAddress (const QString &sipAddress) { bool VcardModel::addSipAddress (const QString &sipAddress) {
CHECK_VCARD_IS_WRITABLE(this); CHECK_VCARD_IS_WRITABLE(this);
string interpretedSipAddress = ::interpretSipAddress(sipAddress); string interpretedSipAddress = ::Utils::appStringToCoreString(SipAddressesModel::interpretSipAddress(sipAddress));
if (interpretedSipAddress.empty()) if (interpretedSipAddress.empty())
return false; return false;
...@@ -331,7 +316,7 @@ void VcardModel::removeSipAddress (const QString &sipAddress) { ...@@ -331,7 +316,7 @@ void VcardModel::removeSipAddress (const QString &sipAddress) {
shared_ptr<belcard::BelCard> belcard = mVcard->getVcard(); shared_ptr<belcard::BelCard> belcard = mVcard->getVcard();
list<shared_ptr<belcard::BelCardImpp> > addresses = belcard->getImpp(); list<shared_ptr<belcard::BelCardImpp> > addresses = belcard->getImpp();
shared_ptr<belcard::BelCardImpp> value = ::findBelCardValue( shared_ptr<belcard::BelCardImpp> value = ::findBelCardValue(
addresses, ::Utils::coreStringToAppString(::interpretSipAddress(sipAddress)) addresses, ::Utils::appStringToCoreString(SipAddressesModel::interpretSipAddress(sipAddress))
); );
if (!value) { if (!value) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment