Cleaned up isPastOnSessionTime logic

* Added new shouldStartNewSession method to encapsulate foreground check
* Added for foreground check to attemptSessionUpgrade
* Added appEntryState logging to doSessionInit

Author: jkasten2

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

@@ -824,21 +824,19 @@ private static void handleAmazonPurchase() {
    // If we don't have a OneSignal player_id yet make the call to create it regardless of focus
    private static void doSessionInit() {
       // Check session time to determine whether to start a new session or not
-      if (isPastOnSessionTime()) {
-         if (inForeground) {
-            logger.debug("Starting new session");
-
-            OneSignalStateSynchronizer.setNewSession();
-            outcomeEventsController.cleanOutcomes();
-            sessionManager.restartSessionIfNeeded(getAppEntryState());
-            getInAppMessageController().resetSessionLaunchTime();
-            setLastSessionTime(time.getCurrentTimeMillis());
-         }
-      } else {
-         logger.debug("Continue on same session");
-
+      if (shouldStartNewSession()) {
+         logger.debug("Starting new session with appEntryState: " + getAppEntryState());
+
+         OneSignalStateSynchronizer.setNewSession();
+         outcomeEventsController.cleanOutcomes();
+         sessionManager.restartSessionIfNeeded(getAppEntryState());
+         getInAppMessageController().resetSessionLaunchTime();
+         setLastSessionTime(time.getCurrentTimeMillis());
+      } else if (isInForeground()) {
+         logger.debug("Continue on same session with appEntryState: " + getAppEntryState());
          sessionManager.attemptSessionUpgrade(getAppEntryState());
       }
+
       getInAppMessageController().initWithCachedInAppMessages();
 
       // We still want register the user to OneSignal if the SDK was initialized
@@ -2914,6 +2912,16 @@ static boolean isAppActive() {
       return initDone && isInForeground();
    }
 
+   private static boolean shouldStartNewSession() {
+      if (!isInForeground())
+         return false;
+
+      if (!isPastOnSessionTime())
+         return false;
+
+      return true;
+   }
+
    private static boolean isPastOnSessionTime() {
       long currentTimeMillis = OneSignal.getTime().getCurrentTimeMillis();
       long lastSessionTime = getLastSessionTime();