mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 05:31:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move Fingerprint to api package

Browse source
This commit is contained in:
Benoit Marty 2022-04-11 12:25:00 +02:00 committed by Benoit Marty
parent 0720196ee6
commit b1f4aa91e2
13 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/HomeServerConnectionConfig.kt
View file

@ -22,7 +22,7 @@ import okhttp3.CipherSuite
import okhttp3.ConnectionSpec
import okhttp3.TlsVersion
import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig.Builder
import org.matrix.android.sdk.internal.network.ssl.Fingerprint
import org.matrix.android.sdk.api.network.ssl.Fingerprint
import org.matrix.android.sdk.internal.util.ensureTrailingSlash
/**

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
View file

@ -17,8 +17,8 @@
package org.matrix.android.sdk.api.failure
import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
import org.matrix.android.sdk.api.network.ssl.Fingerprint
import org.matrix.android.sdk.api.session.crypto.MXCryptoError
import org.matrix.android.sdk.internal.network.ssl.Fingerprint
import java.io.IOException
/**

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
View file

@ -16,7 +16,7 @@
package org.matrix.android.sdk.api.failure
import org.matrix.android.sdk.internal.network.ssl.Fingerprint
import org.matrix.android.sdk.api.network.ssl.Fingerprint
// This class will be sent to the bus
sealed class GlobalError {

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/Fingerprint.kt → matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ssl/Fingerprint.kt
View file

@ -14,10 +14,11 @@
* limitations under the License.
*/
package org.matrix.android.sdk.internal.network.ssl
package org.matrix.android.sdk.api.network.ssl
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import org.matrix.android.sdk.internal.network.ssl.CertUtil
import java.security.cert.CertificateException
import java.security.cert.X509Certificate

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
View file

@ -26,12 +26,12 @@ import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
import org.matrix.android.sdk.api.auth.data.SessionParams
import org.matrix.android.sdk.api.auth.data.WellKnownBaseConfig
import org.matrix.android.sdk.api.legacy.LegacySessionImporter
import org.matrix.android.sdk.api.network.ssl.Fingerprint
import org.matrix.android.sdk.internal.auth.SessionParamsStore
import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreMigration
import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreModule
import org.matrix.android.sdk.internal.database.RealmKeysUtils
import org.matrix.android.sdk.internal.legacy.riot.LoginStorage
import org.matrix.android.sdk.internal.network.ssl.Fingerprint
import org.matrix.android.sdk.api.util.md5
import timber.log.Timber
import java.io.File

1
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt
View file

@ -16,6 +16,7 @@
package org.matrix.android.sdk.internal.network.ssl
import org.matrix.android.sdk.api.network.ssl.Fingerprint
import java.security.cert.CertificateException
import java.security.cert.X509Certificate
import javax.net.ssl.X509TrustManager

1
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt
View file

@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.network.ssl
import android.os.Build
import androidx.annotation.RequiresApi
import org.matrix.android.sdk.api.network.ssl.Fingerprint
import java.net.Socket
import java.security.cert.CertificateException
import java.security.cert.X509Certificate

1
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt
View file

@ -17,6 +17,7 @@
package org.matrix.android.sdk.internal.network.ssl
import android.os.Build
import org.matrix.android.sdk.api.network.ssl.Fingerprint
import javax.net.ssl.X509ExtendedTrustManager
import javax.net.ssl.X509TrustManager

1
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/UnrecognizedCertificateException.kt
View file

@ -16,6 +16,7 @@
package org.matrix.android.sdk.internal.network.ssl
import org.matrix.android.sdk.api.network.ssl.Fingerprint
import java.security.cert.CertificateException
import java.security.cert.X509Certificate

2
vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
View file

@ -21,7 +21,7 @@ import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.resources.StringProvider
import im.vector.app.databinding.DialogSslFingerprintBinding
import org.matrix.android.sdk.internal.network.ssl.Fingerprint
import org.matrix.android.sdk.api.network.ssl.Fingerprint
import timber.log.Timber
import java.util.HashMap
import java.util.HashSet

2
vector/src/main/java/im/vector/app/features/login/LoginAction.kt
View file

@ -20,7 +20,7 @@ import im.vector.app.core.platform.VectorViewModelAction
import org.matrix.android.sdk.api.auth.data.Credentials
import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
import org.matrix.android.sdk.internal.network.ssl.Fingerprint
import org.matrix.android.sdk.api.network.ssl.Fingerprint
sealed class LoginAction : VectorViewModelAction {
data class OnGetStarted(val resetLoginConfig: Boolean) : LoginAction()

2
vector/src/main/java/im/vector/app/features/login2/LoginAction2.kt
View file

@ -21,7 +21,7 @@ import im.vector.app.features.login.LoginConfig
import org.matrix.android.sdk.api.auth.data.Credentials
import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
import org.matrix.android.sdk.internal.network.ssl.Fingerprint
import org.matrix.android.sdk.api.network.ssl.Fingerprint
sealed class LoginAction2 : VectorViewModelAction {
// First action

2
vector/src/main/java/im/vector/app/features/onboarding/OnboardingAction.kt
View file

@ -22,7 +22,7 @@ import im.vector.app.features.login.LoginConfig
import im.vector.app.features.login.ServerType
import im.vector.app.features.login.SignMode
import org.matrix.android.sdk.api.auth.data.Credentials
import org.matrix.android.sdk.internal.network.ssl.Fingerprint
import org.matrix.android.sdk.api.network.ssl.Fingerprint
sealed interface OnboardingAction : VectorViewModelAction {
data class OnGetStarted(val resetLoginConfig: Boolean, val onboardingFlow: OnboardingFlow) : OnboardingAction