From 6c21a6b48daa653f361a4f657dd6fa041c8c82a6 Mon Sep 17 00:00:00 2001 From: ericdecanini Date: Tue, 24 May 2022 15:26:24 +0200 Subject: [PATCH] Separates some method parameters --- .../api/session/crypto/keysbackup/KeysBackupService.kt | 3 ++- .../android/sdk/internal/crypto/store/IMXCryptoStore.kt | 8 ++++++-- .../crypto/verification/DefaultVerificationTransaction.kt | 3 ++- .../sdk/internal/session/profile/BindThreePidsTask.kt | 3 +-- .../im/vector/app/features/login2/LoginWebFragment2.kt | 3 ++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt index a0b1604e86..5947c1dca7 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt @@ -200,7 +200,8 @@ interface KeysBackupService { */ fun restoreKeysWithRecoveryKey( keysVersionResult: KeysVersionResult, - recoveryKey: String, roomId: String?, + recoveryKey: String, + roomId: String?, sessionId: String?, stepProgressListener: StepProgressListener?, callback: MatrixCallback diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt index 72014ff3bb..b18de34329 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt @@ -483,8 +483,12 @@ internal interface IMXCryptoStore { fun getWithHeldMegolmSession(roomId: String, sessionId: String): RoomKeyWithHeldContent? fun markedSessionAsShared( - roomId: String?, sessionId: String, userId: String, deviceId: String, - deviceIdentityKey: String, chainIndex: Int + roomId: String?, + sessionId: String, + userId: String, + deviceId: String, + deviceIdentityKey: String, + chainIndex: Int ) /** diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt index b683c8905f..9d19fd137e 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt @@ -59,7 +59,8 @@ internal abstract class DefaultVerificationTransaction( protected fun trust( canTrustOtherUserMasterKey: Boolean, toVerifyDeviceIds: List, - eventuallyMarkMyMasterKeyAsTrusted: Boolean, autoDone: Boolean = true + eventuallyMarkMyMasterKeyAsTrusted: Boolean, + autoDone: Boolean = true ) { Timber.d("## Verification: trust ($otherUserId,$otherDeviceId) , verifiedDevices:$toVerifyDeviceIds") Timber.d("## Verification: trust Mark myMSK trusted $eventuallyMarkMyMasterKeyAsTrusted") diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt index 71e9743c6a..5e892b32c3 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt @@ -36,8 +36,7 @@ internal abstract class BindThreePidsTask : Task internal class DefaultBindThreePidsTask @Inject constructor( private val profileAPI: ProfileAPI, private val identityStore: IdentityStore, - @AuthenticatedIdentity - private val accessTokenProvider: AccessTokenProvider, + @AuthenticatedIdentity private val accessTokenProvider: AccessTokenProvider, private val globalErrorReceiver: GlobalErrorReceiver ) : BindThreePidsTask() { override suspend fun execute(params: Params) { diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt index bc79ef8bd8..e633a110ef 100644 --- a/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt +++ b/vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt @@ -125,7 +125,8 @@ class LoginWebFragment2 @Inject constructor( views.loginWebWebView.webViewClient = object : WebViewClient() { override fun onReceivedSslError( - view: WebView, handler: SslErrorHandler, + view: WebView, + handler: SslErrorHandler, error: SslError ) { MaterialAlertDialogBuilder(requireActivity())