Browse Source

[iOS] Namespace the public API of the feature invite

master
Lyubo Marinov 7 years ago
parent
commit
85612b9ae1

+ 1
- 1
ios/app/src/ViewController.h View File

18
 
18
 
19
 #import <JitsiMeet/JitsiMeet.h>
19
 #import <JitsiMeet/JitsiMeet.h>
20
 
20
 
21
-@interface ViewController : UIViewController<JitsiMeetViewDelegate, InviteControllerDelegate>
21
+@interface ViewController : UIViewController<JitsiMeetViewDelegate, JMInviteControllerDelegate>
22
 
22
 
23
 @end
23
 @end

+ 4
- 6
ios/app/src/ViewController.m View File

31
 
31
 
32
     view.delegate = self;
32
     view.delegate = self;
33
 
33
 
34
-    // inviteController
35
-    InviteController *inviteController = view.inviteController;
36
-    inviteController.delegate = self;
34
+    view.inviteController.delegate = self;
37
 
35
 
38
 #endif // #ifdef DEBUG
36
 #endif // #ifdef DEBUG
39
 
37
 
78
     _onJitsiMeetViewDelegateEvent(@"LOAD_CONFIG_ERROR", data);
76
     _onJitsiMeetViewDelegateEvent(@"LOAD_CONFIG_ERROR", data);
79
 }
77
 }
80
 
78
 
81
-- (void)beginAddPeople:(AddPeopleController *)addPeopleController {
79
+- (void)beginAddPeople:(JMAddPeopleController *)addPeopleController {
82
     NSLog(
80
     NSLog(
83
-        @"[%s:%d] InviteControllerDelegate %s",
81
+        @"[%s:%d] JMInviteControllerDelegate %s",
84
         __FILE__, __LINE__, __FUNCTION__);
82
         __FILE__, __LINE__, __FUNCTION__);
85
 
83
 
86
     // XXX Explicitly invoke endAddPeople on addPeopleController; otherwise, it
84
     // XXX Explicitly invoke endAddPeople on addPeopleController; otherwise, it
87
-    // is going to be memory-leaked in the associated InviteController and no
85
+    // is going to be memory-leaked in the associated JMInviteController and no
88
     // subsequent InviteButton clicks/taps will be delivered.
86
     // subsequent InviteButton clicks/taps will be delivered.
89
     [addPeopleController endAddPeople];
87
     [addPeopleController endAddPeople];
90
 }
88
 }

+ 1
- 1
ios/sdk/src/JitsiMeetView.h View File

26
 
26
 
27
 @property (nonatomic, nullable, weak) id<JitsiMeetViewDelegate> delegate;
27
 @property (nonatomic, nullable, weak) id<JitsiMeetViewDelegate> delegate;
28
 
28
 
29
-@property (nonatomic, readonly, nonnull) InviteController *inviteController;
29
+@property (nonatomic, readonly, nonnull) JMInviteController *inviteController;
30
 
30
 
31
 @property (nonatomic) BOOL pictureInPictureEnabled;
31
 @property (nonatomic) BOOL pictureInPictureEnabled;
32
 
32
 

+ 2
- 2
ios/sdk/src/JitsiMeetView.m View File

413
 
413
 
414
     Invite *inviteModule = [bridgeWrapper.bridge moduleForName:@"Invite"];
414
     Invite *inviteModule = [bridgeWrapper.bridge moduleForName:@"Invite"];
415
     _inviteController
415
     _inviteController
416
-        = [[InviteController alloc] initWithExternalAPIScope:externalAPIScope
417
-                                                   andInviteModule:inviteModule];
416
+        = [[JMInviteController alloc] initWithExternalAPIScope:externalAPIScope
417
+                                               andInviteModule:inviteModule];
418
 
418
 
419
     // Set a background color which is in accord with the JavaScript and Android
419
     // Set a background color which is in accord with the JavaScript and Android
420
     // parts of the application and causes less perceived visual flicker than
420
     // parts of the application and causes less perceived visual flicker than

+ 3
- 3
ios/sdk/src/invite/AddPeopleController+Private.h View File

17
 #import "AddPeopleController.h"
17
 #import "AddPeopleController.h"
18
 #import "InviteController.h"
18
 #import "InviteController.h"
19
 
19
 
20
-@interface AddPeopleController ()
20
+@interface JMAddPeopleController ()
21
 
21
 
22
 @property (nonatomic, strong) NSMutableDictionary* _Nonnull items;
22
 @property (nonatomic, strong) NSMutableDictionary* _Nonnull items;
23
-@property (nonatomic, weak, nullable) InviteController *owner;
23
+@property (nonatomic, weak, nullable) JMInviteController *owner;
24
 @property (nonatomic, readonly) NSString* _Nonnull uuid;
24
 @property (nonatomic, readonly) NSString* _Nonnull uuid;
25
 
25
 
26
-- (instancetype _Nonnull)initWithOwner:(InviteController * _Nonnull)owner;
26
+- (instancetype _Nonnull)initWithOwner:(JMInviteController * _Nonnull)owner;
27
 
27
 
28
 - (void)inviteSettled:(NSArray<NSDictionary *> * _Nonnull)failedInvitees;
28
 - (void)inviteSettled:(NSArray<NSDictionary *> * _Nonnull)failedInvitees;
29
 
29
 

+ 2
- 2
ios/sdk/src/invite/AddPeopleController.h View File

18
 
18
 
19
 #import "AddPeopleControllerDelegate.h"
19
 #import "AddPeopleControllerDelegate.h"
20
 
20
 
21
-@interface AddPeopleController: NSObject
21
+@interface JMAddPeopleController: NSObject
22
 
22
 
23
-@property (nonatomic, nullable, weak) id<AddPeopleControllerDelegate> delegate;
23
+@property (nonatomic, nullable, weak) id<JMAddPeopleControllerDelegate> delegate;
24
 
24
 
25
 - (void)endAddPeople;
25
 - (void)endAddPeople;
26
 
26
 

+ 2
- 2
ios/sdk/src/invite/AddPeopleController.m View File

17
 #import "AddPeopleController+Private.h"
17
 #import "AddPeopleController+Private.h"
18
 #import "InviteController+Private.h"
18
 #import "InviteController+Private.h"
19
 
19
 
20
-@implementation AddPeopleController
20
+@implementation JMAddPeopleController
21
 
21
 
22
-- (instancetype)initWithOwner:(InviteController *)owner {
22
+- (instancetype)initWithOwner:(JMInviteController *)owner {
23
     self = [super init];
23
     self = [super init];
24
     if (self) {
24
     if (self) {
25
         _uuid = [[NSUUID UUID] UUIDString];
25
         _uuid = [[NSUUID UUID] UUIDString];

+ 7
- 7
ios/sdk/src/invite/AddPeopleControllerDelegate.h View File

18
 
18
 
19
 #import "AddPeopleController.h"
19
 #import "AddPeopleController.h"
20
 
20
 
21
-@class AddPeopleController;
21
+@class JMAddPeopleController;
22
 
22
 
23
-@protocol AddPeopleControllerDelegate
23
+@protocol JMAddPeopleControllerDelegate
24
 
24
 
25
 /**
25
 /**
26
- * Called when an AddPeopleController has results for a query that was
26
+ * Called when a JMAddPeopleController has results for a query that was
27
  * previously provided.
27
  * previously provided.
28
  */
28
  */
29
-- (void)addPeopleController:(AddPeopleController * _Nonnull)controller
29
+- (void)addPeopleController:(JMAddPeopleController * _Nonnull)controller
30
           didReceiveResults:(NSArray<NSDictionary *> * _Nonnull)results
30
           didReceiveResults:(NSArray<NSDictionary *> * _Nonnull)results
31
                    forQuery:(NSString * _Nonnull)query;
31
                    forQuery:(NSString * _Nonnull)query;
32
 
32
 
33
 /**
33
 /**
34
- * Called when an AddPeopleController has finished the inviting process, either
34
+ * Called when a JMAddPeopleController has finished the inviting process, either
35
  * succesfully or not. In case of failure the failedInvitees array will contain
35
  * succesfully or not. In case of failure the failedInvitees array will contain
36
  * the items for which invitations failed.
36
  * the items for which invitations failed.
37
  */
37
  */
38
-- (void)inviteSettled:(NSArray<NSDictionary *> * _Nonnull)failedInvitees
39
- fromSearchController:(AddPeopleController * _Nonnull)addPeopleController;
38
+- (void) inviteSettled:(NSArray<NSDictionary *> * _Nonnull)failedInvitees
39
+  fromSearchController:(JMAddPeopleController * _Nonnull)addPeopleController;
40
 
40
 
41
 @end
41
 @end

+ 20
- 14
ios/sdk/src/invite/Invite.m View File

42
 
42
 
43
 /**
43
 /**
44
  * Initiates the process to add people. This involves calling a delegate method
44
  * Initiates the process to add people. This involves calling a delegate method
45
- * in the InviteControllerDelegate so the native host application can start
45
+ * in the JMInviteControllerDelegate so the native host application can start
46
  * the query process.
46
  * the query process.
47
  *
47
  *
48
  * @param externalAPIScope - Scope identifying the JitsiMeetView where the
48
  * @param externalAPIScope - Scope identifying the JitsiMeetView where the
49
  * calling JS code is being executed.
49
  * calling JS code is being executed.
50
  */
50
  */
51
 RCT_EXPORT_METHOD(beginAddPeople:(NSString *)externalAPIScope) {
51
 RCT_EXPORT_METHOD(beginAddPeople:(NSString *)externalAPIScope) {
52
-    JitsiMeetView *view = [JitsiMeetView viewForExternalAPIScope:externalAPIScope];
53
-    InviteController *controller = view.inviteController;
54
-    [controller beginAddPeople];
52
+    JitsiMeetView *view
53
+        = [JitsiMeetView viewForExternalAPIScope:externalAPIScope];
54
+    JMInviteController *inviteController = view.inviteController;
55
+    [inviteController beginAddPeople];
55
 }
56
 }
56
 
57
 
57
 /**
58
 /**
59
  *
60
  *
60
  * @param externalAPIScope - Scope identifying the JitsiMeetView where the
61
  * @param externalAPIScope - Scope identifying the JitsiMeetView where the
61
  * calling JS code is being executed.
62
  * calling JS code is being executed.
62
- * @param addPeopleControllerScope - Scope identifying the AddPeopleController
63
+ * @param addPeopleControllerScope - Scope identifying the JMAddPeopleController
63
  * wich was settled.
64
  * wich was settled.
64
  * @param failedInvitees - Array with the invitees which were not invited due
65
  * @param failedInvitees - Array with the invitees which were not invited due
65
  * to a failure.
66
  * to a failure.
67
 RCT_EXPORT_METHOD(inviteSettled:(NSString *)externalAPIScope
68
 RCT_EXPORT_METHOD(inviteSettled:(NSString *)externalAPIScope
68
        addPeopleControllerScope:(NSString *)addPeopleControllerScope
69
        addPeopleControllerScope:(NSString *)addPeopleControllerScope
69
                  failedInvitees:(NSArray *)failedInvitees) {
70
                  failedInvitees:(NSArray *)failedInvitees) {
70
-    JitsiMeetView *view = [JitsiMeetView viewForExternalAPIScope:externalAPIScope];
71
-    InviteController *controller = view.inviteController;
72
-    [controller inviteSettled:addPeopleControllerScope failedInvitees:failedInvitees];
71
+    JitsiMeetView *view
72
+        = [JitsiMeetView viewForExternalAPIScope:externalAPIScope];
73
+    JMInviteController *inviteController = view.inviteController;
74
+    [inviteController inviteSettled:addPeopleControllerScope
75
+                     failedInvitees:failedInvitees];
73
 }
76
 }
74
 
77
 
75
 /**
78
 /**
76
  * Process results received for the given query. This involves calling a
79
  * Process results received for the given query. This involves calling a
77
- * delegate method in AddPeopleControllerDelegate so the native host application
78
- * is made aware of the query results.
80
+ * delegate method in JMAddPeopleControllerDelegate so the native host
81
+ * application is made aware of the query results.
79
  *
82
  *
80
  * @param externalAPIScope - Scope identifying the JitsiMeetView where the
83
  * @param externalAPIScope - Scope identifying the JitsiMeetView where the
81
  * calling JS code is being executed.
84
  * calling JS code is being executed.
82
- * @param addPeopleControllerScope - Scope identifying the AddPeopleController
85
+ * @param addPeopleControllerScope - Scope identifying the JMAddPeopleController
83
  * for which the results were received.
86
  * for which the results were received.
84
  * @param query - The actual query for which the results were received.
87
  * @param query - The actual query for which the results were received.
85
  * @param results - The query results.
88
  * @param results - The query results.
88
          addPeopleControllerScope:(NSString *)addPeopleControllerScope
91
          addPeopleControllerScope:(NSString *)addPeopleControllerScope
89
                             query:(NSString *)query
92
                             query:(NSString *)query
90
                           results:(NSArray *)results) {
93
                           results:(NSArray *)results) {
91
-    JitsiMeetView *view = [JitsiMeetView viewForExternalAPIScope:externalAPIScope];
92
-    InviteController *controller = view.inviteController;
93
-    [controller receivedResults:addPeopleControllerScope query:query results:results];
94
+    JitsiMeetView *view
95
+        = [JitsiMeetView viewForExternalAPIScope:externalAPIScope];
96
+    JMInviteController *inviteController = view.inviteController;
97
+    [inviteController receivedResults:addPeopleControllerScope
98
+                                query:query
99
+                              results:results];
94
 }
100
 }
95
 
101
 
96
 - (void)            invite:(NSArray<NSDictionary *> * _Nonnull)invitees
102
 - (void)            invite:(NSArray<NSDictionary *> * _Nonnull)invitees

+ 5
- 5
ios/sdk/src/invite/InviteController+Private.h View File

19
 #import "AddPeopleController.h"
19
 #import "AddPeopleController.h"
20
 #import "Invite+Private.h"
20
 #import "Invite+Private.h"
21
 
21
 
22
-@interface InviteController ()
22
+@interface JMInviteController ()
23
 
23
 
24
-@property (nonatomic, nullable) AddPeopleController *addPeopleController;
24
+@property (nonatomic, nullable) JMAddPeopleController *addPeopleController;
25
 
25
 
26
 @property (nonatomic) NSString * _Nonnull externalAPIScope;
26
 @property (nonatomic) NSString * _Nonnull externalAPIScope;
27
 
27
 
32
 
32
 
33
 - (void)beginAddPeople;
33
 - (void)beginAddPeople;
34
 
34
 
35
-- (void)endAddPeopleForController:(AddPeopleController * _Nonnull)controller;
35
+- (void)endAddPeopleForController:(JMAddPeopleController * _Nonnull)controller;
36
 
36
 
37
 - (void) invite:(NSArray * _Nonnull)invitees
37
 - (void) invite:(NSArray * _Nonnull)invitees
38
-  forController:(AddPeopleController * _Nonnull)controller;
38
+  forController:(JMAddPeopleController * _Nonnull)controller;
39
 
39
 
40
 - (void)inviteSettled:(NSString * _Nonnull)addPeopleControllerScope
40
 - (void)inviteSettled:(NSString * _Nonnull)addPeopleControllerScope
41
        failedInvitees:(NSArray * _Nonnull)failedInvitees;
41
        failedInvitees:(NSArray * _Nonnull)failedInvitees;
42
 
42
 
43
 - (void)performQuery:(NSString * _Nonnull)query
43
 - (void)performQuery:(NSString * _Nonnull)query
44
-       forController:(AddPeopleController * _Nonnull)controller;
44
+       forController:(JMAddPeopleController * _Nonnull)controller;
45
 
45
 
46
 - (void)receivedResults:(NSString * _Nonnull)addPeopleControllerScope
46
 - (void)receivedResults:(NSString * _Nonnull)addPeopleControllerScope
47
                   query:(NSString * _Nonnull)query
47
                   query:(NSString * _Nonnull)query

+ 2
- 2
ios/sdk/src/invite/InviteController.h View File

18
 
18
 
19
 #import "InviteControllerDelegate.h"
19
 #import "InviteControllerDelegate.h"
20
 
20
 
21
-@interface InviteController : NSObject
21
+@interface JMInviteController : NSObject
22
 
22
 
23
 @property (nonatomic) BOOL addPeopleEnabled;
23
 @property (nonatomic) BOOL addPeopleEnabled;
24
 
24
 
25
 @property (nonatomic) BOOL dialOutEnabled;
25
 @property (nonatomic) BOOL dialOutEnabled;
26
 
26
 
27
-@property (nonatomic, nullable, weak) id<InviteControllerDelegate> delegate;
27
+@property (nonatomic, nullable, weak) id<JMInviteControllerDelegate> delegate;
28
 
28
 
29
 - (void)  invite:(NSArray * _Nonnull)invitees
29
 - (void)  invite:(NSArray * _Nonnull)invitees
30
   withCompletion:(void (^ _Nullable)(NSArray<NSDictionary *> * _Nonnull failedInvitees))completion;
30
   withCompletion:(void (^ _Nullable)(NSArray<NSDictionary *> * _Nonnull failedInvitees))completion;

+ 7
- 7
ios/sdk/src/invite/InviteController.m View File

17
 #import "InviteController+Private.h"
17
 #import "InviteController+Private.h"
18
 #import "AddPeopleController+Private.h"
18
 #import "AddPeopleController+Private.h"
19
 
19
 
20
-@implementation InviteController {
20
+@implementation JMInviteController {
21
     NSNumber *_addPeopleEnabled;
21
     NSNumber *_addPeopleEnabled;
22
     NSNumber *_dialOutEnabled;
22
     NSNumber *_dialOutEnabled;
23
 }
23
 }
49
         return;
49
         return;
50
     }
50
     }
51
 
51
 
52
-    _addPeopleController = [[AddPeopleController alloc] initWithOwner:self];
52
+    _addPeopleController = [[JMAddPeopleController alloc] initWithOwner:self];
53
 
53
 
54
     @try {
54
     @try {
55
         if (self.delegate
55
         if (self.delegate
61
     }
61
     }
62
 }
62
 }
63
 
63
 
64
--(void)endAddPeopleForController:(AddPeopleController *)controller {
64
+-(void)endAddPeopleForController:(JMAddPeopleController *)controller {
65
     if (self.addPeopleController == controller) {
65
     if (self.addPeopleController == controller) {
66
         self.addPeopleController = nil;
66
         self.addPeopleController = nil;
67
     }
67
     }
99
 
99
 
100
 - (void)inviteSettled:(NSString *)addPeopleControllerScope
100
 - (void)inviteSettled:(NSString *)addPeopleControllerScope
101
        failedInvitees:(NSArray *)failedInvitees {
101
        failedInvitees:(NSArray *)failedInvitees {
102
-    AddPeopleController *controller = self.addPeopleController;
102
+    JMAddPeopleController *controller = self.addPeopleController;
103
 
103
 
104
     if (controller != nil
104
     if (controller != nil
105
             && [controller.uuid isEqualToString:addPeopleControllerScope]) {
105
             && [controller.uuid isEqualToString:addPeopleControllerScope]) {
116
 - (void)receivedResults:(NSString *)addPeopleControllerScope
116
 - (void)receivedResults:(NSString *)addPeopleControllerScope
117
                   query:(NSString *)query
117
                   query:(NSString *)query
118
                 results:(NSArray *)results {
118
                 results:(NSArray *)results {
119
-    AddPeopleController *controller = self.addPeopleController;
119
+    JMAddPeopleController *controller = self.addPeopleController;
120
 
120
 
121
     if (controller != nil
121
     if (controller != nil
122
             && [controller.uuid isEqualToString:addPeopleControllerScope]) {
122
             && [controller.uuid isEqualToString:addPeopleControllerScope]) {
127
 #pragma mark Use the Invite react-native module to emit the search / submission events
127
 #pragma mark Use the Invite react-native module to emit the search / submission events
128
 
128
 
129
 - (void) invite:(NSArray *)invitees
129
 - (void) invite:(NSArray *)invitees
130
-  forController:(AddPeopleController * _Nonnull)controller {
130
+  forController:(JMAddPeopleController * _Nonnull)controller {
131
     [self        invite:invitees
131
     [self        invite:invitees
132
      forControllerScope:controller.uuid];
132
      forControllerScope:controller.uuid];
133
 }
133
 }
147
 }
147
 }
148
 
148
 
149
 - (void)performQuery:(NSString * _Nonnull)query
149
 - (void)performQuery:(NSString * _Nonnull)query
150
-       forController:(AddPeopleController * _Nonnull)controller {
150
+       forController:(JMAddPeopleController * _Nonnull)controller {
151
     [self.inviteModule performQuery:query
151
     [self.inviteModule performQuery:query
152
                    externalAPIScope:self.externalAPIScope
152
                    externalAPIScope:self.externalAPIScope
153
            addPeopleControllerScope:controller.uuid];
153
            addPeopleControllerScope:controller.uuid];

+ 2
- 2
ios/sdk/src/invite/InviteControllerDelegate.h View File

16
 
16
 
17
 #import "AddPeopleController.h"
17
 #import "AddPeopleController.h"
18
 
18
 
19
-@protocol InviteControllerDelegate <NSObject>
19
+@protocol JMInviteControllerDelegate <NSObject>
20
 
20
 
21
 /**
21
 /**
22
  * Called when the invite button in the conference is tapped.
22
  * Called when the invite button in the conference is tapped.
24
  * The search controller provided can be used to query user search within the
24
  * The search controller provided can be used to query user search within the
25
  * conference.
25
  * conference.
26
  */
26
  */
27
-- (void)beginAddPeople:(AddPeopleController *)addPeopleController;
27
+- (void)beginAddPeople:(JMAddPeopleController *)addPeopleController;
28
 
28
 
29
 @end
29
 @end

Loading…
Cancel
Save