From 48bf11849f6c8182b58ad6e967c1f7f82d6315ec Mon Sep 17 00:00:00 2001
From: Matthew Wood <mwood@bandwidth.com>
Date: Mon, 10 Sep 2018 15:26:58 -0400
Subject: [PATCH] Guard against NPE in deleteChannelGroup

- Fix only necessary in Android
- Only experienced by devices on Oreo or higher
---
 .../firebase/notifications/RNFirebaseNotifications.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/android/src/main/java/io/invertase/firebase/notifications/RNFirebaseNotifications.java b/android/src/main/java/io/invertase/firebase/notifications/RNFirebaseNotifications.java
index b81444e0..1bc86b43 100644
--- a/android/src/main/java/io/invertase/firebase/notifications/RNFirebaseNotifications.java
+++ b/android/src/main/java/io/invertase/firebase/notifications/RNFirebaseNotifications.java
@@ -176,8 +176,13 @@ public class RNFirebaseNotifications extends ReactContextBaseJavaModule implemen
 
   @ReactMethod
   public void deleteChannelGroup(String channelId, Promise promise) {
-    notificationManager.deleteChannelGroup(channelId);
-    promise.resolve(null);
+    try {
+      notificationManager.deleteChannelGroup(channelId);
+      promise.resolve(null);
+    } catch (NullPointerException e) {
+      promise.reject("notifications/channel-group-not-found",
+        "The requested NotificationChannelGroup does not exist, have you created it?");
+    }
   }
 
   @ReactMethod