Adding in google GCM to support custom data and multiple gcm apps

Author: bassrock

.gitignore

@@ -1,3 +1,4 @@
 .idea
 vendor
 composer.phar
+atlassian-ide-plugin.xml

DependencyInjection/Configuration.php

@@ -105,11 +105,18 @@ protected function addAndroid()
                                         scalarNode("source")->defaultValue("")->end()->
                                     end()->
                             end()->
-                            arrayNode("gcm")->
-                                canBeUnset()->
-                                    children()->
-                                        scalarNode("api_key")->isRequired()->cannotBeEmpty()->end()->
-                                    end()->
+                            arrayNode("gcm")
+                                ->children()
+                                ->arrayNode('api_keys')
+                                    ->isRequired()
+                                    ->requiresAtLeastOneElement()
+                                    ->useAttributeAsKey('name')
+                                    ->prototype('array')
+                                    ->children()
+                                        ->scalarNode('api_key')->isRequired()->end()
+                                        ->scalarNode('internal_app_id')->isRequired()->end()
+                                    ->end()->
+                                end()->
                             end()->
                         end()->
                 end()->

Model/Message.php

@@ -86,7 +86,7 @@ abstract class Message implements MessageInterface
     /**
      * Collapse key for data
      *
-     * @var int
+     * @var string
      */
     protected $collapseKey = self::DEFAULT_COLLAPSE_KEY;
 
@@ -234,6 +234,7 @@ public function getMessageBody()
                 "registration_id" => $this->device->getDeviceidentifier(),
                 "collapse_key"    => $this->collapseKey,
                 "data.message"    => $this->message,
+                "data.content_available" => $this->contentAvailable ? 1 : 0,
             );
             if (!empty($this->customData)) {
                 $data = array_merge($data, $this->customData);
@@ -388,7 +389,7 @@ public function getTargetOS()
      * Android-specific
      * Returns the collapse key
      *
-     * @return int
+     * @return string
      */
     public function getCollapseKey()
     {

Model/MessageInterface.php

@@ -4,7 +4,7 @@
 
 interface MessageInterface
 {
-    const DEFAULT_COLLAPSE_KEY = 1;
+    const DEFAULT_COLLAPSE_KEY = "1";
 
     /**
      * @return mixed database ID for this device

Resources/config/android.xml

@@ -20,7 +20,7 @@
 
         <!-- Android (GCM) -->
         <service id="dab_push_notifications.android.gcm" class="%dab_push_notifications.android.gcm.class%" public="false">
-            <argument>%dab_push_notifications.android.gcm.api_key%</argument>
+            <argument>%dab_push_notifications.android.gcm.api_keys%</argument>
             <tag name="dab_push_notifications.handler" osType="dab_push_notifications.os.android.gcm" />
             <argument type="service" id="dab_push_notifications.manager.device" />
         </service>

Resources/config/doctrine/Message.orm.xml

@@ -31,6 +31,10 @@
 
         <field name="contentAvailable" type="boolean" />
 
+        <field name="collapseKey" type="string" nullable="true" />
+
+        <field name="customData" type="array" nullable="true" />
+
         <field name="createdAt" type="datetime" />
 
         <field name="updatedAt" type="datetime" />

Service/OS/AndroidGCMNotification.php

@@ -17,11 +17,11 @@ class AndroidGCMNotification implements OSNotificationServiceInterface
     protected $apiURL = "https://android.googleapis.com/gcm/send";
 
     /**
-     * Google GCM API key
+     * Array of used api keys
      *
      * @var string
      */
-    protected $apiKey;
+    protected $apiKeys;
 
     /**
      * @var \DABSquared\PushNotificationsBundle\Model\DeviceManager
@@ -47,9 +47,9 @@ class AndroidGCMNotification implements OSNotificationServiceInterface
      *
      * @param $apiKey
      */
-    public function __construct($apiKey, \DABSquared\PushNotificationsBundle\Model\DeviceManager $deviceManager)
+    public function __construct($apiKeys, \DABSquared\PushNotificationsBundle\Model\DeviceManager $deviceManager)
     {
-        $this->apiKey = $apiKey;
+        $this->apiKeys = $apiKeys;
         $this->deviceManager = $deviceManager;
     }
 
@@ -66,8 +66,18 @@ public function send(MessageInterface $message)
             throw new InvalidMessageTypeException(sprintf("Message type '%s' not supported by GCM", get_class($message)));
         }
 
+        $apiKey = null;
+
+        foreach($this->apiKeys as $anAPIKey) {
+            if($message->getDevice()->getAppId() == $anAPIKey['internal_app_id']) {
+                $apiKey = $anAPIKey;
+                break;
+            }
+        }
+
+
         $headers = array(
-            "Authorization: key=" . $this->apiKey,
+            "Authorization: key=" . $apiKey,
             "Content-Type: application/json",
         );
         $data = array_merge(

Service/OS/iOSNotification.php

@@ -8,7 +8,6 @@
     DABSquared\PushNotificationsBundle\Device\Types,
     DABSquared\PushNotificationsBundle\Model\Device;
 
-use Buzz\Browser;
 use DABSquared\PushNotificationsBundle\Message\MessageStatus;
 use DABSquared\PushNotificationsBundle\Model\DeviceManagerInterface;
 use DABSquared\PushNotificationsBundle\Model\MessageManagerInterface;
@@ -108,9 +107,9 @@ public function send(MessageInterface $message)
      * Send a bunch of notification messages
      *
      * @param array $messages
-     * @throws \RuntimeException
+     * @return bool|void
+     * @throws \Symfony\Component\DependencyInjection\Exception\RuntimeException
      * @throws \DABSquared\PushNotificationsBundle\Exception\InvalidMessageTypeException
-     * @return int
      */
     public function sendMessages(array $messages)
     {