cordova-plugin-appice 2.0.7 → 2.0.8

package/src/firebase/original/original.iml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/android" isTestSource="false" packagePrefix="org.apache.cordova.firebase" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/android" isTestSource="false" packagePrefix="org.apache.cordova.firebase" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>

package/src/ios/AppDelegate+AppICEPlugin.h

@@ -1,8 +1,8 @@
-
-#import "AppDelegate.h"
-
-@interface AppDelegate (AppICEPlugin)
-
-+(id) delegate;
-
-@end
+
+#import "AppDelegate.h"
+
+@interface AppDelegate (AppICEPlugin)
+
++(id) delegate;
+
+@end

package/src/ios/AppDelegate+AppICEPlugin.m

@@ -1,259 +1,191 @@
-
-#import "AppDelegate+AppICEPlugin.h"
-#import "AppICEPlugin.h"
-#import <objc/runtime.h>
-#import "appICE.h"
-
-
-
-
-
-#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
-@import UserNotifications;
-#endif
-
-#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
-@interface AppDelegate () <UNUserNotificationCenterDelegate>
-@end
-#endif
-
-#define kApplicationInBackgroundKey @"applicationInBackground"
-#define SYSTEM_VERSION_GRATERTHAN_OR_EQUALTO(v)  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
-
-@implementation AppDelegate (AppICEPlugin)
-
-static id appdelegate;
-typedef void (*OriginalImpType)(id self, SEL selector);
-static OriginalImpType originalImp;
-+ (void)load {
-   /*
-    //for did finish launch method
-   Method originalDidFinishLaunchingWithOptions = class_getInstanceMethod(self, @selector(application:didFinishLaunchingWithOptions:));
-
-   Method swizzledDidFinishLaunchingWithOptions = class_getInstanceMethod(self, @selector(application:swizzledDidFinishLaunchingWithOptions:));
-     method_exchangeImplementations(originalDidFinishLaunchingWithOptions, swizzledDidFinishLaunchingWithOptions);
-    
-
- 
-    //for Notification received
-     Method originalDidReceiveRemoteNotification = class_getInstanceMethod(self, @selector(application:didReceiveRemoteNotification:fetchCompletionHandler:));
-    Method swizzleDidReceiveRemoteNotification = class_getInstanceMethod(self, @selector(application:swizzleddidReceiveRemoteNotification:fetchCompletionHandler:));
-    method_exchangeImplementations(originalDidReceiveRemoteNotification, swizzleDidReceiveRemoteNotification);
-
-
-
-    
-    //for remote notfication failed
-      Method originaldidFailToRegisterForRemoteNotificationsWithError = class_getInstanceMethod(self, @selector(application:didFailToRegisterForRemoteNotificationsWithError:));
-    Method swizzleddidFailToRegisterForRemoteNotificationsWithError = class_getInstanceMethod(self, @selector(application:swizzleddidFailToRegisterForRemoteNotificationsWithError:));
-    method_exchangeImplementations(originaldidFailToRegisterForRemoteNotificationsWithError, swizzleddidFailToRegisterForRemoteNotificationsWithError);
-    NSLog(@"Appice+delegate loaded"); */
-
-        //for device token register
-      Method originaldidRegisterForRemoteNotificationsWithDeviceToken = class_getInstanceMethod(self, @selector(application:didRegisterForRemoteNotificationsWithDeviceToken:));
-    Method swizzleddidRegisterForRemoteNotificationsWithDeviceToken = class_getInstanceMethod(self, @selector(application:swizzleddidRegisterForRemoteNotificationsWithDeviceToken:));
-    method_exchangeImplementations(originaldidRegisterForRemoteNotificationsWithDeviceToken, swizzleddidRegisterForRemoteNotificationsWithDeviceToken);
-}
-
-+(id) delegate{
-    return appdelegate;
-}
-
-- (id)init
-{
-    self = [super init];
-    
-    appdelegate = self;
-    
-    NSLog(@"Appice+delegate init");
-    
-    return self;
-}
-
-- (void)setApplicationInBackground:(NSNumber *)applicationInBackground {
-    objc_setAssociatedObject(self, kApplicationInBackgroundKey, applicationInBackground, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (NSNumber *)applicationInBackground {
-  return objc_getAssociatedObject(self, kApplicationInBackgroundKey);
-}
--(void)application:(UIApplication *)application swizzleddidReceiveRemoteNotification:(NSDictionary *)userInfo
-fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
-    @try {
-        BOOL appIceServer = [[appICE sharedInstance] isAppICENotification:userInfo];
-        if(appIceServer)
-        {
-          [[AppICEPlugin appice] onHandleRemoteUNotification:userInfo];
-            completionHandler(UIBackgroundFetchResultNewData);
-        }
-        else
-        {
-            [self application:application swizzleddidReceiveRemoteNotification:userInfo fetchCompletionHandler:completionHandler];
-        }
-    }
-    @catch (NSException *exception) {
-        NSLog(@"exception from did receive notfication cordova = %@",exception.reason);
-    } @finally {
-        
-    }
-}
-
-- (BOOL)application:(UIApplication *)application swizzledDidFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    [self application:application swizzledDidFinishLaunchingWithOptions:launchOptions];
-
-    [self registerForRemoteNotification];
-
-    self.applicationInBackground = @(YES);
-   
-    return YES;
-}
-
-- (void)registerForRemoteNotification {
-    if(SYSTEM_VERSION_GRATERTHAN_OR_EQUALTO(@"10.0")) {
-        UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-        center.delegate = self;        [center requestAuthorizationWithOptions:(UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge) completionHandler:^(BOOL granted, NSError * _Nullable error){
-            if( !error ){
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [[UIApplication sharedApplication] registerForRemoteNotifications];
-                });
-            }
-        }];
-    }
-    else {
-        [[UIApplication sharedApplication] registerUserNotificationSettings:[UIUserNotificationSettings settingsForTypes:(UIUserNotificationTypeSound | UIUserNotificationTypeAlert | UIUserNotificationTypeBadge) categories:nil]];
-        [[UIApplication sharedApplication] registerForRemoteNotifications];
-    }
-}
-
-#pragma mark - Register Remote Notification
-
-- (void)application:(UIApplication*)application swizzleddidRegisterForRemoteNotificationsWithDeviceToken:(NSData*)deviceToken {
-    @try {
-        [[AppICEPlugin appice] handleToken:deviceToken];
-    } @catch(NSException *e){}
-}
-
-- (void)application:(UIApplication*)application swizzleddidFailToRegisterForRemoteNotificationsWithError:(NSError*)error {
-    @try {
-        [[AppICEPlugin appice] handleTokenError:error];
-    } @catch (NSException *exception) {
-    }
-}
-// - (void)application:(UIApplication*)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData*)deviceToken
-// {
-//      [[AppICEPlugin appice] handleToken:deviceToken];
-// }
-#pragma mark - Handle Notification info
-
-- (void) application:(UIApplication*)application didReceiveLocalNotification:(UILocalNotification*)notification {
-    
-    @try {
-        [[AppICEPlugin appice] onHandleLocalNotification:notification];
-    } @catch (NSException *exception) {
-    }
-}
-
-/*- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
-    @try {
-        [[AppICEPlugin appice] onHandleRemoteUNotification:userInfo];
-    } @catch (NSException *exception) {
-    }
-}*/
-
-
-#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center
-       willPresentNotification:(UNNotification *)notification
-         withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler {
-    @try {
-        [[AppICEPlugin appice] onHandleRemoteUNotification:notification.request.content.userInfo];
-        
-        completionHandler(UNNotificationPresentationOptionAlert | UNNotificationPresentationOptionBadge | UNNotificationPresentationOptionSound);
-    } @catch (NSException *exception) {
-        
-    } @finally {
-        
-    }
-}
-
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler{
-    
-    @try {
-        NSDictionary *userInfo = response.notification.request.content.userInfo;
-        
-        [[AppICEPlugin appice] onHandleNotificationUResponse:userInfo];
-        
-        completionHandler();
-    } @catch (NSException *exception) {
-        
-    } @finally {
-        
-    }
-}
-#endif
-
-#pragma mark - Handle Notification Action
-
-- (void)application:(UIApplication *)application handleActionWithIdentifier:(NSString *)identifier forLocalNotification:(UILocalNotification *)notification completionHandler:(void(^)())completionHandler {
-    
-    @try {
-        [[AppICEPlugin appice] onHandleActionForIdentifier:identifier];
-        
-        if (completionHandler) {
-            completionHandler();
-        }
-    } @catch (NSException *exception) {
-        
-    } @finally {
-        
-    }
-}
-
-- (void)application:(UIApplication *)application handleActionWithIdentifier:(NSString *)identifier forRemoteNotification:(NSDictionary *)userInfo completionHandler:(void (^)())completionHandler
-{
-    @try {
-        [[AppICEPlugin appice] onHandleActionForIdentifier:identifier];
-        
-        if (completionHandler) {
-            completionHandler();
-        }
-    } @catch (NSException *exception) {
-        
-    } @finally {
-        
-    }
-}
-
-#pragma mark - OpenURL Functions
-
-- (BOOL)application:(UIApplication*)application openURL:(NSURL*)url sourceApplication:(NSString*)sourceApplication annotation:(id)annotation {
-    @try {
-        if (!url) {
-            return NO;
-        }
-        [[AppICEPlugin appice] onHandleOpenURLNotification:url];
-    } @catch (NSException *exception) {
-    }
-    return YES;
-}
-
-- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options {
-    @try {
-        if (!url) {
-            return NO;
-        }
-        [[AppICEPlugin appice] onHandleOpenURLNotification:url];
-    
-    } @catch (NSException *exception) {
-    }
-    return YES;
-}
-
-- (void)openURL:(NSURL*)url options:(NSDictionary<NSString *, id> *)options completionHandler:(void (^ __nullable)(BOOL success))completion {
-    @try {
-        [[AppICEPlugin appice] onHandleOpenURLNotification:url];
-    } @catch (NSException *exception) {
-    }
-}
-
-@end
+#import "AppDelegate+AppICEPlugin.h"
+#import "AppICEPlugin.h"
+#import <objc/runtime.h>
+#import "appICE.h"
+
+
+
+
+
+#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
+@import UserNotifications;
+#endif
+
+#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
+@interface AppDelegate () <UNUserNotificationCenterDelegate>
+@end
+#endif
+
+#define kApplicationInBackgroundKey @"applicationInBackground"
+#define SYSTEM_VERSION_GRATERTHAN_OR_EQUALTO(v)  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
+
+@implementation AppDelegate (AppICEPlugin)
+
+static id appdelegate;
+typedef void (*OriginalImpType)(id self, SEL selector);
+static OriginalImpType originalImp;
++ (void)load {
+   
+    NSLog(@"In Appice Load method");
+
+}
+
+- (id)init
+{
+    self = [super init];
+    
+    NSLog(@"Appice+delegate init");
+    UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+    center.delegate = self;
+    return self;
+}
+
+- (void)setApplicationInBackground:(NSNumber *)applicationInBackground {
+    objc_setAssociatedObject(self, kApplicationInBackgroundKey, applicationInBackground, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+
+- (NSNumber *)applicationInBackground {
+  return objc_getAssociatedObject(self, kApplicationInBackgroundKey);
+}
+
+
+#pragma mark - Register Remote Notification
+
+
+- (void)application:(UIApplication*)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData*)deviceToken
+{
+ //    swizzle method called
+     @try {
+         [[AppICEPlugin appice] handleToken:deviceToken];
+        NSLog(@"inside didRegisterForRemoteNotificationsWithDeviceToken %@",deviceToken);
+    } @catch (NSException *exception) {
+    }
+}
+#pragma mark - Handle Notification info
+
+- (void) application:(UIApplication*)application didReceiveLocalNotification:(UILocalNotification*)notification {
+    
+    @try {
+        NSLog(@"inside didReceiveLocalNotification");
+    } @catch (NSException *exception) {
+    }
+}
+
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler
+{
+    @try {
+        BOOL appIceServer = [[appICE sharedInstance] isAppICENotification:userInfo];
+                if(appIceServer)
+                {
+                    // if yes appice plugin will be notified
+                  [[AppICEPlugin appice] onHandleRemoteUNotification:userInfo];
+                    completionHandler(UIBackgroundFetchResultNewData);
+                }
+        NSLog(@"inside didrecieveremotenotification %@",userInfo);
+    } @catch (NSException *exception) {
+    }
+
+}
+
+
+#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center
+       willPresentNotification:(UNNotification *)notification
+         withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler {
+    @try {
+    
+        completionHandler(UNNotificationPresentationOptionAlert | UNNotificationPresentationOptionBadge | UNNotificationPresentationOptionSound);
+    } @catch (NSException *exception) {
+        
+    } @finally {
+        
+    }
+}
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler{
+    
+    @try {
+ 
+        NSDictionary *userInfo = response.notification.request.content.userInfo;
+                NSLog(@"inside didReceiveNotificationResponse %@",userInfo);
+                BOOL appIceServer = [[appICE sharedInstance] isAppICENotification:userInfo];
+                if(appIceServer)
+                {
+                  [[AppICEPlugin appice] onHandleNotificationUResponse:userInfo];
+        
+                }
+        completionHandler();
+    } @catch (NSException *exception) {
+        
+    } @finally {
+        
+    }
+}
+#endif
+
+#pragma mark - Handle Notification Action
+
+- (void)application:(UIApplication *)application handleActionWithIdentifier:(NSString *)identifier forLocalNotification:(UILocalNotification *)notification completionHandler:(void(^)())completionHandler {
+    
+    @try {
+        [[AppICEPlugin appice] onHandleActionForIdentifier:identifier];
+        
+        if (completionHandler) {
+            completionHandler();
+        }
+    } @catch (NSException *exception) {
+        
+    } @finally {
+        
+    }
+}
+
+- (void)application:(UIApplication *)application handleActionWithIdentifier:(NSString *)identifier forRemoteNotification:(NSDictionary *)userInfo completionHandler:(void (^)())completionHandler
+{
+    @try {
+        [[AppICEPlugin appice] onHandleActionForIdentifier:identifier];
+        
+        if (completionHandler) {
+            completionHandler();
+        }
+    } @catch (NSException *exception) {
+        
+    } @finally {
+        
+    }
+}
+
+#pragma mark - OpenURL Functions
+
+- (BOOL)application:(UIApplication*)application openURL:(NSURL*)url sourceApplication:(NSString*)sourceApplication annotation:(id)annotation {
+    @try {
+        if (!url) {
+            return NO;
+        }
+        [[AppICEPlugin appice] onHandleOpenURLNotification:url];
+    } @catch (NSException *exception) {
+    }
+    return YES;
+}
+
+- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options {
+    @try {
+        if (!url) {
+            return NO;
+        }
+        [[AppICEPlugin appice] onHandleOpenURLNotification:url];
+    
+    } @catch (NSException *exception) {
+    }
+    return YES;
+}
+
+- (void)openURL:(NSURL*)url options:(NSDictionary<NSString *, id> *)options completionHandler:(void (^ __nullable)(BOOL success))completion {
+    @try {
+        [[AppICEPlugin appice] onHandleOpenURLNotification:url];
+    } @catch (NSException *exception) {
+    }
+}
+
+@end
+