From f0f70bf3d50de938e28e59cf050becb2abab8d0c Mon Sep 17 00:00:00 2001
From: Pepe Becker <mail@pepebecker.com>
Date: Mon, 9 Sep 2019 20:21:06 +0900
Subject: [PATCH] Create SinchModule

---
 .../Classes/Convenience/BModuleHelper.m       |   1 +
 ChatSDKCore/Classes/Core.h                    |   3 ++
 .../Abstract/BAbstractNetworkAdapter.h        |   1 +
 ChatSDKCore/Classes/Interfaces/PCall.h        |  27 +++++++++++
 .../Classes/Interfaces/PCallDelegate.h        |  22 +++++++++
 ChatSDKCore/Classes/Interfaces/PCallHandler.h |  43 ++++++++++++++++++
 .../Classes/Interfaces/PNetworkAdapter.h      |   3 ++
 ChatSDKCore/Classes/Session/BChatSDK.h        |   1 +
 ChatSDKCore/Classes/Session/BChatSDK.m        |   4 ++
 ChatSDKUI/Assets/call_white_24pt.png          | Bin 0 -> 241 bytes
 ChatSDKUI/Assets/call_white_24pt@2x.png       | Bin 0 -> 395 bytes
 ChatSDKUI/Assets/call_white_24pt@3x.png       | Bin 0 -> 552 bytes
 .../Chat View/BChatViewController.m           |  12 +++++
 Xcode/Podfile                                 |   1 +
 14 files changed, 118 insertions(+)
 create mode 100644 ChatSDKCore/Classes/Interfaces/PCall.h
 create mode 100644 ChatSDKCore/Classes/Interfaces/PCallDelegate.h
 create mode 100644 ChatSDKCore/Classes/Interfaces/PCallHandler.h
 create mode 100755 ChatSDKUI/Assets/call_white_24pt.png
 create mode 100755 ChatSDKUI/Assets/call_white_24pt@2x.png
 create mode 100755 ChatSDKUI/Assets/call_white_24pt@3x.png

diff --git a/ChatSDKCore/Classes/Convenience/BModuleHelper.m b/ChatSDKCore/Classes/Convenience/BModuleHelper.m
index 95abd5f6..3fa7fff6 100755
--- 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
index 826bbae0..3003a523 100755
--- 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
index 16023476..e7215e3e 100755
--- 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
new file mode 100644
index 00000000..93e5f893
--- /dev/null
+++ 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
new file mode 100644
index 00000000..61d4809b
--- /dev/null
+++ 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
new file mode 100644
index 00000000..53dd1978
--- /dev/null
+++ 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
index 614bba78..641ae5fb 100755
--- a/ChatSDKCore/Classes/Interfaces/PNetworkAdapter.h
+++ b/ChatSDKCore/Classes/Interfaces/PNetworkAdapter.h
@@ -27,6 +27,7 @@
 @protocol PPublicThreadHandler;
 @protocol PLastOnlineHandler;
 @protocol PBlockingHandler;
+@protocol PCallHandler;
 @protocol PNearbyUsersHandler;
 @protocol PReadReceiptHandler;
 @protocol PStickerMessageHandler;
@@ -98,6 +99,7 @@
 -(id<PPublicThreadHandler>) publicThread;
 -(id<PLastOnlineHandler>) lastOnline;
 -(id<PBlockingHandler>) blocking;
+-(id<PCallHandler>) calling;
 -(id<PNearbyUsersHandler>) nearbyUsers;
 -(id<PReadReceiptHandler>) readReceipt;
 -(id<PStickerMessageHandler>) stickerMessage;
@@ -125,6 +127,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
index 096fe1d7..260f5856 100755
--- 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
index ffe64809..20be6d02 100755
--- 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
new file mode 100755
index 0000000000000000000000000000000000000000..34c17c8729d58a23afdd0e4cb5bfb607020c18ea
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i9iA?ZAr*{gPOFv(1TZih=oh=A
zI;n7apUbbsj{Pc2gg$QlYEWKYetnxw`QFS~|8~3<=hMB)VAn38#;DRR@ryB}UE&mj
zkA;-55MzP5+8*``k4t<kGTBTl#2<OE=sW3b*I9UUqkuQl52>V`nJn7(S|j2j4^1&o
z?Dn2#DfjJ}a>U2G8wKVVcNpHR`?)dvX98bI<x&QQLvc1nNBk1=&;3lcw96?7Upe*1
phJ&W_Q!-3bj=k#Rxpjx1A-UqC<ZCUnc|bofc)I$ztaD0e0s#1KTVenJ

literal 0
HcmV?d00001

diff --git a/ChatSDKUI/Assets/call_white_24pt@2x.png b/ChatSDKUI/Assets/call_white_24pt@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..e26d2cef75db6f2a087cb43e964ed3efd718d79d
GIT binary patch
literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0003}Nkl<ZcmeIx
z1I(6T6vpu@+jb4vwmD|o_MB@>L-xF;G}p}Bm~DJE|GE3a2~Ruo`<r=q$yZDa!+B3(
zaqN;GUSnw|FJxgECojZdSt2hy!?IakxQ*qIyl@uF4S8WZmOQG+2a~almJjM<TPZKx
z!_rA!I7m^s%#a^OP*@tn<%v?fBZ#B3ys@94pZw8|e11Bvzz-MsDW9J5M|Xlpl$Srw
z6C9L3nvhN~UjEofkWN>5qa>FJ;^-)ERO30pNBm3Bg;athdaD>(F^CrWUkoRgAcF<=
zrTD-lwy}yCjG=*|U=D?y3Atb(c@&q=c16K5@(JJ`?eql=iNltpXqZ6`0c3NEw%p{m
z6cs~>BLYQ7Bd)m>uu+-~B)Ju^QG-2XxD~KbkNsr06|hmCZM=0WV51b{ImLa7dmvBL
pVhn3J#1-!Fl60OhTrn}OJ_GPriZQ!Jh5P^j002ovPDHLkV1f%Bs{sH2

literal 0
HcmV?d00001

diff --git a/ChatSDKUI/Assets/call_white_24pt@3x.png b/ChatSDKUI/Assets/call_white_24pt@3x.png
new file mode 100755
index 0000000000000000000000000000000000000000..d9d2b8770f5f45c6ede97371f68b3047803dcab3
GIT binary patch
literal 552
zcmV+@0@wYCP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0005+Nkl<ZcmeI$
z1FT&^6hP5a+qP}n3L7W2ZQDU@1+{I2wXLAG?e=TenumEw-=7oQbz|<Uk%YkG@pwG6
z<}jb|=QjPtHKr5X0C9_F1b0c?;xoa$(tbjw2yu&>*u)i=xPVPAaf!p&)Df51f=wrJ
ziHX?E6_;p>%@J{lD%gA?nYcr8>>7(p+`?wQxWqzic8g0i#b$`OL~4RNPC{{u^8~h$
z#NryG2xNk2AUpm<&`Pv$5YsEFiyk^*sv(+4&PO9?mgr)x5fnil(L`1vjij}ri^Z54
zi6#mXZ3I0bjc8&Krmdoh^t{B>TQt!PQxug&4{<n;=`mSE59Nr!bcxiWhc5U!K~mAf
zDtzr#Od=5%@O757qJ``{!q>H62M;8mJsTNLX^9P#;2pl6Q$JwN0e-p1DhARZ%;P-u
ziNaSj<NTc%u^fNyv!8w6uaU$F$N8*(`^{HJAM7T||D!ok`179Lf9{w%L}T|dTrch;
z{+*z_d_^8!6A}pz%JZB+)=``*;4<hd@^OJM2=7q2Qa#8-J3c7~nJCJB^&k_?c&Hp?
zA~}=zq#R@-8*}-r9AqLp^NCOnGLeyfTp%=2;tFM%%Ux`)iCg5S6Ki;aNqdJ!7HZLv
q$?V`Lm$=1qKJ%Pe;_-Mq9=k7UL&gpf?NtQ;0000<MNUMnLSTXfE&Y1{

literal 0
HcmV?d00001

diff --git a/ChatSDKUI/Classes/Components/Chat View/BChatViewController.m b/ChatSDKUI/Classes/Components/Chat View/BChatViewController.m
index e485c4eb..381a680a 100755
--- a/ChatSDKUI/Classes/Components/Chat View/BChatViewController.m	
+++ b/ChatSDKUI/Classes/Components/Chat View/BChatViewController.m	
@@ -40,6 +40,11 @@ -(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];
@@ -47,6 +52,13 @@ -(void) viewDidLoad {
     [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
index a5a7ecfd..fba1b04e 100755
--- 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"