mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-26 20:57:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rename parameter

Browse source
This commit is contained in:
Benoit Marty 2020-01-27 11:22:30 +01:00
parent f80861bed8
commit fc04833157
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationAction.kt
View file

@ -19,10 +19,10 @@ package im.vector.riotx.features.crypto.verification
import im.vector.riotx.core.platform.VectorViewModelAction import im.vector.riotx.core.platform.VectorViewModelAction
sealed class VerificationAction : VectorViewModelAction { sealed class VerificationAction : VectorViewModelAction {
data class RequestVerificationByDM(val userID: String, val roomId: String?) : VerificationAction() data class RequestVerificationByDM(val otherUserId: String, val roomId: String?) : VerificationAction()
data class StartSASVerification(val userID: String, val pendingRequestTransactionId: String) : VerificationAction() data class StartSASVerification(val otherUserId: String, val pendingRequestTransactionId: String) : VerificationAction()
data class RemoteQrCodeScanned(val userID: String, val transactionId: String, val scannedData: String) : VerificationAction() data class RemoteQrCodeScanned(val otherUserId: String, val transactionId: String, val scannedData: String) : VerificationAction()
data class SASMatchAction(val userID: String, val sasTransactionId: String) : VerificationAction() data class SASMatchAction(val otherUserId: String, val sasTransactionId: String) : VerificationAction()
data class SASDoNotMatchAction(val userID: String, val sasTransactionId: String) : VerificationAction() data class SASDoNotMatchAction(val otherUserId: String, val sasTransactionId: String) : VerificationAction()
object GotItConclusion : VerificationAction() object GotItConclusion : VerificationAction()
} }

6
vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
View file

@ -166,18 +166,18 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(@Assisted ini
} }
is VerificationAction.RemoteQrCodeScanned -> { is VerificationAction.RemoteQrCodeScanned -> {
val existingTransaction = session.getVerificationService() val existingTransaction = session.getVerificationService()
.getExistingTransaction(action.userID, action.transactionId) as? QRVerificationTransaction .getExistingTransaction(action.otherUserId, action.transactionId) as? QRVerificationTransaction
existingTransaction existingTransaction
?.userHasScannedRemoteQrCode(action.scannedData) ?.userHasScannedRemoteQrCode(action.scannedData)
} }
is VerificationAction.SASMatchAction -> { is VerificationAction.SASMatchAction -> {
(session.getVerificationService() (session.getVerificationService()
.getExistingTransaction(action.userID, action.sasTransactionId) .getExistingTransaction(action.otherUserId, action.sasTransactionId)
as? SasVerificationTransaction)?.userHasVerifiedShortCode() as? SasVerificationTransaction)?.userHasVerifiedShortCode()
} }
is VerificationAction.SASDoNotMatchAction -> { is VerificationAction.SASDoNotMatchAction -> {
(session.getVerificationService() (session.getVerificationService()
.getExistingTransaction(action.userID, action.sasTransactionId) .getExistingTransaction(action.otherUserId, action.sasTransactionId)
as? SasVerificationTransaction) as? SasVerificationTransaction)
?.shortCodeDoesNotMatch() ?.shortCodeDoesNotMatch()
} }

12
vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
View file

@ -69,10 +69,10 @@ class VerificationChooseMethodFragment @Inject constructor(
controller.update(state) controller.update(state)
} }
override fun doVerifyBySas() = withState(sharedViewModel) { override fun doVerifyBySas() = withState(sharedViewModel) { state ->
sharedViewModel.handle(VerificationAction.StartSASVerification( sharedViewModel.handle(VerificationAction.StartSASVerification(
it.otherUserMxItem?.id ?: "", state.otherUserMxItem?.id ?: "",
it.pendingRequest.invoke()?.transactionId ?: "")) state.pendingRequest.invoke()?.transactionId ?: ""))
} }
override fun openCamera() { override fun openCamera() {
@ -112,10 +112,10 @@ class VerificationChooseMethodFragment @Inject constructor(
} }
} }
private fun onRemoteQrCodeScanned(remoteQrCode: String) = withState(sharedViewModel) { private fun onRemoteQrCodeScanned(remoteQrCode: String) = withState(sharedViewModel) { state ->
sharedViewModel.handle(VerificationAction.RemoteQrCodeScanned( sharedViewModel.handle(VerificationAction.RemoteQrCodeScanned(
it.otherUserMxItem?.id ?: "", state.otherUserMxItem?.id ?: "",
it.pendingRequest.invoke()?.transactionId ?: "", state.pendingRequest.invoke()?.transactionId ?: "",
remoteQrCode remoteQrCode
)) ))
} }