Fix InterruptedException, email id log, and focus attribution

   * InterruptedException was due to a circular initialization of the JobScheduler,
     this was making the job scheduler to stop and interrump the thread
   * Email id can be null, downgrade log to Info, keep Error lvl for User id
   * Focus attribution was being init as attributed by IAM, attribution in session can only be by notification
   * OSInfluence null ids weren't parsed, changed to empty string

Author: Jeasmine

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

@@ -50,7 +50,7 @@ void appForegrounded() {
    }
 
    void appBackgrounded() {
-      giveProcessorsValidFocusTime(OneSignal.getSessionManager().getInfluences(), FocusEventType.BACKGROUND);
+      giveProcessorsValidFocusTime(OneSignal.getSessionManager().getSessionInfluences(), FocusEventType.BACKGROUND);
       timeFocusedAtMs = null;
    }
 

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

@@ -115,6 +115,11 @@ List<OSInfluence> getInfluences() {
         return trackerFactory.getInfluences();
     }
 
+    @NonNull
+    List<OSInfluence> getSessionInfluences() {
+        return trackerFactory.getSessionInfluences();
+    }
+
     /**
      * Attempt to override the current session before the 30 second session minimum
      * This should only be done in a upward direction:

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

@@ -684,7 +684,8 @@ private static void init(OneSignal.Builder inBuilder) {
          if (sender_id != null && sender_id.length() > 4)
             sender_id = sender_id.substring(4);
 
-         OneSignal.init(context, sender_id, bundle.getString("onesignal_app_id"), mInitBuilder.mNotificationOpenedHandler, mInitBuilder.mNotificationReceivedHandler);
+         String appId = bundle.getString("onesignal_app_id");
+         OneSignal.init(context, sender_id, appId, mInitBuilder.mNotificationOpenedHandler, mInitBuilder.mNotificationReceivedHandler);
       } catch (Throwable t) {
          t.printStackTrace();
       }
@@ -2287,7 +2288,6 @@ static boolean hasUserId() {
    static String getUserId() {
       if (userId == null && appContext != null)
          userId = getSavedUserId(appContext);
-
       return userId;
    }
 

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

@@ -115,6 +115,7 @@ public void run() {
 
       // getResponseCode() can hang past it's timeout setting so join it's thread to ensure it is timing out.
       try {
+         // Sequentially wait for connectionThread to execute
          connectionThread.join(getThreadTimeout(timeout));
          if (connectionThread.getState() != Thread.State.TERMINATED)
             connectionThread.interrupt();

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

@@ -120,11 +120,14 @@ private static synchronized void scheduleSyncTask(Context context, long delayMs)
       if (delayMs < 5_000)
          delayMs = 5_000;
 
+      boolean scheduled;
       if (useJob())
-         scheduleSyncServiceAsJob(context, delayMs);
+         scheduled = scheduleSyncServiceAsJob(context, delayMs);
       else
-         scheduleSyncServiceAsAlarm(context, delayMs);
-      nextScheduledSyncTimeMs = System.currentTimeMillis() + delayMs;
+         scheduled = scheduleSyncServiceAsAlarm(context, delayMs);
+
+      if (scheduled)
+         nextScheduledSyncTimeMs = System.currentTimeMillis() + delayMs;
    }
 
    private static boolean hasBootPermission(Context context) {
@@ -134,10 +137,27 @@ private static boolean hasBootPermission(Context context) {
              ) == PackageManager.PERMISSION_GRANTED;
    }
 
+
+   @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+   private static boolean isJobIdRunning(Context context) {
+      final JobScheduler jobScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
+      for (JobInfo jobInfo : jobScheduler.getAllPendingJobs()) {
+         if (jobInfo.getId() == OneSignalSyncServiceUtils.SYNC_TASK_ID) {
+            return true;
+         }
+      }
+      return false;
+   }
+
    @RequiresApi(21)
-   private static void scheduleSyncServiceAsJob(Context context, long delayMs) {
+   private static boolean scheduleSyncServiceAsJob(Context context, long delayMs) {
       OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "scheduleSyncServiceAsJob:atTime: " + delayMs);
 
+      if (isJobIdRunning(context)) {
+         OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "scheduleSyncServiceAsJob Scheduler already running!");
+         return false;
+      }
+
       JobInfo.Builder jobBuilder = new JobInfo.Builder(
          SYNC_TASK_ID,
          new ComponentName(context, SyncJobService.class)
@@ -150,26 +170,31 @@ private static void scheduleSyncServiceAsJob(Context context, long delayMs) {
       if (hasBootPermission(context))
          jobBuilder.setPersisted(true);
 
-      JobScheduler jobScheduler = (JobScheduler)context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
+      JobScheduler jobScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
       try {
          int result = jobScheduler.schedule(jobBuilder.build());
          OneSignal.Log(OneSignal.LOG_LEVEL.INFO, "scheduleSyncServiceAsJob:result: " + result);
+         return true;
       } catch (NullPointerException e) {
          // Catch for buggy Oppo devices
          // https://github.com/OneSignal/OneSignal-Android-SDK/issues/487
          OneSignal.Log(OneSignal.LOG_LEVEL.ERROR,
             "scheduleSyncServiceAsJob called JobScheduler.jobScheduler which " +
                "triggered an internal null Android error. Skipping job.", e);
+
+         return false;
       }
    }
 
-   private static void scheduleSyncServiceAsAlarm(Context context, long delayMs) {
+   private static boolean scheduleSyncServiceAsAlarm(Context context, long delayMs) {
       OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "scheduleServiceSyncTask:atTime: " + delayMs);
 
       PendingIntent pendingIntent = syncServicePendingIntent(context);
       AlarmManager alarm = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
       long triggerAtMs = System.currentTimeMillis() + delayMs;
       alarm.set(AlarmManager.RTC_WAKEUP,  triggerAtMs + delayMs, pendingIntent);
+
+      return true;
    }
 
    private static Thread syncBgThread;

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

@@ -29,6 +29,8 @@
 
 import android.app.job.JobParameters;
 import android.app.job.JobService;
+import android.content.Context;
+import android.net.ConnectivityManager;
 import android.os.Build;
 import android.support.annotation.RequiresApi;
 
@@ -46,7 +48,8 @@ public boolean onStartJob(JobParameters jobParameters) {
 
    @Override
    public boolean onStopJob(JobParameters jobParameters) {
+      OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "SyncJobService onStopJob called, system conditions not available");
       boolean reschedule = OneSignalSyncServiceUtils.stopSyncBgThread();
       return reschedule;
    }
-}
+}

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

@@ -18,6 +18,11 @@ protected UserState newUserState(String inPersistKey, boolean load) {
         return new UserStateEmail(inPersistKey, load);
     }
 
+    @Override
+    protected OneSignal.LOG_LEVEL getLogLevel() {
+        return OneSignal.LOG_LEVEL.INFO;
+    }
+
     // Email subscription not readable from SDK
     @Override
     boolean getSubscribed() {

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

@@ -18,6 +18,11 @@ protected UserState newUserState(String inPersistKey, boolean load) {
         return new UserStatePush(inPersistKey, load);
     }
 
+    @Override
+    protected OneSignal.LOG_LEVEL getLogLevel() {
+        return OneSignal.LOG_LEVEL.ERROR;
+    }
+
     @Override
     boolean getSubscribed() {
         return getToSyncUserState().isSubscribed();

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

@@ -197,6 +197,7 @@ boolean persist() {
         return false;
     }
 
+    protected abstract OneSignal.LOG_LEVEL getLogLevel();
     protected abstract String getId();
 
     private boolean isSessionCall() {
@@ -306,7 +307,7 @@ private void logoutEmailSyncSuccess() {
 
     private void doPutSync(String userId, final JSONObject jsonBody, final JSONObject dependDiff) {
         if (userId == null) {
-            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR, "Error updating the user record because of the null user id");
+            OneSignal.onesignalLog(getLogLevel(), "Error updating the user record because of the null user id");
             sendTagsHandlersPerformOnFailure(new SendTagsError(-1, "Unable to update tags: the current user is not registered with OneSignal"));
             externalUserIdUpdateHandlersPerformOnFailure();
             return;

OneSignalSDK/onesignal/src/main/java/com/onesignal/influence/OSTrackerFactory.java

@@ -57,6 +57,17 @@ public List<OSInfluence> getInfluences() {
         return influences;
     }
 
+    public List<OSInfluence> getSessionInfluences() {
+        List<OSInfluence> influences = new ArrayList<>();
+        for (OSChannelTracker tracker : trackers.values()) {
+            // IAM doesn't influence session calls
+            if (tracker instanceof OSInAppMessageTracker)
+                continue;
+            influences.add(tracker.getCurrentSessionInfluence());
+        }
+        return influences;
+    }
+
     public OSChannelTracker getIAMChannelTracker() {
         return trackers.get(OSInAppMessageTracker.TAG);
     }