From 0aeddea30f2f54d7cb06ae0a1c58be52b654d75a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 2 Jun 2021 17:47:29 +0100
Subject: [PATCH] Only do native lookup if it's supported

Also fix as bug where we were checking the wrong field to check
for native/virtual support: oops.
---
 src/CallHandler.tsx | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index ba0178fa59..0d87451b5f 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -264,7 +264,7 @@ export default class CallHandler extends EventEmitter {
     }
 
     public getSupportsVirtualRooms() {
-        return this.supportsPstnProtocol;
+        return this.supportsSipNativeVirtual;
     }
 
     public pstnLookup(phoneNumber: string): Promise<ThirdpartyLookupResponse[]> {
@@ -883,10 +883,15 @@ export default class CallHandler extends EventEmitter {
 
         // Now check to see if this is a virtual user, in which case we should find the
         // native user
-        const nativeLookupResults = await this.sipNativeLookup(userId);
-        const lookupSuccess = nativeLookupResults.length > 0 && nativeLookupResults[0].fields.lookup_success;
-        const nativeUserId = lookupSuccess ? nativeLookupResults[0].userid : userId;
-        console.log("Looked up " + number + " to " + userId + " and mapped to native user " + nativeUserId);
+        let nativeUserId;
+        if (this.getSupportsVirtualRooms()) {
+            const nativeLookupResults = await this.sipNativeLookup(userId);
+            const lookupSuccess = nativeLookupResults.length > 0 && nativeLookupResults[0].fields.lookup_success;
+            nativeUserId = lookupSuccess ? nativeLookupResults[0].userid : userId;
+            console.log("Looked up " + number + " to " + userId + " and mapped to native user " + nativeUserId);
+        } else {
+            nativeUserId = userId;
+        }
 
         const roomId = await ensureDMExists(MatrixClientPeg.get(), nativeUserId);