Simpler way to customize open action and misc fixes

* Now supports application meta-tag 'com.onesignal.NotificationOpened.DEFAULT' with the value 'DISABLE' to turn off the launching of the main Activity.
  - No longer need to create a BroadcastReceiver just to have your NotificationOpenedHandler fire in your Application class.
* Fixed issue with deleteTag not working when the value is a number.
* Added a number of checks around tag methods to make them consistent to what the REST API supports.
* Fixed location warning.
* Reverted back to Robolectric 3.0 as custom shadows in 3.1 were not working.

Author: jkasten2

OneSignalSDK.jar

@@ -37,4 +37,7 @@ public static void resetRunnables() {
    public static void SyncService_onTaskRemoved() {
       SyncService.onTaskRemoved();
    }
+
+
+   public class NotificationTable extends OneSignalDbContract.NotificationTable { }
 }

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

@@ -0,0 +1,19 @@
+package com.onesignal;
+
+import android.util.Log;
+
+import org.robolectric.annotation.Implements;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Implements(OneSignal.class)
+public class ShadowOneSignal {
+
+   public static String messages = "";
+
+   static void Log(final OneSignal.LOG_LEVEL level, String message, Throwable throwable) {
+      messages += message;
+      Log.e("", message, throwable);
+   }
+}

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

@@ -33,8 +33,9 @@
 public class ShadowPushRegistratorADM {
     public static boolean testNoClass = true;
 
-    public void __constructor__() throws ClassNotFoundException {
-        if (testNoClass)
-            throw new ClassNotFoundException();
-    }
+// TODO: Does not compile in Robolectric 3.0, try 3.1 once it releases.
+//    public void __constructor__() throws ClassNotFoundException {
+//        if (testNoClass)
+//            throw new ClassNotFoundException();
+//    }
 }

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

@@ -38,7 +38,7 @@ public CustomRobolectricTestRunner(Class<?> klass) throws InitializationError {
     }
 
     @Override
-    public InstrumentationConfiguration createClassLoaderConfig(Config config) {
+    public InstrumentationConfiguration createClassLoaderConfig() {
         return InstrumentationConfiguration.newBuilder().addInstrumentedPackage("com.onesignal").build();
     }
 }

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

@@ -44,7 +44,7 @@
 import com.onesignal.ShadowRoboNotificationManager;
 import com.onesignal.ShadowRoboNotificationManager.PostedNotification;
 import com.onesignal.example.BlankActivity;
-import com.onesignal.OneSignalDbContract.NotificationTable;
+import com.onesignal.OneSignalPackagePrivateHelper.NotificationTable;
 
 import junit.framework.Assert;
 

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

@@ -30,6 +30,10 @@
 import android.app.Activity;
 import android.app.Service;
 import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ResolveInfo;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
 
@@ -38,6 +42,7 @@
 import com.onesignal.OneSignal;
 import com.onesignal.ShadowLocationGMS;
 import com.onesignal.ShadowOSUtils;
+import com.onesignal.ShadowOneSignal;
 import com.onesignal.ShadowOneSignalRestClient;
 import com.onesignal.OneSignalPackagePrivateHelper;
 import com.onesignal.ShadowPushRegistratorADM;
@@ -58,6 +63,7 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.shadows.ShadowConnectivityManager;
 import org.robolectric.shadows.ShadowLog;
 import org.robolectric.shadows.ShadowSystemClock;
@@ -67,7 +73,7 @@
 
 @Config(packageName = "com.onesignal.example",
       constants = BuildConfig.class,
-      shadows = {ShadowOneSignalRestClient.class, ShadowPushRegistratorGPS.class, ShadowPushRegistratorADM.class, ShadowOSUtils.class, ShadowLocationGMS.class},
+      shadows = {ShadowOneSignalRestClient.class, ShadowPushRegistratorGPS.class, ShadowPushRegistratorADM.class, ShadowOSUtils.class},
       sdk = 21)
 
 @RunWith(CustomRobolectricTestRunner.class)
@@ -117,6 +123,7 @@ public void beforeEachTest() throws Exception {
 
       ShadowPushRegistratorGPS.fail = false;
       notificationOpenedMessage = null;
+      lastGetTags = null;
    }
 
    @Test
@@ -222,6 +229,41 @@ public void notificationOpened(String message, JSONObject additionalData, boolea
       threadWait();
    }
 
+   @Test
+   public void testOpeningLauncherActivity() throws Exception {
+      AddLauncherIntentFilter();
+
+      // From app launching normally
+      Assert.assertNotNull(Shadows.shadowOf(blankActivity).getNextStartedActivity());
+
+      OneSignal.handleNotificationOpened(blankActivity, new JSONArray("[{ \"alert\": \"Test Msg\", \"custom\": { \"i\": \"UUID\" } }]"), false);
+
+      Assert.assertNotNull(Shadows.shadowOf(blankActivity).getNextStartedActivity());
+      Assert.assertNull(Shadows.shadowOf(blankActivity).getNextStartedActivity());
+   }
+
+   @Test
+   public void testDisableOpeningLauncherActivityOnNotifiOpen() throws Exception {
+      ShadowApplication.getInstance().getAppManifest().getApplicationMetaData().put("com.onesignal.NotificationOpened.DEFAULT", "DISABLE");
+      RuntimeEnvironment.getRobolectricPackageManager().addManifest(ShadowApplication.getInstance().getAppManifest(), ShadowApplication.getInstance().getResourceLoader());
+      AddLauncherIntentFilter();
+
+      // From app launching normally
+      Assert.assertNotNull(Shadows.shadowOf(blankActivity).getNextStartedActivity());
+      OneSignal.init(blankActivity, "123456789", ONESIGNAL_APP_ID, new OneSignal.NotificationOpenedHandler() {
+         @Override
+         public void notificationOpened(String message, JSONObject additionalData, boolean isActive) {
+            notificationOpenedMessage = message;
+         }
+      });
+      Assert.assertNull(notificationOpenedMessage);
+
+      OneSignal.handleNotificationOpened(blankActivity, new JSONArray("[{ \"alert\": \"Test Msg\", \"custom\": { \"i\": \"UUID\" } }]"), false);
+
+      Assert.assertNull(Shadows.shadowOf(blankActivity).getNextStartedActivity());
+      Assert.assertEquals("Test Msg", notificationOpenedMessage);
+   }
+
    @Test
    public void testNotificationReceivedWhenAppInFocus() throws Exception {
       OneSignal.init(blankActivity, "123456789", ONESIGNAL_APP_ID, new OneSignal.NotificationOpenedHandler() {
@@ -505,7 +547,6 @@ public void shouldSendTagsWithRequestBatching() throws Exception {
          @Override
          public void tagsAvailable(JSONObject tags) {
             lastGetTags = tags;
-            System.out.println("tags: " + tags);
          }
       });
       threadAndTaskWait();
@@ -517,6 +558,62 @@ public void tagsAvailable(JSONObject tags) {
       Assert.assertEquals(2, ShadowOneSignalRestClient.networkCallCount);
    }
 
+   @Test
+   public void testOldIntValues() throws Exception {
+      final SharedPreferences prefs = blankActivity.getSharedPreferences(OneSignal.class.getSimpleName(), Context.MODE_PRIVATE);
+      SharedPreferences.Editor editor = prefs.edit();
+      editor.putString("ONESIGNAL_USERSTATE_SYNCVALYES_CURRENT_STATE", "{\"tags\": {\"int\": 123}}");
+      editor.putString("ONESIGNAL_USERSTATE_SYNCVALYES_TOSYNC_STATE", "{\"tags\": {\"int\": 123}}");
+      editor.commit();
+
+      OneSignalInit();
+      threadAndTaskWait();
+      System.out.println("Saved state: " + prefs.getString("ONESIGNAL_USERSTATE_SYNCVALYES_CURRENT_STATE", null));
+      System.out.println("Deleting tag");
+      OneSignal.deleteTag("int");
+      threadAndTaskWait();
+      
+      lastGetTags = null;
+      OneSignal.getTags(new OneSignal.GetTagsHandler() {
+         @Override
+         public void tagsAvailable(JSONObject tags) {
+            System.out.println("tags: " + tags);
+            lastGetTags = tags;
+         }
+      });
+
+      final SharedPreferences prefs2 = blankActivity.getSharedPreferences(OneSignal.class.getSimpleName(), Context.MODE_PRIVATE);
+      System.out.println("Saved state: " + prefs2.getString("ONESIGNAL_USERSTATE_SYNCVALYES_CURRENT_STATE", null));
+
+      System.out.println("lastGetTags: " + lastGetTags);
+      Assert.assertNull(lastGetTags);
+   }
+
+   @Test
+   public void testSendTagNonStringValues() throws Exception {
+      OneSignalInit();
+      OneSignal.sendTags("{\"int\": 122, \"bool\": true, \"null\": null, \"array\": [123], \"object\": {}}");
+      OneSignal.getTags(new OneSignal.GetTagsHandler() {
+         @Override
+         public void tagsAvailable(JSONObject tags) {
+            lastGetTags = tags;
+         }
+      });
+
+      System.out.println(lastGetTags);
+
+      Assert.assertEquals(String.class, lastGetTags.get("int").getClass());
+      Assert.assertEquals("122", lastGetTags.get("int"));
+      Assert.assertEquals(String.class, lastGetTags.get("bool").getClass());
+      Assert.assertEquals("true", lastGetTags.get("bool"));
+
+      // null should be the same as a blank string.
+      Assert.assertFalse(lastGetTags.has("null"));
+
+      Assert.assertFalse(lastGetTags.has("array"));
+      Assert.assertFalse(lastGetTags.has("object"));
+   }
+
    @Test
    public void shouldSaveToSyncIfKilledBeforeDelayedCompare() throws Exception {
       OneSignalInit();
@@ -559,8 +656,95 @@ public void shouldNotCrashIfOnTaskRemovedIsCalledBeforeInitIsDone() {
       OneSignalPackagePrivateHelper.SyncService_onTaskRemoved();
    }
 
+   @Test
+   public void testMethodCallsBeforeInit() throws Exception {
+      OneSignal.sendTag("key", "value");
+      OneSignal.sendTags("{\"key\": \"value\"}");
+      OneSignal.deleteTag("key");
+      OneSignal.deleteTags("[\"key1\", \"key2\"]");
+      OneSignal.setSubscription(false);
+      OneSignal.enableVibrate(false);
+      OneSignal.enableSound(false);
+      OneSignal.promptLocation();
+      OneSignal.postNotification("{}", new OneSignal.PostNotificationResponseHandler() {
+         @Override
+         public void onSuccess(JSONObject response) {
+         }
+
+         @Override
+         public void onFailure(JSONObject response) {
+         }
+      });
+      OneSignalInit();
+      threadAndTaskWait();
+   }
+
+   // ####### DeleteTags Tests ######
+   @Test
+   public void testDeleteTags() throws Exception {
+      OneSignalInit();
+      OneSignal.sendTags("{\"str\": \"str1\", \"int\": 122, \"bool\": true}");
+      OneSignal.deleteTag("int");
+      OneSignal.getTags(new OneSignal.GetTagsHandler() {
+         @Override
+         public void tagsAvailable(JSONObject tags) {
+            lastGetTags = tags;
+         }
+      });
+
+      System.out.println("lastGetTags: " + lastGetTags);
+      Assert.assertFalse(lastGetTags.has("int"));
+      lastGetTags = null;
+
+      // Makes sure they get sent
+      OneSignal.sendTags("{\"str\": \"str1\", \"int\": 122, \"bool\": true}");
+      threadAndTaskWait();
+      Assert.assertEquals("str1", ShadowOneSignalRestClient.lastPost.getJSONObject("tags").get("str"));
+
+      OneSignal.deleteTag("int");
+
+      OneSignal.getTags(new OneSignal.GetTagsHandler() {
+         @Override
+         public void tagsAvailable(JSONObject tags) {
+            lastGetTags = tags;
+         }
+      });
+
+      System.out.println("lastGetTags: " + lastGetTags);
+      Assert.assertFalse(lastGetTags.has("int"));
+
+      // After the success response it should not store a "" string when saving to storage.
+      threadAndTaskWait();
+
+      final SharedPreferences prefs = blankActivity.getSharedPreferences(OneSignal.class.getSimpleName(), Context.MODE_PRIVATE);
+      String syncValues = prefs.getString("ONESIGNAL_USERSTATE_SYNCVALYES_CURRENT_STATE", null);
+      Assert.assertFalse(new JSONObject(syncValues).has("tags"));
+   }
+
+   @Test
+   public void testOmitDeletesOfNonExistingKeys() throws Exception {
+      OneSignalInit();
+      OneSignal.deleteTag("this_key_does_not_exist");
+      threadAndTaskWait();
+
+      Assert.assertFalse(ShadowOneSignalRestClient.lastPost.has("tags"));
+   }
+
+
    // ####### GetTags Tests ########
 
+   public void testGetTagsWithNoTagsShouldBeNull() throws Exception {
+      OneSignalInit();
+      OneSignal.getTags(new OneSignal.GetTagsHandler() {
+         @Override
+         public void tagsAvailable(JSONObject tags) {
+            lastGetTags = tags;
+         }
+      });
+
+      Assert.assertNull(lastGetTags);
+   }
+
    @Test
    public void shouldGetTags() throws Exception {
       OneSignalInit();
@@ -642,6 +826,7 @@ public void shouldNotDoubleCountFocusTime() throws Exception {
    // ####### Unit Test Location       ########
 
    @Test
+   @Config(shadows = {ShadowLocationGMS.class})
    public void shouldUpdateAllLocationFieldsWhenAnyFieldsChange() throws Exception {
       OneSignalInit();
       threadAndTaskWait();
@@ -663,6 +848,22 @@ public void shouldUpdateAllLocationFieldsWhenAnyFieldsChange() throws Exception
       Assert.assertEquals(0.0, ShadowOneSignalRestClient.lastPost.getDouble("loc_type"));
    }
 
+   @Test
+   @Config(shadows = {ShadowOneSignal.class})
+   public void testLocationTimeout() throws Exception {
+      //ShadowApplication.getInstance().grantPermissions(new String[]{"android.permission.YOUR_PERMISSION"});
+
+      OneSignalInit();
+      threadAndTaskWait();
+
+      Class klass = Class.forName("com.onesignal.LocationGMS");
+      klass.getDeclaredMethod("startFallBackThread").invoke(null);
+      klass.getDeclaredMethod("fireFailedComplete").invoke(null);
+      threadAndTaskWait();
+
+      Assert.assertFalse(ShadowOneSignal.messages.contains("GoogleApiClient timedout"));
+   }
+
    // ####### Unit test helper methods ########
 
    private static void threadWait() {
@@ -685,4 +886,18 @@ private void OneSignalInit() {
    private void OneSignalInitWithBadProjectNum() {
       OneSignal.init(blankActivity, "NOT A VALID Google project number", ONESIGNAL_APP_ID);
    }
+
+   // For some reason Roboelctric does not automatically add this when it reads the AndroidManifest.xml
+   //    Also it seems it has to be done in the test itself instead of the setup process.
+   private static void AddLauncherIntentFilter() {
+      Intent launchIntent = new Intent(Intent.ACTION_MAIN);
+      launchIntent.setPackage("com.onesignal.example");
+      launchIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+      ResolveInfo resolveInfo = new ResolveInfo();
+      resolveInfo.activityInfo = new ActivityInfo();
+      resolveInfo.activityInfo.packageName = "com.onesignal.example";
+      resolveInfo.activityInfo.name = "MainActivity";
+
+      RuntimeEnvironment.getRobolectricPackageManager().addResolveInfoForIntent(launchIntent, resolveInfo);
+   }
 }