rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separates some method parameters

Browse Source
This commit is contained in:
ericdecanini 2022-05-24 15:26:24 +02:00
parent 3f3662e605
commit 6c21a6b48d
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
View File

@ -200,7 +200,8 @@ interface KeysBackupService {
*/ */
fun restoreKeysWithRecoveryKey( fun restoreKeysWithRecoveryKey(
keysVersionResult: KeysVersionResult, keysVersionResult: KeysVersionResult,
recoveryKey: String, roomId: String?, recoveryKey: String,
roomId: String?,
sessionId: String?, sessionId: String?,
stepProgressListener: StepProgressListener?, stepProgressListener: StepProgressListener?,
callback: MatrixCallback<ImportRoomKeysResult> callback: MatrixCallback<ImportRoomKeysResult>

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
View File

@ -483,8 +483,12 @@ internal interface IMXCryptoStore {
fun getWithHeldMegolmSession(roomId: String, sessionId: String): RoomKeyWithHeldContent? fun getWithHeldMegolmSession(roomId: String, sessionId: String): RoomKeyWithHeldContent?
fun markedSessionAsShared( fun markedSessionAsShared(
roomId: String?, sessionId: String, userId: String, deviceId: String, roomId: String?,
deviceIdentityKey: String, chainIndex: Int sessionId: String,
userId: String,
deviceId: String,
deviceIdentityKey: String,
chainIndex: Int
) )
/** /**

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
View File

@ -59,7 +59,8 @@ internal abstract class DefaultVerificationTransaction(
protected fun trust( protected fun trust(
canTrustOtherUserMasterKey: Boolean, canTrustOtherUserMasterKey: Boolean,
toVerifyDeviceIds: List<String>, toVerifyDeviceIds: List<String>,
eventuallyMarkMyMasterKeyAsTrusted: Boolean, autoDone: Boolean = true eventuallyMarkMyMasterKeyAsTrusted: Boolean,
autoDone: Boolean = true
) { ) {
Timber.d("## Verification: trust ($otherUserId,$otherDeviceId) , verifiedDevices:$toVerifyDeviceIds") Timber.d("## Verification: trust ($otherUserId,$otherDeviceId) , verifiedDevices:$toVerifyDeviceIds")
Timber.d("## Verification: trust Mark myMSK trusted $eventuallyMarkMyMasterKeyAsTrusted") Timber.d("## Verification: trust Mark myMSK trusted $eventuallyMarkMyMasterKeyAsTrusted")

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
View File

@ -36,8 +36,7 @@ internal abstract class BindThreePidsTask : Task<BindThreePidsTask.Params, Unit>
internal class DefaultBindThreePidsTask @Inject constructor( internal class DefaultBindThreePidsTask @Inject constructor(
private val profileAPI: ProfileAPI, private val profileAPI: ProfileAPI,
private val identityStore: IdentityStore, private val identityStore: IdentityStore,
@AuthenticatedIdentity @AuthenticatedIdentity private val accessTokenProvider: AccessTokenProvider,
private val accessTokenProvider: AccessTokenProvider,
private val globalErrorReceiver: GlobalErrorReceiver private val globalErrorReceiver: GlobalErrorReceiver
) : BindThreePidsTask() { ) : BindThreePidsTask() {
override suspend fun execute(params: Params) { override suspend fun execute(params: Params) {

3
vector/src/main/java/im/vector/app/features/login2/LoginWebFragment2.kt
View File

@ -125,7 +125,8 @@ class LoginWebFragment2 @Inject constructor(
views.loginWebWebView.webViewClient = object : WebViewClient() { views.loginWebWebView.webViewClient = object : WebViewClient() {
override fun onReceivedSslError( override fun onReceivedSslError(
view: WebView, handler: SslErrorHandler, view: WebView,
handler: SslErrorHandler,
error: SslError error: SslError
) { ) {
MaterialAlertDialogBuilder(requireActivity()) MaterialAlertDialogBuilder(requireActivity())