Rename helper function

Motivation: this function checks whether the `RNOneSignal` object is non null OR undefined (`!=`) so we should clarify this doesn't check for OneSignal initialization. The new function name should be more clear.

Note: this check exists since PR OneSignal#485 which provided Expo support (not really support but rather avoid crashing the app in Expo environments)

Author: rgomezp

src/helpers.js

@@ -13,9 +13,8 @@ export function isValidCallback(handler) {
     );
 }
 
-export function checkIfInitialized(object) {
-    const initialized = object != null;
-    return initialized;
+export function isObjectNonNull(object) {
+  return object != null;
 }
 
 /**

src/index.js

@@ -11,7 +11,7 @@ import {
     EMAIL_SUBSCRIPTION_CHANGED,
     SMS_SUBSCRIPTION_CHANGED
 } from './events';
-import { isValidCallback, checkIfInitialized } from './helpers';
+import { isValidCallback, isObjectNonNull } from './helpers';
 
 const RNOneSignal = NativeModules.OneSignal;
 const eventManager = new EventManager(RNOneSignal);
@@ -30,28 +30,28 @@ export default class OneSignal {
     /* O B S E R V E R S */
 
     static addPermissionObserver(observer) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         isValidCallback(observer);
         RNOneSignal.addPermissionObserver();
         eventManager.addEventHandler(PERMISSION_CHANGED, observer);
     }
 
     static addSubscriptionObserver(observer) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         isValidCallback(observer);
         RNOneSignal.addSubscriptionObserver();
         eventManager.addEventHandler(SUBSCRIPTION_CHANGED, observer);
     }
 
     static addEmailSubscriptionObserver(observer) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         isValidCallback(observer);
         RNOneSignal.addEmailSubscriptionObserver();
         eventManager.addEventHandler(EMAIL_SUBSCRIPTION_CHANGED, observer);
     }
 
     static addSMSSubscriptionObserver(observer) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         isValidCallback(observer);
         RNOneSignal.addSMSSubscriptionObserver();
         eventManager.addEventHandler(SMS_SUBSCRIPTION_CHANGED, observer);
@@ -67,14 +67,14 @@ export default class OneSignal {
      * @param  {function} handler
      */
     static setNotificationWillShowInForegroundHandler(handler){
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         isValidCallback(handler);
         RNOneSignal.setNotificationWillShowInForegroundHandler();
         eventManager.setEventHandler(NOTIFICATION_WILL_SHOW, handler);
     }
 
     static setNotificationOpenedHandler(handler){
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         isValidCallback(handler);
 
         RNOneSignal.setNotificationOpenedHandler();
@@ -84,18 +84,18 @@ export default class OneSignal {
     /* R E G I S T R A T I O N  E T C */
 
     static promptForPushNotificationsWithUserResponse(handler) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (Platform.OS === 'ios') {
             isValidCallback(handler);
             RNOneSignal.promptForPushNotificationsWithUserResponse(handler);
         } else {
             console.log("promptForPushNotificationsWithUserResponse: this function is not supported on Android");
         }
-    }  
-    
+    }
+
     static registerForProvisionalAuthorization(handler) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (Platform.OS === 'ios') {
             isValidCallback(handler);
@@ -106,13 +106,13 @@ export default class OneSignal {
     }
 
     static disablePush(disable) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         RNOneSignal.disablePush(disable);
     }
 
     static unsubscribeWhenNotificationsAreDisabled(unsubscribe) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (Platform.OS === 'android') {
             RNOneSignal.unsubscribeWhenNotificationsAreDisabled(unsubscribe);
@@ -125,18 +125,18 @@ export default class OneSignal {
 
     static isLocationShared() {
         // must return a promise
-        if (!checkIfInitialized(RNOneSignal)) return Promise.resolve();
+        if (!isObjectNonNull(RNOneSignal)) return Promise.resolve();
         return RNOneSignal.isLocationShared();
     }
 
     static setLocationShared(shared) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         RNOneSignal.setLocationShared(shared);
     }
 
     static promptLocation() {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         //Supported in both iOS & Android
         RNOneSignal.promptLocation();
@@ -148,7 +148,7 @@ export default class OneSignal {
      * Gets the device state.
      */
     static async getDeviceState() {
-        if (!checkIfInitialized(RNOneSignal)) return Promise.resolve();
+        if (!isObjectNonNull(RNOneSignal)) return Promise.resolve();
         const deviceState = await RNOneSignal.getDeviceState();
 
         if (Platform.OS === 'android') {
@@ -162,7 +162,7 @@ export default class OneSignal {
     /* T A G S */
 
     static sendTag(key, value) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (!key || (!value && value !== "")) {
             console.error("OneSignal: sendTag: must include a key and a value");
@@ -176,7 +176,7 @@ export default class OneSignal {
     }
 
     static sendTags(tags) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         let keys = Object.keys(tags);
 
         if (keys.length === 0) {
@@ -193,20 +193,20 @@ export default class OneSignal {
     }
 
     static getTags(callback) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         RNOneSignal.getTags(callback);
     }
 
     static deleteTag(key) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         if (typeof key !== "string") {
             console.error("OneSignal: deleteTag: key argument must be of type string");
         }
         RNOneSignal.deleteTags([key]);
     }
 
     static deleteTags(tagKeys) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (!Array.isArray(tagKeys)) {
             console.error("OneSignal: deleteTags: argument must be of array type");
@@ -218,7 +218,7 @@ export default class OneSignal {
     /* E M A I L */
 
     static setEmail(email, emailAuthCode, handler) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (emailAuthCode === undefined)
             emailAuthCode = null;
@@ -230,7 +230,7 @@ export default class OneSignal {
     }
 
     static logoutEmail(handler) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (!handler)
             handler = function(){};
@@ -241,7 +241,7 @@ export default class OneSignal {
     /* S M S */
 
     static setSMSNumber(smsNumber, smsAuthCode, handler) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (smsAuthCode === undefined)
             smsAuthCode = null;
@@ -253,7 +253,7 @@ export default class OneSignal {
     }
 
     static logoutSMSNumber(handler) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (!handler)
             handler = function(){};
@@ -264,7 +264,7 @@ export default class OneSignal {
     /* N O T I F I C A T I O N S */
 
     static postNotification(notificationObjectString, onSuccess, onFailure) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (!onSuccess)
             onSuccess = function(){};
@@ -276,7 +276,7 @@ export default class OneSignal {
     }
 
     static clearOneSignalNotifications() {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (Platform.OS === 'android') {
             RNOneSignal.clearOneSignalNotifications();
@@ -286,7 +286,7 @@ export default class OneSignal {
     }
 
     static removeNotification(id) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (Platform.OS === 'android') {
             RNOneSignal.removeNotification(id);
@@ -296,7 +296,7 @@ export default class OneSignal {
     }
 
     static removeGroupedNotifications(id) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (Platform.OS === 'android') {
             RNOneSignal.removeGroupedNotifications(id);
@@ -308,7 +308,7 @@ export default class OneSignal {
     /* E X T E R N A L  U S E R  I D */
 
     static setExternalUserId(externalId, varArg1, varArg2) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (typeof varArg1 === "function") {
             RNOneSignal.setExternalUserId(externalId, null, varArg1);
@@ -323,7 +323,7 @@ export default class OneSignal {
     }
 
     static removeExternalUserId(handler) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (handler === undefined)
             handler = function(){};
@@ -334,7 +334,7 @@ export default class OneSignal {
     /* I N  A P P  M E S S A G I N G */
 
     static setInAppMessageClickHandler(handler) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         isValidCallback(handler);
         RNOneSignal.initInAppMessageClickHandlerParams();
         RNOneSignal.setInAppMessageClickHandler();
@@ -343,7 +343,7 @@ export default class OneSignal {
 
     // Pass a String key and any value and creates a trigger map to pass to addTriggers()
     static addTrigger(key, value) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         if (!key || !value) {
             console.error("OneSignal: addTrigger: must include a key and a value");
@@ -357,7 +357,7 @@ export default class OneSignal {
 
     // Expected format is Map<String, Object>, make sure all values are Objects and keys are Strings
     static addTriggers(triggers) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         let keys = Object.keys(triggers);
 
@@ -369,76 +369,76 @@ export default class OneSignal {
     }
 
     static removeTriggersForKeys(keys) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         RNOneSignal.removeTriggersForKeys(keys);
     }
 
     static removeTriggerForKey(key) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         RNOneSignal.removeTriggerForKey(key);
     }
 
     static getTriggerValueForKey(key) {
         // must return a promise
-        if (!checkIfInitialized(RNOneSignal)) return Promise.resolve();
+        if (!isObjectNonNull(RNOneSignal)) return Promise.resolve();
         return RNOneSignal.getTriggerValueForKey(key);
     }
 
     static pauseInAppMessages(pause) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         RNOneSignal.pauseInAppMessages(pause);
     }
 
     /* O U T C O M E S */
 
     static sendOutcome(name, handler=function(){}) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         RNOneSignal.sendOutcome(name, handler);
     }
 
     static sendUniqueOutcome(name, handler=function(){}) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         RNOneSignal.sendUniqueOutcome(name, handler);
     }
 
     static sendOutcomeWithValue(name, value, handler=function(){}) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
         RNOneSignal.sendOutcomeWithValue(name, Number(value), handler);
     }
 
     /* P R I V A C Y  C O N S E N T */
 
     static userProvidedPrivacyConsent() {
-        if (!checkIfInitialized(RNOneSignal)) return Promise.resolve();
+        if (!isObjectNonNull(RNOneSignal)) return Promise.resolve();
 
         //returns a promise
         return RNOneSignal.userProvidedPrivacyConsent();
     }
 
     static requiresUserPrivacyConsent() {
-        if (!checkIfInitialized(RNOneSignal)) return Promise.resolve();
+        if (!isObjectNonNull(RNOneSignal)) return Promise.resolve();
 
         //returns a promise
         return RNOneSignal.requiresUserPrivacyConsent();
     }
 
     static setRequiresUserPrivacyConsent(required) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         RNOneSignal.setRequiresUserPrivacyConsent(required);
     }
 
     static provideUserConsent(granted) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         RNOneSignal.provideUserConsent(granted);
     }
 
     /* O T H E R  F U N C T I O N S */
 
     static setLogLevel(nsLogLevel, visualLogLevel) {
-        if (!checkIfInitialized(RNOneSignal)) return;
+        if (!isObjectNonNull(RNOneSignal)) return;
 
         RNOneSignal.setLogLevel(nsLogLevel, visualLogLevel);
     }