Merge pull request #62 from OneSignal/regression_fixes_badge_and_buttons

Fixed badge and button regression bugs

Author: jkasten2

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

@@ -1,7 +1,35 @@
+/**
+ * Modified MIT License
+ *
+ * Copyright 2016 OneSignal
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * 1. The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 2. All copies of substantial portions of the Software may only be used in connection
+ * with services provided by OneSignal.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package com.onesignal;
 
 import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
+
+import com.onesignal.shortcutbadger.ShortcutBadger;
 
 import org.robolectric.annotation.Implements;
 
@@ -10,7 +38,8 @@ public class ShadowBadgeCountUpdater {
 
    public static int lastCount = 0;
 
-   private static void updateCount(int count, Context context) {
+   static void updateCount(int count, Context context) {
       lastCount = count;
+      ShortcutBadger.applyCount(context, count);
    }
 }

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

@@ -38,6 +38,7 @@
 import android.os.Bundle;
 
 import com.onesignal.BuildConfig;
+import com.onesignal.GcmBroadcastReceiver;
 import com.onesignal.NotificationExtenderService;
 import com.onesignal.NotificationOpenedProcessor;
 import com.onesignal.OSNotificationDisplayedResult;
@@ -95,16 +96,6 @@ public void beforeEachTest() throws Exception {
       blankActivity = Robolectric.buildActivity(BlankActivity.class).create().get();
       blankActivity.getApplicationInfo().name = "UnitTestApp";
 
-      // Add our launcher Activity to the run time to simulate a real app.
-      // getRobolectricPackageManager is null if run in BeforeClass for some reason.
-      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 = "com.onesignal.example.BlankActivity";
-      RuntimeEnvironment.getRobolectricPackageManager().addResolveInfoForIntent(launchIntent, resolveInfo);
       ShadowBadgeCountUpdater.lastCount = 0;
    }
 
@@ -280,6 +271,32 @@ public void shouldGenerate2BasicGroupNotifications() throws Exception {
       cursor.close();
    }
 
+
+
+   @Test
+   public void shouldSetButtonsCorrectly() throws Exception {
+      Intent intentGcm = new Intent();
+      intentGcm.setAction("com.google.android.c2dm.intent.RECEIVE");
+      intentGcm.putExtra("message_type", "gcm");
+      Bundle bundle = getBaseNotifBundle();
+      bundle.putString("o", "[{\"n\": \"text1\", \"i\": \"id1\"}]");
+      intentGcm.putExtras(bundle);
+
+      GcmBroadcastReceiver gcmBroadcastReceiver = new GcmBroadcastReceiver();
+      try {
+         gcmBroadcastReceiver.onReceive(blankActivity, intentGcm);
+      } // setResultCode throws this error due to onReceive not designed to be called manually.
+      catch (java.lang.IllegalStateException e) {}
+
+      Intent intent = Shadows.shadowOf(blankActivity).getNextStartedService();
+      Assert.assertEquals("com.onesignal.GcmIntentService", intent.getComponent().getClassName());
+      Assert.assertEquals(null, intent.getStringExtra("o"));
+      JSONObject customJson = new JSONObject(intent.getStringExtra("custom"));
+      JSONObject additionalData = new JSONObject((customJson.getString("a")));
+      Assert.assertEquals("id1", additionalData.getJSONArray("actionButtons").getJSONObject(0).getString("id"));
+   }
+
+
    @Test
    @Config(shadows = {ShadowOneSignal.class})
    public void shouldFireNotificationExtenderService() throws Exception {

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

@@ -54,6 +54,7 @@
 
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -83,11 +84,11 @@ public class MainOneSignalClassRunner {
 
    private static final String ONESIGNAL_APP_ID = "b2f7f966-d8cc-11e4-bed1-df8f05be55ba";
    private static int testSleepTime;
-   private Activity blankActivity;
+   private static Activity blankActivity;
    private static String callBackUseId, getCallBackRegId;
    private static String notificationOpenedMessage;
    private static JSONObject lastGetTags;
-   private ActivityController<BlankActivity> blankActivityController;
+   private static ActivityController<BlankActivity> blankActivityController;
 
    private static void GetIdsAvailable() {
       OneSignal.idsAvailable(new OneSignal.IdsAvailableHandler() {
@@ -108,6 +109,22 @@ public void tagsAvailable(JSONObject tags) {
       });
    }
 
+   private static void cleanUp() {
+      callBackUseId = getCallBackRegId = null;
+      StaticResetHelper.restSetStaticFields();
+
+      ShadowOneSignalRestClient.nextSuccessResponse = null;
+      ShadowOneSignalRestClient.failNext = false;
+      ShadowOneSignalRestClient.failAll = false;
+      ShadowOneSignalRestClient.interruptibleDelayNext = false;
+      ShadowOneSignalRestClient.networkCallCount = 0;
+      ShadowOneSignalRestClient.testThread = Thread.currentThread();
+
+      ShadowPushRegistratorGPS.fail = false;
+      notificationOpenedMessage = null;
+      lastGetTags = null;
+   }
+
    @BeforeClass // Runs only once, before any tests
    public static void setUpClass() throws Exception {
       ShadowLog.stream = System.out;
@@ -121,25 +138,21 @@ public static void setUpClass() throws Exception {
       StaticResetHelper.saveStaticValues();
    }
 
-   @Before // Before each test
+   @Before
    public void beforeEachTest() throws Exception {
-      callBackUseId = getCallBackRegId = null;
-      StaticResetHelper.restSetStaticFields();
       blankActivityController = Robolectric.buildActivity(BlankActivity.class).create();
       blankActivity = blankActivityController.get();
 
-      ShadowOneSignalRestClient.nextSuccessResponse = null;
-      ShadowOneSignalRestClient.failNext = false;
-      ShadowOneSignalRestClient.failAll = false;
-      ShadowOneSignalRestClient.interruptibleDelayNext = false;
-      ShadowOneSignalRestClient.networkCallCount = 0;
-      ShadowOneSignalRestClient.testThread = Thread.currentThread();
+      cleanUp();
+   }
 
-      ShadowPushRegistratorGPS.fail = false;
-      notificationOpenedMessage = null;
-      lastGetTags = null;
+   @AfterClass
+   public static void afterEverything() {
+      cleanUp();
    }
 
+
+
    @Test
    public void testInitFromApplicationContext() throws Exception {
       // Application.onCreate

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

@@ -68,7 +68,7 @@ static void update(SQLiteDatabase readableDb, Context context) {
       }
    }
 
-   private static void updateCount(int count, Context context) {
+   static void updateCount(int count, Context context) {
       ShortcutBadger.applyCount(context, count);
    }
 }

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

@@ -69,8 +69,11 @@ private static void processOrderBroadcast(final Context context, Intent intent,
       if (processBundle(context, bundle))
          return;
 
-      ComponentName comp = new ComponentName(context.getPackageName(), GcmIntentService.class.getName());
-      startWakefulService(context, intent.setComponent(comp));
+      Intent intentForService = new Intent();
+      intentForService.putExtras(bundle);
+      intentForService.setComponent(new ComponentName(context.getPackageName(),
+                                    GcmIntentService.class.getName()));
+      startWakefulService(context, intentForService);
    }
 
    static boolean processBundle(Context context, final Bundle bundle) {

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

@@ -160,7 +160,7 @@ public void init() {
    private static TrackGooglePurchase trackGooglePurchase;
    private static TrackAmazonPurchase trackAmazonPurchase;
 
-   public static final String VERSION = "020402";
+   public static final String VERSION = "020403";
 
    private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/shortcutbadger/ShortcutBadger.java

@@ -89,7 +89,13 @@ public static void removeCountOrThrow(Context context) throws ShortcutBadgeExcep
    }
 
    private static void initBadger(Context context) {
-      sComponentName = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName()).getComponent();
+      Intent launcherIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+
+      // App does not have a launcher intent. (AKA app drawer icon.)
+      if (launcherIntent == null)
+         return;
+
+      sComponentName = launcherIntent.getComponent();
 
       Log.d(LOG_TAG, "Finding badger");