mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 19:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix use an account with phone.

Browse source 
Fix compose messages.
This commit is contained in:
Julien Wadel 2023-07-18 12:46:22 +02:00
parent 6ce24013c2
commit 6f446c3c76
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
linphone-app/src/components/assistant/AssistantModel.cpp
View file

@ -187,9 +187,9 @@ private:
}
void onRecoverAccount (
const shared_ptr<linphone::AccountCreator> &,
const shared_ptr<linphone::AccountCreator> &accountCreator,
linphone::AccountCreator::Status status,
const string &
const string &response
) override {
if (status == linphone::AccountCreator::Status::RequestOk) {
CoreManager::getInstance()->getSipAddressesModel()->reset();
@ -204,7 +204,21 @@ private:
}
mAssistant->setIsProcessing(false);
}
virtual void onLoginLinphoneAccount(
const std::shared_ptr<linphone::AccountCreator> & creator,
linphone::AccountCreator::Status status,
const std::string & response) override {
if( status == linphone::AccountCreator::Status::RequestOk){
createAccount(creator);
CoreManager::getInstance()->getSipAddressesModel()->reset();
emit mAssistant->activateStatusChanged(QString(""));
} else {
if (status == linphone::AccountCreator::Status::RequestFailed)
emit mAssistant->activateStatusChanged(tr("requestFailed"));
else
emit mAssistant->activateStatusChanged(tr("smsActivationFailed"));
}
}
private:
AssistantModel *mAssistant;
};
@ -237,9 +251,11 @@ AssistantModel::~AssistantModel(){
void AssistantModel::activate () {
setIsProcessing(true);
if (mAccountCreator->getEmail().empty())
mAccountCreator->activateAccount();
else
if (mAccountCreator->getEmail().empty()){
if(mAccountCreator->getUsername().empty())
mAccountCreator->setUsername(mAccountCreator->getPhoneNumber());
mAccountCreator->loginLinphoneAccount();// It will detect if phone is an alias or not.
}else
mAccountCreator->isAccountActivated();
}
@ -251,6 +267,8 @@ void AssistantModel::create () {
void AssistantModel::login () {
setIsProcessing(true);
if(mAccountCreator->getUsername().empty())
mAccountCreator->setUsername(mAccountCreator->getPhoneNumber());
if (!mCountryCode.isEmpty()) {// Recovering account from phone
mAccountCreator->requestAccountCreationRequestToken();
return;

1
linphone-app/ui/modules/Linphone/Chat/Chat.qml
View file

@ -442,6 +442,7 @@ Rectangle {
onTextChanged: {// This slot can be call before the item has been completed because of Rich text. So the cache must not take it account.
if(componentReady) {
proxyModel.cachedText=text
Logic.handleTextChanged(textArea.getText())
}
}
onValidText: {