Fixes for Android GCM. Should also fix issue #8

Author: bassrock

DependencyInjection/DABSquaredPushNotificationsExtension.php

@@ -130,7 +130,7 @@ protected function setAndroidConfig(array $config)
         // GCM
         $this->container->setParameter("dab_push_notifications.android.gcm.enabled", isset($config["android"]["gcm"]));
         if (isset($config["android"]["gcm"])) {
-            $this->container->setParameter("dab_push_notifications.android.gcm.api_key", $config["android"]["gcm"]["api_key"]);
+            $this->container->setParameter("dab_push_notifications.android.gcm.api_keys", $config["android"]["gcm"]["api_keys"]);
         }
     }
 

Resources/doc/1-setting_up_the_bundle.md

@@ -42,6 +42,11 @@ dab_squared_push_notifications:
     apps:
         your_app_free: {name: 'Your App Free', internal_app_id: 0000001 }
         your_app_premium: {name: 'Your App Premium', internal_app_id: 0000002 }
+    android:
+        gcm:
+          api_keys:
+            your_app_free: { api_key: 'YOUR ANDROID SERVER KEY HERE', internal_app_id: 0000001 }
+            your_app_premium: { api_key: 'YOUR ANDROID SERVER KEY HERE', internal_app_id: 0000002 }
     ios:
         certificates:
             dev_free: { sandbox: true, pem: %kernel.root_dir%/../pushcerts/dev/certificate.pem, passphrase: ~, internal_app_id: 0000001}

Resources/doc/5-integration_with_ios.md

@@ -1,5 +1,9 @@
 Step 5: Integration With iOS
 =======================================
+
+### Accepting pull requests with better iOS Docs.
+
+
 In the AppDelegate file do the following:
 
 
@@ -158,5 +162,5 @@ In the AppDelegate file do the following:
 }
 ```
 
-[Step 6: Integration with Safari](6-integration_with_safari.md).
+[Step 6: Integration with Android](6-integration_with_android.md).
 

Resources/doc/6-integration_with_android.md

@@ -0,0 +1,18 @@
+Step 6: Integration With Android
+=======================================
+
+
+### Accepting pull requests with better Android Docs.
+
+
+### A)  Register For Notifications:
+
+Make a call to the GCM Google Play services with a unique device identifier
+
+
+### B)  Register With Server:
+
+When you register with the server you use the gcm Registration ID as the deviceToken and a custom set unique device id as the deviceIdentifier.
+
+
+[Step 7: Integration with Safari](7-integration_with_safari.md).

Resources/doc/6-integration_with_safari.md renamed to Resources/doc/7-integration_with_safari.md

@@ -1,4 +1,4 @@
-Step 6: Integration With Safari (Requires FOSUserBundle or Some Type Of User System)
+Step 7: Integration With Safari (Requires FOSUserBundle or Some Type Of User System)
 =======================================
 
 
@@ -44,4 +44,4 @@ document.body.onload = function() {
 
 ```
 
-Once that is in the webservices routing should cover the rest. Make sure you imported the safari routing files.
+Once that is in the webservices routing should cover the rest. Make sure you imported the safari routing files.

Service/OS/AndroidGCMNotification.php

@@ -70,7 +70,7 @@ public function send(MessageInterface $message)
 
         foreach($this->apiKeys as $anAPIKey) {
             if($message->getDevice()->getAppId() == $anAPIKey['internal_app_id']) {
-                $apiKey = $anAPIKey;
+                $apiKey = $anAPIKey['api_key'];
                 break;
             }
         }
@@ -80,19 +80,21 @@ public function send(MessageInterface $message)
             "Authorization: key=" . $apiKey,
             "Content-Type: application/json",
         );
+
         $data = array_merge(
             $message->getGCMOptions(),
             array("data" => $message->getMessageBody())
         );
 
         $device = $message->getDevice();
         // Chunk number of registration IDs according to the maximum allowed by GCM
-        $chunks = array_chunk(array($device->getDeviceIdentifier()), $this->registrationIdMaxCount);
+        $chunks = array_chunk(array($device->getDeviceToken()), $this->registrationIdMaxCount);
 
         // Perform the calls (in parallel)
         $this->responses = array();
         foreach ($chunks as $registrationIDs) {
             $data["registration_ids"] = $registrationIDs;
+
             // Open connection
             $ch = curl_init();
             // Set the url, number of POST vars, POST data