From ec4e78b6d0bd81eb7605028e70b2e03c62a60520 Mon Sep 17 00:00:00 2001
From: Hamed Saadat <hsaadat@hyperpad.com>
Date: Thu, 27 Jul 2017 14:28:35 -0400
Subject: [PATCH 1/2] :bug: Crash when content is NSNull

When sending a test push notification, some of the fields are NSNull instead of nil, causing a crash when trying to access certain content
---
 .../Internal/Models/Components/FBNCardTextContent.m             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iOS/FBNotifications/FBNotifications/Internal/Models/Components/FBNCardTextContent.m b/iOS/FBNotifications/FBNotifications/Internal/Models/Components/FBNCardTextContent.m
index 3e21058..8648f34 100644
--- a/iOS/FBNotifications/FBNotifications/Internal/Models/Components/FBNCardTextContent.m
+++ b/iOS/FBNotifications/FBNotifications/Internal/Models/Components/FBNCardTextContent.m
@@ -62,7 +62,7 @@ - (instancetype)initFromDictionary:(NSDictionary<NSString *, id> *)dictionary {
 }
 
 + (nullable instancetype)contentFromDictionary:(nullable NSDictionary<NSString *, id> *)dictionary {
-    if (!dictionary) {
+    if (!dictionary || [dictionary isEqual:[NSNull null]]) {
         return nil;
     }
     return [[self alloc] initFromDictionary:dictionary];

From 878000b7f3936141cfbb62c7639c6ae01d3d9249 Mon Sep 17 00:00:00 2001
From: Hamed Saadat <hsaadat@hyperpad.com>
Date: Mon, 28 Aug 2017 09:26:47 -0400
Subject: [PATCH 2/2] Cleaner NSNull check

---
 .../Internal/Models/Components/FBNCardTextContent.m             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iOS/FBNotifications/FBNotifications/Internal/Models/Components/FBNCardTextContent.m b/iOS/FBNotifications/FBNotifications/Internal/Models/Components/FBNCardTextContent.m
index 8648f34..6b43958 100644
--- a/iOS/FBNotifications/FBNotifications/Internal/Models/Components/FBNCardTextContent.m
+++ b/iOS/FBNotifications/FBNotifications/Internal/Models/Components/FBNCardTextContent.m
@@ -62,7 +62,7 @@ - (instancetype)initFromDictionary:(NSDictionary<NSString *, id> *)dictionary {
 }
 
 + (nullable instancetype)contentFromDictionary:(nullable NSDictionary<NSString *, id> *)dictionary {
-    if (!dictionary || [dictionary isEqual:[NSNull null]]) {
+    if (!dictionary || dictionary == NSNull.null) {
         return nil;
     }
     return [[self alloc] initFromDictionary:dictionary];