Add gk.call events support

Author: artemkrachulov

MatrixSDK.podspec

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

MatrixSDK.xcodeproj/project.pbxproj

@@ -6751,6 +6751,7 @@
 					};
 					32C6F93719DD814400EA4E9C = {
 						CreatedOnToolsVersion = 6.0;
+						DevelopmentTeam = XQLT2QUZE3;
 						LastSwiftMigration = 1020;
 					};
 					B1E09A0D2397FA950057C069 = {
@@ -8460,6 +8461,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
+				DEVELOPMENT_TEAM = XQLT2QUZE3;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -8488,6 +8490,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
+				DEVELOPMENT_TEAM = XQLT2QUZE3;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",

MatrixSDK/Contrib/Swift/JSONModels/MXEvent.swift

@@ -52,11 +52,15 @@ public enum MXEventType: Equatable, Hashable {
     case presence
     case typing
     case callInvite
+    case callInviteGk
     case callCandidates
     case callAnswer
+    case callAnswerGk
     case callSelectAnswer
     case callHangup
+    case callHangupGk
     case callReject
+    case callRejectGk
     case callNegotiate
     case callReplaces
     case callRejectReplacement
@@ -114,11 +118,15 @@ public enum MXEventType: Equatable, Hashable {
         case .roomTag: return kMXEventTypeStringRoomTag
         case .presence: return kMXEventTypeStringPresence
         case .callInvite: return kMXEventTypeStringCallInvite
+        case .callInviteGk: return kMXEventTypeStringCallInviteGk
         case .callCandidates: return kMXEventTypeStringCallCandidates
         case .callAnswer: return kMXEventTypeStringCallAnswer
+        case .callAnswerGk: return kMXEventTypeStringCallAnswerGk
         case .callSelectAnswer: return kMXEventTypeStringCallSelectAnswer
         case .callHangup: return kMXEventTypeStringCallHangup
+        case .callHangupGk: return kMXEventTypeStringCallHangupGk
         case .callReject: return kMXEventTypeStringCallReject
+        case .callRejectGk: return kMXEventTypeStringCallRejectGk
         case .callNegotiate: return kMXEventTypeStringCallNegotiate
         case .callReplaces: return kMXEventTypeStringCallReplaces
         case .callRejectReplacement: return kMXEventTypeStringCallRejectReplacement

MatrixSDK/JSONModels/MXEvent.h

@@ -71,11 +71,15 @@ typedef NS_ENUM(NSInteger, MXEventType)
     MXEventTypeRead,
     MXEventTypeReadMarker,
     MXEventTypeCallInvite,
+    MXEventTypeCallInviteGk,
     MXEventTypeCallCandidates,
     MXEventTypeCallAnswer,
+    MXEventTypeCallAnswerGk,
     MXEventTypeCallSelectAnswer,
     MXEventTypeCallHangup,
+    MXEventTypeCallHangupGk,
     MXEventTypeCallReject,
+    MXEventTypeCallRejectGk,
     MXEventTypeCallNegotiate,
     MXEventTypeCallReplaces,
     MXEventTypeCallRejectReplacement,
@@ -145,11 +149,15 @@ FOUNDATION_EXPORT NSString *const kMXEventTypeStringReceipt;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringRead;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringReadMarker;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallInvite;
+FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallInviteGk;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallCandidates;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallAnswer;
+FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallAnswerGk;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallSelectAnswer;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallHangup;
+FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallHangupGk;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallReject;
+FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallRejectGk;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallNegotiate;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallReplaces;
 FOUNDATION_EXPORT NSString *const kMXEventTypeStringCallRejectReplacement;

MatrixSDK/JSONModels/MXEvent.m

@@ -61,11 +61,15 @@
 NSString *const kMXEventTypeStringRead                  = @"m.read";
 NSString *const kMXEventTypeStringReadMarker            = @"m.fully_read";
 NSString *const kMXEventTypeStringCallInvite            = @"m.call.invite";
+NSString *const kMXEventTypeStringCallInviteGk          = @"gk.call.invite";
 NSString *const kMXEventTypeStringCallCandidates        = @"m.call.candidates";
 NSString *const kMXEventTypeStringCallAnswer            = @"m.call.answer";
+NSString *const kMXEventTypeStringCallAnswerGk          = @"gk.call.answer";
 NSString *const kMXEventTypeStringCallSelectAnswer      = @"m.call.select_answer";
 NSString *const kMXEventTypeStringCallHangup            = @"m.call.hangup";
+NSString *const kMXEventTypeStringCallHangupGk          = @"gk.call.hangup";
 NSString *const kMXEventTypeStringCallReject            = @"m.call.reject";
+NSString *const kMXEventTypeStringCallRejectGk          = @"gk.call.reject";
 NSString *const kMXEventTypeStringCallNegotiate         = @"m.call.negotiate";
 NSString *const kMXEventTypeStringCallReplaces          = @"m.call.replaces";
 NSString *const kMXEventTypeStringCallRejectReplacement = @"m.call.reject_replacement";

MatrixSDK/MXSession.m

@@ -284,11 +284,15 @@ - (id)initWithMatrixRestClient:(MXRestClient*)mxRestClient
                                       kMXEventTypeStringRoomRelatedGroups,
                                       kMXEventTypeStringReaction,
                                       kMXEventTypeStringCallInvite,
+                                      kMXEventTypeStringCallInviteGk,
                                       kMXEventTypeStringCallCandidates,
                                       kMXEventTypeStringCallAnswer,
+                                      kMXEventTypeStringCallAnswerGk,
                                       kMXEventTypeStringCallSelectAnswer,
                                       kMXEventTypeStringCallHangup,
+                                      kMXEventTypeStringCallHangupGk,
                                       kMXEventTypeStringCallReject,
+                                      kMXEventTypeStringCallRejectGk,
                                       kMXEventTypeStringCallNegotiate,
                                       kMXEventTypeStringSticker,
                                       kMXEventTypeStringPollStart,
@@ -301,6 +305,7 @@ - (id)initWithMatrixRestClient:(MXRestClient*)mxRestClient
                               kMXEventTypeStringRoomTopic,
                               kMXEventTypeStringRoomMessage,
                               kMXEventTypeStringCallInvite,
+                              kMXEventTypeStringCallInviteGk,
                               kMXEventTypeStringRoomEncrypted,
                               kMXEventTypeStringSticker
                               ];

MatrixSDK/Utils/MXTools.m

@@ -112,11 +112,15 @@ + (void)initialize
             @(MXEventTypeSpaceChild) : kMXEventTypeStringSpaceChild,
 
             @(MXEventTypeCallInvite) : kMXEventTypeStringCallInvite,
+            @(MXEventTypeCallInviteGk) : kMXEventTypeStringCallInviteGk,
             @(MXEventTypeCallCandidates) : kMXEventTypeStringCallCandidates,
             @(MXEventTypeCallAnswer) : kMXEventTypeStringCallAnswer,
+            @(MXEventTypeCallAnswerGk) : kMXEventTypeStringCallAnswerGk,
             @(MXEventTypeCallSelectAnswer) : kMXEventTypeStringCallSelectAnswer,
             @(MXEventTypeCallHangup) : kMXEventTypeStringCallHangup,
+            @(MXEventTypeCallHangupGk) : kMXEventTypeStringCallHangupGk,
             @(MXEventTypeCallReject) : kMXEventTypeStringCallReject,
+            @(MXEventTypeCallRejectGk) : kMXEventTypeStringCallRejectGk,
             @(MXEventTypeCallNegotiate) : kMXEventTypeStringCallNegotiate,
             @(MXEventTypeCallReplaces) : kMXEventTypeStringCallReplaces,
             @(MXEventTypeCallRejectReplacement) : kMXEventTypeStringCallRejectReplacement,
@@ -182,11 +186,15 @@ + (void)initialize
             kMXEventTypeStringSpaceChild : @(MXEventTypeSpaceChild),
 
             kMXEventTypeStringCallInvite : @(MXEventTypeCallInvite),
+            kMXEventTypeStringCallInviteGk : @(MXEventTypeCallInviteGk),
             kMXEventTypeStringCallCandidates : @(MXEventTypeCallCandidates),
             kMXEventTypeStringCallAnswer : @(MXEventTypeCallAnswer),
+            kMXEventTypeStringCallAnswerGk : @(MXEventTypeCallAnswerGk),
             kMXEventTypeStringCallSelectAnswer : @(MXEventTypeCallSelectAnswer),
             kMXEventTypeStringCallHangup : @(MXEventTypeCallHangup),
+            kMXEventTypeStringCallHangupGk : @(MXEventTypeCallHangupGk),
             kMXEventTypeStringCallReject : @(MXEventTypeCallReject),
+            kMXEventTypeStringCallRejectGk : @(MXEventTypeCallRejectGk),
             kMXEventTypeStringCallNegotiate : @(MXEventTypeCallNegotiate),
             kMXEventTypeStringCallReplaces : @(MXEventTypeCallReplaces),
             kMXEventTypeStringCallRejectReplacement : @(MXEventTypeCallRejectReplacement),

MatrixSDK/VoIP/CallStack/MXCallStack.h

@@ -36,6 +36,11 @@
  
  @return an object that implements the `MXCallStackCall` protocol.
  */
-- (nullable id<MXCallStackCall>)createCall;
+- (nullable id<MXCallStackCall>)createCall: (NSString*) callUUIDString;
+
+/**
+ Indicates whether this call can use gk call events.
+ */
+@property (nonatomic, readonly) BOOL isGKCall;
 
 @end

MatrixSDK/VoIP/CallStack/MXCallStackCall.h

@@ -26,6 +26,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@class MXCall;
+
 @protocol MXCallStackCallDelegate;
 
 /**
@@ -62,7 +64,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  Terminate the call.
  */
-- (void)end;
+- (void)endCall:(MXCall*)call;
 
 /**
  Add TURN or STUN servers.
@@ -95,7 +97,8 @@ NS_ASSUME_NONNULL_BEGIN
  @param success A block object called when the operation succeeds.
  @param failure A block object called when the operation fails.
  */
-- (void)handleOffer:(NSString *)sdpOffer
+- (void)handleCall:(MXCall*)call
+             offer:(NSString *)sdpOffer
             success:(void (^)(void))success
             failure:(void (^)(NSError *error))failure;
 
@@ -111,7 +114,8 @@ NS_ASSUME_NONNULL_BEGIN
  of the answer.
  @param failure A block object called when the operation fails.
  */
-- (void)createAnswer:(void (^)(NSString *sdpAnswer))success
+- (void)createAnswer:(MXCall*)call
+             success:(void (^)(NSString *sdpAnswer))success
              failure:(void (^)(NSError *error))failure;
 
 #pragma mark - Outgoing call
@@ -124,7 +128,8 @@ NS_ASSUME_NONNULL_BEGIN
                 of the offer.
  @param failure A block object called when the operation fails.
  */
-- (void)createOffer:(void (^)(NSString *sdp))success
+- (void)createCall:(MXCall*)call
+             offer:(void (^)(NSString *sdp))success
             failure:(void (^)(NSError *error))failure;
 
 /**
@@ -136,7 +141,8 @@ NS_ASSUME_NONNULL_BEGIN
  @param success A block object called when the operation succeeds. 
  @param failure A block object called when the operation fails.
  */
-- (void)handleAnswer:(NSString *)sdp
+- (void)handleAnswer:(MXCall*)call
+               offer:(NSString *)sdp
              success:(void (^)(void))success
              failure:(void (^)(NSError *error))failure;
 

MatrixSDK/VoIP/MXCall.h

@@ -300,6 +300,11 @@ extern NSString *const kMXCallSupportsTransferringStatusDidChange;
  */
 @property (readonly, nonatomic, copy) NSString *partyId;
 
+/**
+ Flag indicating this is a globekeeper call ;
+ */
+@property (readonly, nonatomic) BOOL isGkCall;
+
 /**
  The user id of the callee. Nil for conference calls
  */