iosAlert add subtitle

Author: KenChoi1992

src/main/java/cn/jpush/api/push/model/notification/IosAlert.java

@@ -11,6 +11,7 @@
 public class IosAlert implements PushModel {
 
     private final String title;
+    private final String subtitle;
     private final String body;
     private final String title_loc_key;
     private final String[] title_loc_args;
@@ -19,9 +20,10 @@ public class IosAlert implements PushModel {
     private final String[] loc_args;
     private final String launch_image;
 
-    private IosAlert(String title, String body, String title_loc_key, String[] title_loc_args,
+    private IosAlert(String title, String subtitle, String body, String title_loc_key, String[] title_loc_args,
                     String action_loc_key, String loc_key, String[] loc_args, String launch_image) {
         this.title = title;
+        this.subtitle = subtitle;
         this.body = body;
         this.title_loc_key = title_loc_key;
         this.title_loc_args = title_loc_args;
@@ -43,6 +45,10 @@ public JsonElement toJSON() {
             json.addProperty("title", title);
         }
 
+        if ( StringUtils.isNotEmpty(subtitle) ) {
+            json.addProperty("subtitle", subtitle);
+        }
+
         if( StringUtils.isNotEmpty(body) ) {
             json.addProperty("body", body);
         }
@@ -87,6 +93,7 @@ public String toString() {
 
     public static class Builder {
         private String title;
+        private String subtitle;
         private String body;
         private String title_loc_key;
         private String[] title_loc_args;
@@ -95,8 +102,9 @@ public static class Builder {
         private String[] loc_args;
         private String launch_image;
 
-        public Builder setTitleAndBody(String title, String body){
+        public Builder setTitleAndBody(String title, String subtitle, String body){
             this.title = title;
+            this.subtitle = subtitle;
             this.body = body;
             return this;
         }
@@ -124,7 +132,7 @@ public Builder setLaunchImage(String launch_image) {
         }
 
         public IosAlert build() {
-            return new IosAlert(title, body, title_loc_key, title_loc_args, action_loc_key,
+            return new IosAlert(title, subtitle, body, title_loc_key, title_loc_args, action_loc_key,
                     loc_key, loc_args, launch_image);
         }
     }

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

@@ -36,7 +36,6 @@ public class IosNotification extends PlatformNotification {
     private static final String SOUND = "sound";
     private static final String CONTENT_AVAILABLE = "content-available";
     private static final String MUTABLE_CONTENT = "mutable-content";
-    private static final String SUBTITLE = "subtitle";
     private static final String CATEGORY = "category";
 
     private static final String ALERT_VALID_BADGE = "Badge number should be 0~99999, "
@@ -50,12 +49,11 @@ public class IosNotification extends PlatformNotification {
     private final boolean contentAvailable;
     private final String category;
     private final boolean mutableContent;
-    private final String subtitle;
 
 
     private IosNotification(Object alert, String sound, String badge,
             boolean contentAvailable, boolean soundDisabled, boolean badgeDisabled, 
-            String category, boolean mutableContent, String subtitle,
+            String category, boolean mutableContent,
             Map<String, String> extras, 
             Map<String, Number> numberExtras, 
             Map<String, Boolean> booleanExtras, 
@@ -69,7 +67,6 @@ private IosNotification(Object alert, String sound, String badge,
         this.badgeDisabled = badgeDisabled;
         this.category = category;
         this.mutableContent = mutableContent;
-        this.subtitle = subtitle;
     }
 
     public static Builder newBuilder() {
@@ -113,11 +110,7 @@ public JsonElement toJSON() {
         if (mutableContent) {
             json.add(MUTABLE_CONTENT, new JsonPrimitive(1));
         }
-        if (null != subtitle) {
-            json.add(SUBTITLE, new JsonPrimitive(subtitle));
-        }
 
-        
         return json;
     }
 
@@ -130,8 +123,7 @@ public static class Builder extends PlatformNotification.Builder<IosNotification
         private boolean badgeDisabled = false;
         private String category;
         private boolean mutableContent;
-        private String subtitle;
-        
+
         protected Builder getThis() {
         	return this;
         }
@@ -202,15 +194,10 @@ public Builder setMutableContent(boolean mutableContent) {
             return this;
         }
 
-        public Builder setSubtitle(String subtitle) {
-            this.subtitle = subtitle;
-            return this;
-        }
-
 
         public IosNotification build() {
             return new IosNotification(alert, sound, badge, contentAvailable, 
-                    soundDisabled, badgeDisabled, category, mutableContent, subtitle,
+                    soundDisabled, badgeDisabled, category, mutableContent,
             		extrasBuilder, numberExtrasBuilder, booleanExtrasBuilder, jsonExtrasBuilder);
         }
     }