Skip to content

Bug fixed #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 22, 2017
Merged

Bug fixed #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fa2554
Attachments processing fixed
Sep 22, 2017
ffabb77
Bug fixes
Sep 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions SDK/backendlessAPI/Classes/Backendless.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion SDK/backendlessAPI/Classes/Messaging/MessagingService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions SDK/backendlessAPI/Classes/Messaging/MessagingService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand All @@ -179,7 +179,6 @@ -(void)attachmentProcessing:(UNNotificationRequest *)request withContentHandler:
}
#endif


// sync methods with fault return (as exception)

-(NSString *)registerDevice:(NSData *)deviceToken {
Expand Down
2 changes: 1 addition & 1 deletion SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */,
Expand Down
Binary file modified SDK/ios/backendless/backendless.a
View file
Open in desktop
Binary file not shown.
4 changes: 0 additions & 4 deletions SDK/ios/backendless/include/Backendless.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion SDK/ios/backendless/include/MessagingService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified SDK/lib/backendless/backendless.a
View file
Open in desktop
Binary file not shown.
4 changes: 0 additions & 4 deletions SDK/lib/backendless/include/Backendless.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion SDK/lib/backendless/include/MessagingService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions SDK/osx/backendless/include/Backendless.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion SDK/osx/backendless/include/MessagingService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified SDK/osx/backendless/libbackendless-mac.a
View file
Open in desktop
Binary file not shown.