Merge pull request #147 from olgadanylova/master

Olga Danylova · web-flow · commit fb6f5c6d3ea9 · 2017-09-22T18:25:48.000+03:00
Bug fixed
diff --git a/SDK/backendlessAPI/Classes/Backendless.h b/SDK/backendlessAPI/Classes/Backendless.h
@@ -19,10 +19,6 @@
  *  ********************************************************************************************************************
  */
 
-// applications & services deployment
-#define OLD_ASYNC_WITH_FAULT 0
-#define OLD_MEDIA_APP 0
-
 // implementation options
 #define _USE_SAFARI_VC_ 1
 
diff --git a/SDK/backendlessAPI/Classes/Messaging/MessagingService.h b/SDK/backendlessAPI/Classes/Messaging/MessagingService.h
@@ -83,6 +83,7 @@
 -(DeviceRegistration *)currentDevice;
 -(NSString *)deviceTokenAsString:(NSData *)token;
 #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
--(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler;
+-(void)attachmentProcessing:(UNNotificationRequest *_Nonnull)request withContentHandler:(void (^_Nonnull)(UNNotificationContent *_Nonnull))contentHandler;
 #endif
+
 @end
diff --git a/SDK/backendlessAPI/Classes/Messaging/MessagingService.m b/SDK/backendlessAPI/Classes/Messaging/MessagingService.m
@@ -158,7 +158,7 @@ -(NSString *)deviceTokenAsString:(NSData *)token {
 }
 
 #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
--(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler {
+-(void)attachmentProcessing:(UNNotificationRequest *_Nonnull)request withContentHandler:(void (^_Nonnull)(UNNotificationContent *_Nonnull))contentHandler {
     UNMutableNotificationContent *bestAttemptContent = [request.content mutableCopy];
     NSString *urlString = [request.content.userInfo valueForKey:@"attachment-url"];
     NSURL *fileUrl = [NSURL URLWithString:urlString];
@@ -179,7 +179,6 @@ -(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:
 }
 #endif
 
-
 // sync methods with fault return (as exception)
 
 -(NSString *)registerDevice:(NSData *)deviceToken {
diff --git a/SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj b/SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj
@@ -3201,10 +3201,10 @@
 		F91B47E115FF448F00012DFC /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				0F9AC6E81E798C5B0087869F /* weborb */,
 				D30A5D7319B9CA8200C0BA44 /* Backendless-Bridging-Header.h */,
 				F91B47FE15FF569400012DFC /* Backendless.h */,
 				F91B47FF15FF569400012DFC /* Backendless.m */,
+				0F9AC6E81E798C5B0087869F /* weborb */,
 				91F1398917D7240A00D1AC4C /* Cache */,
 				F91B47EC15FF48AF00012DFC /* IO */,
 				F9BE41C11B2ED8FC00CD0A72 /* Exceptions */,
diff --git a/SDK/ios/backendless/backendless.a b/SDK/ios/backendless/backendless.a
diff --git a/SDK/ios/backendless/include/Backendless.h b/SDK/ios/backendless/include/Backendless.h
@@ -19,10 +19,6 @@
  *  ********************************************************************************************************************
  */
 
-// applications & services deployment
-#define OLD_ASYNC_WITH_FAULT 0
-#define OLD_MEDIA_APP 0
-
 // implementation options
 #define _USE_SAFARI_VC_ 1
 
diff --git a/SDK/ios/backendless/include/MessagingService.h b/SDK/ios/backendless/include/MessagingService.h
@@ -83,6 +83,7 @@
 -(DeviceRegistration *)currentDevice;
 -(NSString *)deviceTokenAsString:(NSData *)token;
 #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
--(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler;
+-(void)attachmentProcessing:(UNNotificationRequest *_Nonnull)request withContentHandler:(void (^_Nonnull)(UNNotificationContent *_Nonnull))contentHandler;
 #endif
+
 @end
diff --git a/SDK/lib/backendless/backendless.a b/SDK/lib/backendless/backendless.a
diff --git a/SDK/lib/backendless/include/Backendless.h b/SDK/lib/backendless/include/Backendless.h
@@ -19,10 +19,6 @@
  *  ********************************************************************************************************************
  */
 
-// applications & services deployment
-#define OLD_ASYNC_WITH_FAULT 0
-#define OLD_MEDIA_APP 0
-
 // implementation options
 #define _USE_SAFARI_VC_ 1
 
diff --git a/SDK/lib/backendless/include/MessagingService.h b/SDK/lib/backendless/include/MessagingService.h
@@ -83,6 +83,7 @@
 -(DeviceRegistration *)currentDevice;
 -(NSString *)deviceTokenAsString:(NSData *)token;
 #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
--(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler;
+-(void)attachmentProcessing:(UNNotificationRequest *_Nonnull)request withContentHandler:(void (^_Nonnull)(UNNotificationContent *_Nonnull))contentHandler;
 #endif
+
 @end
diff --git a/SDK/osx/backendless/include/Backendless.h b/SDK/osx/backendless/include/Backendless.h
@@ -19,10 +19,6 @@
  *  ********************************************************************************************************************
  */
 
-// applications & services deployment
-#define OLD_ASYNC_WITH_FAULT 0
-#define OLD_MEDIA_APP 0
-
 // implementation options
 #define _USE_SAFARI_VC_ 1
 
diff --git a/SDK/osx/backendless/include/MessagingService.h b/SDK/osx/backendless/include/MessagingService.h
@@ -83,6 +83,7 @@
 -(DeviceRegistration *)currentDevice;
 -(NSString *)deviceTokenAsString:(NSData *)token;
 #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
--(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:(void (^)(UNNotificationContent *))contentHandler;
+-(void)attachmentProcessing:(UNNotificationRequest *_Nonnull)request withContentHandler:(void (^_Nonnull)(UNNotificationContent *_Nonnull))contentHandler;
 #endif
+
 @end
diff --git a/SDK/osx/backendless/libbackendless-mac.a b/SDK/osx/backendless/libbackendless-mac.a

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ -(NSString )deviceTokenAsString:(NSData )token {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`#if TARGET_OS_IPHONE \|\| TARGET_IPHONE_SIMULATOR`
`161`		`--(void)attachmentProcessing:(UNNotificationRequest )request withContentHandler:(void (^)(UNNotificationContent ))contentHandler {`
	`161`	`+-(void)attachmentProcessing:(UNNotificationRequest _Nonnull)request withContentHandler:(void (^_Nonnull)(UNNotificationContent _Nonnull))contentHandler {`
`162`	`162`	`UNMutableNotificationContent *bestAttemptContent = [request.content mutableCopy];`
`163`	`163`	`NSString *urlString = [request.content.userInfo valueForKey:@"attachment-url"];`
`164`	`164`	`NSURL *fileUrl = [NSURL URLWithString:urlString];`
`@@ -179,7 +179,6 @@ -(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:`
`179`	`179`	`}`
`180`	`180`	`#endif`
`181`	`181`
`182`		`-`
`183`	`182`	`// sync methods with fault return (as exception)`
`184`	`183`
`185`	`184`	`-(NSString )registerDevice:(NSData )deviceToken {`