Merge pull request #51 from CatalystCode/android-pn-inactive

Handling clicking on notification

Author: phongcao

README.md

@@ -473,10 +473,14 @@ const senderID = '...';         // The Sender ID from the Cloud Messaging tab of
 const tags = [ ... ];           // The set of tags to subscribe to
 
 class myapp extends Component {
-  register() 
+  constructor(props) {
+    super(props);
+    PushNotificationEmitter.addListener(DEVICE_NOTIF_EVENT, this._onRemoteNotification);
+  }
+
+  register() {
     PushNotificationEmitter.addListener(NOTIF_REGISTER_AZURE_HUB_EVENT, this._onAzureNotificationHubRegistered);
     PushNotificationEmitter.addListener(NOTIF_AZURE_HUB_REGISTRATION_ERROR_EVENT, this._onAzureNotificationHubRegistrationError);
-    PushNotificationEmitter.addListener(DEVICE_NOTIF_EVENT, this._onRemoteNotification);  
 
     NotificationHub.register({connectionString, hubName, senderID, tags})
       .catch(reason => console.warn(reason));

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

@@ -5,8 +5,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
 
+import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
@@ -23,12 +25,13 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UiThreadUtil;
 
-public class ReactNativeNotificationHubModule extends ReactContextBaseJavaModule {
+public class ReactNativeNotificationHubModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
     public static final String NOTIF_REGISTER_AZURE_HUB_EVENT = "azureNotificationHubRegistered";
     public static final String NOTIF_AZURE_HUB_REGISTRATION_ERROR_EVENT = "azureNotificationHubRegistrationError";
     public static final String DEVICE_NOTIF_EVENT = "remoteNotificationReceived";
 
     private static final int PLAY_SERVICES_RESOLUTION_REQUEST = 9000;
+    private static final int NOTIFICATION_DELAY_ON_START = 3000;
 
     private static final String ERROR_INVALID_ARGUMENTS = "E_INVALID_ARGUMENTS";
     private static final String ERROR_PLAY_SERVICES = "E_PLAY_SERVICES";
@@ -45,6 +48,7 @@ public ReactNativeNotificationHubModule(ReactApplicationContext reactContext) {
         LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(reactContext);
         localBroadcastManager.registerReceiver(mLocalBroadcastReceiver, new IntentFilter(ReactNativeRegistrationIntentService.TAG));
         localBroadcastManager.registerReceiver(mLocalBroadcastReceiver, new IntentFilter(ReactNativeNotificationsHandler.TAG));
+        reactContext.addLifecycleEventListener(this);
     }
 
     @Override
@@ -128,6 +132,23 @@ public void unregister(Promise promise) {
         }
     }
 
+    @Override
+    public void onHostResume() {
+        Activity activity = getCurrentActivity();
+        if (activity != null) {
+            Intent intent = activity.getIntent();
+            if (intent != null) {
+                Bundle bundle = intent.getBundleExtra("notification");
+                if (bundle != null) {
+                    new ReactNativeNotificationsHandler().sendBroadcast(mReactContext, bundle, NOTIFICATION_DELAY_ON_START);
+                }
+            }
+        }
+    }
+    @Override
+    public void onHostPause() {}
+    @Override
+    public void onHostDestroy() {}
     public class LocalBroadcastReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {

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

@@ -42,21 +42,32 @@ public class ReactNativeNotificationsHandler extends NotificationsHandler {
     public void onReceive(Context context, Bundle bundle) {
         this.context = context;
         sendNotification(bundle);
+        sendBroadcast(context, bundle, 0);
+    }
 
+    public void sendBroadcast(final Context context, final Bundle bundle, final long delay) {
+        (new Thread() {
+            public void run() {
+                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) {
+                        } catch (JSONException e) {}
             }
-        }
 
-        LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(context);
         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);
+                }
+                catch (Exception e) {}
+            }
+        }).start();
     }
 
     private Class getMainActivityClass() {