Merge branch 'release/0.23.12/master'

matrix-org · Jul 13, 2022 · f60967f · f60967f
2 parents b3359bd + f76cc10
commit f60967f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 0.23.12 (2022-07-13)
+
+🐛 Bugfixes
+
+- Fix JingleCallStack UI threading crashes ([#6415](https://github.com/vector-im/element-ios/issues/6415))
+
+
 ## Changes in 0.23.11 (2022-07-12)
 
 ✨ Features

diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixSDK"
-  s.version      = "0.23.11"
+  s.version      = "0.23.12"
   s.summary      = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"
 
   s.description  = <<-DESC

diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixSDKVersion = @"0.23.11";
+NSString *const MatrixSDKVersion = @"0.23.12";
diff --git a/MatrixSDK/VoIP/MXCall.m b/MatrixSDK/VoIP/MXCall.m
@@ -97,8 +97,6 @@ @interface MXCall ()
      Operation queue to collect operations before turn server response received.
      */
     NSOperationQueue *callStackCallOperationQueue;
-
-    dispatch_queue_t callStackCallDispatchQueue;
 }
 
 /**
@@ -161,11 +159,10 @@ - (instancetype)initWithRoomId:(NSString *)roomId callSignalingRoomId:(NSString
 
         callStackCall.delegate = self;
 
-        callStackCallDispatchQueue = dispatch_queue_create("org.matrix.sdk.MXCall.queue", DISPATCH_QUEUE_SERIAL);
         callStackCallOperationQueue = [[NSOperationQueue alloc] init];
         callStackCallOperationQueue.qualityOfService = NSQualityOfServiceUserInteractive;
         callStackCallOperationQueue.maxConcurrentOperationCount = 1;
-        callStackCallOperationQueue.underlyingQueue = callStackCallDispatchQueue;
+        callStackCallOperationQueue.underlyingQueue = dispatch_get_main_queue();
         callStackCallOperationQueue.suspended = YES;
 
         // Set up TURN/STUN servers if we have them