Cleanup

• Cleans up initialization of the SDK, since Activity is a subclass of Context, we can simplify the initialization method.

Author: Nightsd01

android/src/main/java/com/geektime/rnonesignalandroid/RNOneSignal.java

@@ -105,34 +105,29 @@ private JSONObject jsonFromErrorMessageString(String errorMessage) throws JSONEx
 
    @ReactMethod 
    public void init(String appId) {
-      Activity activity = mReactApplicationContext.getCurrentActivity();
+      Context context = mReactApplicationContext.getCurrentActivity();
 
       if (oneSignalInitDone) {
-         Log.w("onesignal", "Already initialized the OneSignal React-Native SDK");
+         Log.e("onesignal", "Already initialized the OneSignal React-Native SDK");
          return;
       }
 
       oneSignalInitDone = true;
 
       OneSignal.sdkType = "react";
 
-      if (activity == null) {
+      if (context == null) {
          // in some cases, especially when react-native-navigation is installed,
          // the activity can be null, so we can initialize with the context instead
-         OneSignal.init(mReactApplicationContext.getApplicationContext(),
-                 null,
-                 appId,
-                 new NotificationOpenedHandler(mReactContext),
-                 new NotificationReceivedHandler(mReactContext)
-         );
-      } else {
-         OneSignal.init(activity,
-                 null,
-                 appId,
-                 new NotificationOpenedHandler(mReactContext),
-                 new NotificationReceivedHandler(mReactContext)
-         );
+         context = mReactApplicationContext.getApplicationContext();
       }
+
+      OneSignal.init(context,
+              null,
+              appId,
+              new NotificationOpenedHandler(mReactContext),
+              new NotificationReceivedHandler(mReactContext)
+      );
    }
 
    @ReactMethod