Convoy/latest

.travis.yml

@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - "6"
+  - "7"

RNNotifications/RNNotifications.h

@@ -8,11 +8,28 @@
 #import <React/RCTBridgeModule.h>
 #endif
 
+#if __has_include(<React/RCTConvert.h>)
+#import <React/RCTConvert.h>
+#elif __has_include("React/RCTConvert.h")
+#import "React/RCTConvert.h"
+#else
+#import "RCTConvert.h"
+#endif
+
+@interface RCTConvert (UILocalNotification)
++ (UILocalNotification *)UILocalNotification:(id)json;
+@end
+
+@interface RCTConvert (UIBackgroundFetchResult)
++(UIBackgroundFetchResult *)UIBackgroundFetchResult:(id)json;
+@end
+
 @interface RNNotifications : NSObject <RCTBridgeModule>
 
 typedef void (^RCTRemoteNotificationCallback)(UIBackgroundFetchResult result);
 
 + (void)didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken;
++ (void)didFailToRegisterForRemoteNotificationsWithError:(NSError *)error;
 + (void)didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings;
 + (void)didUpdatePushCredentials:(PKPushCredentials *)credentials forType:(NSString *)type;
 

android/build.gradle

@@ -1,12 +1,26 @@
+buildscript {
+    repositories {
+    maven {
+        url "https://maven.google.com"
+    }
+    jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.0.1'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -20,13 +34,12 @@ android {
 
 dependencies {
     // Google's GCM.
-    compile 'com.google.android.gms:play-services-gcm:11.6.0'
-
-    compile 'com.facebook.react:react-native:+'
+    api "com.google.firebase:firebase-messaging:17.3.4"
+    implementation 'com.facebook.react:react-native:+'
 
-    compile 'me.leolin:ShortcutBadger:1.1.8@aar'
+    implementation 'me.leolin:ShortcutBadger:1.1.8@aar'
 
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.+'
-    testCompile 'org.robolectric:robolectric:3.1.4'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.+'
+    testImplementation 'org.robolectric:robolectric:3.1.4'
 }

android/src/main/AndroidManifest.xml

@@ -11,46 +11,26 @@
         android:protectionLevel="signature" />
     <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
 
+    <!-- Ref: http://stackoverflow.com/questions/13602190/java-lang-securityexception-requires-vibrate-permission-on-jelly-bean-4-2 -->
+    <uses-permission android:name="android.permission.VIBRATE" android:maxSdkVersion="18" />
+
     <application>
 
         <!--
          A proxy-service that gives the library an opportunity to do some work before launching/resuming the actual application task.
          -->
         <service android:name=".core.ProxyService"/>
 
-        <!--
-         Google's ready-to-use GcmReceiver.
-         1. Awaits actual GCM messages (e.g. push notifications) and invokes the GCM service with the concrete content.
-         2. Awaits instance-ID/token refresh requests from the GCM and invokes the Instance-ID listener service.
-         -->
-        <receiver
-            android:name="com.google.android.gms.gcm.GcmReceiver"
-            android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-                <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-                <category android:name="${applicationId}" />
-            </intent-filter>
-        </receiver>
-        <!-- Dispatched by the GcmReceiver when messages are received. -->
         <service
-            android:name="com.wix.reactnativenotifications.gcm.GcmMessageHandlerService"
-            android:exported="false">
+            android:name=".gcm.FcmInstanceIdListenerService">
             <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-            </intent-filter>
-        </service>
-        <!-- Dispatched by the GcmReceiver. Starts the designated refresh-handling service. -->
-        <service
-            android:name=".gcm.GcmInstanceIdListenerService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.android.gms.iid.InstanceID" />
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
             </intent-filter>
         </service>
+
         <service
-            android:name=".gcm.GcmInstanceIdRefreshHandlerService"
+            android:name=".gcm.FcmInstanceIdRefreshHandlerService"
             android:exported="false" />
     </application>
 

android/src/main/java/com/wix/reactnativenotifications/Defs.java

@@ -7,5 +7,6 @@ public interface Defs {
     String TOKEN_RECEIVED_EVENT_NAME = "remoteNotificationsRegistered";
 
     String NOTIFICATION_RECEIVED_EVENT_NAME = "notificationReceived";
+    String NOTIFICATION_RECEIVED_FOREGROUND_EVENT_NAME = "notificationReceivedInForeground";
     String NOTIFICATION_OPENED_EVENT_NAME = "notificationOpened";
 }

android/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java

@@ -5,6 +5,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v4.app.NotificationManagerCompat;
 import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
@@ -22,18 +23,18 @@
 import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
 import com.wix.reactnativenotifications.core.notificationdrawer.PushNotificationsDrawer;
 import com.wix.reactnativenotifications.core.ReactAppLifecycleFacade;
-import com.wix.reactnativenotifications.gcm.GcmInstanceIdRefreshHandlerService;
+import com.wix.reactnativenotifications.gcm.FcmInstanceIdRefreshHandlerService;
 import com.wix.reactnativenotifications.helpers.ApplicationBadgeHelper;
 
 import static com.wix.reactnativenotifications.Defs.LOGTAG;
 
 public class RNNotificationsModule extends ReactContextBaseJavaModule implements AppLifecycleFacade.AppVisibilityListener, Application.ActivityLifecycleCallbacks {
 
-    public RNNotificationsModule(Application application, ReactApplicationContext reactContext) {
+    public RNNotificationsModule(Application application, RNNotificationsNativeCallback nativeCallback, ReactApplicationContext reactContext) {
         super(reactContext);
 
         if (AppLifecycleFacadeHolder.get() instanceof ReactAppLifecycleFacade) {
-            ((ReactAppLifecycleFacade) AppLifecycleFacadeHolder.get()).init(reactContext);
+            ((ReactAppLifecycleFacade) AppLifecycleFacadeHolder.get()).init(reactContext, nativeCallback);
         }
         AppLifecycleFacadeHolder.get().addVisibilityListener(this);
         application.registerActivityLifecycleCallbacks(this);
@@ -47,7 +48,7 @@ public String getName() {
     @Override
     public void initialize() {
         Log.d(LOGTAG, "Native module init");
-        startGcmIntentService(GcmInstanceIdRefreshHandlerService.EXTRA_IS_APP_INIT);
+        startGcmIntentService(FcmInstanceIdRefreshHandlerService.EXTRA_IS_APP_INIT);
 
         final IPushNotificationsDrawer notificationsDrawer = PushNotificationsDrawer.get(getReactApplicationContext().getApplicationContext());
         notificationsDrawer.onAppInit();
@@ -56,7 +57,7 @@ public void initialize() {
     @ReactMethod
     public void refreshToken() {
         Log.d(LOGTAG, "Native method invocation: refreshToken()");
-        startGcmIntentService(GcmInstanceIdRefreshHandlerService.EXTRA_MANUAL_REFRESH);
+        startGcmIntentService(FcmInstanceIdRefreshHandlerService.EXTRA_MANUAL_REFRESH);
     }
 
     @ReactMethod
@@ -99,6 +100,12 @@ public void cancelLocalNotification(int notificationId) {
         notificationsDrawer.onNotificationClearRequest(notificationId);
     }
 
+    @ReactMethod
+    public void isRegisteredForRemoteNotifications(Promise promise) {
+        boolean hasPermission = NotificationManagerCompat.from(getReactApplicationContext()).areNotificationsEnabled();
+        promise.resolve(new Boolean(hasPermission));
+    }
+
     @Override
     public void onAppVisible() {
         final IPushNotificationsDrawer notificationsDrawer = PushNotificationsDrawer.get(getReactApplicationContext().getApplicationContext());
@@ -141,7 +148,7 @@ public void onActivityDestroyed(Activity activity) {
 
     protected void startGcmIntentService(String extraFlag) {
         final Context appContext = getReactApplicationContext().getApplicationContext();
-        final Intent tokenFetchIntent = new Intent(appContext, GcmInstanceIdRefreshHandlerService.class);
+        final Intent tokenFetchIntent = new Intent(appContext, FcmInstanceIdRefreshHandlerService.class);
         tokenFetchIntent.putExtra(extraFlag, true);
         appContext.startService(tokenFetchIntent);
     }

android/src/main/java/com/wix/reactnativenotifications/RNNotificationsNativeCallback.java

@@ -0,0 +1,7 @@
+package com.wix.reactnativenotifications;
+
+import com.facebook.react.bridge.WritableMap;
+
+public interface RNNotificationsNativeCallback {
+    void onEventNotSentToJS(String eventName, WritableMap data);
+}

android/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java

@@ -3,7 +3,6 @@
 import android.app.Application;
 
 import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
@@ -14,21 +13,20 @@
 
 public class RNNotificationsPackage implements ReactPackage {
 
-
-    final Application mApplication;
+    private final Application mApplication;
+    private RNNotificationsNativeCallback mNativeCallback;
 
     public RNNotificationsPackage(Application application) {
         mApplication = application;
     }
 
-    @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(new RNNotificationsModule(mApplication, reactContext));
+    public void addNativeCallback(RNNotificationsNativeCallback rnNotificationsNativeCallback) {
+        mNativeCallback = rnNotificationsNativeCallback;
     }
 
-    // Deprecated RN 0.47
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        return Arrays.<NativeModule>asList(new RNNotificationsModule(mApplication, mNativeCallback, reactContext));
     }
 
     @Override

android/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacade.java

@@ -1,5 +1,6 @@
 package com.wix.reactnativenotifications.core;
 
+import com.wix.reactnativenotifications.RNNotificationsNativeCallback;
 import com.facebook.react.bridge.ReactContext;
 
 public interface AppLifecycleFacade {
@@ -11,6 +12,7 @@ interface AppVisibilityListener {
 
     boolean isReactInitialized();
     ReactContext getRunningReactContext();
+    RNNotificationsNativeCallback getNativeCallback();
     boolean isAppVisible();
     void addVisibilityListener(AppVisibilityListener listener);
     void removeVisibilityListener(AppVisibilityListener listener);

android/src/main/java/com/wix/reactnativenotifications/core/JsIOHelper.java

@@ -1,5 +1,6 @@
 package com.wix.reactnativenotifications.core;
 
+import com.wix.reactnativenotifications.RNNotificationsNativeCallback;
 import android.os.Bundle;
 
 import com.facebook.react.bridge.Arguments;
@@ -8,18 +9,18 @@
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 public class JsIOHelper {
-    public boolean sendEventToJS(String eventName, Bundle data, ReactContext reactContext) {
-        if (reactContext != null) {
-            sendEventToJS(eventName, Arguments.fromBundle(data), reactContext);
-            return true;
-        }
-        return false;
+    public boolean sendEventToJS(String eventName, Bundle data, AppLifecycleFacade appLifecycleFacade) {
+        return sendEventToJS(eventName, Arguments.fromBundle(data), appLifecycleFacade);
     }
 
-    public boolean sendEventToJS(String eventName, WritableMap data, ReactContext reactContext) {
-        if (reactContext != null) {
+    public boolean sendEventToJS(String eventName, WritableMap data, AppLifecycleFacade appLifecycleFacade) {
+        RNNotificationsNativeCallback nativeCallback = appLifecycleFacade.getNativeCallback();
+        ReactContext reactContext = appLifecycleFacade.getRunningReactContext();
+        if (appLifecycleFacade.isReactInitialized() && reactContext != null) {
             reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, data);
             return true;
+        } else if (nativeCallback != null) {
+            nativeCallback.onEventNotSentToJS(eventName, data);
         }
         return false;
     }

android/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java

@@ -8,12 +8,14 @@
 import com.wix.reactnativenotifications.core.notification.PushNotificationProps;
 
 public class NotificationIntentAdapter {
-    private static final int PENDING_INTENT_CODE = 0;
     private static final String PUSH_NOTIFICATION_EXTRA_NAME = "pushNotification";
 
     public static PendingIntent createPendingNotificationIntent(Context appContext, Intent intent, PushNotificationProps notification) {
         intent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, notification.asBundle());
-        return PendingIntent.getService(appContext, PENDING_INTENT_CODE, intent, PendingIntent.FLAG_ONE_SHOT);
+        // a unique action, data, type, class, or category must be set, otherwise the intent matcher
+        // gets confused see https://developer.android.com/reference/android/app/PendingIntent
+        intent.setAction(String.valueOf(System.currentTimeMillis()));
+        return PendingIntent.getService(appContext, (int) System.currentTimeMillis(), intent, PendingIntent.FLAG_ONE_SHOT);
     }
 
     public static Bundle extractPendingNotificationDataFromIntent(Intent intent) {

android/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java

@@ -1,5 +1,6 @@
 package com.wix.reactnativenotifications.core;
 
+import com.wix.reactnativenotifications.RNNotificationsNativeCallback;
 import android.util.Log;
 
 import com.facebook.react.bridge.LifecycleEventListener;
@@ -14,10 +15,12 @@ public class ReactAppLifecycleFacade implements AppLifecycleFacade {
 
     private ReactContext mReactContext;
     private boolean mIsVisible;
+    private RNNotificationsNativeCallback mNativeCallback;
     private Set<AppVisibilityListener> mListeners = new CopyOnWriteArraySet<>();
 
-    public void init(ReactContext reactContext) {
+    public void init(ReactContext reactContext, RNNotificationsNativeCallback nativeCallback) {
         mReactContext = reactContext;
+        mNativeCallback = nativeCallback;
         reactContext.addLifecycleEventListener(new LifecycleEventListener() {
             @Override
             public void onHostResume() {
@@ -58,6 +61,11 @@ public ReactContext getRunningReactContext() {
         return mReactContext;
     }
 
+    @Override
+    public RNNotificationsNativeCallback getNativeCallback() {
+        return mNativeCallback;
+    }
+
     @Override
     public boolean isAppVisible() {
         return mIsVisible;