From d69881f321c1eecab3b066fb104f3b9119cf522f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 12 Dec 2019 17:41:16 +0100 Subject: [PATCH] cleanup --- .../matrix/android/internal/auth/db/RealmSessionParamsStore.kt | 1 - .../main/java/im/vector/riotx/core/extensions/UrlExtensions.kt | 1 - .../java/im/vector/riotx/core/platform/VectorBaseActivity.kt | 2 +- .../java/im/vector/riotx/features/signout/SoftLogoutActivity.kt | 1 - .../im/vector/riotx/features/signout/SoftLogoutViewState.kt | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt index 2a6ed732b6..a4774c632a 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt @@ -95,7 +95,6 @@ internal class RealmSessionParamsStore @Inject constructor(private val mapper: S } } - override suspend fun updateCredentials(newCredentials: Credentials) { awaitTransaction(realmConfiguration) { realm -> val currentSessionParams = realm diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt b/vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt index 2141b571a3..7614fda619 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt +++ b/vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt @@ -36,7 +36,6 @@ fun StringBuilder.appendParamToUrl(param: String, value: String): StringBuilder return this } - /** * Ex: "https://matrix.org/" -> "matrix.org" */ diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt index 11d3d5da42..c98b53b2da 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt @@ -197,7 +197,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector { protected open fun handleInvalidToken(globalError: GlobalError.InvalidToken) { Timber.w("Invalid token event received") - if(mainActivityStarted) { + if (mainActivityStarted) { return } diff --git a/vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutActivity.kt b/vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutActivity.kt index cebce7fad4..354cf46a79 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutActivity.kt @@ -83,4 +83,3 @@ class SoftLogoutActivity : VectorBaseActivity() { Timber.w("Ignoring invalid token global error") } } - diff --git a/vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutViewState.kt b/vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutViewState.kt index 003a7af8e0..87b6a420e1 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutViewState.kt @@ -32,5 +32,4 @@ data class SoftLogoutViewState( fun isLoading(): Boolean { return asyncLoginAction is Loading } - }