Merge pull request #22 from one-signal/fix_for_launch_url_when_app_is_closed

URLs now launch when app is closed and init is in an Activity

Author: Vivek Ayer

OneSignalSDK/app/build.gradle

@@ -59,14 +59,14 @@ dependencies {
     //compile "com.google.android.gms:play-services-analytics:7.0.0"
     compile "com.google.android.gms:play-services-location:8.4.0"
 
-//    testCompile 'junit:junit:4.12'
+    testCompile 'junit:junit:4.12'
 //    testCompile 'org.robolectric:shadows-support-v4:3.0'
-//    testCompile('org.robolectric:robolectric:3.0') {
-//        exclude group: 'commons-logging', module: 'commons-logging'
-//        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
-//    }
-
-    testCompile("org.robolectric:robolectric:3.1-SNAPSHOT") {
+    testCompile('org.robolectric:robolectric:3.0') {
+        exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
+
+//    testCompile("org.robolectric:robolectric:3.1-SNAPSHOT") {
+//        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
+//    }
 }

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

@@ -242,6 +242,21 @@ public void testOpeningLauncherActivity() throws Exception {
       Assert.assertNull(Shadows.shadowOf(blankActivity).getNextStartedActivity());
    }
 
+   @Test
+   public void testOpeningLaunchUrl() throws Exception {
+      // Clear app launching normally
+      Shadows.shadowOf(blankActivity).getNextStartedActivity();
+
+      // No OneSignal init here to test case where it is located in an Activity.
+
+      OneSignal.handleNotificationOpened(blankActivity, new JSONArray("[{ \"alert\": \"Test Msg\", \"custom\": { \"i\": \"UUID\", \"u\": \"http://google.com\" } }]"), false);
+
+      Intent intent = Shadows.shadowOf(blankActivity).getNextStartedActivity();
+      Assert.assertEquals("android.intent.action.VIEW", intent.getAction());
+      Assert.assertEquals("http://google.com", intent.getData().toString());
+      Assert.assertNull(Shadows.shadowOf(blankActivity).getNextStartedActivity());
+   }
+
    @Test
    public void testDisableOpeningLauncherActivityOnNotifiOpen() throws Exception {
       ShadowApplication.getInstance().getAppManifest().getApplicationMetaData().put("com.onesignal.NotificationOpened.DEFAULT", "DISABLE");

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

@@ -820,7 +820,7 @@ static void sendPurchases(JSONArray purchases, boolean newAsExisting, OneSignalR
       }
    }
 
-   private static boolean openURLFromNotification(JSONArray dataArray) {
+   private static boolean openURLFromNotification(Context context, JSONArray dataArray) {
       int jsonArraySize = dataArray.length();
 
       boolean urlOpened = false;
@@ -840,7 +840,7 @@ private static boolean openURLFromNotification(JSONArray dataArray) {
 
                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
                intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET |Intent.FLAG_ACTIVITY_MULTIPLE_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-               appContext.startActivity(intent);
+               context.startActivity(intent);
                urlOpened = true;
             }
          } catch (Throwable t) {
@@ -943,7 +943,7 @@ static void handleNotificationOpened(JSONArray data) {
    public static void handleNotificationOpened(Context inContext, JSONArray data, boolean fromAlert) {
       sendNotificationOpened(inContext, data);
 
-      boolean urlOpened = openURLFromNotification(data);
+      boolean urlOpened = openURLFromNotification(inContext, data);
 
       runNotificationOpenedCallback(data, false);