rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes post merge errors

Browse Source
This commit is contained in:
ericdecanini 2022-05-17 14:46:02 +02:00
parent b12549831e
commit 6a3044cb2e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
View File

@ -207,7 +207,7 @@ internal class DefaultRegistrationWizard(
mutableParams["session"] = safeSession mutableParams["session"] = safeSession
val params = RegistrationCustomParams(auth = mutableParams) val params = RegistrationCustomParams(auth = mutableParams)
return performRegistrationOtherRequest(params) return performRegistrationOtherRequest(LoginType.CUSTOM, params)
} }
private suspend fun performRegistrationRequest( private suspend fun performRegistrationRequest(
@ -216,17 +216,19 @@ internal class DefaultRegistrationWizard(
delayMillis: Long = 0 delayMillis: Long = 0
): RegistrationResult { ): RegistrationResult {
delay(delayMillis) delay(delayMillis)
return register { registerTask.execute(RegisterTask.Params(registrationParams)) } return register(loginType) { registerTask.execute(RegisterTask.Params(registrationParams)) }
} }
private suspend fun performRegistrationOtherRequest( private suspend fun performRegistrationOtherRequest(
registrationCustomParams: RegistrationCustomParams loginType: LoginType,
registrationCustomParams: RegistrationCustomParams,
): RegistrationResult { ): RegistrationResult {
return register { registerCustomTask.execute(RegisterCustomTask.Params(registrationCustomParams)) } return register(loginType) { registerCustomTask.execute(RegisterCustomTask.Params(registrationCustomParams)) }
} }
private suspend fun register( private suspend fun register(
execute: suspend () -> Credentials loginType: LoginType,
execute: suspend () -> Credentials,
): RegistrationResult { ): RegistrationResult {
val credentials = try { val credentials = try {
execute.invoke() execute.invoke()
@ -241,8 +243,7 @@ internal class DefaultRegistrationWizard(
} }
} }
val session = val session = sessionCreator.createSession(credentials, pendingSessionData.homeServerConnectionConfig, loginType)
sessionCreator.createSession(credentials, pendingSessionData.homeServerConnectionConfig, loginType)
return RegistrationResult.Success(session) return RegistrationResult.Success(session)
} }