Fix / Decline request was not implemented

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasVerificationService.kt

@@ -57,6 +57,8 @@ interface SasVerificationService {
 
     fun requestKeyVerificationInDMs(userId: String, roomId: String): PendingVerificationRequest
 
+    fun declineVerificationRequestInDMs(otherUserId: String, otherDeviceId: String, transactionId: String, roomId: String)
+
     fun beginKeyVerificationInDMs(method: String,
                                   transactionId: String,
                                   roomId: String,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultSasVerificationService.kt

@@ -704,6 +704,16 @@ internal class DefaultSasVerificationService @Inject constructor(
         val transport = sasTransportRoomMessageFactory.createTransport(context, credentials.userId, credentials.deviceId
                 ?: "", roomId, null)
 
+        // Cancel existing pending requests?
+        requestsForUser.forEach { existingRequest ->
+            existingRequest.transactionId?.let { tid ->
+                if (!existingRequest.isFinished) {
+                    Timber.d("## SAS, cancelling pending requests to start a new one")
+                    transport.cancelTransaction(tid, existingRequest.otherUserId, "", CancelCode.User)
+                }
+            }
+        }
+
         val localID = LocalEcho.createLocalEchoId()
 
         val verificationRequest = PendingVerificationRequest(
@@ -727,6 +737,17 @@ internal class DefaultSasVerificationService @Inject constructor(
         return verificationRequest
     }
 
+    override fun declineVerificationRequestInDMs(otherUserId: String, otherDeviceId: String, transactionId: String, roomId: String) {
+        sasTransportRoomMessageFactory.createTransport(context, credentials.userId, credentials.deviceId
+                ?: "", roomId, null).cancelTransaction(transactionId, otherUserId, otherDeviceId, CancelCode.User)
+
+        getExistingVerificationRequest(otherUserId, transactionId)?.let {
+            updatePendingRequest(it.copy(
+                    cancelConclusion = CancelCode.User
+            ))
+        }
+    }
+
     private fun updatePendingRequest(updated: PendingVerificationRequest) {
         val requestsForUser = pendingRequests[updated.otherUserId]
                 ?: ArrayList<PendingVerificationRequest>().also {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/PendingVerificationRequest.kt

@@ -37,4 +37,6 @@ data class PendingVerificationRequest(
 
     val isReady: Boolean = readyInfo != null
     val isSent: Boolean = transactionId != null
+
+    val isFinished: Boolean = isSuccessful || cancelConclusion != null
 }

vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt

@@ -146,7 +146,11 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
         }
 
         // Transaction has not yet started
-        if (it.pendingRequest == null || !it.pendingRequest.isReady) {
+        if (it.pendingRequest?.cancelConclusion != null) {
+            // The request has been declined, we should dismiss
+            dismiss()
+        } else if (it.pendingRequest == null || !it.pendingRequest.isReady) {
+            // We are waiting for other party to reply with ready
             showFragment(VerificationRequestFragment::class, Bundle().apply {
                 putParcelable(MvRx.KEY_ARG, VerificationArgs(it.otherUserMxItem?.id ?: ""))
             })

vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailAction.kt

@@ -65,7 +65,7 @@ sealed class RoomDetailAction : VectorViewModelAction {
     object ResendAll : RoomDetailAction()
 
     data class AcceptVerificationRequest(val transactionId: String, val otherUserId: String, val otherdDeviceId: String) : RoomDetailAction()
-    data class DeclineVerificationRequest(val transactionId: String) : RoomDetailAction()
+    data class DeclineVerificationRequest(val transactionId: String, val otherUserId: String, val otherdDeviceId: String) : RoomDetailAction()
 
     data class RequestVerification(val userId: String) : RoomDetailAction()
 }

vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt

@@ -27,7 +27,6 @@ import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.MatrixPatterns
-import im.vector.matrix.android.api.failure.Failure
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.events.model.isImageMessage
@@ -185,7 +184,7 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
             is RoomDetailAction.ExitTrackingUnreadMessagesState  -> stopTrackingUnreadMessages()
             is RoomDetailAction.AcceptVerificationRequest        -> handleAcceptVerification(action)
             is RoomDetailAction.DeclineVerificationRequest       -> handleDeclineVerification(action)
-            is RoomDetailAction.RequestVerification       -> handleRequestVerification(action)
+            is RoomDetailAction.RequestVerification              -> handleRequestVerification(action)
         }
     }
 
@@ -799,18 +798,14 @@ class RoomDetailViewModel @AssistedInject constructor(@Assisted initialState: Ro
         session.getSasVerificationService().readyPendingVerificationInDMs(action.otherUserId, room.roomId,
                 action.transactionId)
         _requestLiveData.postValue(LiveEvent(Success(action)))
-//        session.getSasVerificationService().beginKeyVerificationInDMs(
-//                KeyVerificationStart.VERIF_METHOD_SAS,
-//                action.transactionId,
-//                room.roomId,
-//                action.otherUserMxItem,
-//                action.otherdDeviceId,
-//                null
-//        )
     }
 
     private fun handleDeclineVerification(action: RoomDetailAction.DeclineVerificationRequest) {
-        Timber.e("TODO implement $action")
+        session.getSasVerificationService().declineVerificationRequestInDMs(
+                action.otherUserId,
+                action.otherdDeviceId,
+                action.transactionId,
+                room.roomId)
     }
 
     private fun handleRequestVerification(action: RoomDetailAction.RequestVerification) {

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/VerificationRequestItem.kt

@@ -137,7 +137,7 @@ abstract class VerificationRequestItem : AbsBaseMessageItem<VerificationRequestI
                         att.otherUserId,
                         att.fromDevide))
             } else if (it == declineButton) {
-                callback?.onTimelineItemAction(RoomDetailAction.DeclineVerificationRequest(att.referenceId))
+                callback?.onTimelineItemAction(RoomDetailAction.DeclineVerificationRequest(att.referenceId, att.otherUserId, att.fromDevide))
             }
         })