mirror of
https://github.com/element-hq/element-android
synced 2024-11-24 02:15:35 +03:00
Separates some method parameters
This commit is contained in:
parent
3f3662e605
commit
6c21a6b48d
5 changed files with 13 additions and 7 deletions
|
@ -200,7 +200,8 @@ interface KeysBackupService {
|
|||
*/
|
||||
fun restoreKeysWithRecoveryKey(
|
||||
keysVersionResult: KeysVersionResult,
|
||||
recoveryKey: String, roomId: String?,
|
||||
recoveryKey: String,
|
||||
roomId: String?,
|
||||
sessionId: String?,
|
||||
stepProgressListener: StepProgressListener?,
|
||||
callback: MatrixCallback<ImportRoomKeysResult>
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
||||
/**
|
||||
|
|
|
@ -59,7 +59,8 @@ internal abstract class DefaultVerificationTransaction(
|
|||
protected fun trust(
|
||||
canTrustOtherUserMasterKey: Boolean,
|
||||
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 Mark myMSK trusted $eventuallyMarkMyMasterKeyAsTrusted")
|
||||
|
|
|
@ -36,8 +36,7 @@ internal abstract class BindThreePidsTask : Task<BindThreePidsTask.Params, Unit>
|
|||
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) {
|
||||
|
|
|
@ -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())
|
||||
|
|
Loading…
Reference in a new issue