From 1e8b7341b35a4eb96ffdc361b0e30d6d54d69040 Mon Sep 17 00:00:00 2001 From: Taras Smakula <tarassmakula@gmail.com> Date: Fri, 7 Oct 2022 16:17:30 +0300 Subject: [PATCH] Remove unused registration Swiclops method --- .../auth/registration/RegistrationWizard.kt | 5 ----- .../registration/DefaultRegistrationWizard.kt | 18 ------------------ .../registration/RegistrationCustomParams.kt | 10 +--------- 3 files changed, 1 insertion(+), 32 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 a8111915..628c3731 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 @@ -129,9 +129,4 @@ interface RegistrationWizard { //Added to support few registration flows suspend fun getAllRegistrationFlows(): List<List<Stage>> - //Added to support custom Swiclops registration - suspend fun registrationSwiclops( - authParams: JsonDict, - userName: String?, - initialDeviceDisplayName: String?): RegistrationResult } \ No newline at end of file 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 8401db7f..4777fe2b 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 @@ -295,22 +295,4 @@ internal class DefaultRegistrationWizard( } return emptyList() } - - override suspend fun registrationSwiclops( - authParams: JsonDict, - userName: String?, - initialDeviceDisplayName: String?): RegistrationResult { - val safeSession = pendingSessionData.currentSession - ?: throw IllegalStateException("developer error, call createAccount() method first") - - val mutableParams = authParams.toMutableMap() - mutableParams["session"] = safeSession - - val params = RegistrationCustomParams( - auth = mutableParams, - username = userName, - initialDeviceDisplayName = initialDeviceDisplayName - ) - return performRegistrationOtherRequest(LoginType.CUSTOM, params) - } } \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationCustomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationCustomParams.kt index 21aea43e..814376db 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationCustomParams.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationCustomParams.kt @@ -27,13 +27,5 @@ import org.matrix.android.sdk.api.util.JsonDict internal data class RegistrationCustomParams( // authentication parameters @Json(name = "auth") - val auth: JsonDict? = null, - - // the account username - @Json(name = "username") - val username: String? = null, - - // device name - @Json(name = "initial_device_display_name") - val initialDeviceDisplayName: String? = null, + val auth: JsonDict? = null ) -- GitLab