Firebase Messaging: fix Android notification body and title not sent to Flutter (flutter#672)

bkayfitz-cara · kroikie · commit 7f9fdbfe270c · 2018-09-04T16:27:59.000-07:00
* sending notification title and body to flutter

* Safety checks for null pointer exceptions

* Use remote data scheme on dart side
diff --git a/packages/firebase_messaging/CHANGELOG.md b/packages/firebase_messaging/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0
+
+* Updated Android to send Remote Message's title and body to Dart.
+
 ## 1.0.5
 
 * Bumped test and mockito versions to pick up Dart 2 support.
diff --git a/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java b/packages/firebase_messaging/android/src/main/java/io/flutter/plugins/firebasemessaging/FirebaseMessagingPlugin.java
@@ -9,6 +9,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.messaging.FirebaseMessaging;
@@ -54,16 +55,41 @@ private FirebaseMessagingPlugin(Registrar registrar, MethodChannel channel) {
   @Override
   public void onReceive(Context context, Intent intent) {
     String action = intent.getAction();
+
+    if (action == null) {
+      return;
+    }
+
     if (action.equals(FlutterFirebaseInstanceIDService.ACTION_TOKEN)) {
       String token = intent.getStringExtra(FlutterFirebaseInstanceIDService.EXTRA_TOKEN);
       channel.invokeMethod("onToken", token);
     } else if (action.equals(FlutterFirebaseMessagingService.ACTION_REMOTE_MESSAGE)) {
       RemoteMessage message =
           intent.getParcelableExtra(FlutterFirebaseMessagingService.EXTRA_REMOTE_MESSAGE);
-      channel.invokeMethod("onMessage", message.getData());
+      Map<String, Object> content = parseRemoteMessage(message);
+      channel.invokeMethod("onMessage", content);
     }
   }
 
+  @NonNull
+  private Map<String, Object> parseRemoteMessage(RemoteMessage message) {
+    Map<String, Object> content = new HashMap<>();
+    content.put("data", message.getData());
+
+    RemoteMessage.Notification notification = message.getNotification();
+
+    Map<String, Object> notificationMap = new HashMap<>();
+
+    String title = notification != null ? notification.getTitle() : null;
+    notificationMap.put("title", title);
+
+    String body = notification != null ? notification.getBody() : null;
+    notificationMap.put("body", body);
+
+    content.put("notification", notificationMap);
+    return content;
+  }
+
   @Override
   public void onMethodCall(MethodCall call, Result result) {
     if ("configure".equals(call.method)) {
@@ -100,9 +126,18 @@ private boolean sendMessageFromIntent(String method, Intent intent) {
         || CLICK_ACTION_VALUE.equals(intent.getStringExtra("click_action"))) {
       Map<String, String> message = new HashMap<>();
       Bundle extras = intent.getExtras();
+
+      if (extras == null) {
+        return false;
+      }
+
       for (String key : extras.keySet()) {
-        message.put(key, extras.get(key).toString());
+        Object extra = extras.get(key);
+        if (extra != null) {
+          message.put(key, extra.toString());
+        }
       }
+
       channel.invokeMethod(method, message);
       return true;
     }
diff --git a/packages/firebase_messaging/example/lib/main.dart b/packages/firebase_messaging/example/lib/main.dart
@@ -9,9 +9,9 @@ import 'package:flutter/material.dart';
 
 final Map<String, Item> _items = <String, Item>{};
 Item _itemForMessage(Map<String, dynamic> message) {
-  final String itemId = message['id'];
+  final String itemId = message['data']['id'];
   final Item item = _items.putIfAbsent(itemId, () => new Item(itemId: itemId))
-    ..status = message['status'];
+    ..status = message['data']['status'];
   return item;
 }
 
diff --git a/packages/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Cloud Messaging, a cross-platform
   messaging solution that lets you reliably deliver messages on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_messaging
-version: 1.0.5
+version: 2.0.0
 
 flutter:
   plugin:
