Refactored notification handler.

Author: phongcao

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

@@ -15,12 +15,10 @@ public class ReactNativeFirebaseMessagingService extends FirebaseMessagingServic
 
     private static final String TAG = "ReactNativeFMS";
 
-    private static ReactNativeNotificationsHandler notificationHandler;
     private static String notificationChannelID;
 
-    public static void createNotificationHandler(Context context) {
-        if (notificationHandler == null) {
-            notificationHandler = new ReactNativeNotificationsHandler();
+    public static void createNotificationChannel(Context context) {
+        if (notificationChannelID == null) {
             NotificationHubUtil notificationHubUtil = NotificationHubUtil.getInstance();
             NotificationChannelBuilder builder = new NotificationChannelBuilder();
             if (notificationHubUtil.hasChannelImportance(context)) {
@@ -62,12 +60,12 @@ public void onNewToken(String token) {
     public void onMessageReceived(RemoteMessage remoteMessage) {
         Log.d(TAG, "Remote message from: " + remoteMessage.getFrom());
 
-        if (notificationHandler == null) {
-            createNotificationHandler(this);
+        if (notificationChannelID == null) {
+            createNotificationChannel(this);
         }
 
         Bundle bundle = remoteMessage.toIntent().getExtras();
-        notificationHandler.sendNotification(this, bundle, notificationChannelID);
-        notificationHandler.sendBroadcast(this, bundle, 0);
+        ReactNativeNotificationsHandler.sendNotification(this, bundle, notificationChannelID);
+        ReactNativeNotificationsHandler.sendBroadcast(this, bundle, 0);
     }
 }

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

@@ -170,7 +170,7 @@ public void onHostResume() {
             if (intent != null) {
                 Bundle bundle = intent.getBundleExtra("notification");
                 if (bundle != null) {
-                    new ReactNativeNotificationsHandler().sendBroadcast(
+                    ReactNativeNotificationsHandler.sendBroadcast(
                             mReactContext, bundle, NOTIFICATION_DELAY_ON_START);
                 }
             }

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

@@ -26,14 +26,17 @@
 
 import java.util.Set;
 
-public class ReactNativeNotificationsHandler {
+public final class ReactNativeNotificationsHandler {
     public static final String TAG = "ReactNativeNotification";
 
     public static final String NOTIFICATION_CHANNEL_ID = "rn-push-notification-channel-id";
 
     private static final long DEFAULT_VIBRATION = 300L;
 
-    public void sendBroadcast(final Context context, final Bundle bundle, final long delay) {
+    private ReactNativeNotificationsHandler() {
+    }
+
+    public static void sendBroadcast(final Context context, final Bundle bundle, final long delay) {
         (new Thread() {
             public void run() {
                 try {
@@ -58,7 +61,7 @@ public void run() {
         }).start();
     }
 
-    public void sendNotification(Context context, Bundle bundle, String notificationChannelID) {
+    public static void sendNotification(Context context, Bundle bundle, String notificationChannelID) {
         try {
             Class intentClass = getMainActivityClass(context);
             if (intentClass == null) {
@@ -277,7 +280,7 @@ public void sendNotification(Context context, Bundle bundle, String notification
         }
     }
 
-    private Class getMainActivityClass(Context context) {
+    private static Class getMainActivityClass(Context context) {
         String packageName = context.getPackageName();
         Intent launchIntent = context.getPackageManager().getLaunchIntentForPackage(packageName);
         String className = launchIntent.getComponent().getClassName();

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

@@ -70,7 +70,7 @@ public void onSuccess(InstanceIdResult instanceIdResult) {
                                 localBroadcastManager.sendBroadcast(event);
 
                                 // Create notification handler
-                                ReactNativeFirebaseMessagingService.createNotificationHandler(
+                                ReactNativeFirebaseMessagingService.createNotificationChannel(
                                         ReactNativeRegistrationIntentService.this);
                             }
                         } catch (Exception e) {