Badges are now cleared when notifications are disabled

Author: jkasten2

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

@@ -41,7 +41,7 @@ class BadgeCountUpdater {
    // Cache for manifest setting.
    private static int badgesEnabled = -1;
 
-   private static boolean isBadgesEnabled(Context context) {
+   private static boolean areBadgeSettingsEnabled(Context context) {
       if (badgesEnabled != -1)
          return (badgesEnabled == 1);
 
@@ -57,9 +57,13 @@ private static boolean isBadgesEnabled(Context context) {
 
       return (badgesEnabled == 1);
    }
+   
+   private static boolean areBadgesEnabled(Context context) {
+      return areBadgeSettingsEnabled(context) && OSUtils.areNotificationsEnabled(context);
+   }
 
    static void update(SQLiteDatabase readableDb, Context context) {
-      if (!isBadgesEnabled(context))
+      if (!areBadgesEnabled(context))
          return;
 
       Cursor cursor = readableDb.query(
@@ -79,7 +83,7 @@ static void update(SQLiteDatabase readableDb, Context context) {
    }
 
    static void updateCount(int count, Context context) {
-      if (!isBadgesEnabled(context))
+      if (!areBadgeSettingsEnabled(context))
          return;
 
       // Can throw if badges are not support on the device.

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

@@ -29,12 +29,15 @@
 
 class OSPermissionChangedInternalObserver {
 
+   // TODO: Make sure this method doesn't get prograuded out.
    public void changed(OSPermissionState state) {
-      handleInternalChanges();
+      handleInternalChanges(state);
       fireChangesToPublicObserver(state);
    }
 
-   private void handleInternalChanges() {
+   static void handleInternalChanges(OSPermissionState state) {
+      if (!state.getEnabled())
+         BadgeCountUpdater.updateCount(0, OneSignal.appContext);
       OneSignalStateSynchronizer.setPermission(OneSignal.areNotificationsEnabledForSubscribedState());
    }
 

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

@@ -373,7 +373,9 @@ public static void init(Context context, String googleProjectNumber, String oneS
 
       if (TrackGooglePurchase.CanTrack(appContext))
          trackGooglePurchase = new TrackGooglePurchase(appContext);
-
+   
+      OSPermissionChangedInternalObserver.handleInternalChanges(getCurrentPermissionState(appContext));
+      
       initDone = true;
    }
 

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

@@ -1,7 +1,7 @@
 /**
  * Modified MIT License
  *
- * Copyright 2016 OneSignal
+ * Copyright 2017 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
@@ -40,8 +40,5 @@ public class ShadowBadgeCountUpdater {
 
    public static void updateCount(int count, Context context) {
       lastCount = count;
-      try {
-         ShortcutBadger.applyCount(context, count);
-      } catch(Throwable t) {}
    }
 }

OneSignalSDK/unittest/src/test/java/com/test/onesignal/ShadowNotificationManagerCompat.java renamed to OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowNotificationManagerCompat.java

@@ -25,15 +25,15 @@
  * THE SOFTWARE.
  */
 
-package com.test.onesignal;
+package com.onesignal;
 
 import android.support.v4.app.NotificationManagerCompat;
 
 import org.robolectric.annotation.Implements;
 
 @Implements(NotificationManagerCompat.class)
 public class ShadowNotificationManagerCompat {
-   static boolean enabled = true;
+   public static boolean enabled = true;
 
    public boolean areNotificationsEnabled() {
       return enabled;

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

@@ -50,6 +50,7 @@
 import com.onesignal.OneSignalDbHelper;
 import com.onesignal.OneSignalPackagePrivateHelper;
 import com.onesignal.ShadowBadgeCountUpdater;
+import com.onesignal.ShadowNotificationManagerCompat;
 import com.onesignal.ShadowNotificationRestorer;
 import com.onesignal.ShadowOneSignal;
 import com.onesignal.ShadowOneSignalRestClient;
@@ -92,7 +93,8 @@
       instrumentedPackages = {"com.onesignal"},
       shadows = { ShadowRoboNotificationManager.class,
                   ShadowOneSignalRestClient.class,
-                  ShadowBadgeCountUpdater.class },
+                  ShadowBadgeCountUpdater.class,
+                  ShadowNotificationManagerCompat.class},
       sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class GenerateNotificationRunner {
@@ -304,6 +306,17 @@ public void shouldUpdateBadgesWhenDismissingNotification() {
       Assert.assertEquals(0, ShadowBadgeCountUpdater.lastCount);
    }
 
+   @Test
+   public void shouldNotSetBadgesWhenNotificationPermissionIsDisabled() throws Exception {
+      ShadowNotificationManagerCompat.enabled = false;
+      OneSignal.init(blankActivity, "123456789", "b2f7f966-d8cc-11e4-bed1-df8f05be55ba");
+      threadAndTaskWait();
+      
+      Bundle bundle = getBaseNotifBundle();
+      NotificationBundleProcessor_ProcessFromGCMIntentService(blankActivity, bundle, null);
+      Assert.assertEquals(0, ShadowBadgeCountUpdater.lastCount);
+   }
+   
    @Test
    public void shouldUpdateNormalNotificationDisplayWhenReplacingANotification() throws Exception {
       // Setup - init

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

@@ -57,6 +57,7 @@
 import com.onesignal.ShadowGoogleApiClientBuilder;
 import com.onesignal.ShadowGoogleApiClientCompatProxy;
 import com.onesignal.ShadowFusedLocationApiWrapper;
+import com.onesignal.ShadowNotificationManagerCompat;
 import com.onesignal.ShadowOSUtils;
 import com.onesignal.ShadowOneSignal;
 import com.onesignal.ShadowOneSignalRestClient;
@@ -83,7 +84,6 @@
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.shadows.ShadowConnectivityManager;
 import org.robolectric.shadows.ShadowLog;
-import org.robolectric.shadows.ShadowNotificationManager;
 import org.robolectric.shadows.ShadowSystemClock;
 import org.robolectric.util.ActivityController;
 
@@ -94,7 +94,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Observer;
 
 import static com.onesignal.OneSignalPackagePrivateHelper.GcmBroadcastReceiver_processBundle;
 import static com.onesignal.OneSignalPackagePrivateHelper.NotificationBundleProcessor_Process;
@@ -1667,16 +1666,32 @@ public void shouldSetNotificationTypesToZeroWhenUnsubscribeWhenNotificationsAreD
       OneSignal.startInit(blankActivity).unsubscribeWhenNotificationsAreDisabled(true).init();
       OneSignal.init(blankActivity, "123456789", ONESIGNAL_APP_ID);
       threadAndTaskWait();
-   
+      
       Assert.assertEquals(0, ShadowOneSignalRestClient.lastPost.getInt("notification_types"));
-   
+      
       blankActivityController.pause();
       threadAndTaskWait();
       ShadowNotificationManagerCompat.enabled = true;
       blankActivityController.resume();
       threadAndTaskWait();
       Assert.assertEquals(1, ShadowOneSignalRestClient.lastPost.getInt("notification_types"));
    }
+   
+   @Test
+   @Config(shadows = {ShadowBadgeCountUpdater.class})
+   public void shouldClearBadgesWhenPermissionIsDisabled() throws Exception {
+      OneSignalInit();
+      threadAndTaskWait();
+      ShadowBadgeCountUpdater.updateCount(1, blankActivity);
+   
+      blankActivityController.pause();
+      threadAndTaskWait();
+      ShadowNotificationManagerCompat.enabled = false;
+      blankActivityController.resume();
+      threadAndTaskWait();
+      
+      Assert.assertEquals(0, ShadowBadgeCountUpdater.lastCount);
+   }
 
    // ####### Unit test helper methods ########
 

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

@@ -1,6 +1,7 @@
 package com.test.onesignal;
 
 import com.onesignal.OneSignalPackagePrivateHelper;
+import com.onesignal.ShadowNotificationManagerCompat;
 import com.onesignal.ShadowOSUtils;
 import com.onesignal.ShadowOneSignalRestClient;
 import com.onesignal.ShadowPushRegistratorGPS;