Create SinchModule

pepebecker · pepebecker · commit a1ab49526255 · 2019-12-02T12:11:08.000+09:00
diff --git a/ChatSDKCore/Classes/Convenience/BModuleHelper.m b/ChatSDKCore/Classes/Convenience/BModuleHelper.m
@@ -50,6 +50,7 @@ -(void) activateModulesForXMPP {
 
 -(void) activateCommonModules: (NSString *) server {
     [self activateModuleForName:@"BBlockingModule"];
+    [self activateModuleForName:@"BSinchModule"];
     [self activateModuleForName:@"BLastOnlineModule"];
     [self activateModuleForName:@"BAudioMessageModule"];
     [self activateModuleForName:@"BVideoMessageModule"];
diff --git a/ChatSDKCore/Classes/Core.h b/ChatSDKCore/Classes/Core.h
@@ -73,6 +73,9 @@
 #import <ChatSDK/PPublicThreadHandler.h>
 #import <ChatSDK/PEncryptionHandler.h>
 #import <ChatSDK/PBlockingHandler.h>
+#import <ChatSDK/PCallHandler.h>
+#import <ChatSDK/PCallDelegate.h>
+#import <ChatSDK/PCall.h>
 #import <ChatSDK/PLastOnlineHandler.h>
 #import <ChatSDK/PNearbyUsersHandler.h>
 #import <ChatSDK/PReadReceiptHandler.h>
diff --git a/ChatSDKCore/Classes/Handlers/Abstract/BAbstractNetworkAdapter.h b/ChatSDKCore/Classes/Handlers/Abstract/BAbstractNetworkAdapter.h
@@ -25,6 +25,7 @@
 @property (nonatomic, readwrite) id<PSearchHandler> search;
 @property (nonatomic, readwrite) id<PPublicThreadHandler> publicThread;
 @property (nonatomic, readwrite) id<PBlockingHandler> blocking;
+@property (nonatomic, readwrite) id<PCallHandler> calling;
 @property (nonatomic, readwrite) id<PLastOnlineHandler> lastOnline;
 @property (nonatomic, readwrite) id<PNearbyUsersHandler> nearbyUsers;
 @property (nonatomic, readwrite) id<PReadReceiptHandler> readReceipt;
diff --git a/ChatSDKCore/Classes/Interfaces/PCall.h b/ChatSDKCore/Classes/Interfaces/PCall.h
@@ -0,0 +1,27 @@
+//
+//  PCall.h
+//  ChatSDK
+//
+//  Created by Pepe Becker on 9/3/19.
+//
+
+#ifndef PCall_h
+#define PCall_h
+
+@protocol PCall <NSObject>
+
+- (void)answer;
+- (void)hangup;
+- (void)pauseVideo;
+- (void)resumeVideo;
+
+- (void)setDelegate:(id<PCallDelegate>)delegate;
+- (id<PCallDelegate>)delegate;
+
+- (NSString *)callId;
+- (NSString *)remoteUserId;
+- (BOOL)isOutgoing;
+
+@end
+
+#endif /* PCall_h */
diff --git a/ChatSDKCore/Classes/Interfaces/PCallDelegate.h b/ChatSDKCore/Classes/Interfaces/PCallDelegate.h
@@ -0,0 +1,22 @@
+//
+//  PCallDelegate.h
+//  ChatSDK
+//
+//  Created by Pepe Becker on 9/5/19.
+//
+
+#ifndef PCallDelegate_h
+#define PCallDelegate_h
+
+@protocol PCall;
+
+@protocol PCallDelegate <NSObject>
+@optional
+- (void)callDidEnd:(id<PCall>)call;
+- (void)callDidProgress:(id<PCall>)call;
+- (void)callDidEstablish:(id<PCall>)call;
+- (void)callDidPauseVideo:(id<PCall>)call;
+- (void)callDidResumeVideo:(id<PCall>)call;
+@end
+
+#endif /* PCallDelegate_h */
diff --git a/ChatSDKCore/Classes/Interfaces/PCallHandler.h b/ChatSDKCore/Classes/Interfaces/PCallHandler.h
@@ -0,0 +1,43 @@
+//
+//  PCallHandler.h
+//  ChatSDKModules
+//
+//  Created by Pepe Becker on 9/3/19.
+//
+
+#ifndef PCallHandler_h
+#define PCallHandler_h
+
+@class RXPromise;
+@protocol PCall;
+
+@protocol PCallHandler <NSObject>
+
+- (RXPromise *)startWithUserId:(NSString *)userId;
+- (RXPromise *)callUserWithId:(NSString *)userId;
+- (id<PCall>)activeCall;
+- (id<PCall>)incomingCall;
+- (void)answerIncomingCall;
+- (void)hangupIncomingCall;
+- (void)hangupActiveCall;
+
+- (UIView *)localView;
+- (UIView *)remoteView;
+
+- (void)enableSpeaker;
+- (void)disableSpeaker;
+
+- (int)captureDevicePosition;
+- (void)setCaptureDevicePosition:(int)i;
+- (void)toggleCaptureDevicePosition;
+
+- (UINavigationController *)callNavigationController;
+- (UINavigationController *)incomingCallNavigationController;
+- (UIViewController *)callViewController;
+- (UIViewController *)incomingCallViewController;
+- (void)setCallViewControllerClass:(Class)controllerClass;
+- (void)setIncomingCallViewControllerClass:(Class)controllerClass;
+
+@end
+
+#endif /* PCallHandler_h */
diff --git a/ChatSDKCore/Classes/Interfaces/PNetworkAdapter.h b/ChatSDKCore/Classes/Interfaces/PNetworkAdapter.h
@@ -23,6 +23,7 @@
 @protocol PPublicThreadHandler;
 @protocol PLastOnlineHandler;
 @protocol PBlockingHandler;
+@protocol PCallHandler;
 @protocol PNearbyUsersHandler;
 @protocol PReadReceiptHandler;
 @protocol PStickerMessageHandler;
@@ -94,6 +95,7 @@
 -(id<PPublicThreadHandler>) publicThread;
 -(id<PLastOnlineHandler>) lastOnline;
 -(id<PBlockingHandler>) blocking;
+-(id<PCallHandler>) calling;
 -(id<PNearbyUsersHandler>) nearbyUsers;
 -(id<PReadReceiptHandler>) readReceipt;
 -(id<PStickerMessageHandler>) stickerMessage;
@@ -121,6 +123,7 @@
 -(void) setPublicThread: (id<PPublicThreadHandler>) publicThread;
 -(void) setLastOnline: (id<PLastOnlineHandler>) lastOnline;
 -(void) setBlocking: (id<PBlockingHandler>) blocking;
+-(void) setCalling: (id<PCallHandler>) calling;
 -(void) setNearbyUsers: (id<PNearbyUsersHandler>) nearbyUsers;
 -(void) setReadReceipt: (id<PReadReceiptHandler>) readReceipt;
 -(void) setStickerMessage: (id<PStickerMessageHandler>) stickerMessage;
diff --git a/ChatSDKCore/Classes/Session/BChatSDK.h b/ChatSDKCore/Classes/Session/BChatSDK.h
@@ -79,6 +79,7 @@
 +(id<PSearchHandler>) search;
 +(id<PPublicThreadHandler>) publicThread;
 +(id<PBlockingHandler>) blocking;
++(id<PCallHandler>) calling;
 +(id<PLastOnlineHandler>) lastOnline;
 +(id<PNearbyUsersHandler>) nearbyUsers;
 +(id<PReadReceiptHandler>) readReceipt;
diff --git a/ChatSDKCore/Classes/Session/BChatSDK.m b/ChatSDKCore/Classes/Session/BChatSDK.m
@@ -272,6 +272,10 @@ -(BBackgroundPushNotificationQueue *) pushQueue {
     return self.a.blocking;
 }
 
++(id<PCallHandler>) calling {
+    return self.a.calling;
+}
+
 +(id<PLastOnlineHandler>) lastOnline {
     return self.a.lastOnline;
 }
diff --git a/ChatSDKUI/Assets/call_white_24pt.png b/ChatSDKUI/Assets/call_white_24pt.png
diff --git a/ChatSDKUI/Assets/call_white_24pt@2x.png b/ChatSDKUI/Assets/call_white_24pt@2x.png
diff --git a/ChatSDKUI/Assets/call_white_24pt@3x.png b/ChatSDKUI/Assets/call_white_24pt@3x.png
diff --git a/ChatSDKUI/Classes/Components/Chat View/BChatViewController.m b/ChatSDKUI/Classes/Components/Chat View/BChatViewController.m
@@ -40,13 +40,25 @@ -(void) viewDidLoad {
     [self updateSubtitle];
     
     [super setAudioEnabled: BChatSDK.audioMessage != Nil];
+
+    if (BChatSDK.calling) {
+        UIBarButtonItem * callItem = [[UIBarButtonItem alloc] initWithTitle:@"Call" style:UIBarButtonItemStylePlain target:self action:@selector(call)];
+        self.navigationItem.rightBarButtonItem = callItem;
+    }
     
     // Add the initial batch of messages
     NSArray<PMessage> * messages = [BChatSDK.db loadMessagesForThread:_thread newest:BChatSDK.config.messagesToLoadPerBatch];
     messages = [messages sortedArrayUsingComparator:[BMessageSorter oldestFirst]];
     [self setMessages:messages scrollToBottom:NO animate:NO force: YES];
 }
 
+-(void) call {
+    if (!BChatSDK.calling) return;
+    [BChatSDK.calling callUserWithId:_thread.otherUser.entityID];
+    UIViewController * controller = [BChatSDK.calling callNavigationController];
+    [self presentViewController:controller animated:YES completion:nil];
+}
+
 -(void) updateSubtitle {
     
     if (BChatSDK.config.userChatInfoEnabled) {
diff --git a/Xcode/Podfile b/Xcode/Podfile
@@ -19,6 +19,7 @@ target 'ChatSDK Demo' do
 #   pod 'FBSDKLoginKit'
  
   
+  #pod "ChatSDKModules/SinchModule", :path => "../ChatSDKModules"
   #pod "ChatSDKModules/StickerMessage", :path => "../ChatSDKModules"
   #pod "ChatSDKModules/KeyboardOverlayOptions", :path => "../ChatSDKModules"
   #pod "ChatSDKModules/ContactBook", :path => "../ChatSDKModules"

Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,10 @@ -(BBackgroundPushNotificationQueue *) pushQueue {`
`272`	`272`	`return self.a.blocking;`
`273`	`273`	`}`
`274`	`274`
	`275`	`++(id<PCallHandler>) calling {`
	`276`	`+ return self.a.calling;`
	`277`	`+}`
	`278`	`+`
`275`	`279`	`+(id<PLastOnlineHandler>) lastOnline {`
`276`	`280`	`return self.a.lastOnline;`
`277`	`281`	`}`