* Android Native SDK - app close fix.

* Fixed issue where notification callback would fire instead of showing a notification when init was called from onCreate of the Application class.

Author: jkasten2

OneSignalSDK/app/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

@@ -118,6 +118,27 @@ public void beforeEachTest() throws Exception {
       notificationOpenedMessage = null;
    }
 
+   @Test
+   public void testInitFromApplicationContext() throws Exception {
+      // Application.onCreate
+      OneSignal.init(RuntimeEnvironment.application, "123456789", ONESIGNAL_APP_ID);
+      threadAndTaskWait();
+      Assert.assertNotNull(ShadowOneSignalRestClient.lastPost);
+
+      ShadowOneSignalRestClient.lastPost = null;
+      StaticResetHelper.restSetStaticFields();
+
+      // Restart app, should not send onSession automatically
+      OneSignal.init(RuntimeEnvironment.application, "123456789", ONESIGNAL_APP_ID);
+      threadAndTaskWait();
+      Assert.assertNull(ShadowOneSignalRestClient.lastPost);
+
+      // Starting of first Activity should trigger onSession
+      blankActivityController.resume();
+      threadAndTaskWait();
+      Assert.assertNotNull(ShadowOneSignalRestClient.lastPost);
+   }
+
    @Test
    public void testOpenFromNotificationWhenAppIsDead() throws Exception {
       OneSignal.handleNotificationOpened(blankActivity, new JSONArray("[{ \"alert\": \"Robo test message\", \"custom\": { \"i\": \"UUID\" } }]"), false);

OneSignalSDK/onesignal/src/main/java/com/onesignal/ActivityLifecycleHandler.java

@@ -34,6 +34,8 @@
 
 class ActivityLifecycleHandler {
 
+   static boolean nextResumeIsFirstActivity;
+
    interface ActivityAvailableListener {
       void available(Activity activity);
    }
@@ -108,7 +110,8 @@ static private void handleLostFocus() {
    }
 
    static private void handleFocus() {
-      if (focusHandlerThread.hasBackgrounded()) {
+      if (focusHandlerThread.hasBackgrounded() || nextResumeIsFirstActivity) {
+         nextResumeIsFirstActivity = false;
          focusHandlerThread.resetBackgroundState();
          OneSignal.onAppFocus();
       }

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java

@@ -69,7 +69,7 @@
 import com.onesignal.OneSignalDbContract.NotificationTable;
 
 public class OneSignal {
-   
+
    public enum LOG_LEVEL {
       NONE, FATAL, ERROR, WARN, INFO, DEBUG, VERBOSE
    }
@@ -141,8 +141,10 @@ public void init() {
     */
    static final String TAG = "OneSignal";
 
-   static String appId;
+   static String appId, mGoogleProjectNumber;
    static Context appContext;
+
+   private static boolean startedRegistration;
 
    private static LOG_LEVEL visualLogLevel = LOG_LEVEL.NONE;
    private static LOG_LEVEL logCatLevel = LOG_LEVEL.WARN;
@@ -153,7 +155,7 @@ public void init() {
    private static NotificationOpenedHandler notificationOpenedHandler;
 
    static boolean initDone;
-   private static boolean foreground = true;
+   private static boolean foreground;
 
    private static IdsAvailableHandler idsAvailableHandler;
 
@@ -162,7 +164,7 @@ public void init() {
    private static TrackGooglePurchase trackGooglePurchase;
    private static TrackAmazonPurchase trackAmazonPurchase;
 
-   public static final String VERSION = "020003";
+   public static final String VERSION = "020004";
 
    private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();
 
@@ -213,11 +215,6 @@ public static void init(Context context, String googleProjectNumber, String oneS
       osUtils = new OSUtils();
 
       deviceType = osUtils.getDeviceType();
-      PushRegistrator pushRegistrator;
-      if (deviceType == 2)
-         pushRegistrator = new PushRegistratorADM();
-      else
-         pushRegistrator = new PushRegistratorGPS();
 
       // START: Init validation
       try {
@@ -248,6 +245,8 @@ public static void init(Context context, String googleProjectNumber, String oneS
          }
       }
 
+      mGoogleProjectNumber = googleProjectNumber;
+
       try {
          Class.forName("android.support.v4.view.MenuCompat");
          try {
@@ -278,11 +277,15 @@ public static void init(Context context, String googleProjectNumber, String oneS
       }
 
       // END: Init validation
+      boolean contextIsActivity = (context instanceof Activity);
 
+      foreground = contextIsActivity;
       appId = oneSignalAppId;
       appContext = context.getApplicationContext();
-      if (context instanceof Activity)
+      if (contextIsActivity)
          ActivityLifecycleHandler.curActivity = (Activity)context;
+      else
+         ActivityLifecycleHandler.nextResumeIsFirstActivity = true;
       notificationOpenedHandler = inNotificationOpenedHandler;
       lastTrackedTime = SystemClock.elapsedRealtime();
 
@@ -311,7 +314,30 @@ public static void init(Context context, String googleProjectNumber, String oneS
       else
          SaveAppId(appId);
 
-      pushRegistrator.registerForPush(appContext, googleProjectNumber, new PushRegistrator.RegisteredHandler() {
+      if (foreground || getUserId() == null)
+         startRegistrationOrOnSession();
+
+      fireCallbackForOpenedNotifications();
+
+      if (TrackGooglePurchase.CanTrack(appContext))
+         trackGooglePurchase = new TrackGooglePurchase(appContext);
+
+      initDone = true;
+   }
+
+   private static void startRegistrationOrOnSession() {
+      if (startedRegistration)
+         return;
+
+      startedRegistration = true;
+
+      PushRegistrator pushRegistrator;
+      if (deviceType == 2)
+         pushRegistrator = new PushRegistratorADM();
+      else
+         pushRegistrator = new PushRegistratorGPS();
+
+      pushRegistrator.registerForPush(appContext, mGoogleProjectNumber, new PushRegistrator.RegisteredHandler() {
          @Override
          public void complete(String id) {
             lastRegistrationId = id;
@@ -328,13 +354,6 @@ public void complete(Double lat, Double log) {
             registerUser();
          }
       });
-
-      fireCallbackForOpenedNotifications();
-
-      if (TrackGooglePurchase.CanTrack(appContext))
-         trackGooglePurchase = new TrackGooglePurchase(appContext);
-
-      initDone = true;
    }
 
    private static void fireCallbackForOpenedNotifications() {
@@ -525,6 +544,8 @@ static void onAppFocus() {
       foreground = true;
       lastTrackedTime = SystemClock.elapsedRealtime();
 
+      startRegistrationOrOnSession();
+
       if (trackGooglePurchase != null)
          trackGooglePurchase.trackIAP();
    }