From d3f1516f14fee22610c3520e23187469e0ee01e4 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Tue, 7 May 2019 13:54:58 -0400
Subject: [PATCH] PMC-751

---
 workflow/engine/config/mobile.ini             |  4 +--
 .../Light/PushMessageAndroid.php              | 28 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/workflow/engine/config/mobile.ini b/workflow/engine/config/mobile.ini
index b76af1aa3..26feba970 100644
--- a/workflow/engine/config/mobile.ini
+++ b/workflow/engine/config/mobile.ini
@@ -1,6 +1,6 @@
 ;Setting Android
-android[url] = "https://android.googleapis.com/gcm/send"
-android[serverApiKey] = "AIzaSyALwyLUYtZDcJQr54V5rxhZjoWnOLWCSvc"
+android[url] = "https://fcm.googleapis.com/fcm/send"
+android[serverApiKey] = "AAAAMvip2iU:APA91bHFAvHmCsSh0zbRaC9Xo2EPIbbRYzehkFAKUdXmj_ZVBOOO52npae183LYUONHjNPHaKo1MqT4BWiEuTF7HVEMfwn05XOA-h1LQ_bJ0ezAA35l-wADPq5VtKDiHT1VFGW1oeU7L"
 
 ;Setting Apple
 apple[url] = "ssl://gateway.push.apple.com:2195"
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
index 98c02649d..456904e90 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
@@ -17,9 +17,9 @@ use ProcessMaker\Core\System;
 
 class PushMessageAndroid
 {
-    private $url = 'https://android.googleapis.com/gcm/send';
-    private $serverApiKey = "AIzaSyBO-VLXGhjf0PPlwmPFTPQEKIBfVDydLAk";
-    private $devices = array();
+    private $url = 'https://fcm.googleapis.com/fcm/send';
+    private $serverApiKey = "AAAAMvip2iU:APA91bHFAvHmCsSh0zbRaC9Xo2EPIbbRYzehkFAKUdXmj_ZVBOOO52npae183LYUONHjNPHaKo1MqT4BWiEuTF7HVEMfwn05XOA-h1LQ_bJ0ezAA35l-wADPq5VtKDiHT1VFGW1oeU7L";
+    private $devices = [];
     private $numberDevices = 0;
 
     /**
@@ -78,24 +78,24 @@ class PushMessageAndroid
         }
 
         if (!is_null($data)) {
-            $fields = array(
+            $fields = [
                 'registration_ids' => $this->devices,
-                'data' => array(
-                    "message" => $message,
-                    "data" => $data
-                ),
-            );
+                'notification' => [
+                    "body" => $message,
+                    "data" => $data,
+                ],
+            ];
         } else {
-            $fields = array(
+            $fields = [
                 'registration_ids' => $this->devices,
-                'data' => array("message" => $message),
-            );
+                'data' => ["message" => $message],
+            ];
         }
 
-        $headers = array(
+        $headers = [
             'Authorization: key=' . $this->serverApiKey,
             'Content-Type: application/json'
-        );
+        ];
         // Open connection
         $ch = curl_init();