data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix request error ui get account devices

Browse source
This commit is contained in:
gaelle 2025-03-05 07:49:09 +01:00
parent 37daee36f7
commit c20a54df48
5 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Linphone/core/account/AccountDeviceList.cpp
View file

@ -150,10 +150,13 @@ void AccountDeviceList::setSelf(QSharedPointer<AccountDeviceList> me) {
&AccountManagerServicesModel::requestError, &AccountManagerServicesModel::requestError,
[this](const std::shared_ptr<const linphone::AccountManagerServicesRequest> &request, int statusCode, [this](const std::shared_ptr<const linphone::AccountManagerServicesRequest> &request, int statusCode,
const std::string &errorMessage, const std::string &errorMessage,
const std::shared_ptr<const linphone::Dictionary> &parameterErrors) { const std::shared_ptr<const linphone::Dictionary> &parameterErrors) {
lDebug() << "REQUEST ERROR" << errorMessage; lDebug() << "REQUEST ERROR" << errorMessage << "/" << int(request->getType());
if (request->getType() == linphone::AccountManagerServicesRequest::Type::GetDevicesList) { QString message = QString::fromStdString(errorMessage);
} if (request->getType() == linphone::AccountManagerServicesRequest::Type::GetDevicesList) {
message = tr("Erreur lors de la récupération des appareils");
}
emit requestError(message);
}); });
mAccountManagerServicesModelConnection->makeConnectToModel( mAccountManagerServicesModelConnection->makeConnectToModel(
&AccountManagerServicesModel::devicesListFetched, &AccountManagerServicesModel::devicesListFetched,

1
Linphone/core/account/AccountDeviceList.hpp
View file

@ -56,6 +56,7 @@ public:
signals: signals:
void componentReady(); void componentReady();
void devicesSet(); void devicesSet();
void requestError(QString errorMessage = QString());
private: private:
QSharedPointer<AccountCore> mAccountCore; QSharedPointer<AccountCore> mAccountCore;

1
Linphone/core/account/AccountDeviceProxy.cpp
View file

@ -36,6 +36,7 @@ AccountDeviceProxy::AccountDeviceProxy(QObject *parent) : LimitProxy(parent) {
auto model = getListModel<AccountDeviceList>(); auto model = getListModel<AccountDeviceList>();
if (model) { if (model) {
connect(model, &AccountDeviceList::devicesSet, this, &AccountDeviceProxy::devicesSet); connect(model, &AccountDeviceList::devicesSet, this, &AccountDeviceProxy::devicesSet);
connect(model, &AccountDeviceList::requestError, this, &AccountDeviceProxy::requestError);
} }
}); });
setSourceModels(new SortFilterList(mAccountDeviceList.get(), Qt::DescendingOrder)); setSourceModels(new SortFilterList(mAccountDeviceList.get(), Qt::DescendingOrder));

1
Linphone/core/account/AccountDeviceProxy.hpp
View file

@ -49,6 +49,7 @@ signals:
void lUpdate(); void lUpdate();
void accountChanged(); void accountChanged();
void devicesSet(); void devicesSet();
void requestError(QString message = QString());
private: private:
QString mSearchText; QString mSearchText;

4
Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml
View file

@ -245,6 +245,10 @@ AbstractSettingsLayout {
id: accountDeviceProxy id: accountDeviceProxy
account: model account: model
onDevicesSet: devices.loading = false; onDevicesSet: devices.loading = false;
onRequestError: (errorMessage) => {
devices.loading = false;
mainWindow.showInformationPopup(qsTr("Erreur"), errorMessage, false)
}
} }
Control.Control { Control.Control {
Layout.fillWidth: true Layout.fillWidth: true