From 5765a754fc86f49b8c520b9b69c53a18150a4db4 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 12 Jun 2024 15:31:59 +0200 Subject: [PATCH] Fix formatting issues --- .../kotlin/io/element/android/appnav/loggedin/SendQueues.kt | 4 ++-- .../io/element/android/appnav/loggedin/SendQueuesTest.kt | 5 ----- .../{OidcConfiguration.kt => OidcConfigurationProvider.kt} | 2 +- .../matrix/impl/auth/RustMatrixAuthenticationService.kt | 6 +++--- .../android/libraries/matrix/impl/timeline/RustTimeline.kt | 1 - 5 files changed, 6 insertions(+), 12 deletions(-) rename libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/{OidcConfiguration.kt => OidcConfigurationProvider.kt} (96%) diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt index e52e9ac758..4960c00f44 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt @@ -38,7 +38,6 @@ class SendQueues @Inject constructor( private val matrixClient: MatrixClient, private val networkMonitor: NetworkMonitor, ) { - fun launchIn(coroutineScope: CoroutineScope) { networkMonitor.connectivity .onEach { networkStatus -> @@ -55,6 +54,7 @@ class SendQueues @Inject constructor( room.setSendQueueEnabled(enabled = true) } } - }.launchIn(coroutineScope) + } + .launchIn(coroutineScope) } } diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt index 682fb08d31..640e81ce96 100644 --- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt +++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt @@ -39,7 +39,6 @@ import org.junit.Test @Test fun `test network status online and sending queue failed`() = runTest { - val sendQueueDisabledFlow = MutableSharedFlow(replay = 1) val setAllSendQueuesEnabledLambda = lambdaRecorder { _: Boolean -> } matrixClient.sendQueueDisabledFlow = sendQueueDisabledFlow @@ -62,12 +61,10 @@ import org.junit.Test assert(setRoomSendQueueEnabledLambda) .isCalledOnce() .with(value(true)) - } @Test fun `test network status offline and sending queue failed`() = runTest { - val sendQueueDisabledFlow = MutableSharedFlow(replay = 1) val setAllSendQueuesEnabledLambda = lambdaRecorder { _: Boolean -> } @@ -91,12 +88,10 @@ import org.junit.Test assert(setRoomSendQueueEnabledLambda) .isNeverCalled() - } @Test fun `test network status getting offline and online`() = runTest { - val setEnableSendingQueueLambda = lambdaRecorder { _: Boolean -> } matrixClient.setAllSendQueuesEnabledLambda = setEnableSendingQueueLambda diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfiguration.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt similarity index 96% rename from libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfiguration.kt rename to libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt index df9168d954..e55f0bd227 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfiguration.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt @@ -21,7 +21,7 @@ import org.matrix.rustcomponents.sdk.OidcConfiguration import java.io.File import javax.inject.Inject -class OidConfigurationProvider @Inject constructor( +class OidcConfigurationProvider @Inject constructor( private val baseDirectory: File, ) { fun get(): OidcConfiguration = OidcConfiguration( diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt index feb98ea9a9..bb65a5a442 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt @@ -69,7 +69,7 @@ class RustMatrixAuthenticationService @Inject constructor( private val passphraseGenerator: PassphraseGenerator, userCertificatesProvider: UserCertificatesProvider, proxyProvider: ProxyProvider, - private val oidConfigurationProvider: OidConfigurationProvider, + private val oidcConfigurationProvider: OidcConfigurationProvider, ) : MatrixAuthenticationService { // Passphrase which will be used for new sessions. Existing sessions will use the passphrase // stored in the SessionData. @@ -81,7 +81,7 @@ class RustMatrixAuthenticationService @Inject constructor( proxy = proxyProvider.provides(), userAgent = userAgentProvider.provide(), additionalRootCertificates = userCertificatesProvider.provides(), - oidcConfiguration = oidConfigurationProvider.get(), + oidcConfiguration = oidcConfigurationProvider.get(), customSlidingSyncProxy = null, sessionDelegate = null, crossProcessRefreshLockId = null, @@ -220,7 +220,7 @@ class RustMatrixAuthenticationService @Inject constructor( .passphrase(pendingPassphrase) .buildWithQrCode( qrCodeData = (qrCodeData as SdkQrCodeLoginData).rustQrCodeData, - oidcConfiguration = oidConfigurationProvider.get(), + oidcConfiguration = oidcConfigurationProvider.get(), progressListener = object : QrLoginProgressListener { override fun onUpdate(state: QrLoginProgress) { Timber.d("QR Code login progress: $state") diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt index b4fd51a03e..593b41deea 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt @@ -281,7 +281,6 @@ class RustTimeline( messageEventContentFromParts(body, htmlBody).withMentions(mentions.map()).use { content -> runCatching { inner.send(content) - Unit } } }