Rename `currentThreePid` to `getCurrentThreePid`
This commit is contained in:
parent
e6c8ffd1b8
commit
768df330b5
|
@ -112,7 +112,7 @@ interface RegistrationWizard {
|
||||||
* Returns the current ThreePid, waiting for validation. The SDK will store it in database, so it can be
|
* 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
|
* 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
|
* Return true when login and password have been sent with success to the homeserver, i.e. [createAccount] has been
|
||||||
|
|
|
@ -49,7 +49,7 @@ internal class DefaultRegistrationWizard(
|
||||||
private val validateCodeTask: ValidateCodeTask = DefaultValidateCodeTask(authAPI)
|
private val validateCodeTask: ValidateCodeTask = DefaultValidateCodeTask(authAPI)
|
||||||
private val registerCustomTask: RegisterCustomTask = DefaultRegisterCustomTask(authAPI)
|
private val registerCustomTask: RegisterCustomTask = DefaultRegisterCustomTask(authAPI)
|
||||||
|
|
||||||
override fun currentThreePid(): String? {
|
override fun getCurrentThreePid(): String? {
|
||||||
return when (val threePid = pendingSessionData.currentThreePidData?.threePid) {
|
return when (val threePid = pendingSessionData.currentThreePidData?.threePid) {
|
||||||
is RegisterThreePid.Email -> threePid.email
|
is RegisterThreePid.Email -> threePid.email
|
||||||
is RegisterThreePid.Msisdn -> {
|
is RegisterThreePid.Msisdn -> {
|
||||||
|
|
|
@ -91,7 +91,7 @@ class LoginViewModel @AssistedInject constructor(
|
||||||
private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
|
private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
|
||||||
|
|
||||||
val currentThreePid: String?
|
val currentThreePid: String?
|
||||||
get() = registrationWizard?.currentThreePid()
|
get() = registrationWizard?.getCurrentThreePid()
|
||||||
|
|
||||||
// True when login and password has been sent with success to the homeserver
|
// True when login and password has been sent with success to the homeserver
|
||||||
val isRegistrationStarted: Boolean
|
val isRegistrationStarted: Boolean
|
||||||
|
|
|
@ -92,7 +92,7 @@ class LoginViewModel2 @AssistedInject constructor(
|
||||||
private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
|
private val matrixOrgUrl = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash()
|
||||||
|
|
||||||
val currentThreePid: String?
|
val currentThreePid: String?
|
||||||
get() = registrationWizard?.currentThreePid()
|
get() = registrationWizard?.getCurrentThreePid()
|
||||||
|
|
||||||
// True when login and password has been sent with success to the homeserver
|
// True when login and password has been sent with success to the homeserver
|
||||||
val isRegistrationStarted: Boolean
|
val isRegistrationStarted: Boolean
|
||||||
|
|
|
@ -114,7 +114,7 @@ class OnboardingViewModel @AssistedInject constructor(
|
||||||
get() = authenticationService.getRegistrationWizard()
|
get() = authenticationService.getRegistrationWizard()
|
||||||
|
|
||||||
val currentThreePid: String?
|
val currentThreePid: String?
|
||||||
get() = registrationWizard.currentThreePid()
|
get() = registrationWizard.getCurrentThreePid()
|
||||||
|
|
||||||
// True when login and password has been sent with success to the homeserver
|
// True when login and password has been sent with success to the homeserver
|
||||||
val isRegistrationStarted: Boolean
|
val isRegistrationStarted: Boolean
|
||||||
|
|
Loading…
Reference in New Issue