mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-07 15:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

- URI handlers when no domain are provided like tel:number.

Browse source 
- remove trailing new lines in smart search bar.
This commit is contained in:
Julien Wadel 2024-02-19 09:11:37 +01:00
parent 4b824fca23
commit 7e281cc1a7
3 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
linphone-app/src/app/cli/Cli.cpp
View file

@ -356,12 +356,8 @@ void Cli::Command::execute (QHash<QString, QString> &args) const {
}
}
void Cli::Command::executeUri (const shared_ptr<linphone::Address> &address) const {
QHash<QString, QString> args;
QString qAddress = Utils::coreStringToAppString(address->asString());
if(address->getDomain() == "" && qAddress.back() == '@')
qAddress.remove(qAddress.size()-1, 1);
QUrl url(qAddress);
void Cli::Command::executeUri (QString address, QHash<QString, QString> args) const {
QUrl url(address);
QString query = url.query();
QStringList parameters = query.split('&');
@ -375,12 +371,7 @@ void Cli::Command::executeUri (const shared_ptr<linphone::Address> &address) con
}
}
// TODO: check if there is too much headers.
for (const auto &argName : mArgsScheme.keys()) {
const string header = address->getHeader(Utils::appStringToCoreString(argName));
args[argName] = QByteArray::fromBase64(QByteArray(header.c_str(), int(header.length())));
}
args["sip-address"] = qAddress;
args["sip-address"] = address;
execute(args);
}
@ -533,10 +524,15 @@ void Cli::executeCommand (const QString &command, CommandFormat *format) {
App::getInstance()->useFetchConfig(fetchUrl);
}else{
shared_ptr<linphone::Address> address;
QString qAddress;
std::string t;
address = linphone::Factory::get()->createAddress(Utils::appStringToCoreString(transformedCommand));// Test if command is an address
if(Utils::isUsername(transformedCommand)){
address = linphone::Factory::get()->createAddress(Utils::appStringToCoreString(transformedCommand+"@to.remove"));
if(address)
address->setDomain("");
address->setDomain("");
qAddress = Utils::coreStringToAppString(address->asString());
if(address && qAddress.isEmpty())
qAddress = transformedCommand;
}else
address = linphone::Factory::get()->createAddress(Utils::appStringToCoreString(transformedCommand));// Test if command is an address
if (format)
@ -568,9 +564,15 @@ void Cli::executeCommand (const QString &command, CommandFormat *format) {
qWarning() << QStringLiteral("This command doesn't exist: `%1`.").arg(functionName);
return;
}
if(address)
mCommands[functionName].executeUri(address);
else
if(address){
// TODO: check if there is too much headers.
QHash<QString, QString> headers;
for (const auto &argName : mCommands[functionName].mArgsScheme.keys()) {
const string header = address->getHeader(Utils::appStringToCoreString(argName));
headers[argName] = QByteArray::fromBase64(QByteArray(header.c_str(), int(header.length())));
}
mCommands[functionName].executeUri(qAddress, headers);
}else
mCommands[functionName].executeUrl(command);
}
}

5
linphone-app/src/app/cli/Cli.hpp
View file

@ -64,7 +64,7 @@ class Cli : public QObject {
);
void execute (QHash<QString, QString> &args) const;
void executeUri (const std::shared_ptr<linphone::Address> &address) const;
void executeUri (QString address, QHash<QString, QString> args) const;
void executeUrl (const QString &url) const;
const char *getFunctionDescription () const {
@ -73,11 +73,12 @@ class Cli : public QObject {
QString getFunctionSyntax () const ;
QHash<QString, Argument> mArgsScheme;
private:
QString mFunctionName;
const char *mFunctionDescription;
Function mFunction = nullptr;
QHash<QString, Argument> mArgsScheme;
bool mGenericArguments=false;// Used to avoid check on arguments
};

2
linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml
View file

@ -113,7 +113,7 @@ SearchBox {
searchBox.addContact(sipAddress)
})
genSipAddress: searchBox.filter
genSipAddress: searchBox.filter.replace(/\n+$/, "")
model: SearchSipAddressesProxyModel {
id:searchModel