From 30fe3773ae5bd430995057c8a22d375c61e6fe7c Mon Sep 17 00:00:00 2001
From: chagai95 <31655082+chagai95@users.noreply.github.com>
Date: Thu, 19 May 2022 15:03:51 +0200
Subject: [PATCH 1/4] refactor - better naming, return native user id and not
 sip user id and create a dm with the native user instead of with the sip user

---
 .../features/call/dialpad/DialPadLookup.kt    | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
index e835a74fd6..14ce5f2dc0 100644
--- a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
+++ b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
@@ -42,18 +42,23 @@ class DialPadLookup @Inject constructor(
         val sipUserId = thirdPartyUser.userId
         val nativeLookupResults = session.sipNativeLookup(thirdPartyUser.userId)
         // If I have a native user I check for an existing native room with him...
-        val roomId = if (nativeLookupResults.isNotEmpty()) {
+        if (nativeLookupResults.isNotEmpty()) {
             val nativeUserId = nativeLookupResults.first().userId
             if (nativeUserId == session.myUserId) {
                 throw Failure.NumberIsYours
             }
-            session.roomService().getExistingDirectRoomWithUser(nativeUserId)
-            // if there is not, just create a DM with the sip user
-                    ?: directRoomHelper.ensureDMExists(sipUserId)
-        } else {
-            // do the same if there is no corresponding native user.
-            directRoomHelper.ensureDMExists(sipUserId)
+            var nativeRoomId = session.getExistingDirectRoomWithUser(nativeUserId)
+            if (nativeRoomId == null) {
+                // if there is no existing native room with the existing native user,
+                // just create a DM with the native user
+                nativeRoomId = directRoomHelper.ensureDMExists(nativeUserId)
+            }
+            Timber.d("lookupPhoneNumber with nativeUserId: $nativeUserId and nativeRoomId: $nativeRoomId")
+            return Result(userId = nativeUserId, roomId = nativeRoomId)
         }
-        return Result(userId = sipUserId, roomId = roomId)
+        // If there is no native user then we return sipUserId and sipRoomId - this is usually a PSTN call.
+        val sipRoomId = directRoomHelper.ensureDMExists(sipUserId)
+        Timber.d("lookupPhoneNumber with sipRoomId: $sipRoomId and sipUserId: $sipUserId")
+        return Result(userId = sipUserId, roomId = sipRoomId)
     }
 }

From 8c783f94142eaa2e36c01aa6d4885370e8d49528 Mon Sep 17 00:00:00 2001
From: chagai95 <31655082+chagai95@users.noreply.github.com>
Date: Thu, 19 May 2022 15:12:04 +0200
Subject: [PATCH 2/4] Create 6101.bugfix

---
 changelog.d/6101.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6101.bugfix

diff --git a/changelog.d/6101.bugfix b/changelog.d/6101.bugfix
new file mode 100644
index 0000000000..2d8da5327d
--- /dev/null
+++ b/changelog.d/6101.bugfix
@@ -0,0 +1 @@
+Refactor - better naming, return native user id and not sip user id and create a dm with the native user instead of with the sip user.

From f949c517b6f369d79664fc0160aba1646006c200 Mon Sep 17 00:00:00 2001
From: chagai95 <31655082+chagai95@users.noreply.github.com>
Date: Fri, 20 May 2022 15:52:43 +0200
Subject: [PATCH 3/4] import timber and use .roomService()

---
 .../java/im/vector/app/features/call/dialpad/DialPadLookup.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
index 14ce5f2dc0..3ab2ee50c0 100644
--- a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
+++ b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
@@ -23,6 +23,7 @@ import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.createdirect.DirectRoomHelper
 import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
+import timber.log.Timber
 
 class DialPadLookup @Inject constructor(
         private val session: Session,
@@ -47,7 +48,7 @@ class DialPadLookup @Inject constructor(
             if (nativeUserId == session.myUserId) {
                 throw Failure.NumberIsYours
             }
-            var nativeRoomId = session.getExistingDirectRoomWithUser(nativeUserId)
+            var nativeRoomId = session.roomService().getExistingDirectRoomWithUser(nativeUserId)
             if (nativeRoomId == null) {
                 // if there is no existing native room with the existing native user,
                 // just create a DM with the native user

From c2707d4538c44aa4e9ec3ddbbc727eb01787e8da Mon Sep 17 00:00:00 2001
From: chagai95 <31655082+chagai95@users.noreply.github.com>
Date: Tue, 14 Jun 2022 14:08:22 +0200
Subject: [PATCH 4/4] Wrong import order

---
 .../java/im/vector/app/features/call/dialpad/DialPadLookup.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
index 3ab2ee50c0..8f904c8ab8 100644
--- a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
+++ b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
@@ -22,8 +22,8 @@ import im.vector.app.features.call.vectorCallService
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.createdirect.DirectRoomHelper
 import org.matrix.android.sdk.api.session.Session
-import javax.inject.Inject
 import timber.log.Timber
+import javax.inject.Inject
 
 class DialPadLookup @Inject constructor(
         private val session: Session,