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

Rename `currentThreePid` to `getCurrentThreePid`

This commit is contained in:
Benoit Marty 2022-05-05 18:08:28 +02:00 committed by Benoit Marty
parent e6c8ffd1b8
commit 768df330b5
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
View File

@ -112,7 +112,7 @@ interface RegistrationWizard {
* Returns the current ThreePid, waiting for validation. The SDK will store it in database, so it can be
* restored even if the app has been killed during the registration
*/
fun currentThreePid(): String?
fun getCurrentThreePid(): String?
/**
* Return true when login and password have been sent with success to the homeserver, i.e. [createAccount] has been

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

@ -49,7 +49,7 @@ internal class DefaultRegistrationWizard(
private val validateCodeTask: ValidateCodeTask = DefaultValidateCodeTask(authAPI)
private val registerCustomTask: RegisterCustomTask = DefaultRegisterCustomTask(authAPI)
override fun currentThreePid(): String? {
override fun getCurrentThreePid(): String? {
return when (val threePid = pendingSessionData.currentThreePidData?.threePid) {
is RegisterThreePid.Email -> threePid.email
is RegisterThreePid.Msisdn -> {

2
vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
View File

@ -91,7 +91,7 @@ class LoginViewModel @AssistedInject constructor(
private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
val currentThreePid: String?
get() = registrationWizard?.currentThreePid()
get() = registrationWizard?.getCurrentThreePid()
// True when login and password has been sent with success to the homeserver
val isRegistrationStarted: Boolean

2
vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt
View File

@ -92,7 +92,7 @@ class LoginViewModel2 @AssistedInject constructor(
private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
val currentThreePid: String?
get() = registrationWizard?.currentThreePid()
get() = registrationWizard?.getCurrentThreePid()
// True when login and password has been sent with success to the homeserver
val isRegistrationStarted: Boolean

2
vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
View File

@ -114,7 +114,7 @@ class OnboardingViewModel @AssistedInject constructor(
get() = authenticationService.getRegistrationWizard()
val currentThreePid: String?
get() = registrationWizard.currentThreePid()
get() = registrationWizard.getCurrentThreePid()
// True when login and password has been sent with success to the homeserver
val isRegistrationStarted: Boolean