From 8257847f392e5e15c1bf50d9806c5ae80ef6683a Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 13 Sep 2023 10:51:13 +0200 Subject: [PATCH] Deactivate account creation and login by phone because of unsecure captcha. --- linphone-app/assets/linphonerc-factory | 1 - .../src/components/settings/SettingsModel.cpp | 8 +++++--- .../views/App/Main/Assistant/AssistantHome.qml | 16 ++++++++++++++-- .../App/Main/Assistant/CreateAppSipAccount.qml | 3 +++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/linphone-app/assets/linphonerc-factory b/linphone-app/assets/linphonerc-factory index 7b3b4e8e5..95a48025c 100644 --- a/linphone-app/assets/linphonerc-factory +++ b/linphone-app/assets/linphonerc-factory @@ -20,7 +20,6 @@ update_presence_model_timestamp_before_publish_expires_refresh=1 max_conference_size=vga [ui] - use_qrcode=0 [account_creator] diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index a5a8d39f4..c5d619683 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -237,12 +237,14 @@ void SettingsModel::setAutoApplyProvisioningConfigUriHandlerEnabled (bool status // --------------------------------------------------------------------------- bool SettingsModel::getAssistantSupportsPhoneNumbers () const { - return !!mConfig->getInt(UiSection, "assistant_supports_phone_numbers", 1); + return !!mConfig->getInt(UiSection, getEntryFullName(UiSection, "assistant_supports_phone_numbers") , 1); } void SettingsModel::setAssistantSupportsPhoneNumbers (bool status) { - mConfig->setInt(UiSection, "assistant_supports_phone_numbers", status); - emit assistantSupportsPhoneNumbersChanged(status); + if(!isReadOnly(UiSection, "assistant_supports_phone_numbers")) { + mConfig->setInt(UiSection, "assistant_supports_phone_numbers", status); + emit assistantSupportsPhoneNumbersChanged(status); + } } bool SettingsModel::useWebview() const{ diff --git a/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml b/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml index 4f37ff765..84a819828 100644 --- a/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml +++ b/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml @@ -118,12 +118,24 @@ ColumnLayout { onClicked:{ assistant.pushView($view, $props) } } } - + Connections{ + target: SettingsModel + onAssistantSupportsPhoneNumbersChanged: { + if(!SettingsModel.useWebview()){ + buttonsModel.get(0).$view = !SettingsModel.assistantSupportsPhoneNumbers ? 'CreateAppSipAccountWithEmail' : 'CreateAppSipAccount' + } + } + } model: ListModel { + id: buttonsModel Component.onCompleted: { insert(0, { $text: qsTr('createAppSipAccount'), - $view: SettingsModel.useWebview() ? 'CreateAppSipAccountWithWebView' : 'CreateAppSipAccount', + $view: SettingsModel.useWebview() + ? 'CreateAppSipAccountWithWebView' + : !SettingsModel.assistantSupportsPhoneNumbers + ? 'CreateAppSipAccountWithEmail' + : 'CreateAppSipAccount', $viewType: 'CreateAppSipAccount', $props: SettingsModel.useWebview() ? {defaultUrl: SettingsModel.assistantRegistrationUrl, defaultLogoutUrl:SettingsModel.assistantLogoutUrl, configFilename: 'create-app-sip-account.rc'} : {} diff --git a/linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccount.qml index ff49deb93..2e9f4dd88 100644 --- a/linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccount.qml +++ b/linphone-app/ui/views/App/Main/Assistant/CreateAppSipAccount.qml @@ -1,6 +1,8 @@ import QtQuick 2.7 import Common 1.0 +import ConstantsCpp 1.0 +import Linphone 1.0 import App.Styles 1.0 @@ -22,6 +24,7 @@ import App.Styles 1.0 width: CreateAppSipAccountStyle.buttons.button.width TextButtonA { + visible: SettingsModel.assistantSupportsPhoneNumbers text: qsTr('withPhoneNumber') height: CreateAppSipAccountStyle.buttons.button.height