Push action caching implemented for iOS. (#56)

* Push action caching implemented for iOS.

* Changelog and release version updated.

* Changlelog updated and android sdk version to .9

* Public header file issue fixed for “CountlyReactNative.h” file

* onNotificationResponse function added in .h file for public

* Revert to android SDK .8 version

Author: ijunaid

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 20.11.6
+* !! To handle the push notification you need to add the notifcation callback "didReceiveNotificationResponse" in your "AppDelegate.m" file and send the reponse to Countly SDK using this function "onNotificationResponse", for more detials please check the below mentioned link of "Handling push callbacks" section in Countly SDK documentation.
+https://support.count.ly/hc/en-us/articles/360037813231-React-Native-Bridge-#handling-push-callbacks
+* Push notification action issue fixed when app is closed and user tap on notification.
+* Updated underlying android SDK to 20.11.8
+* Underlying iOS SDK version is 20.11.1
+
 ## 20.11.5
 * iOS thread safety added to make all function calls on main thread.
 

CountlyReactNative.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'CountlyReactNative'
-  s.version = '20.11.5'
+  s.version = '20.11.6'
   s.license = {
     :type => 'COMMUNITY',
     :text => <<-LICENSE
@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
   s.author = {'Countly' => '[email protected]'}
   s.source = { :git => 'https://github.com/Countly/countly-sdk-ios.git', :tag => s.version.to_s }
   s.source_files = 'ios/src/*.{h,m}'
-  s.public_header_files = 'ios/src/Countly.h', 'ios/src/CountlyUserDetails.h', 'ios/src/CountlyConfig.h'
+  s.public_header_files = 'ios/src/CountlyReactNative.h'
   s.requires_arc = true
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '8.0'

android/build.gradle

@@ -1,5 +1,6 @@
 buildscript {
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
@@ -31,6 +32,7 @@ android {
 }
 
 repositories {
+    mavenCentral()
     google()
     maven {
         // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -44,7 +46,7 @@ repositories {
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    implementation 'ly.count.android:sdk:20.11.5'
+    implementation 'ly.count.android:sdk:20.11.8'
 
     //if any version higher than 18.0.0 is used then it forces AndroidX
     implementation 'com.google.firebase:firebase-messaging:18.0.0'

android/src/main/java/ly/count/android/sdk/react/CountlyReactNative.java

@@ -74,7 +74,7 @@ public String toString(){
 public class CountlyReactNative extends ReactContextBaseJavaModule implements LifecycleEventListener {
 
     public static final String TAG = "CountlyRNPlugin";
-    private String COUNTLY_RN_SDK_VERSION_STRING = "20.11.5";
+    private String COUNTLY_RN_SDK_VERSION_STRING = "20.11.6";
     private String COUNTLY_RN_SDK_NAME = "js-rnb-android";
 
     private static CountlyConfig config = new CountlyConfig();

example/README.md

@@ -22,20 +22,23 @@ Add header file
 
 Before `@end` add these method
 
--(void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)(void))completionHandler{
-  NSLog(@"didReceiveNotificationResponse");
-  NSDictionary *notification = response.notification.request.content.userInfo;
-  [CountlyReactNative onNotification: notification];
+// Required for the notification event. You must call the completion handler after handling the remote notification.
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler
+{
+  [CountlyReactNative onNotification: userInfo];
+  completionHandler(0);
+}
+
+// When app is killed.
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)(void))completionHandler{
+  [CountlyReactNative onNotificationResponse: response];
   completionHandler();
 }
 
-//Called when a notification is delivered to a foreground app.
--(void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler
-{
-  NSLog(@"didReceiveNotificationResponse");
-  NSDictionary *userInfo = notification.request.content.userInfo;
-  [CountlyReactNative onNotification: userInfo];
-  completionHandler(UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge);
+// When app is running.
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler{
+  [CountlyReactNative onNotification: notification.request.content.userInfo];
+  completionHandler(0);
 }
 
 

example/install.sh

@@ -11,7 +11,7 @@ rm App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/App.js --output App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/Example.js --output Example.js
 
-yarn add [email protected].5
+yarn add [email protected].6
 
 cd ./ios
 pod install

ios/src/CountlyReactNative.h

@@ -52,6 +52,7 @@ typedef void (^Result)(id _Nullable result);
 - (void)askForNotificationPermission:(NSArray*_Nullable)arguments;
 - (void)registerForNotification:(NSArray*_Nullable)arguments;
 + (void)onNotification:(NSDictionary *_Nullable)notification;
++ (void)onNotificationResponse:(UNNotificationResponse* _Nullable)response;
 - (void)handleRemoteNotificationReceived:(NSDictionary *_Nullable)notification;
 - (void)remoteConfigClearValues:(RCTPromiseResolveBlock _Nullable )resolve rejecter:(RCTPromiseRejectBlock _Nullable )reject;
 + (NSString *_Nullable) toJSON: (NSDictionary  * _Nullable) json;

ios/src/CountlyReactNative.m

@@ -21,7 +21,7 @@ @interface CountlyFeedbackWidget ()
 + (CountlyFeedbackWidget *)createWithDictionary:(NSDictionary *)dictionary;
 @end
 
-NSString* const kCountlyReactNativeSDKVersion = @"20.11.5";
+NSString* const kCountlyReactNativeSDKVersion = @"20.11.6";
 NSString* const kCountlyReactNativeSDKName = @"js-rnb-ios";
 
 CountlyConfig* config = nil;
@@ -31,7 +31,11 @@ + (CountlyFeedbackWidget *)createWithDictionary:(NSDictionary *)dictionary;
 NSMutableArray<CLYFeature>* countlyFeatures = nil;
 BOOL enablePushNotifications = true;
 
+NSDictionary* notificationCacheDictionary = nil;
+NSInteger notificationCacheButtonIndex = 0;
+
 @implementation CountlyReactNative
+NSString* const kCountlyNotificationPersistencyKey = @"kCountlyNotificationPersistencyKey";
 
 - (NSArray<NSString *> *)supportedEvents {
     return @[@"onCountlyPushNotification"];
@@ -66,8 +70,27 @@ @implementation CountlyReactNative
     }
 
     if (serverurl != nil && [serverurl length] > 0) {
-      [[Countly sharedInstance] startWithConfig:config];
-      resolve(@"Success");
+        dispatch_async(dispatch_get_main_queue(), ^
+        {
+            [[Countly sharedInstance] startWithConfig:config];
+            
+            resolve(@"Success");
+            // NSData* readData = [NSData dataWithContentsOfURL:[CountlyReactNative storageFileURL]];
+
+            if (notificationCacheDictionary != nil)
+            {
+                // NSDictionary* readDict = [NSKeyedUnarchiver unarchiveObjectWithData:readData];
+                NSDictionary* notificationDictionary = notificationCacheDictionary;// [readDict[kCountlyNotificationPersistencyKey] mutableCopy];
+                NSInteger buttonIndex = notificationCacheButtonIndex;
+                if([notificationDictionary count] > 0) {
+                    [Countly.sharedInstance recordActionForNotification:notificationDictionary clickedButtonIndex:buttonIndex];
+                    notificationCacheDictionary = nil;
+                    notificationCacheButtonIndex = 0;
+                    // [CountlyReactNative saveToFile:NSMutableDictionary.new buttonIndex:0];
+                }
+                
+            }
+        });
     }
   });
 }
@@ -236,29 +259,6 @@ - (void) saveListener:(Result) result{
 
 };
 
-+ (void)onNotification:(NSDictionary *)notificationMessage
-{
-    COUNTLY_RN_LOG(@"Notification received");
-    COUNTLY_RN_LOG(@"The notification %@", [CountlyReactNative toJSON:notificationMessage]);
-    if(notificationMessage && notificationListener != nil){
-      lastStoredNotification = notificationMessage;
-      notificationListener(@[[CountlyReactNative toJSON:notificationMessage]]);
-    }else{
-      lastStoredNotification = notificationMessage;
-    }
-    if(notificationMessage){
-      if(notificationIDs == nil){
-        notificationIDs = [[NSMutableArray alloc] init];
-      }
-      if ([[notificationMessage allKeys] containsObject:@"c"]) {
-        NSDictionary* countlyPayload = notificationMessage[@"c"];
-        if ([[countlyPayload allKeys] containsObject:@"c"]) {
-          NSString *notificationID = countlyPayload[@"i"];
-          [notificationIDs insertObject:notificationID atIndex:[notificationIDs count]];
-        }
-      }
-    }
-}
 + (NSString *) toJSON: (NSDictionary  *) json{
     NSError *error;
     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:json options:NSJSONWritingPrettyPrinted error:&error];
@@ -1091,4 +1091,113 @@ void CountlyRNInternalLog(NSString *format, ...)
 
     va_end(args);
 }
+
++ (void)onNotification:(NSDictionary *)notificationMessage
+{
+    [CountlyReactNative onNotification:notificationMessage buttonIndex:0];
+}
+
++ (void)onNotification:(NSDictionary *)notificationMessage buttonIndex:(NSInteger)btnIndex
+{
+    COUNTLY_RN_LOG(@"Notification received");
+    COUNTLY_RN_LOG(@"The notification %@", [CountlyReactNative toJSON:notificationMessage]);
+    if(notificationMessage && notificationListener != nil){
+      lastStoredNotification = notificationMessage;
+      notificationListener(@[[CountlyReactNative toJSON:notificationMessage]]);
+    }else{
+      lastStoredNotification = notificationMessage;
+    }
+    if(notificationMessage){
+      if(notificationIDs == nil){
+        notificationIDs = [[NSMutableArray alloc] init];
+      }
+      if ([[notificationMessage allKeys] containsObject:@"c"]) {
+        NSDictionary* countlyPayload = notificationMessage[@"c"];
+        if ([[countlyPayload allKeys] containsObject:@"c"]) {
+          NSString *notificationID = countlyPayload[@"i"];
+          [notificationIDs insertObject:notificationID atIndex:[notificationIDs count]];
+        }
+      }
+    }
+}
+
++(void)onNotificationResponse:(UNNotificationResponse *)response
+API_AVAILABLE(ios(10.0)){
+    NSDictionary* notificationDictionary = response.notification.request.content.userInfo;
+    NSInteger buttonIndex = 0;
+    if ([response.actionIdentifier hasPrefix:kCountlyActionIdentifier])
+    {
+        buttonIndex = [[response.actionIdentifier stringByReplacingOccurrencesOfString:kCountlyActionIdentifier withString:@""] integerValue];
+    }
+    if(!CountlyCommon.sharedInstance.hasStarted) {
+      notificationCacheDictionary = notificationDictionary;
+      notificationCacheButtonIndex = buttonIndex;
+        // [CountlyReactNative saveToFile:notificationDictionary buttonIndex:buttonIndex];
+    }
+    [CountlyReactNative onNotification:notificationDictionary buttonIndex:buttonIndex];
+    
+}
++ (NSURL *)storageDirectoryURL
+{
+    static NSURL* URL = nil;
+
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^
+    {
+#if (TARGET_OS_TV)
+        NSSearchPathDirectory directory = NSCachesDirectory;
+#else
+        NSSearchPathDirectory directory = NSApplicationSupportDirectory;
+#endif
+        URL = [[NSFileManager.defaultManager URLsForDirectory:directory inDomains:NSUserDomainMask] lastObject];
+
+#if (TARGET_OS_OSX)
+        URL = [URL URLByAppendingPathComponent:NSBundle.mainBundle.bundleIdentifier];
+#endif
+        NSError *error = nil;
+
+        if (![NSFileManager.defaultManager fileExistsAtPath:URL.path])
+        {
+            [NSFileManager.defaultManager createDirectoryAtURL:URL withIntermediateDirectories:YES attributes:nil error:&error];
+            if (error)
+            {
+                COUNTLY_LOG(@"Application Support directory can not be created: \n%@", error);
+            }
+        }
+    });
+
+    return URL;
+}
+
++ (NSURL *)storageFileURL
+{
+    NSString* const kCountlyPersistencyFileName = @"CountlyBridge.dat";
+
+    static NSURL* URL = nil;
+
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^
+    {
+        URL = [[CountlyReactNative storageDirectoryURL] URLByAppendingPathComponent:kCountlyPersistencyFileName];
+    });
+
+    return URL;
+}
+
++ (void)saveToFile:(NSDictionary *)notificationMessage buttonIndex:(NSInteger)btnIndex
+{
+    NSData* saveData;
+
+    @synchronized (self)
+    {
+        saveData = [NSKeyedArchiver archivedDataWithRootObject:@{kCountlyNotificationPersistencyKey: notificationMessage}];
+        
+    }
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-variable"
+
+    BOOL writeResult = [saveData writeToFile:[CountlyReactNative storageFileURL].path atomically:YES];
+    COUNTLY_LOG(@"Result of writing data to file: %d", writeResult);
+}
 @end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "countly-sdk-react-native-bridge",
-  "version": "20.11.5",
+  "version": "20.11.6",
   "author": "Countly <[email protected]> (https://count.ly/)",
   "bugs": {
     "url": "https://github.com/Countly/countly-sdk-react-native-bridge/issues"