Change extra param to 'extras'

Author: Javen

src/cn/jpush/api/JPushClient.java

@@ -29,12 +29,12 @@ public JPushClient(String masterSecret, String appKey, long timeToLive, DeviceEn
 	    _reportClient = new ReportClient(masterSecret, appKey);
 	}
 
-	public MessageResult sendNotification(String notificationContent, NotificationParams params, Map<String, Object> extra) {
-	    return _pushClient.sendNotification(notificationContent, params, extra);
+	public MessageResult sendNotification(String notificationContent, NotificationParams params, Map<String, Object> extras) {
+	    return _pushClient.sendNotification(notificationContent, params, extras);
 	}
 
-	public MessageResult sendCustomMessage(String msgTitle, String msgContent, CustomMessageParams params, Map<String, Object> extra) {
-	    return _pushClient.sendCustomMessage(msgTitle, msgContent, params, extra);
+	public MessageResult sendCustomMessage(String msgTitle, String msgContent, CustomMessageParams params, Map<String, Object> extras) {
+	    return _pushClient.sendCustomMessage(msgTitle, msgContent, params, extras);
 	}
 
 

src/cn/jpush/api/push/CustomMessageParams.java

@@ -15,19 +15,19 @@ public class CustomMsgContent extends MessageParams.MsgContent {
 		//message 里的内容类型
 		private String contentType = "";
 		//更多的附属信息
-		private Map<String, Object> extra = new HashMap<String, Object>();
+		private Map<String, Object> extras = new HashMap<String, Object>();
 
 		public String getContentType() {
 			return contentType;
 		}
 		public void setContentType(String contentType) {
 			this.contentType = contentType;
 		}
-		public Map<String, Object> getExtra() {
-			return extra;
+		public Map<String, Object> getExtras() {
+			return extras;
 		}
-		public void setExtra(Map<String, Object> extra) {
-			this.extra = extra;
+		public void setExtras(Map<String, Object> extras) {
+			this.extras = extras;
 		}
 		@Override
 		public String toString() {
@@ -36,7 +36,7 @@ public String toString() {
 			params.put("title", this.getTitle());
 			params.put("message", this.getMessage());
 			params.put("content_type", this.getContentType());
-			params.put("extras", this.getExtra());
+			params.put("extras", this.getExtras());
 
 			return StringUtils.encodeParam(gson.toJson(params));
 		}

src/cn/jpush/api/push/NotificationParams.java

@@ -16,7 +16,7 @@ public class NotificationContent extends MessageParams.MsgContent {
 		// Android notification builder id - default is 0
 		private int builderId = 0;
 
-		private Map<String, Object> extra = new HashMap<String, Object>();
+		private Map<String, Object> extras = new HashMap<String, Object>();
 
 		public int getBuilderId() {
 			return builderId;
@@ -25,11 +25,11 @@ public void setBuilderId(int builderId) {
 			this.builderId = builderId;
 		}
 
-		public Map<String, Object> getExtra() {
-			return extra;
+		public Map<String, Object> getExtras() {
+			return extras;
 		}
-		public void setExtra(Map<String, Object> extra) {
-			this.extra = extra;
+		public void setExtras(Map<String, Object> extras) {
+			this.extras = extras;
 		}
 
 		@Override
@@ -38,7 +38,7 @@ public String toString() {
 			params.put("n_content", this.getMessage());
 			params.put("n_builder_id", String.valueOf(this.getBuilderId()));
 			params.put("n_title", this.getTitle());
-			params.put("n_extras", this.getExtra());
+			params.put("n_extras", this.getExtras());
 			return StringUtils.encodeParam(_gson.toJson(params));
 		}
 	}

src/cn/jpush/api/push/PushClient.java

@@ -31,19 +31,19 @@ public PushClient(String masterSecret, String appKey, long timeToLive, DeviceEnu
 	}
 
 
-	public MessageResult sendNotification(String notificationContent, NotificationParams params, Map<String, Object> extra) {
-		if (null != extra) {
-			params.getMsgContent().setExtra(extra);
+	public MessageResult sendNotification(String notificationContent, NotificationParams params, Map<String, Object> extras) {
+		if (null != extras) {
+			params.getMsgContent().setExtras(extras);
 		}
 		return sendMessage(notificationContent, params);
 	}
 
-	public MessageResult sendCustomMessage(String msgTitle, String msgContent, CustomMessageParams params, Map<String, Object> extra) {
+	public MessageResult sendCustomMessage(String msgTitle, String msgContent, CustomMessageParams params, Map<String, Object> extras) {
 	    if (null != msgTitle) {
 	        params.getMsgContent().setTitle(msgTitle);
 	    }
-        if (null != extra) {
-            params.getMsgContent().setExtra(extra);
+        if (null != extras) {
+            params.getMsgContent().setExtras(extras);
         }
         return sendMessage(msgContent, params);
     }