diff --git a/linphone-app/assets/languages/cs.ts b/linphone-app/assets/languages/cs.ts index 9d2143775..1f82f51f2 100644 --- a/linphone-app/assets/languages/cs.ts +++ b/linphone-app/assets/languages/cs.ts @@ -1506,6 +1506,11 @@ Adresa URL není nakonfigurována. remoteProvisioningUpdateDescription Je nutné aplikaci restartovat. Chcete ji nyní restartovat? + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index 6a0b7f585..9882e467b 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -1495,6 +1495,11 @@ Server url ikke konfigureret. remoteProvisioningUpdateDescription Det er nødvendigt at genstarte applikationen. Vil du gøre det nu? + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index 7524b0c9d..fa01528d0 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -1495,6 +1495,11 @@ Server URL ist nicht konfiguriert. remoteProvisioningUpdateDescription Ein Neustart der Anwendung ist notwendig. Möchten Sie die Anwendung jetzt neu starten? + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 3bb5e6cf3..265e09d83 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -1495,6 +1495,10 @@ Server URL not configured. remoteProvisioningUpdateDescription It is necessary to restart the application. Do you want to restart now? + + remoteProvisioningWarnAccountOverwrite + An account is already provisioned. This action will erase the existing account. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index ba796c072..30371a639 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -1495,6 +1495,11 @@ URL del servidor no configurada. remoteProvisioningUpdateDescription Es necesario reiniciar la aplicación. ¿Desea reiniciarla ahora? + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index 884f7c9b3..ab8c20d6f 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -1495,6 +1495,10 @@ URL du serveur non configurée. remoteProvisioningUpdateDescription Voulez-vous redémarrer maintenant pour prendre en compte ces modifications ? + + remoteProvisioningWarnAccountOverwrite + Un compte est déjà configuré. Cette action effacera le compte existant. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 4a7779a80..c5a7b8bfe 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -1484,6 +1484,11 @@ A kiszolgáló URL-je nincs konfigurálva. remoteProvisioningUpdateDescription Az alkalmazás újraindítása szükséges. Szeretné most újraindítani? + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 9f2e06479..85c9aa884 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -1495,6 +1495,11 @@ URL del server non configurato. remoteProvisioningUpdateDescription È necessario riavviare l'applicazione. Vuoi riavviare ora? + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index 268e8095d..d328ac793 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -1484,6 +1484,11 @@ remoteProvisioningUpdateDescription アプリケーションを再起動する必要があります。今すぐ再起動しますか？ + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/ka.ts b/linphone-app/assets/languages/ka.ts index 640811787..e4c34e575 100644 --- a/linphone-app/assets/languages/ka.ts +++ b/linphone-app/assets/languages/ka.ts @@ -1362,6 +1362,11 @@ remoteProvisioningUpdateDescription + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 9be653458..fd8dac505 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -1507,6 +1507,11 @@ Nesukonfigūruotas serverio url. Yra būtina paleisti programą iš naujo. Ar norite tai atlikti dabar? + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/pt.ts b/linphone-app/assets/languages/pt.ts index 9294027e0..6afee54a4 100644 --- a/linphone-app/assets/languages/pt.ts +++ b/linphone-app/assets/languages/pt.ts @@ -1087,6 +1087,11 @@ remoteProvisioningUpdateDescription + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index efaec80b8..e32dc41d3 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -1495,6 +1495,11 @@ URL do servidor não configurado. remoteProvisioningUpdateDescription É necessário reiniciar o aplicativo. Deseja reiniciar agora? + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index f88f1e83b..d82f3df75 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -1506,6 +1506,11 @@ remoteProvisioningUpdateDescription Требуется перезапустить приложение. Хотите перезапустить сейчас? + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 829c53d6f..635c7d165 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -1495,6 +1495,11 @@ Serverwebbadressen är inte konfigurerad. remoteProvisioningUpdateDescription Det är nödvändigt att starta om programmet. Vill du starta om nu? + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 6f96fcb51..aa8513264 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -1484,6 +1484,11 @@ Sunucu url'si yapılandırılmadı. remoteProvisioningUpdateDescription Uygulamanın yeniden başlaması gerekiyor. Şimdi yeniden başlatmak ister misiniz? + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 9a087d2f7..82ba1b1fd 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -1506,6 +1506,10 @@ remoteProvisioningUpdateDescription Потрібно перезапустити застосунок. Бажаєте перезапустити зараз? + + remoteProvisioningWarnAccountOverwrite + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index 2e23fa952..2e4ea1df0 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -1484,6 +1484,11 @@ remoteProvisioningUpdateDescription 需要重启应用程序。您想要立刻重启吗？ + + remoteProvisioningWarnAccountOverwrite + 'An account is already provisioned. This action will erase the existing account. : Warn user about it. + An account is already provisioned. This action will erase the existing account. : Warn user about it. + lastProvisioningFailed 'Last remote provisioning failed' : Test to warn the user that the last fetch of remote provisioning has failed. diff --git a/linphone-app/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml b/linphone-app/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml index 21346e402..0d1036db8 100644 --- a/linphone-app/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml +++ b/linphone-app/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml @@ -46,10 +46,28 @@ import App.Styles 1.0 onOauth2StatusChanged: requestBlock.setText(status) onOauth2RequestFailed: requestBlock.stop(error) onOauth2AuthenticationGranted: requestBlock.stop('') - onProvisioningTokenReceived: {url.text = token - SettingsModel.remoteProvisioning = url.text - assistantModel.qrcode = '' - requestBlock.stop('')} + onProvisioningTokenReceived: { + if (AccountSettingsModel.accounts.length <= ((SettingsModel.showLocalSipAccount ? 1 : 0))) { + url.text = token + SettingsModel.remoteProvisioning = url.text + assistantModel.qrcode = '' + requestBlock.stop('') + } else { + window.detachVirtualWindow() + window.attachVirtualWindow(Utils.buildCommonDialogUri('ConfirmDialog'), { + descriptionText: qsTr('remoteProvisioningWarnAccountOverwrite'), + }, function (confirm) { + if (confirm) { + url.text = token + SettingsModel.remoteProvisioning = url.text + assistantModel.qrcode = '' + requestBlock.stop('') + } else { + window.setView('Home') + } + }) + } + } onQRCodeAttached: requestBlock.stop('Attached') onQRCodeNotAttached: requestBlock.stop(message) @@ -97,8 +115,22 @@ import App.Styles 1.0 Layout.preferredHeight: fitHeight addHeight: 15 - onClicked: SettingsModel.remoteProvisioning = url.text - + onClicked:{ + if (AccountSettingsModel.accounts.length <= ((SettingsModel.showLocalSipAccount ? 1 : 0))) { + SettingsModel.remoteProvisioning = url.text + } else { + window.detachVirtualWindow() + window.attachVirtualWindow(Utils.buildCommonDialogUri('ConfirmDialog'), { + descriptionText: qsTr('remoteProvisioningWarnAccountOverwrite'), + }, function (confirm) { + if (confirm) { + SettingsModel.remoteProvisioning = url.text + } else { + window.setView('Home') + } + }) + } + } text: qsTr('confirmAction') enabled: url.text.length > 0 } diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml index d80d51168..4d62f98d5 100644 --- a/linphone-app/ui/views/App/Main/MainWindow.qml +++ b/linphone-app/ui/views/App/Main/MainWindow.qml @@ -432,7 +432,8 @@ ApplicationWindow { Connections{ target: App onRequestFetchConfig: { - window.attachVirtualWindow(Utils.buildCommonDialogUri('ConfirmDialog'), { + if (AccountSettingsModel.accounts.length <= ((SettingsModel.showLocalSipAccount ? 1 : 0))) { + window.attachVirtualWindow(Utils.buildCommonDialogUri('ConfirmDialog'), { flat: true, //: 'Do you want to download and apply configuration from this URL?' : text to confirm to fetch a specified URL descriptionText: ''+qsTr('confirmFetchUri') @@ -442,6 +443,26 @@ ApplicationWindow { App.setFetchConfig(filePath) } }) + } else { + window.attachVirtualWindow(Utils.buildCommonDialogUri('ConfirmDialog'), { + descriptionText: qsTr('remoteProvisioningWarnAccountOverwrite'), + }, function (confirm) { + if (confirm) { + window.attachVirtualWindow(Utils.buildCommonDialogUri('ConfirmDialog'), { + flat: true, + //: 'Do you want to download and apply configuration from this URL?' : text to confirm to fetch a specified URL + descriptionText: ''+qsTr('confirmFetchUri') + +'

'+filePath, + }, function (status) { + if (status) { + App.setFetchConfig(filePath) + } + }) + } else { + window.setView('Home') + } + }) + } } } }