From d37a0eee3a79c3fb5f58badfc52c9aac1b118c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Tue, 9 Apr 2019 12:46:29 +0200 Subject: [PATCH] ios: fix compilation warnings --- ios/sdk/src/JitsiMeet.h | 16 ++++++++-------- ios/sdk/src/JitsiMeet.m | 2 +- ios/sdk/src/JitsiMeetConferenceOptions.h | 4 ++-- ios/sdk/src/JitsiMeetView+Private.h | 2 +- ios/sdk/src/JitsiMeetView.h | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ios/sdk/src/JitsiMeet.h b/ios/sdk/src/JitsiMeet.h index b9b353266..6a0943241 100644 --- a/ios/sdk/src/JitsiMeet.h +++ b/ios/sdk/src/JitsiMeet.h @@ -44,23 +44,23 @@ #pragma mak - This class is a singleton -+ (instancetype)sharedInstance; ++ (instancetype _Nonnull)sharedInstance; #pragma mark - Methods that the App delegate must call - (BOOL)application:(UIApplication *_Nonnull)application didFinishLaunchingWithOptions:(NSDictionary *_Nonnull)launchOptions; -- (BOOL)application:(UIApplication * _Nonnull)application - continueUserActivity:(NSUserActivity * _Nonnull)userActivity - restorationHandler:(void (^ _Nullable)(NSArray * _Nullable))restorationHandler; +- (BOOL)application:(UIApplication *_Nonnull)application + continueUserActivity:(NSUserActivity *_Nonnull)userActivity + restorationHandler:(void (^_Nullable)(NSArray> *_Nonnull))restorationHandler; -- (BOOL)application:(UIApplication *)app - openURL:(NSURL *)url - options:(NSDictionary *)options; +- (BOOL)application:(UIApplication *_Nonnull)app + openURL:(NSURL *_Nonnull)url + options:(NSDictionary *_Nonnull)options; #pragma mark - Utility methods -- (JitsiMeetConferenceOptions *)getInitialConferenceOptions; +- (JitsiMeetConferenceOptions *_Nonnull)getInitialConferenceOptions; @end diff --git a/ios/sdk/src/JitsiMeet.m b/ios/sdk/src/JitsiMeet.m index 5361f2f3a..8dd34dfd3 100644 --- a/ios/sdk/src/JitsiMeet.m +++ b/ios/sdk/src/JitsiMeet.m @@ -70,7 +70,7 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity - restorationHandler:(void (^)(NSArray *restorableObjects))restorationHandler { + restorationHandler:(void (^)(NSArray> *))restorationHandler { JitsiMeetConferenceOptions *options = [self optionsFromUserActivity:userActivity]; diff --git a/ios/sdk/src/JitsiMeetConferenceOptions.h b/ios/sdk/src/JitsiMeetConferenceOptions.h index 16261a535..a25a76f63 100644 --- a/ios/sdk/src/JitsiMeetConferenceOptions.h +++ b/ios/sdk/src/JitsiMeetConferenceOptions.h @@ -67,7 +67,7 @@ @property (nonatomic, readonly) BOOL welcomePageEnabled; -+ (instancetype)fromBuilder:(void (^)(JitsiMeetConferenceOptionsBuilder *))initBlock; -- (instancetype)init NS_UNAVAILABLE; ++ (instancetype _Nonnull)fromBuilder:(void (^_Nonnull)(JitsiMeetConferenceOptionsBuilder *_Nonnull))initBlock; +- (instancetype _Nonnull)init NS_UNAVAILABLE; @end diff --git a/ios/sdk/src/JitsiMeetView+Private.h b/ios/sdk/src/JitsiMeetView+Private.h index bd468a325..d17ac0eb7 100644 --- a/ios/sdk/src/JitsiMeetView+Private.h +++ b/ios/sdk/src/JitsiMeetView+Private.h @@ -19,7 +19,7 @@ @interface JitsiMeetView () -+ (instancetype)viewForExternalAPIScope:(NSString *)externalAPIScope; ++ (instancetype _Nullable)viewForExternalAPIScope:(NSString *_Nonnull)externalAPIScope; + (BOOL)setPropsInViews:(NSDictionary *_Nonnull)newProps; @end diff --git a/ios/sdk/src/JitsiMeetView.h b/ios/sdk/src/JitsiMeetView.h index 26caf7aff..30db2719e 100644 --- a/ios/sdk/src/JitsiMeetView.h +++ b/ios/sdk/src/JitsiMeetView.h @@ -31,7 +31,7 @@ * is an already active conference it will be automatically left prior to * joining the new one. */ -- (void)join:(JitsiMeetConferenceOptions *)options; +- (void)join:(JitsiMeetConferenceOptions *_Nullable)options; /** * Leaves the currently active conference. */