Added setAppContext which triggers dependents

* Added null check to flushBufferToDisk

Author: jkasten2

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

@@ -496,6 +496,11 @@ public static OneSignal.Builder getCurrentOrNewInitBuilder() {
       return mInitBuilder;
    }
 
+   static void setAppContext(Context context) {
+      appContext = context.getApplicationContext();
+      OneSignalPrefs.startDelayedWrite();
+   }
+
    /**
     * Initializes OneSignal to register the device for push notifications.
     *<br/>
@@ -552,7 +557,7 @@ public static void init(Context context, String googleProjectNumber, String oneS
    }
 
    public static void init(Context context, String googleProjectNumber, String oneSignalAppId, NotificationOpenedHandler notificationOpenedHandler, NotificationReceivedHandler notificationReceivedHandler) {
-      appContext = context.getApplicationContext();
+      OneSignal.setAppContext(context);
 
       if (requiresUserPrivacyConsent && !userProvidedPrivacyConsent()) {
          OneSignal.Log(LOG_LEVEL.VERBOSE, "OneSignal SDK initialization delayed, user privacy consent is set to required for this application.");
@@ -574,9 +579,6 @@ public static void init(Context context, String googleProjectNumber, String oneS
          return;
 
       if (initDone) {
-         if (context != null)
-            appContext = context.getApplicationContext();
-
          if (mInitBuilder.mNotificationOpenedHandler != null)
             fireCallbackForOpenedNotifications();
 
@@ -587,7 +589,6 @@ public static void init(Context context, String googleProjectNumber, String oneS
 
       foreground = contextIsActivity;
       appId = oneSignalAppId;
-      appContext = context.getApplicationContext();
 
       saveFilterOtherGCMReceivers(mInitBuilder.mFilterOtherGCMReceivers);
 

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

@@ -38,7 +38,7 @@
 class OneSignalPrefs {
 
     // SharedPreferences Instances
-    static final String PREFS_ONESIGNAL = OneSignal.class.getSimpleName();
+    public static final String PREFS_ONESIGNAL = OneSignal.class.getSimpleName();
     static final String PREFS_PLAYER_PURCHASES = "GTPlayerPurchases";
 
     // PREFERENCES KEYS
@@ -113,6 +113,10 @@ public void run() {
         }
 
         private void flushBufferToDisk() {
+            // A flush will be triggered later once a context via OneSignal.setAppContext(...)
+            if (OneSignal.appContext == null)
+                return;
+
             for (String pref : prefsToApply.keySet()) {
                 SharedPreferences prefsToWrite = getSharedPrefsByName(pref);
                 SharedPreferences.Editor editor = prefsToWrite.edit();
@@ -146,19 +150,23 @@ public static void initializePool() {
         prefsHandler = new WritePrefHandlerThread();
     }
 
-    static void saveString(final String prefsName, final String key, final String value) {
+    public static void startDelayedWrite() {
+       prefsHandler.startDelayedWrite();
+    }
+
+    public static void saveString(final String prefsName, final String key, final String value) {
         save(prefsName, key, value);
     }
 
-    static void saveBool(String prefsName, String key, boolean value) {
+    public static void saveBool(String prefsName, String key, boolean value) {
         save(prefsName, key, value);
     }
 
-    static void saveInt(String prefsName, String key, int value) {
+    public static void saveInt(String prefsName, String key, int value) {
         save(prefsName, key, value);
     }
 
-    static void saveLong(String prefsName, String key, long value) {
+    public static void saveLong(String prefsName, String key, long value) {
         save(prefsName, key, value);
     }
 
@@ -167,7 +175,7 @@ static private void save(String prefsName, String key, Object value) {
         synchronized (pref) {
             pref.put(key, value);
         }
-        prefsHandler.startDelayedWrite();
+        startDelayedWrite();
     }
 
     static String getString(String prefsName, String key, String defValue) {

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

@@ -175,7 +175,7 @@ private static void internalSyncOnFocusTime() {
 
    private static Thread syncBgThread;
    static void doBackgroundSync(Context context, SyncRunnable runnable) {
-      OneSignal.appContext = context.getApplicationContext();
+      OneSignal.setAppContext(context);
       syncBgThread = new Thread(runnable, "OS_SYNCSRV_BG_SYNC");
       syncBgThread.start();
    }

OneSignalSDK/unittest/src/test/java/com/onesignal/OneSignalPackagePrivateHelper.java

@@ -181,4 +181,6 @@ public static void OneSignal_onAppLostFocus() {
 
    public static String OneSignal_appId() { return OneSignal.appId; }
 
+
+   public static void OneSignal_setAppContext(Context context) { OneSignal.setAppContext(context); }
 }

OneSignalSDK/unittest/src/test/java/com/test/onesignal/OneSignalPrefsRunner.java

@@ -0,0 +1,73 @@
+package com.test.onesignal;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.onesignal.BuildConfig;
+import com.onesignal.OneSignal;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLog;
+
+import com.onesignal.OneSignalPackagePrivateHelper.OneSignalPrefs;
+import com.onesignal.StaticResetHelper;
+import com.onesignal.example.BlankActivity;
+
+import static com.onesignal.OneSignalPackagePrivateHelper.OneSignal_setAppContext;
+import static org.junit.Assert.assertEquals;
+
+@Config(packageName = "com.onesignal.example",
+   constants = BuildConfig.class,
+   instrumentedPackages = {"com.onesignal"},
+   sdk = 21)
+@RunWith(RobolectricTestRunner.class)
+public class OneSignalPrefsRunner {
+   private static Activity blankActivity;
+
+   @BeforeClass // Runs only once, before any tests
+   public static void setUpClass() {
+      ShadowLog.stream = System.out;
+      TestHelpers.beforeTestSuite();
+      StaticResetHelper.saveStaticValues();
+   }
+
+   @Before // Before each test
+   public void beforeEachTest() {
+      OneSignalPrefs.initializePool();
+      ActivityController<BlankActivity> blankActivityController = Robolectric.buildActivity(BlankActivity.class).create();
+      blankActivity = blankActivityController.get();
+   }
+
+   @AfterClass
+   public static void afterEverything() {
+      StaticResetHelper.restSetStaticFields();
+   }
+
+   @Test
+   public void testNullContextDoesNotCrash() throws Exception {
+      OneSignalPrefs.saveString(OneSignalPrefs.PREFS_ONESIGNAL,"key", "value");
+      TestHelpers.flushBufferedSharedPrefs();
+   }
+
+   @Test
+   public void tesWriteWithNullContextAndSavesAfterSetting() throws Exception {
+      OneSignalPrefs.saveString(OneSignalPrefs.PREFS_ONESIGNAL,"key", "value");
+      TestHelpers.flushBufferedSharedPrefs();
+
+      OneSignal_setAppContext(blankActivity);
+      TestHelpers.flushBufferedSharedPrefs();
+
+      final SharedPreferences prefs = blankActivity.getSharedPreferences(OneSignalPrefs.PREFS_ONESIGNAL, Context.MODE_PRIVATE);
+      String value = prefs.getString("key", "");
+      assertEquals(value, "value");
+   }
+}