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

Handle both fetch-config and call in the same command #LINQT-2306

Browse source 
fix compil warning from ChatProxy
This commit is contained in:
Gaelle Braud 2026-02-05 14:26:22 +01:00
parent 3d1ff2d83e
commit de7b3e1f56
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Linphone/core/App.cpp
View file

@ -782,17 +782,20 @@ void App::initCore() {
if (mIsRestarting) {
if (CoreModel::getInstance()->mConfigStatus == linphone::ConfiguringState::Failed) {
QMetaObject::invokeMethod(thread(), [this]() {
mustBeInMainThread(log().arg(Q_FUNC_INFO));
auto message = CoreModel::getInstance()->mConfigMessage;
//: not reachable
if (message.isEmpty()) message = tr("configuration_error_detail");
mustBeInMainThread(log().arg(Q_FUNC_INFO));
lWarning() << log().arg("Configuration failed (reason: %1)").arg(message);
//: Error
Utils::showInformationPopup(
tr("info_popup_error_title"),
//: Remote provisioning failed : %1
tr("info_popup_configuration_failed_message").arg(message), false);
});
} else {
} else if (CoreModel::getInstance()->mConfigStatus ==
linphone::ConfiguringState::Successful) {
lInfo() << log().arg("Configuration succeed");
mPossiblyLookForAddedAccount = true;
if (mAccountList && mAccountList->getCount() > 0) {
auto defaultConnected =

5
Linphone/core/chat/ChatProxy.hpp
View file

@ -30,13 +30,16 @@
class ChatProxy : public SortFilterProxy, public AbstractObject {
Q_OBJECT
Q_PROPERTY(QAbstractItemModel *model WRITE setSourceModel NOTIFY modelChanged)
Q_PROPERTY(QAbstractItemModel *model READ getSourceModel WRITE setSourceModel NOTIFY modelChanged)
public:
ChatProxy(QObject *parent = Q_NULLPTR);
~ChatProxy();
void setSourceModel(QAbstractItemModel *sourceModel) override;
QAbstractItemModel *getSourceModel() const {
return sourceModel();
}
bool lessThan(const QModelIndex &sourceLeft, const QModelIndex &sourceRight) const override;

33
Linphone/model/cli/CliModel.cpp
View file

@ -282,17 +282,25 @@ void CliModel::Command::executeUri(QString address, QHash<QString, QString> args
QUrl url(address);
QString query = url.query();
lDebug() << QStringLiteral("CliModel : execute uri : %1").arg(query);
QStringList parameters = query.split('&');
for (int i = 0; i < parameters.size(); ++i) {
QStringList parameter = parameters[i].split('=');
lDebug() << QStringLiteral("CliModel : Detecting parameter : %1").arg(parameter[0]);
if (parameter[0] != "" && parameter[0] != "method") {
if (parameter.size() > 1) args[parameter[0]] = QByteArray::fromBase64(parameter[1].toUtf8());
else args[parameter[0]] = "";
QHash<QString, QString> args = parent->parseArgs(parameters[i]);
for (auto it = args.begin(); it != args.end(); ++it) {
auto subfonction = parent->parseFunctionName(it.key(), true);
if (!subfonction.isEmpty()) {
QHash<QString, QString> arg;
arg[it.key()] = QByteArray::fromBase64(it.value().toUtf8());
lDebug() << "parsing parameters" << it.key() << it.value();
parent->addProcess(ProcessCommand(mCommands[it.key()], arg, 1, parent));
}
}
}
args["sip-address"] = address;
args["sip-address"] = address.left(address.indexOf('?'));
lDebug() << "CliModel: getting sip address " << args["sip-address"];
parent->addProcess(ProcessCommand(*this, args, 0, parent));
}
@ -404,7 +412,7 @@ void CliModel::executeCommand(const QString &command) { //, CommandFormat *forma
addProcess(ProcessCommand(mCommands["fetch-config"], arg, 5, this));
} else {
std::shared_ptr<linphone::Address> address;
QString qAddress = transformedCommand.left(transformedCommand.indexOf('?'));
QString qAddress = transformedCommand; //.left(transformedCommand.indexOf('?'));
if (Utils::isUsername(transformedCommand)) {
address = linphone::Factory::get()->createAddress(
Utils::appStringToCoreString(transformedCommand + "@to.remove"));
@ -414,7 +422,6 @@ void CliModel::executeCommand(const QString &command) { //, CommandFormat *forma
} else {
address = linphone::Factory::get()->createAddress(
Utils::appStringToCoreString(qAddress)); // Test if command is an address
qAddress = Utils::coreStringToAppString(address->asStringUriOnly());
}
// if (format) *format = UriFormat;
lInfo() << log().arg("Detecting URI command: `%1`…").arg(command);
@ -434,20 +441,6 @@ void CliModel::executeCommand(const QString &command) { //, CommandFormat *forma
if (functionName.isEmpty()) functionName = "call";
}
}
QStringList fields = command.split('&');
for (int i = 0; i < fields.size(); ++i) {
QHash<QString, QString> args = parseArgs(fields[i]);
QHash<QString, QString> argsToProcess;
for (auto it = args.begin(); it != args.end(); ++it) {
auto subfonction = parseFunctionName(it.key(), true);
if (!subfonction.isEmpty()) {
QHash<QString, QString> arg;
arg[it.key()] = it.value();
// qAddress.remove(fields[i]);
addProcess(ProcessCommand(mCommands[it.key()], arg, 1, this));
}
}
}
functionName = functionName.toLower();
if (functionName.isEmpty()) {