106 lines
5.2 KiB
Diff
106 lines
5.2 KiB
Diff
diff --git a/node_modules/react-native-notifications/RNNotifications/RNNotificationEventHandler.m b/node_modules/react-native-notifications/RNNotifications/RNNotificationEventHandler.m
|
|
index edc4fd4..7cd77f6 100644
|
|
--- a/node_modules/react-native-notifications/RNNotifications/RNNotificationEventHandler.m
|
|
+++ b/node_modules/react-native-notifications/RNNotifications/RNNotificationEventHandler.m
|
|
@@ -3,6 +3,7 @@
|
|
#import "RNNotificationUtils.h"
|
|
#import "RCTConvert+RNNotifications.h"
|
|
#import "RNNotificationParser.h"
|
|
+#import "RNUserDefaults.h"
|
|
|
|
@implementation RNNotificationEventHandler {
|
|
RNNotificationsStore* _store;
|
|
@@ -28,9 +29,91 @@ - (void)didReceiveForegroundNotification:(UNNotification *)notification withComp
|
|
[RNEventEmitter sendEvent:RNNotificationReceivedForeground body:[RNNotificationParser parseNotification:notification]];
|
|
}
|
|
|
|
+/*
|
|
+ * Generate a random alphanumeric string to message id
|
|
+*/
|
|
+-(NSString *)random:(int)len {
|
|
+ NSString *letters = @"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
|
+ NSMutableString *randomString = [NSMutableString stringWithCapacity:len];
|
|
+
|
|
+ for (int i=0; i<len; i++) {
|
|
+ [randomString appendFormat: @"%C", [letters characterAtIndex: arc4random_uniform([letters length])]];
|
|
+ }
|
|
+
|
|
+ return randomString;
|
|
+}
|
|
+
|
|
+/*
|
|
+ * Remove trailing slash on server url from notification
|
|
+*/
|
|
+-(NSString *)serverURL:(NSString *)host {
|
|
+ if ([host length] > 0) {
|
|
+ unichar last = [host characterAtIndex:[host length] - 1];
|
|
+ if (last == '/') {
|
|
+ host = [host substringToIndex:[host length] - 1];
|
|
+ }
|
|
+ }
|
|
+ return host;
|
|
+}
|
|
+
|
|
- (void)didReceiveNotificationResponse:(UNNotificationResponse *)response completionHandler:(void (^)(void))completionHandler {
|
|
- [_store setActionCompletionHandler:completionHandler withCompletionKey:response.notification.request.identifier];
|
|
- [RNEventEmitter sendEvent:RNNotificationOpened body:[RNNotificationParser parseNotificationResponse:response]];
|
|
+ // if notification response is a REPLY_ACTION
|
|
+ if ([response.actionIdentifier isEqualToString:@"REPLY_ACTION"]) {
|
|
+ // convert notification data to dictionary payload
|
|
+ NSDictionary *notification = [RCTConvert UNNotificationPayload:response.notification];
|
|
+
|
|
+ // parse ejson from notification
|
|
+ NSData *ejsonData = [[notification valueForKey:@"ejson"] dataUsingEncoding:NSUTF8StringEncoding];
|
|
+ NSError *error;
|
|
+ NSDictionary *ejson = [NSJSONSerialization JSONObjectWithData:ejsonData options:kNilOptions error:&error];
|
|
+
|
|
+ // data from notification
|
|
+ NSString *host = [ejson valueForKey:@"host"];
|
|
+ NSString *rid = [ejson valueForKey:@"rid"];
|
|
+
|
|
+ // msg on textinput of notification
|
|
+ NSString *msg = [(UNTextInputNotificationResponse *)response userText];
|
|
+
|
|
+ // get credentials
|
|
+ NSString *TOKEN_KEY = @"reactnativemeteor_usertoken";
|
|
+ NSString *userId = [[RNUserDefaults getDefaultUser] stringForKey:[NSString stringWithFormat:@"%@-%@", TOKEN_KEY, [self serverURL:host]]];
|
|
+ NSString *token = [[RNUserDefaults getDefaultUser] stringForKey:[NSString stringWithFormat:@"%@-%@", TOKEN_KEY, userId]];
|
|
+
|
|
+ // background task - we need this because fetch doesn't work if app is closed/killed
|
|
+ UIApplication *app = [UIApplication sharedApplication];
|
|
+ __block UIBackgroundTaskIdentifier task = [app beginBackgroundTaskWithExpirationHandler:^{
|
|
+ [app endBackgroundTask:task];
|
|
+ task = UIBackgroundTaskInvalid;
|
|
+ }];
|
|
+ // we use global queue to make requests with app closed/killed
|
|
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
+ // we make a synchronous request to post new message
|
|
+ NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/api/v1/chat.sendMessage", [self serverURL:host]]]];
|
|
+
|
|
+ NSString *message = [NSString stringWithFormat:@"{ \"message\": { \"_id\": \"%@\", \"msg\": \"%@\", \"rid\": \"%@\" } }", [self random:17], msg, rid];
|
|
+
|
|
+ [request setHTTPMethod:@"POST"];
|
|
+ [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
|
|
+ [request addValue:userId forHTTPHeaderField:@"x-user-id"];
|
|
+ [request addValue:token forHTTPHeaderField:@"x-auth-token"];
|
|
+ [request setHTTPBody:[message dataUsingEncoding:NSUTF8StringEncoding]];
|
|
+
|
|
+ NSURLResponse *response = nil;
|
|
+ NSError *error = nil;
|
|
+ NSData *data = [NSURLConnection sendSynchronousRequest:request returningResponse:&response error:&error];
|
|
+
|
|
+ // end background task
|
|
+ [app endBackgroundTask:task];
|
|
+ task = UIBackgroundTaskInvalid;
|
|
+
|
|
+ // complete notification response
|
|
+ completionHandler();
|
|
+ });
|
|
+ } else {
|
|
+ // We only set initial notification and emit event to JS when not is a reply action
|
|
+ [_store setActionCompletionHandler:completionHandler withCompletionKey:response.notification.request.identifier];
|
|
+ [RNEventEmitter sendEvent:RNNotificationOpened body:[RNNotificationParser parseNotificationResponse:response]];
|
|
+ }
|
|
}
|
|
|
|
@end
|