mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-30 09:49:26 +00:00
Fix FlexiApi register
This commit is contained in:
parent
fe1e68f197
commit
7e22ae310e
2 changed files with 23 additions and 10 deletions
|
|
@ -184,11 +184,17 @@ struct RootView: View {
|
|||
WelcomeView()
|
||||
ToastView().zIndex(3)
|
||||
}
|
||||
.onAppear {
|
||||
appDelegate.coreContext = coreContext
|
||||
}
|
||||
} else if showAssistant {
|
||||
ZStack {
|
||||
AssistantView()
|
||||
ToastView().zIndex(3)
|
||||
}
|
||||
.onAppear {
|
||||
appDelegate.coreContext = coreContext
|
||||
}
|
||||
|
||||
if coreContext.coreIsStarted {
|
||||
VStack {} // Force trigger .onAppear
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ class RegisterViewModel: ObservableObject {
|
|||
}
|
||||
|
||||
init() {
|
||||
SharedMainViewModel.shared.getDialPlansList()
|
||||
getAccountCreationToken()
|
||||
|
||||
self.usernameError = ""
|
||||
|
|
@ -175,15 +176,17 @@ class RegisterViewModel: ObservableObject {
|
|||
parameterErrors?.keys.forEach({ parameter in
|
||||
let parameterErrorMessage = parameterErrors?.getString(key: parameter) ?? ""
|
||||
|
||||
switch parameter {
|
||||
case "username":
|
||||
self.usernameError = parameterErrorMessage
|
||||
case "password":
|
||||
self.passwordError = parameterErrorMessage
|
||||
case "phone":
|
||||
self.phoneNumberError = parameterErrorMessage
|
||||
default:
|
||||
break
|
||||
DispatchQueue.main.async {
|
||||
switch parameter {
|
||||
case "username":
|
||||
self.usernameError = parameterErrorMessage
|
||||
case "password":
|
||||
self.passwordError = parameterErrorMessage
|
||||
case "phone":
|
||||
self.phoneNumberError = parameterErrorMessage
|
||||
default:
|
||||
break
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
|
@ -318,9 +321,11 @@ class RegisterViewModel: ObservableObject {
|
|||
request.submit()
|
||||
} catch {
|
||||
Log.error("\(RegisterViewModel.TAG) Can't create account creation token by push request")
|
||||
self.onFlexiApiTokenRequestError()
|
||||
}
|
||||
} else {
|
||||
Log.warn("\(RegisterViewModel.TAG) No remote push token available in core for account creator configuration")
|
||||
Log.error("\(RegisterViewModel.TAG) No remote push token available in core for account creator configuration")
|
||||
self.onFlexiApiTokenRequestError()
|
||||
}
|
||||
|
||||
Log.info("\(RegisterViewModel.TAG) Found push notification info: provider \("apns.dev"), param \(formatedPnParam ?? "error") and prid \(formatedRemoteToken)")
|
||||
|
|
@ -334,6 +339,8 @@ class RegisterViewModel: ObservableObject {
|
|||
Log.error("\(RegisterViewModel.TAG) Flexi API token request by push error!")
|
||||
|
||||
DispatchQueue.main.async {
|
||||
self.createInProgress = false
|
||||
|
||||
ToastViewModel.shared.toastMessage = "Failed_push_notification_not_received_error"
|
||||
ToastViewModel.shared.displayToast = true
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue