if not set, ios badge is set 1 by default. Add disableBadge method.

Author: Javen

src/cn/jpush/api/push/model/notification/IosNotification.java

@@ -10,18 +10,21 @@ public class IosNotification extends PlatformNotification {
     private static final String NOTIFICATION_IOS = "ios";
 
     private static final String DEFAULT_SOUND = "";
+    private static final int BADGE_UNDEFINED = -1;
+    private static final int DEFAULT_BADGE = 1;
 
     private static final String BADGE = "badge";
     private static final String SOUND = "sound";
     private static final String CONTENT_AVAILABLE = "content-available";
 
     private final boolean soundDisabled;
+    private final boolean badgeDisabled;
     private final String sound;
     private final int badge;
     private final boolean contentAvailable;
 
     private IosNotification(String alert, String sound, int badge, 
-            boolean contentAvailable, boolean soundDisabled,   
+            boolean contentAvailable, boolean soundDisabled, boolean badgeDisabled, 
             ImmutableMap<String, String> extras, 
             ImmutableMap<String, Number> numberExtras, 
             ImmutableMap<String, Boolean> booleanExtras) {
@@ -31,6 +34,7 @@ private IosNotification(String alert, String sound, int badge,
         this.badge = badge;
         this.contentAvailable = contentAvailable;
         this.soundDisabled = soundDisabled;
+        this.badgeDisabled = badgeDisabled;
     }
 
     public static Builder newBuilder() {
@@ -51,8 +55,12 @@ public String getPlatform() {
     public JsonElement toJSON() {
         JsonObject json = super.toJSON().getAsJsonObject();
 
-        if (badge >= 0) {
-            json.add(BADGE, new JsonPrimitive(this.badge));
+        if (!badgeDisabled) {
+            if (badge >= 0) {
+                json.add(BADGE, new JsonPrimitive(this.badge));
+            } else if (badge == BADGE_UNDEFINED) {
+                json.add(BADGE, new JsonPrimitive(DEFAULT_BADGE));
+            }
         }
         if (!soundDisabled) {
             if (null != sound) {
@@ -71,9 +79,10 @@ public JsonElement toJSON() {
 
     public static class Builder extends PlatformNotification.Builder<IosNotification> {
         private String sound;
-        private int badge = -1;
+        private int badge = BADGE_UNDEFINED;
         private boolean contentAvailable = false;
         private boolean soundDisabled = false;
+        private boolean badgeDisabled = false;
 
         public Builder setSound(String sound) {
             this.sound = sound;
@@ -90,6 +99,11 @@ public Builder setBadge(int badge) {
             return this;
         }
 
+        public Builder disableBadge() {
+            this.badgeDisabled = true;
+            return this;
+        }
+        
         public Builder setContentAvailable(boolean contentAvailable) {
             this.contentAvailable = contentAvailable;
             return this;
@@ -128,7 +142,8 @@ public Builder addExtra(String key, Boolean value) {
         }
 
         public IosNotification build() {
-            return new IosNotification(alert, sound, badge, contentAvailable, soundDisabled,  
+            return new IosNotification(alert, sound, badge, contentAvailable, 
+                    soundDisabled, badgeDisabled,   
                     (null == extrasBuilder) ? null : extrasBuilder.build(), 
                     (null == numberExtrasBuilder) ? null : numberExtrasBuilder.build(),
                     (null == booleanExtrasBuilder) ? null : booleanExtrasBuilder.build());

test/cn/jpush/api/push/model/notification/IosNotificationTests.java

@@ -13,6 +13,7 @@ public void testEmpty() {
         IosNotification ios = IosNotification.newBuilder().build();
         JsonObject json = new JsonObject();
         json.add("sound", new JsonPrimitive(""));
+        json.add("badge", new JsonPrimitive(1));
         Assert.assertEquals("", json, ios.toJSON());
     }
 
@@ -22,6 +23,7 @@ public void testQuickAlert() {
         JsonObject json = new JsonObject();
         json.add("alert", new JsonPrimitive("aaa"));
         json.add("sound", new JsonPrimitive(""));
+        json.add("badge", new JsonPrimitive(1));
         Assert.assertEquals("", json, ios.toJSON());
     }
 
@@ -35,10 +37,10 @@ public void testBadge_0() {
     }
 
     @Test
-    public void testBadge_1() {
-        IosNotification ios = IosNotification.newBuilder().setBadge(1).build();
+    public void testBadge_2() {
+        IosNotification ios = IosNotification.newBuilder().setBadge(2).build();
         JsonObject json = new JsonObject();
-        json.add("badge", new JsonPrimitive(1));
+        json.add("badge", new JsonPrimitive(2));
         json.add("sound", new JsonPrimitive(""));
         Assert.assertEquals("", json, ios.toJSON());
     }
@@ -48,6 +50,7 @@ public void testSound() {
         IosNotification ios = IosNotification.newBuilder().setSound("sound").build();
         JsonObject json = new JsonObject();
         json.add("sound", new JsonPrimitive("sound"));
+        json.add("badge", new JsonPrimitive(1));
         Assert.assertEquals("", json, ios.toJSON());
     }
 
@@ -60,6 +63,19 @@ public void testSoundDisabled() {
                 .build();
         JsonObject json = new JsonObject();
         json.add("alert", new JsonPrimitive("alert"));
+        json.add("badge", new JsonPrimitive(1));
+        Assert.assertEquals("", json, ios.toJSON());
+    }
+
+    @Test
+    public void testBadgeDisabled() {
+        IosNotification ios = IosNotification.newBuilder()
+                .disableBadge()
+                .setAlert("alert")
+                .build();
+        JsonObject json = new JsonObject();
+        json.add("alert", new JsonPrimitive("alert"));
+        json.add("sound", new JsonPrimitive(""));
         Assert.assertEquals("", json, ios.toJSON());
     }
 
@@ -75,6 +91,7 @@ public void testExtra() {
         extra.add("key2", new JsonPrimitive(Boolean.TRUE));
         json.add("extras", extra);
         json.add("sound", new JsonPrimitive(""));
+        json.add("badge", new JsonPrimitive(1));
         Assert.assertEquals("", json, ios.toJSON());
     }
 

test/cn/jpush/api/push/model/notification/NotificationTests.java

@@ -52,6 +52,7 @@ public void testAlertIos() {
         JsonObject ios = new JsonObject();
         ios.add("alert", new JsonPrimitive("alert"));
         ios.add("sound", new JsonPrimitive(""));
+        ios.add("badge", new JsonPrimitive(1));
         json.add("ios", ios);
         Assert.assertEquals("", json, notification.toJSON());
     }