From 7292c4e13d2c02c52883732aee957d4e656f4952 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 30 Jun 2021 13:57:42 +0200 Subject: [PATCH] Code quality --- .../internal/wellknown/GetWellknownTask.kt | 1 - .../dialogs/UnrecognizedCertificateDialog.kt | 20 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt index 0cdb6c999b..fdeb8c1ca5 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt @@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.wellknown import android.util.MalformedJsonException import dagger.Lazy -import org.matrix.android.sdk.api.MatrixPatterns import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig import org.matrix.android.sdk.api.auth.data.WellKnown import org.matrix.android.sdk.api.auth.wellknown.WellknownResult diff --git a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt index c1efc72ba7..39458a054a 100644 --- a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt @@ -50,7 +50,15 @@ class UnrecognizedCertificateDialog @Inject constructor( val userId = activeSessionHolder.getSafeActiveSession()?.myUserId val hsConfig = activeSessionHolder.getSafeActiveSession()?.sessionParams?.homeServerConnectionConfig ?: return - internalShow(activity, unrecognizedFingerprint, true, callback, userId, hsConfig.homeServerUriBase.toString(), hsConfig.allowedFingerprints.isNotEmpty()) + internalShow( + activity = activity, + unrecognizedFingerprint = unrecognizedFingerprint, + existing = true, + callback = callback, + userId = userId, + homeServerUrl = hsConfig.homeServerUriBase.toString(), + homeServerConnectionConfigHasFingerprints = hsConfig.allowedFingerprints.isNotEmpty() + ) } /** @@ -60,7 +68,15 @@ class UnrecognizedCertificateDialog @Inject constructor( unrecognizedFingerprint: Fingerprint, homeServerUrl: String, callback: Callback) { - internalShow(activity, unrecognizedFingerprint, false, callback, null, homeServerUrl, false) + internalShow( + activity = activity, + unrecognizedFingerprint = unrecognizedFingerprint, + existing = false, + callback = callback, + userId = null, + homeServerUrl = homeServerUrl, + homeServerConnectionConfigHasFingerprints = false + ) } /**