From f2a578b2c7e6a264539189355d25995bb3ccc125 Mon Sep 17 00:00:00 2001
From: wangmengyan95 <wangmengyan95@gmail.com>
Date: Fri, 20 Nov 2015 14:45:41 -0800
Subject: [PATCH] Add null checking for push raw data

---
 .../main/java/com/parse/ParsePushBroadcastReceiver.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Parse/src/main/java/com/parse/ParsePushBroadcastReceiver.java b/Parse/src/main/java/com/parse/ParsePushBroadcastReceiver.java
index 4b1dc5295..23a38781e 100644
--- a/Parse/src/main/java/com/parse/ParsePushBroadcastReceiver.java
+++ b/Parse/src/main/java/com/parse/ParsePushBroadcastReceiver.java
@@ -136,9 +136,15 @@ public void onReceive(Context context, Intent intent) {
    *      An {@code Intent} containing the channel and data of the current push notification.
    */
   protected void onPushReceive(Context context, Intent intent) {
+    String pushDataStr = intent.getStringExtra(KEY_PUSH_DATA);
+    if (pushDataStr == null) {
+      PLog.e(TAG, "Can not get push data from intent.");
+      return;
+    }
+
     JSONObject pushData = null;
     try {
-      pushData = new JSONObject(intent.getStringExtra(KEY_PUSH_DATA));
+      pushData = new JSONObject(pushDataStr);
     } catch (JSONException e) {
       PLog.e(TAG, "Unexpected JSONException when receiving push data: ", e);
     }