@imatis/react-native-notifications 4.2.4-imatis.21 → 4.3.1-imatis.24

package/android/app/src/reactNative59/reactNative59.iml

@@ -0,0 +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$/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/android/app/src/reactNative60/reactNative60.iml

@@ -0,0 +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$/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/lib/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue Mar 22 09:43:34 CET 2022
+#Mon Jul 12 10:27:56 ICT 2021
 gradle.version=6.1.1

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java

@@ -88,8 +88,10 @@ public class RNNotificationsModule extends ReactContextBaseJavaModule implements
                 return;
             }
 
-            InitialNotificationHolder.getInstance().clear();
             result = Arguments.fromBundle(notification.asBundle());
+            InitialNotificationHolder.getInstance().clear();
+        } catch (NullPointerException e) {
+            Log.e(LOGTAG, "getInitialNotification: Null pointer exception");
         } finally {
             promise.resolve(result);
         }

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java

@@ -47,7 +47,11 @@ public class ReactAppLifecycleFacade implements AppLifecycleFacade {
             return false;
         }
 
-        return mReactContext.hasActiveCatalystInstance();
+        try {
+            return mReactContext.hasActiveCatalystInstance();
+        } catch (Exception e) {
+            return mReactContext.hasActiveReactInstance();
+        }
     }
 
     @Override

package/lib/android/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Mar 22 09:43:01 CET 2022
-sdk.dir=/Users/larserlingdahl/Library/Android/sdk
+#Mon Jul 12 10:26:56 ICT 2021
+sdk.dir=/Users/troy/Library/Android/sdk

package/lib/dist/adapters/NativeEventsReceiver.d.ts

@@ -15,4 +15,5 @@ export declare class NativeEventsReceiver {
     registerPushKitNotificationReceived(callback: (event: object) => void): EmitterSubscription;
     registerNotificationOpened(callback: (notification: Notification, actionResponse?: NotificationActionResponse) => void): EmitterSubscription;
     registerRemoteNotificationsRegistrationFailed(callback: (event: RegistrationError) => void): EmitterSubscription;
+    registerRemoteNotificationsRegistrationDenied(callback: () => void): EmitterSubscription;
 }

package/lib/dist/adapters/NativeEventsReceiver.js

@@ -39,5 +39,8 @@ class NativeEventsReceiver {
     registerRemoteNotificationsRegistrationFailed(callback) {
         return this.emitter.addListener('remoteNotificationsRegistrationFailed', callback);
     }
+    registerRemoteNotificationsRegistrationDenied(callback) {
+        return this.emitter.addListener('remoteNotificationsRegistrationDenied', callback);
+    }
 }
 exports.NativeEventsReceiver = NativeEventsReceiver;

package/lib/dist/events/EventsRegistry.d.ts

@@ -14,4 +14,5 @@ export declare class EventsRegistry {
     registerNotificationReceivedBackground(callback: (notification: Notification, completion: (response: NotificationBackgroundFetchResult) => void) => void): EmitterSubscription;
     registerNotificationOpened(callback: (notification: Notification, completion: () => void, actionResponse?: NotificationActionResponse) => void): EmitterSubscription;
     registerRemoteNotificationsRegistrationFailed(callback: (event: RegistrationError) => void): EmitterSubscription;
+    registerRemoteNotificationsRegistrationDenied(callback: () => void): EmitterSubscription;
 }

package/lib/dist/events/EventsRegistry.js

@@ -21,5 +21,8 @@ class EventsRegistry {
     registerRemoteNotificationsRegistrationFailed(callback) {
         return this.nativeEventsReceiver.registerRemoteNotificationsRegistrationFailed(callback);
     }
+    registerRemoteNotificationsRegistrationDenied(callback) {
+        return this.nativeEventsReceiver.registerRemoteNotificationsRegistrationDenied(callback);
+    }
 }
 exports.EventsRegistry = EventsRegistry;

package/lib/ios/RNEventEmitter.h

@@ -1,6 +1,7 @@
 #import <React/RCTEventEmitter.h>
 
 static NSString* const RNRegistered                  = @"remoteNotificationsRegistered";
+static NSString* const RNRegistrationDenied          = @"remoteNotificationsRegistrationDenied";
 static NSString* const RNRegistrationFailed          = @"remoteNotificationsRegistrationFailed";
 static NSString* const RNPushKitRegistered           = @"pushKitRegistered";
 static NSString* const RNNotificationReceived        = @"notificationReceived";

package/lib/ios/RNEventEmitter.m

@@ -6,6 +6,7 @@ RCT_EXPORT_MODULE();
 
 -(NSArray<NSString *> *)supportedEvents {
     return @[RNRegistered,
+             RNRegistrationDenied,
              RNRegistrationFailed,
              RNPushKitRegistered,
              RNNotificationReceived,

package/lib/ios/RNNotificationCenter.m

@@ -1,3 +1,4 @@
+#import "RNEventEmitter.h"
 #import "RNNotificationCenter.h"
 #import "RCTConvert+RNNotifications.h"
 
@@ -40,6 +41,9 @@
                 }
             }];
         }
+        if (!error && !granted) {
+          [RNEventEmitter sendEvent:RNRegistrationDenied body:nil];
+        }
     }];
 }
 

package/lib/src/adapters/NativeEventsReceiver.ts

@@ -25,13 +25,13 @@ export class NativeEventsReceiver {
   }
 
   public registerNotificationReceived(callback: (notification: Notification) => void): EmitterSubscription {
-    return this.emitter.addListener('notificationReceived', (payload) => {
+    return this.emitter.addListener('notificationReceived', (payload: unknown) => {
       callback(this.notificationFactory.fromPayload(payload));
     });
   }
 
   public registerNotificationReceivedBackground(callback: (notification: Notification) => void): EmitterSubscription {
-    return this.emitter.addListener('notificationReceivedBackground', (payload) => {
+    return this.emitter.addListener('notificationReceivedBackground', (payload: unknown) => {
       callback(this.notificationFactory.fromPayload(payload));
     });
   }
@@ -50,4 +50,8 @@ export class NativeEventsReceiver {
   public registerRemoteNotificationsRegistrationFailed(callback: (event: RegistrationError) => void): EmitterSubscription {
     return this.emitter.addListener('remoteNotificationsRegistrationFailed', callback);
   }
+
+  public registerRemoteNotificationsRegistrationDenied(callback: () => void): EmitterSubscription {
+    return this.emitter.addListener('remoteNotificationsRegistrationDenied', callback);
+  }
 }

package/lib/src/events/EventsRegistry.ts

@@ -34,4 +34,8 @@ export class EventsRegistry {
   public registerRemoteNotificationsRegistrationFailed(callback: (event: RegistrationError) => void): EmitterSubscription {
     return this.nativeEventsReceiver.registerRemoteNotificationsRegistrationFailed(callback);
   }
+
+  public registerRemoteNotificationsRegistrationDenied(callback: () => void): EmitterSubscription {
+    return this.nativeEventsReceiver.registerRemoteNotificationsRegistrationDenied(callback);
+  }
 }