VoIP: Fix regression when using a TURN server

element-hq/element-ios#2796
matrix-org · Nov 4, 2019 · 85f0dda · 85f0dda
1 parent 19d49b0
commit 85f0dda
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -11,6 +11,7 @@ Bug fix:
  * MX3PidAddManager: Add User-Interactive Auth to /account/3pid/add (vector-im/riot-ios#2744).
  * MXHTTPOperation: Make urlResponseFromError return the url response in case of MXError.
  * MXHTTPOperation: Fix a crash in `-mutateTo:` method when operation parameter is nil.
+ * VoIP: Fix regression when using a TURN server (vector-im/riot-ios#2796).
 
 Changes in Matrix iOS SDK in 0.14.0 (2019-10-11)
 ===============================================

diff --git a/MatrixSDKExtensions/VoIP/Jingle/MXJingleCallStackCall.m b/MatrixSDKExtensions/VoIP/Jingle/MXJingleCallStackCall.m
@@ -124,14 +124,13 @@ - (void)end
 
 - (void)addTURNServerUris:(NSArray<NSString *> *)uris withUsername:(nullable NSString *)username password:(nullable NSString *)password
 {
-    RTCConfiguration *configuration = [[RTCConfiguration alloc] init];
     RTCIceServer *ICEServer;
 
     if (uris)
     {
-        RTCIceServer *ICEServer = [[RTCIceServer alloc] initWithURLStrings:uris
-                                                                  username:username
-                                                                credential:password];
+        ICEServer = [[RTCIceServer alloc] initWithURLStrings:uris
+                                                    username:username
+                                                  credential:password];
 
         if (!ICEServer)
         {
@@ -144,6 +143,8 @@ - (void)addTURNServerUris:(NSArray<NSString *> *)uris withUsername:(nullable NSS
                                           optionalConstraints:@{
                                                                 @"RtpDataChannels": @"true"
                                                                 }];
+
+    RTCConfiguration *configuration = [[RTCConfiguration alloc] init];
     if (ICEServer)
     {
         configuration.iceServers = @[ICEServer];