Update

afiqiqmal · Nov 13, 2020 · 8f4947b · 8f4947b
1 parent 524ed62
commit 8f4947b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/Structure/Android/Config.php b/src/Structure/Android/Config.php
@@ -23,7 +23,7 @@ class Config implements Extras
      *
      * @var int
      */
-    protected $urgency;
+    protected $urgency = 3;
 
     /**
      * Scenario where a high-priority data message is sent. The options are as follows:
@@ -178,13 +178,13 @@ public function toArray()
     {
         return [
             'collapse_key' => $this->collapse_state,
-            'urgency' => self::$urgencyName[$this->urgency],
-            'category' => self::$categoryName[$this->category],
+            'urgency' => self::$urgencyName[$this->urgency] ?? null,
+            'category' => self::$categoryName[$this->category] ?? null,
             'ttl' => "{$this->timeToLive}s",
             'bi_tag' => $this->tags,
             'fast_app_target' => $this->staging ? 1 : 2,
             'data' => $this->data,
-            'notification' => $this->notification->toArray(),
+            'notification' => $this->notification ? $this->notification->toArray() : null,
         ];
     }
 

diff --git a/src/Structure/Android/Notification.php b/src/Structure/Android/Notification.php
@@ -719,7 +719,7 @@ public function toArray()
             'use_default_vibrate' => $this->use_default_vibrate,
             'use_default_light' => $this->use_default_light,
             'vibrate_config' => $this->vibrate_config,
-            'visibility' => self::$visibilityName[$this->visibility],
+            'visibility' => self::$visibilityName[$this->visibility] ?? null,
             'light_settings' => $this->light_settings ? $this->light_settings->toArray() : null,
             'foreground_show' => $this->foreground_show,
             'profile_id' => $this->profile_id,

diff --git a/src/Structure/Message.php b/src/Structure/Message.php
@@ -131,10 +131,9 @@ public function setCondition(string $condition)
     public function toArray()
     {
         return [
-            'notification' => $this->notification->toArray() ?? null,
-            'android' => $this->android->toArray() ?? null,
-//            'apns' => $this->apns->toArray() ?? null,
-//            'webpush' => $this->webpush->toArray() ?? null,
+            'data' => $this->data ?? null,
+            'notification' => $this->notification ? $this->notification->toArray() : null,
+            'android' => $this->android ? $this->android->toArray() : null,
             'token' => $this->targetDeviceIds,
             'condition' => $this->condition,
             'topic' => $this->topic,