Add BatchMessaging.disableDoNotDisturbAndShowPendingMessage to save a roundtrip

Author: Minishlink

README.md

@@ -171,8 +171,7 @@ When your app is ready to be interacted with (for example, after showing the spl
 ```js
 import { BatchMessaging } from '@bam.tech/react-native-batch';
 
-await BatchMessaging.setNotDisturbed(false);
-await BatchMessaging.showPendingMessage();
+await BatchMessaging.disableDoNotDisturbAndShowPendingMessage();
 ```
 
 **NB:** Batch's Do Not Disturb mode is enabled by default in React Native because your JS app might not be loaded when the user interacts with it. This could lead to problems when a button should redirect inside your JS app. You can disable this behaviour (see below).

android/src/main/java/tech/bam/RNBatchPush/RNBatchModule.java

@@ -156,12 +156,16 @@ public void push_getLastKnownPushToken(Promise promise) {
 
     // MESSAGING MODULE
 
+    private void showPendingMessage() {
+        BatchMessage message = Batch.Messaging.popPendingMessage();
+        if (message != null) {
+            Batch.Messaging.show(getCurrentActivity(), message);
+        }
+    }
+
     @ReactMethod
     public void messaging_showPendingMessage(Promise promise) {
-        BatchMessage msg = Batch.Messaging.popPendingMessage();
-        if (msg != null) {
-            Batch.Messaging.show(getCurrentActivity(), msg);
-        }
+        showPendingMessage();
 
         promise.resolve(null);
     }
@@ -173,6 +177,14 @@ public void messaging_setNotDisturbed(final boolean active, Promise promise) {
         promise.resolve(null);
     }
 
+    @ReactMethod
+    public void messaging_disableDoNotDisturbAndShowPendingMessage(Promise promise) {
+        Batch.Messaging.setDoNotDisturbEnabled(false);
+        showPendingMessage();
+
+        promise.resolve(null);
+    }
+
     @ReactMethod
     public void messaging_setTypefaceOverride(@Nullable String normalTypefaceName, @Nullable String boldTypefaceName, Promise promise) {
         AssetManager assetManager = this.reactContext.getAssets();

ios/RNBatch.m

@@ -590,6 +590,15 @@ - (NSDictionary*) dictionaryWithNotification:(BatchInboxNotificationContent*)not
     });
 }
 
+RCT_EXPORT_METHOD(messaging_disableDoNotDisturbAndShowPendingMessage:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [BatchMessaging setDoNotDisturb:false];
+        [BatchMessaging showPendingMessage];
+        resolve([NSNull null]);
+    });
+}
+
 RCT_EXPORT_METHOD(messaging_setFontOverride:(nullable NSString*) normalFontName boldFontName:(nullable NSString*) boldFontName italicFontName:(nullable NSString*) italicFontName italicBoldFontName:(nullable NSString*) italicBoldFontName
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)

src/BatchMessaging.ts

@@ -16,6 +16,12 @@ export const BatchMessaging = {
   setNotDisturbed: (active: boolean): Promise<void> =>
     RNBatch.messaging_setNotDisturbed(active),
 
+  /**
+   * Disables do not disturb mode and shows the currently enqueued message, if any.
+   */
+  disableDoNotDisturbAndShowPendingMessage: (): Promise<void> =>
+    RNBatch.messaging_disableDoNotDisturbAndShowPendingMessage(),
+
   /**
    * Override the font used in message views. Not applicable for standard alerts.
    * [iOS](https://doc.batch.com/ios-api-reference/Classes/BatchMessaging.html#/c:objc(cs)BatchMessaging(cm)setFontOverride:boldFont:italicFont:boldItalicFont:)