From 5c4cf3f7c9855c9b448d8ca03b40e821061311f5 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Mon, 8 Feb 2021 18:43:50 +0100
Subject: [PATCH] VoIP: PR review remarks

---
 .../android/sdk/internal/session/call/CallSignalingHandler.kt   | 2 +-
 .../matrix/android/sdk/internal/session/call/MxCallFactory.kt   | 2 +-
 vector/src/main/res/layout/item_verification_action.xml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
index 229c20f95d..7e54301f63 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
@@ -211,7 +211,7 @@ internal class CallSignalingHandler @Inject constructor(private val activeCallHa
             activeCallHandler.getCallWithId(it)
         }
         if (currentCall == null) {
-            Timber.v("Call for content: $this is null")
+            Timber.v("Call with id $callId is null")
         }
         return currentCall
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt
index 4e60de6fd3..b14cdca63c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt
@@ -41,7 +41,7 @@ internal class MxCallFactory @Inject constructor(
 ) {
 
     fun createIncomingCall(roomId: String, opponentUserId: String, content: CallInviteContent): MxCall? {
-        if (content.callId == null) return null
+        content.callId ?: return null
         return MxCallImpl(
                 callId = content.callId,
                 isOutgoing = false,
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index 9db0009583..68ee392cff 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -60,7 +60,7 @@
         app:layout_constraintStart_toStartOf="@+id/itemVerificationActionTitle"
         app:layout_constraintTop_toBottomOf="@+id/itemVerificationActionTitle"
         tools:text="For maximum security, do this in person"
-        />
+        tools:visibility="visible" />
 
     <ImageView
         android:id="@+id/itemVerificationActionIcon"