fix(android): change intent category

README.md

@@ -101,6 +101,10 @@ If you run into errors in combination with firebase.analytics e.g. `Error: Attem
 ```
 to the tiapp.xml
 
+If you register a channel with a different ID then `default` you have to add this to your `<application>` node:
+```xml
+<meta-data android:name="com.google.firebase.messaging.default_notification_channel_id" android:value="your_channel_id"/>
+```
 
 ### Setting the Notification Icon
 

android/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 3.3.1
+version: 4.0.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: titanium-firebase-cloud-messaging

android/src/firebase/cloudmessaging/CloudMessagingModule.java

@@ -26,6 +26,10 @@
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.RemoteMessage;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollModule;
 import org.appcelerator.kroll.annotations.Kroll;
@@ -34,17 +38,14 @@
 import org.appcelerator.titanium.util.TiConvert;
 import org.json.JSONObject;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import ti.modules.titanium.android.notificationmanager.NotificationChannelProxy;
 
 @Kroll.module(name = "CloudMessaging", id = "firebase.cloudmessaging")
 public class CloudMessagingModule extends KrollModule {
 
     private static final String LCAT = "FirebaseCloudMessaging";
-    private static final String FORCE_SHOW_IN_FOREGROUND = "titanium.firebase.cloudmessaging.key";
     private static CloudMessagingModule instance = null;
+    private static final String FORCE_SHOW_IN_FOREGROUND = "titanium.firebase.cloudmessaging.key";
     private static String fcmToken = null;
     private String notificationData = "";
 
@@ -76,7 +77,15 @@ private KrollDict getLastData()
 
             if (extras != null) {
                 for (String key : extras.keySet()) {
-                    data.put(key, extras.get(key));
+                    if (extras.get(key) instanceof Bundle) {
+                        Bundle bndl = (Bundle) extras.get(key);
+
+                        for (String bdnlKey : bndl.keySet()) {
+                            data.put(key + "_" + bdnlKey, bndl.get(bdnlKey));
+                        }
+                    } else {
+                        data.put(key, extras.get(key).toString());
+                    }
                 }
 
                 data.put("inBackground", true);

android/src/firebase/cloudmessaging/PushHandlerActivity.java

@@ -26,7 +26,7 @@ public void onCreate(Bundle savedInstanceState) {
 
             Intent launcherIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
             assert launcherIntent != null;
-            launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+            launcherIntent.addCategory(Intent.ACTION_MAIN);
             launcherIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             launcherIntent.putExtra("fcm_data", notification);