Merge pull request #64 from CatalystCode/thcao/fcm

Replacing deprecated APIs and updating readme file

Author: phongcao

README.md

@@ -90,7 +90,7 @@ In `android/app/src/main/AndroidManifest.xml`
 ```xml  
     <application
       xmlns:tools="http://schemas.android.com/tools"
-      tools:replace="android:icon"
+      tools:replace="android:icon,android:allowBackup"
       ...>
     </application>
 ```
@@ -108,17 +108,35 @@ include ':react-native-azurenotificationhub'
 project(':react-native-azurenotificationhub').projectDir = file('../node_modules/react-native-azurenotificationhub/android')
 ```
 
+In `android/build.gradle`
+
+```gradle
+...
+
+buildscript {
+	...
+    dependencies {
+        ...
+        classpath 'com.google.gms:google-services:4.2.0'
+    }
+}
+
+```
+
 In `android/app/build.gradle`
 
 ```gradle
 ...
 dependencies {
     ...
 
-    compile project(':react-native-azurenotificationhub')
-    compile 'com.google.android.gms:play-services-gcm:9.4.0'
-    compile 'com.google.firebase:firebase-messaging:9.4.0'
+    implementation project(':react-native-azurenotificationhub')
+    implementation 'com.google.firebase:firebase-messaging:17.6.0'
+    implementation 'com.google.firebase:firebase-core:16.0.8'
 }
+
+apply plugin: 'com.google.gms.google-services'
+
 ```
 
 In `android/app/src/main/AndroidManifest.xml`
@@ -127,21 +145,28 @@ In `android/app/src/main/AndroidManifest.xml`
     ...
 
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
     <application ...>
       ...
-      <service
-        android:name="com.azure.reactnative.notificationhub.ReactNativeRegistrationIntentService"
-        android:exported="false">
-      </service>
-      <receiver android:name="com.microsoft.windowsazure.notifications.NotificationsBroadcastReceiver"
-        android:permission="com.google.android.c2dm.permission.SEND">
-        <intent-filter>
-          <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-        </intent-filter>
-      </receiver>
+        <service
+            android:name="com.azure.reactnative.notificationhub.ReactNativeRegistrationIntentService"
+            android:exported="false" />
+
+        <service
+            android:name="com.azure.reactnative.notificationhub.ReactNativeFirebaseMessagingService"
+            android:stopWithTask="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
+        <receiver
+            android:name="com.microsoft.windowsazure.notifications.NotificationsBroadcastReceiver"
+            android:permission="com.google.android.c2dm.permission.SEND">
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+            </intent-filter>
+        </receiver>
     ...
 ```
 

android/build.gradle

@@ -1,12 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.3"
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         ndk {
@@ -22,13 +21,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.facebook.react:react-native:+'
-    compile 'com.google.android.gms:play-services-gcm:15.0.0'
-    compile 'com.google.firebase:firebase-messaging:15.0.0'
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.microsoft.azure:notification-hubs-android-sdk:0.4@aar'
-    compile 'com.microsoft.azure:azure-notifications-handler:1.0.1@aar'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.facebook.react:react-native:+'
+    implementation 'com.google.firebase:firebase-messaging:17.6.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.microsoft.azure:notification-hubs-android-sdk:0.4@aar'
+    implementation 'com.microsoft.azure:azure-notifications-handler:1.0.1@aar'
 }
 
 repositories {

android/src/main/java/com/azure/reactnative/notificationhub/ReactNativeFirebaseMessagingService.java

@@ -0,0 +1,19 @@
+package com.azure.reactnative.notificationhub;
+
+import android.content.Intent;
+import android.util.Log;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+
+public class ReactNativeFirebaseMessagingService extends FirebaseMessagingService {
+
+    private static final String TAG = "ReactNativeFirebaseMS";
+
+    @Override
+    public void onNewToken(String token) {
+        Log.i(TAG, "Refreshing FCM Registration Token");
+
+        Intent intent = new Intent(this, ReactNativeRegistrationIntentService.class);
+        startService(intent);
+    }
+}

android/src/main/java/com/azure/reactnative/notificationhub/ReactNativeInstanceIDService.java

@@ -14,7 +14,6 @@
 import com.google.android.gms.common.GoogleApiAvailability;
 
 import com.microsoft.windowsazure.messaging.NotificationHub;
-import com.microsoft.windowsazure.notifications.NotificationsManager;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -106,7 +105,6 @@ public void register(ReadableMap config, Promise promise) {
 
         Intent intent = new Intent(reactContext, ReactNativeRegistrationIntentService.class);
         reactContext.startService(intent);
-        NotificationsManager.handleNotifications(reactContext, senderID, ReactNativeNotificationsHandler.class);
     }
 
     @ReactMethod
@@ -126,7 +124,6 @@ public void unregister(Promise promise) {
         try {
             hub.unregister();
             notificationHubUtil.setRegistrationID(reactContext, null);
-            NotificationsManager.stopHandlingNotifications(reactContext);
         } catch (Exception e) {
             promise.reject(ERROR_NOTIFICATION_HUB, e);
         }

android/src/main/java/com/azure/reactnative/notificationhub/ReactNativeNotificationHubModule.java

@@ -32,7 +32,8 @@
 import java.util.Set;
 
 public class ReactNativeNotificationsHandler extends NotificationsHandler {
-    public static final String TAG = "ReactNativeNotificationsHandler";
+    public static final String TAG = "ReactNativeNotification";
+
     private static final String NOTIFICATION_CHANNEL_ID = "rn-push-notification-channel-id";
     private static final long DEFAULT_VIBRATION = 300L;
 
@@ -48,24 +49,24 @@ public void onReceive(Context context, Bundle bundle) {
     public void sendBroadcast(final Context context, final Bundle bundle, final long delay) {
         (new Thread() {
             public void run() {
-                try
-                {
+                try {
                     Thread.currentThread().sleep(delay);
-        JSONObject json = new JSONObject();
-        Set<String> keys = bundle.keySet();
-        for (String key : keys) {
-            try {
-                json.put(key, bundle.get(key));
-                        } catch (JSONException e) {}
-            }
+                    JSONObject json = new JSONObject();
+                    Set<String> keys = bundle.keySet();
+                    for (String key : keys) {
+                        try {
+                            json.put(key, bundle.get(key));
+                        } catch (JSONException e) {
+                        }
+                    }
 
-        Intent event= new Intent(TAG);
-        event.putExtra("event", ReactNativeNotificationHubModule.DEVICE_NOTIF_EVENT);
-        event.putExtra("data", json.toString());
+                    Intent event = new Intent(TAG);
+                    event.putExtra("event", ReactNativeNotificationHubModule.DEVICE_NOTIF_EVENT);
+                    event.putExtra("data", json.toString());
                     LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(context);
-        localBroadcastManager.sendBroadcast(event);
+                    localBroadcastManager.sendBroadcast(event);
+                } catch (Exception e) {
                 }
-                catch (Exception e) {}
             }
         }).start();
     }
@@ -291,14 +292,15 @@ private NotificationManager notificationManager() {
     }
 
     private static boolean channelCreated = false;
+
     private static void checkOrCreateChannel(NotificationManager manager) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
             return;
         if (channelCreated)
             return;
         if (manager == null)
             return;
-         final CharSequence name = "rn-push-notification-channel";
+        final CharSequence name = "rn-push-notification-channel";
         int importance = NotificationManager.IMPORTANCE_DEFAULT;
         NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, name, importance);
         channel.enableLights(true);

android/src/main/java/com/azure/reactnative/notificationhub/ReactNativeNotificationsHandler.java

@@ -5,65 +5,76 @@
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.FirebaseOptions;
+import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.InstanceIdResult;
 import com.microsoft.windowsazure.messaging.NotificationHub;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 public class ReactNativeRegistrationIntentService extends IntentService {
 
     public static final String TAG = "ReactNativeRegistration";
 
+    private final ExecutorService pool = Executors.newFixedThreadPool(1);
+
     public ReactNativeRegistrationIntentService() {
         super(TAG);
     }
 
     @Override
     protected void onHandleIntent(Intent intent) {
-        LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(this);
-        Intent event= new Intent(TAG);
-
-        try {
-            NotificationHubUtil notificationHubUtil = NotificationHubUtil.getInstance();
-            String connectionString = notificationHubUtil.getConnectionString(this);
-            String hubName = notificationHubUtil.getHubName(this);
-            String regID = notificationHubUtil.getRegistrationID(this);
-            String storedToken = notificationHubUtil.getFCMToken(this);
-            String[] tags = notificationHubUtil.getTags(this);
+        final LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(this);
+        final Intent event = new Intent(TAG);
+        final NotificationHubUtil notificationHubUtil = NotificationHubUtil.getInstance();
+        final String connectionString = notificationHubUtil.getConnectionString(this);
+        final String hubName = notificationHubUtil.getHubName(this);
+        final String storedToken = notificationHubUtil.getFCMToken(this);
+        final String[] tags = notificationHubUtil.getTags(this);
 
-            if (connectionString == null || hubName == null) {
-                // The intent was triggered when no connection string has been set.
-                // This is likely due to an InstanceID refresh occurring while no user
-                // registration is active for Azure Notification Hub.
-                return;
-            }
+        if (connectionString == null || hubName == null) {
+            // The intent was triggered when no connection string has been set.
+            // This is likely due to an InstanceID refresh occurring while no user
+            // registration is active for Azure Notification Hub.
+            return;
+        }
 
-            String token = FirebaseInstanceId.getInstance().getToken();
-            Log.d(TAG, "FCM Registration Token: " + token);
+        FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(
+                pool, new OnSuccessListener<InstanceIdResult>() {
+                    @Override
+                    public void onSuccess(InstanceIdResult instanceIdResult) {
+                        try {
+                            String regID = notificationHubUtil.getRegistrationID(ReactNativeRegistrationIntentService.this);
+                            String token = instanceIdResult.getToken();
+                            Log.d(TAG, "FCM Registration Token: " + token);
 
-            // Storing the registration ID indicates whether the generated token has been
-            // sent to your server. If it is not stored, send the token to your server.
-            // Also check if the token has been compromised and needs refreshing.
-            if (regID == null || storedToken != token) {
-                NotificationHub hub = new NotificationHub(hubName, connectionString, this);
-                Log.d(TAG, "NH Registration refreshing with token : " + token);
-                regID = hub.register(token, tags).getRegistrationId();
+                            // Storing the registration ID indicates whether the generated token has been
+                            // sent to your server. If it is not stored, send the token to your server.
+                            // Also check if the token has been compromised and needs refreshing.
+                            if (regID == null || storedToken != token) {
+                                NotificationHub hub = new NotificationHub(hubName, connectionString,
+                                        ReactNativeRegistrationIntentService.this);
+                                Log.d(TAG, "NH Registration refreshing with token : " + token);
 
-                Log.d(TAG, "New NH Registration Successfully - RegId : " + regID);
+                                regID = hub.register(token, tags).getRegistrationId();
+                                Log.d(TAG, "New NH Registration Successfully - RegId : " + regID);
 
-                notificationHubUtil.setRegistrationID(this, regID);
-                notificationHubUtil.setFCMToken(this, token);
+                                notificationHubUtil.setRegistrationID(ReactNativeRegistrationIntentService.this, regID);
+                                notificationHubUtil.setFCMToken(ReactNativeRegistrationIntentService.this, token);
 
-                event.putExtra("event", ReactNativeNotificationHubModule.NOTIF_REGISTER_AZURE_HUB_EVENT);
-                event.putExtra("data", regID);
-                localBroadcastManager.sendBroadcast(event);
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "Failed to complete token refresh", e);
+                                event.putExtra("event", ReactNativeNotificationHubModule.NOTIF_REGISTER_AZURE_HUB_EVENT);
+                                event.putExtra("data", regID);
+                                localBroadcastManager.sendBroadcast(event);
+                            }
+                        } catch (Exception e) {
+                            Log.e(TAG, "Failed to complete token refresh", e);
 
-            event.putExtra("event", ReactNativeNotificationHubModule.NOTIF_AZURE_HUB_REGISTRATION_ERROR_EVENT);
-            event.putExtra("data", e.getMessage());
-            localBroadcastManager.sendBroadcast(event);
-        }
+                            event.putExtra("event", ReactNativeNotificationHubModule.NOTIF_AZURE_HUB_REGISTRATION_ERROR_EVENT);
+                            event.putExtra("data", e.getMessage());
+                            localBroadcastManager.sendBroadcast(event);
+                        }
+                    }
+                });
     }
 }