🎨 Fix merge conflicts

docs/API.md

@@ -47,7 +47,6 @@ Attribute | Type | Default | Description
 `android.clearNotifications` | `boolean` | `true` | Optional. If `true` the app clears all pending notifications when it is closed.
 `android.forceShow` | `boolean` | `false` | Optional. Controls the behavior of the notification when app is in foreground. If `true` and app is in foreground, it will show a notification in the notification drawer, the same way as when the app is in background (and `on('notification')` callback will be called *only when the user clicks the notification*). When `false` and app is in foreground, the `on('notification')` callback will be called immediately.
 `android.topics` | `array` | `[]` | Optional. If the array contains one or more strings each string will be used to subscribe to a FcmPubSub topic.
-`/topics/` prefix from each element of the array as the plugin will handle that for you.
 `android.messageKey` | `string` | `message` | Optional. The key to search for text of notification.
 `android.titleKey` | `string` | `'title'` | Optional. The key to search for title of notification.
 

docs/PAYLOAD.md

@@ -805,8 +805,8 @@ var message = {
         title: 'AUX Scrum',
         message: 'Scrum: Daily touchbase @ 10am Please be on time so we can cover everything on the agenda.',
         actions: [
-            { "icon": "emailGuests", "title": "EMAIL GUESTS", "callback": "app.emailGuests", "foreground": true},
-            { "icon": "snooze", "title": "SNOOZE", "callback": "app.snooze", "foreground": false},
+            { icon: "emailGuests", title: "EMAIL GUESTS", callback: "app.emailGuests", foreground: true},
+            { icon: "snooze", title: "SNOOZE", callback: "app.snooze", foreground: false},
         ]
     }
 };
@@ -1137,12 +1137,12 @@ var deviceID = "my device id";
 var fcm = new FCM(apiKey);
 
 var message = {
-    to: deviceID,
-    data: {
-        title: 'Test Push',
-        message: 'Push number 1',
-        info: 'super secret info',
-        content-available: '1'
+    "to": deviceID,
+    "data": {
+        "title": 'Test Push',
+        "message": 'Push number 1',
+        "info": 'super secret info',
+        "content-available": '1'
     }
 };
 
@@ -1179,10 +1179,10 @@ var deviceID = "my device id";
 var fcm = new FCM(apiKey);
 
 var message = {
-    to: deviceID,
-    data: {
-        info: 'super secret info',
-        content-available: '1'
+    "to": deviceID,
+    "data": {
+        "info": 'super secret info',
+        "content-available": '1'
     }
 };
 
@@ -1293,10 +1293,10 @@ var fcm = new FCM(apiKey);
 
 var message = {
     to: deviceID,
-    data: {
-        title: 'Force Start',
-        message: 'This notification should restart the app',
-        force-start: '1'
+    "data": {
+        "title": 'Force Start',
+        "message": 'This notification should restart the app',
+        "force-start": '1'
     }
 };
 

plugin.xml

@@ -30,7 +30,7 @@
       <uses-permission android:name="android.permission.VIBRATE"/>
     </config-file>
     <config-file target="AndroidManifest.xml" parent="/manifest/application">
-      <activity android:name="com.adobe.phonegap.push.PushHandlerActivity" android:exported="true"/>
+      <activity android:name="com.adobe.phonegap.push.PushHandlerActivity" android:exported="true" android:permission="${applicationId}.permission.PushHandlerActivity"/>
       <receiver android:name="com.adobe.phonegap.push.BackgroundActionButtonHandler"/>
       <service android:name="com.adobe.phonegap.push.FCMService">
         <intent-filter>
@@ -87,8 +87,9 @@
     <framework src="FirebaseMessaging" type="podspec" spec="~> 1.2.1"/>
   </platform>
   <platform name="windows">
+    <hook type="after_plugin_install" src="hooks/windows/setToastCapable.js"/>
     <js-module src="src/windows/PushPluginProxy.js" name="PushPlugin">
-      <merges target=""/>
+      <runs/>
     </js-module>
     <config-file target="config.xml" parent="/*">
       <preference name="WindowsToastCapable" value="true"/>