Merge pull request #169 from SXiaoXu/update_fcm

update fcm service

Author: jwfing

android-sdk/leancloud-fcm/src/main/java/cn/leancloud/AVFirebaseMessagingService.java

@@ -35,14 +35,27 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
       return;
     }
     LOGGER.d("received message from: " + remoteMessage.getFrom() + ", payload: " + data.toString());
+
+    if (remoteMessage.getNotification() == null) {
+      return;
+    }
+    String title = remoteMessage.getNotification().getTitle();
+    String alert = remoteMessage.getNotification().getBody();
+
     try {
       JSONObject jsonObject = JSON.parseObject(data.get("payload"));
       if (null != jsonObject) {
         String channel = jsonObject.getString("_channel");
         String action = jsonObject.getString("action");
 
+        if (!StringUtil.isEmpty(title)) {
+          jsonObject.put("title", title);
+        }
+        if (!StringUtil.isEmpty(alert)) {
+          jsonObject.put("alert", alert);
+        }
         AndroidNotificationManager androidNotificationManager = AndroidNotificationManager.getInstance();
-        androidNotificationManager.processGcmMessage(channel, action, jsonObject.toJSONString());
+        androidNotificationManager.processFcmMessage(channel, action, jsonObject.toJSONString());
       }
     } catch (Exception ex) {
       LOGGER.e("failed to parse push data.", ex);

android-sdk/realtime-android/src/main/java/cn/leancloud/push/AndroidNotificationManager.java

@@ -233,14 +233,17 @@ public void processMixNotification(String message, String defaultAction) {
   }
 
   /**
-   * 处理 GCM 的透传消息
+   * 处理 FCM 的透传消息
    * @param channel
    * @param action
    * @param message
    */
-  public void processGcmMessage(String channel, String action, String message) {
-    if (channel == null || !containsDefaultPushCallback(channel)) {
-      channel = AVOSCloud.getApplicationId();
+  public void processFcmMessage(String channel, String action, String message) {
+    if (!StringUtil.isEmpty(message)) {
+      if (channel == null || !containsDefaultPushCallback(channel)) {
+        channel = AVOSCloud.getApplicationId();
+      }
+
       if (action != null) {
         sendBroadcast(channel, message, action);
       } else {