Create asValidObject method - make it compiles #2

element-hq · Mar 5, 2020 · e326631 · e326631
1 parent a3f8a53
commit e326631
Show file tree

Hide file tree

Showing 18 changed files with 68 additions and 26 deletions.
diff --git a/...est/java/im/vector/matrix/android/internal/crypto/verification/qrcode/VerificationTest.kt b/...est/java/im/vector/matrix/android/internal/crypto/verification/qrcode/VerificationTest.kt
@@ -24,7 +24,7 @@ import im.vector.matrix.android.common.CommonTestHelper
 import im.vector.matrix.android.common.CryptoTestHelper
 import im.vector.matrix.android.common.TestConstants
 import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth
-import im.vector.matrix.android.internal.crypto.verification.PendingVerificationRequest
+import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest
 import org.amshove.kluent.shouldBe
 import org.junit.FixMethodOrder
 import org.junit.Test

diff --git a/...erification/PendingVerificationRequest.kt → ...erification/PendingVerificationRequest.kt b/...erification/PendingVerificationRequest.kt → ...erification/PendingVerificationRequest.kt
@@ -13,18 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.matrix.android.internal.crypto.verification
+package im.vector.matrix.android.api.session.crypto.verification
 
 import im.vector.matrix.android.api.extensions.orFalse
-import im.vector.matrix.android.api.session.crypto.verification.CancelCode
 import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_QR_CODE_SCAN
 import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_QR_CODE_SHOW
 import im.vector.matrix.android.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
 import java.util.UUID
 
 /**
  * Stores current pending verification requests
- * TODO We should not expose this whole object to the app. Create an interface
  */
 data class PendingVerificationRequest(
         val ageLocalTs: Long,

diff --git a/...va/im/vector/matrix/android/api/session/crypto/verification/ValidVerificationInfoReady.kt b/...va/im/vector/matrix/android/api/session/crypto/verification/ValidVerificationInfoReady.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.api.session.crypto.verification
+
+data class ValidVerificationInfoReady(
+        val transactionID: String,
+        val fromDevice: String,
+        val methods: List<String>
+)
diff --git a/.../im/vector/matrix/android/api/session/crypto/verification/ValidVerificationInfoRequest.kt b/.../im/vector/matrix/android/api/session/crypto/verification/ValidVerificationInfoRequest.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.api.session.crypto.verification
+
+data class ValidVerificationInfoRequest(
+        val transactionID: String,
+        val fromDevice: String,
+        val methods: List<String>,
+        val timestamp: Long?
+)
diff --git a/...main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationService.kt b/...main/java/im/vector/matrix/android/api/session/crypto/verification/VerificationService.kt
@@ -18,7 +18,6 @@ package im.vector.matrix.android.api.session.crypto.verification
 
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.events.model.LocalEcho
-import im.vector.matrix.android.internal.crypto.verification.PendingVerificationRequest
 
 /**
  * https://matrix.org/docs/spec/client_server/r0.5.0#key-verification-framework

diff --git a/...src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationStart.kt b/...src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationStart.kt
@@ -26,7 +26,7 @@ import im.vector.matrix.android.internal.util.JsonCanonicalizer
 @JsonClass(generateAdapter = true)
 internal data class KeyVerificationStart(
         @Json(name = "from_device") override val fromDevice: String? = null,
-        override val method: String? = null,
+        @Json(name = "method") override val method: String? = null,
         @Json(name = "transaction_id") override val transactionID: String? = null,
         @Json(name = "key_agreement_protocols") override val keyAgreementProtocols: List<String>? = null,
         @Json(name = "hashes") override val hashes: List<String>? = null,

diff --git a/.../android/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt b/.../android/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
@@ -213,7 +213,7 @@ internal class DefaultIncomingSASDefaultVerificationTransaction(
         state = VerificationTxState.ShortCodeReady
     }
 
-    override fun onKeyVerificationMac(vKey: ValidVerificationInfoMac) {
+    override fun onKeyVerificationMac(vMac: ValidVerificationInfoMac) {
         Timber.v("## SAS I: received mac for request id:$transactionId")
         // Check for state?
         if (state != VerificationTxState.SendingKey
@@ -226,7 +226,7 @@ internal class DefaultIncomingSASDefaultVerificationTransaction(
             cancel(CancelCode.UnexpectedMessage)
             return
         }
-        theirMac = vKey
+        theirMac = vMac
 
         // Do I have my Mac?
         if (myMac != null) {

diff --git a/.../android/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt b/.../android/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
@@ -94,7 +94,7 @@ internal class DefaultOutgoingSASDefaultVerificationTransaction(
                 KNOWN_MACS,
                 KNOWN_SHORT_CODES
         )
-kk
+
         startReq = startMessage.asValidObject() as? ValidVerificationInfoStart.SasVerificationInfoStart
         state = VerificationTxState.SendingStart
 
@@ -206,7 +206,7 @@ kk
         }
     }
 
-    override fun onKeyVerificationMac(vKey: ValidVerificationInfoMac) {
+    override fun onKeyVerificationMac(vMac: ValidVerificationInfoMac) {
         Timber.v("## SAS O: onKeyVerificationMac id:$transactionId")
         if (state != VerificationTxState.OnKeyReceived
                 && state != VerificationTxState.ShortCodeReady
@@ -218,7 +218,7 @@ kk
             return
         }
 
-        theirMac = vKey
+        theirMac = vMac
 
         // Do I have my Mac?
         if (myMac != null) {

diff --git a/.../java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt b/.../java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt
@@ -20,6 +20,8 @@ import android.os.Handler
 import android.os.Looper
 import dagger.Lazy
 import im.vector.matrix.android.api.MatrixCallback
+import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest
+import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoReady
 import im.vector.matrix.android.api.session.crypto.CryptoService
 import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
 import im.vector.matrix.android.api.session.crypto.verification.CancelCode

diff --git a/...m/vector/matrix/android/internal/crypto/verification/SASDefaultVerificationTransaction.kt b/...m/vector/matrix/android/internal/crypto/verification/SASDefaultVerificationTransaction.kt
@@ -207,7 +207,7 @@ internal abstract class SASDefaultVerificationTransaction(
 
     abstract fun onKeyVerificationKey(vKey: ValidVerificationInfoKey)
 
-    abstract fun onKeyVerificationMac(vKey: ValidVerificationInfoMac)vMac
+    abstract fun onKeyVerificationMac(vMac: ValidVerificationInfoMac)
 
     protected fun verifyMacs() {
         Timber.v("## SAS verifying macs for id:$transactionId")

diff --git a/.../main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoReady.kt b/.../main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoReady.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.matrix.android.internal.crypto.verification
 
+import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoReady
+
 /**
  * A new event type is added to the key verification framework: m.key.verification.ready,
  * which may be sent by the target of the m.key.verification.request message, upon receipt of the m.key.verification.request event.
@@ -53,8 +55,3 @@ internal interface MessageVerificationReadyFactory {
     fun create(tid: String, methods: List<String>, fromDevice: String): VerificationInfoReady
 }
 
-internal data class ValidVerificationInfoReady(
-        val transactionID: String,
-        val fromDevice: String,
-        val methods: List<String>
-)
diff --git a/...ain/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoRequest.kt b/...ain/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoRequest.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.matrix.android.internal.crypto.verification
 
+import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoRequest
+
 internal interface VerificationInfoRequest : VerificationInfo<ValidVerificationInfoRequest> {
 
     /**
@@ -48,9 +50,3 @@ internal interface VerificationInfoRequest : VerificationInfo<ValidVerificationI
     }
 }
 
-internal data class ValidVerificationInfoRequest(
-        val transactionID: String,
-        val fromDevice: String,
-        val methods: List<String>,
-        val timestamp: Long?
-)
diff --git a/.../main/java/im/vector/matrix/android/internal/crypto/verification/VerificationTransport.kt b/.../main/java/im/vector/matrix/android/internal/crypto/verification/VerificationTransport.kt
@@ -15,6 +15,7 @@
  */
 package im.vector.matrix.android.internal.crypto.verification
 
+import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoRequest
 import im.vector.matrix.android.api.session.crypto.verification.CancelCode
 import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
 

diff --git a/...im/vector/matrix/android/internal/crypto/verification/VerificationTransportRoomMessage.kt b/...im/vector/matrix/android/internal/crypto/verification/VerificationTransportRoomMessage.kt
@@ -22,6 +22,7 @@ import androidx.work.ExistingWorkPolicy
 import androidx.work.Operation
 import androidx.work.WorkInfo
 import im.vector.matrix.android.R
+import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoRequest
 import im.vector.matrix.android.api.session.crypto.verification.CancelCode
 import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
 import im.vector.matrix.android.api.session.events.model.Content

diff --git a/...va/im/vector/matrix/android/internal/crypto/verification/VerificationTransportToDevice.kt b/...va/im/vector/matrix/android/internal/crypto/verification/VerificationTransportToDevice.kt
@@ -16,6 +16,7 @@
 package im.vector.matrix.android.internal.crypto.verification
 
 import im.vector.matrix.android.api.MatrixCallback
+import im.vector.matrix.android.api.session.crypto.verification.ValidVerificationInfoRequest
 import im.vector.matrix.android.api.session.crypto.verification.CancelCode
 import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
 import im.vector.matrix.android.api.session.events.model.EventType

diff --git a/...n/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt b/...n/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -20,7 +20,7 @@ import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.crypto.verification.VerificationService
 import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
 import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState
-import im.vector.matrix.android.internal.crypto.verification.PendingVerificationRequest
+import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest
 import im.vector.riotx.R
 import im.vector.riotx.core.platform.VectorBaseActivity
 import im.vector.riotx.features.home.room.detail.RoomDetailActivity

diff --git a/...ain/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt b/...ain/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -44,7 +44,7 @@ import im.vector.matrix.android.api.util.MatrixItem
 import im.vector.matrix.android.api.util.toMatrixItem
 import im.vector.matrix.android.internal.crypto.crosssigning.fromBase64
 import im.vector.matrix.android.internal.crypto.crosssigning.isVerified
-import im.vector.matrix.android.internal.crypto.verification.PendingVerificationRequest
+import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest
 import im.vector.riotx.core.extensions.exhaustive
 import im.vector.riotx.core.platform.VectorViewModel
 import timber.log.Timber

diff --git a/.../im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt b/.../im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
@@ -26,7 +26,7 @@ import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.crypto.verification.QrCodeVerificationTransaction
 import im.vector.matrix.android.api.session.crypto.verification.VerificationService
 import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction
-import im.vector.matrix.android.internal.crypto.verification.PendingVerificationRequest
+import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest
 import im.vector.riotx.core.di.HasScreenInjector
 import im.vector.riotx.core.platform.EmptyAction
 import im.vector.riotx.core.platform.EmptyViewEvents