Merge pull request #45 from macr1408/master

Fix bug where notifications are not being received in Android

Author: Alymosul

src/ExpoMessage.php

@@ -47,7 +47,7 @@ class ExpoMessage
      *
      * @var string
      */
-    protected $channelId = 'Default';
+    protected $channelId = '';
 
     /**
      * The json data attached to the message.
@@ -205,14 +205,18 @@ public function setJsonData($data)
      */
     public function toArray()
     {
-        return [
+        $message = [
             'title'     =>  $this->title,
             'body'      =>  $this->body,
             'sound'     =>  $this->sound,
             'badge'     =>  $this->badge,
             'ttl'       =>  $this->ttl,
-            'channelId' =>  $this->channelId,
-            'data'      => $this->jsonData,
+            'data'      =>  $this->jsonData,
         ];
+        if (! empty($this->channelId)) {
+            $message['channelId'] = $this->channelId;
+        }
+
+        return $message;
     }
 }