Expose promises to prevent possible race conditions

Author: Minishlink

README.md

@@ -171,8 +171,8 @@ When your app is ready to be interacted with (for example, after showing the spl
 ```js
 import { BatchMessaging } from '@bam.tech/react-native-batch';
 
-BatchMessaging.setNotDisturbed(false);
-BatchMessaging.showPendingMessage();
+await BatchMessaging.setNotDisturbed(false);
+await BatchMessaging.showPendingMessage();
 ```
 
 **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).
@@ -247,7 +247,7 @@ Add `BATCH_OPTED_OUT_BY_DEFAULT=true` in your `Info.plist` as described in the [
 ```js
 import { Batch } from '@bam.tech/react-native-batch';
 
-Batch.optIn();
+await Batch.optIn();
 ```
 
 #### 3. Delete the user's data when the user wants to delete its account
@@ -258,7 +258,7 @@ As per the [SDK documentation](https://doc.batch.com/android/advanced/opt-out#op
 ```js
 import { Batch } from '@bam.tech/react-native-batch';
 
-Batch.optOutAndWipeData();
+await Batch.optOutAndWipeData();
 ```
 
 ### Handling push notification initial deeplink

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

@@ -113,19 +113,22 @@ public void start() {
     // BASE MODULE
 
     @ReactMethod
-    public void optIn() {
+    public void optIn(Promise promise) {
         Batch.optIn(reactContext);
         start();
+        promise.resolve(null);
     }
 
     @ReactMethod
-    public void optOut() {
+    public void optOut(Promise promise) {
         Batch.optOut(reactContext);
+        promise.resolve(null);
     }
 
     @ReactMethod
-    public void optOutAndWipeData() {
+    public void optOutAndWipeData(Promise promise) {
         Batch.optOutAndWipeData(reactContext);
+        promise.resolve(null);
     }
 
     // PUSH MODULE
@@ -154,27 +157,32 @@ public void push_getLastKnownPushToken(Promise promise) {
     // MESSAGING MODULE
 
     @ReactMethod
-    public void messaging_showPendingMessage() {
-        Boolean test = Batch.Messaging.isDoNotDisturbEnabled();
+    public void messaging_showPendingMessage(Promise promise) {
         BatchMessage msg = Batch.Messaging.popPendingMessage();
         if (msg != null) {
             Batch.Messaging.show(getCurrentActivity(), msg);
         }
+
+        promise.resolve(null);
     }
 
     @ReactMethod
-    public void messaging_setNotDisturbed(final boolean active) {
+    public void messaging_setNotDisturbed(final boolean active, Promise promise) {
         Batch.Messaging.setDoNotDisturbEnabled(active);
+
+        promise.resolve(null);
     }
 
     @ReactMethod
-    public void messaging_setTypefaceOverride(@Nullable String normalTypefaceName, @Nullable String boldTypefaceName) {
+    public void messaging_setTypefaceOverride(@Nullable String normalTypefaceName, @Nullable String boldTypefaceName, Promise promise) {
         AssetManager assetManager = this.reactContext.getAssets();
         @Nullable Typeface normalTypeface = normalTypefaceName != null ? createTypeface(normalTypefaceName, Typeface.NORMAL, assetManager) : null;
         @Nullable Typeface boldTypeface = boldTypefaceName != null ? createTypeface(boldTypefaceName, Typeface.BOLD, assetManager) : null;
         @Nullable Typeface boldTypefaceFallback = boldTypefaceName != null ? createTypeface(boldTypefaceName, Typeface.NORMAL, assetManager) : null;
 
         Batch.Messaging.setTypefaceOverride(normalTypeface, boldTypeface != null ? boldTypeface : boldTypefaceFallback);
+
+        promise.resolve(null);
     }
 
     // from https://github.com/facebook/react-native/blob/dc80b2dcb52fadec6a573a9dd1824393f8c29fdc/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactFontManager.java#L118

ios/RNBatch.m

@@ -46,20 +46,26 @@ + (void)start
     [Batch startWithAPIKey:batchAPIKey];
 }
 
-RCT_EXPORT_METHOD(optIn)
+RCT_EXPORT_METHOD(optIn:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     [Batch optIn];
     [RNBatch start];
+    resolve([NSNull null]);
 }
 
-RCT_EXPORT_METHOD(optOut)
+RCT_EXPORT_METHOD(optOut:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     [Batch optOut];
+    resolve([NSNull null]);
 }
 
-RCT_EXPORT_METHOD(optOutAndWipeData)
+RCT_EXPORT_METHOD(optOutAndWipeData:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     [Batch optOutAndWipeData];
+    resolve([NSNull null]);
 }
 
 RCT_EXPORT_METHOD(presentDebugViewController)
@@ -568,25 +574,34 @@ - (NSDictionary*) dictionaryWithNotification:(BatchInboxNotificationContent*)not
 
 // Messaging module
 
-RCT_EXPORT_METHOD(messaging_setNotDisturbed:(BOOL) active)
+RCT_EXPORT_METHOD(messaging_setNotDisturbed:(BOOL) active
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     [BatchMessaging setDoNotDisturb:active];
+    resolve([NSNull null]);
 }
 
-RCT_EXPORT_METHOD(messaging_showPendingMessage) {
+RCT_EXPORT_METHOD(messaging_showPendingMessage:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^{
         [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)
+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)
 {
     UIFont* normalFont = normalFontName != nil ? [UIFont fontWithName:normalFontName size: 14] : nil;
     UIFont* boldFont = boldFontName != nil ? [UIFont fontWithName:boldFontName size: 14] : nil;
     UIFont* italicFont = italicFontName != nil ? [UIFont fontWithName:italicFontName size: 14] : nil;
     UIFont* italicBoldFont = italicBoldFontName != nil ? [UIFont fontWithName:italicBoldFontName size: 14] : nil;
 
     [BatchMessaging setFontOverride:normalFont boldFont:boldFont italicFont:italicFont boldItalicFont:italicBoldFont];
+
+    resolve([NSNull null]);
 }
 
 @end

src/Batch.ts

@@ -22,7 +22,7 @@ export const Batch = {
    * Some features might not be disabled until the next app start if you call this late into the application's life. It is strongly
    * advised to restart the application (or at least the current activity) after opting in.
    */
-  optIn: (): void => RNBatch.optIn(),
+  optIn: (): Promise<void> => RNBatch.optIn(),
 
   /**
    * Opt Out from Batch SDK Usage
@@ -46,7 +46,7 @@ export const Batch = {
    * Your app should be prepared to handle these cases.
    * Some features might not be disabled until the next app start.
    */
-  optOut: (): void => RNBatch.optOut(),
+  optOut: (): Promise<void> => RNBatch.optOut(),
 
   /**
    * Opt Out from Batch SDK Usage
@@ -56,7 +56,7 @@ export const Batch = {
    * Note that calling this method will stop Batch.
    * Your app should be prepared to handle these cases.
    */
-  optOutAndWipeData: (): void => RNBatch.optOutAndWipeData(),
+  optOutAndWipeData: (): Promise<void> => RNBatch.optOutAndWipeData(),
 
   /**
    * Shows debug view

src/BatchMessaging.ts

@@ -3,17 +3,17 @@ const RNBatch = NativeModules.RNBatch;
 
 export const BatchMessaging = {
   /**
-   * - Shows the currently enqueued message, if any.
-   * - Used in conjonction with `Batch.start(true)` to display pending messages
+   * Shows the currently enqueued message, if any.
    */
-  showPendingMessage: (): void => RNBatch.messaging_showPendingMessage(),
+  showPendingMessage: (): Promise<void> =>
+    RNBatch.messaging_showPendingMessage(),
 
   /**
    * Define if incoming messages have to be enqueued or displayed directly
    *
    * @param active
    */
-  setNotDisturbed: (active: boolean): void =>
+  setNotDisturbed: (active: boolean): Promise<void> =>
     RNBatch.messaging_setNotDisturbed(active),
 
   /**
@@ -31,16 +31,19 @@ export const BatchMessaging = {
     boldFontName?: string | null,
     italicFontName?: string | null,
     italicBoldFontName?: string | null
-  ): void => {
+  ): Promise<void> => {
     if (Platform.OS === 'android') {
-      RNBatch.messaging_setTypefaceOverride(normalFontName, boldFontName);
-    } else {
-      RNBatch.messaging_setFontOverride(
+      return RNBatch.messaging_setTypefaceOverride(
         normalFontName,
-        boldFontName,
-        italicFontName,
-        italicBoldFontName
+        boldFontName
       );
     }
+
+    return RNBatch.messaging_setFontOverride(
+      normalFontName,
+      boldFontName,
+      italicFontName,
+      italicBoldFontName
+    );
   },
 };