Merge pull request #113 from koenhoeijmakers/master

Do not always set content-available and mutable-content
laravel-notification-channels · Nov 24, 2020 · cc0100e · cc0100e
2 parents b2b4972 + a5515b7
commit cc0100e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/src/ApnAdapter.php b/src/ApnAdapter.php
@@ -48,9 +48,15 @@ public function adapt(ApnMessage $message, string $token)
         }
 
         $payload = Payload::create()
-            ->setAlert($alert)
-            ->setContentAvailability((bool) $message->contentAvailable)
-            ->setMutableContent((bool) $message->mutableContent);
+            ->setAlert($alert);
+
+        if ($contentAvailable = $message->contentAvailable) {
+            $payload->setContentAvailability((bool) $message->contentAvailable);
+        }
+
+        if ($mutableContent = $message->mutableContent) {
+            $payload->setMutableContent((bool) $message->mutableContent);
+        }
 
         if (is_int($badge = $message->badge)) {
             $payload->setBadge($badge);

diff --git a/tests/ApnAdapterTest.php b/tests/ApnAdapterTest.php
@@ -45,6 +45,16 @@ public function it_adapts_content_available()
         $this->assertTrue($notification->getPayload()->isContentAvailable());
     }
 
+    /** @test */
+    public function it_does_not_set_content_available_by_default()
+    {
+        $message = (new ApnMessage);
+
+        $notification = $this->adapter->adapt($message, 'token');
+
+        $this->assertNull($notification->getPayload()->isContentAvailable());
+    }
+
     /** @test */
     public function it_adapts_mutable_content()
     {
@@ -55,6 +65,16 @@ public function it_adapts_mutable_content()
         $this->assertTrue($notification->getPayload()->hasMutableContent());
     }
 
+    /** @test */
+    public function it_does_not_set_mutable_content_by_default()
+    {
+        $message = (new ApnMessage);
+
+        $notification = $this->adapter->adapt($message, 'token');
+
+        $this->assertNull($notification->getPayload()->hasMutableContent());
+    }
+
     /** @test */
     public function it_adapts_badge()
     {