From 768df330b522d1d7bb2abbb0b27e9636031b526c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 5 May 2022 18:08:28 +0200 Subject: [PATCH] Rename `currentThreePid` to `getCurrentThreePid` --- .../android/sdk/api/auth/registration/RegistrationWizard.kt | 2 +- .../sdk/internal/auth/registration/DefaultRegistrationWizard.kt | 2 +- .../main/java/im/vector/app/features/login/LoginViewModel.kt | 2 +- .../main/java/im/vector/app/features/login2/LoginViewModel2.kt | 2 +- .../im/vector/app/features/onboarding/OnboardingViewModel.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt index 6100ae2a80..14d26bf2b3 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt @@ -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 diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt index 03f54705fc..345f4097db 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt @@ -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 -> { diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt index ed9ec7b3b9..cacbd0e282 100644 --- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt @@ -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 diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt index 1117c32d39..06388a04a0 100644 --- a/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt +++ b/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt @@ -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 diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt index b247086dbf..f795b39c51 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt @@ -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