Fix: notification can alert to all three platforms.

Refine: check basic params.

Author: Javen

src/cn/jpush/api/common/BaseHttpClient.java

@@ -11,6 +11,7 @@
 import java.net.UnknownHostException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+import java.util.regex.Pattern;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
@@ -186,6 +187,24 @@ public static String getAuthorizationBase64(String appKey, String masterSecret)
         String encodeKey = appKey + ":" + masterSecret;
         return String.valueOf(Base64.encode(encodeKey.getBytes())); 
     }
+    
+    private final static Pattern PUSH_PATTERNS = Pattern.compile("[^a-zA-Z0-9]");
+    
+    public static void checkBasic(String appKey, String masterSecret) {
+        if (StringUtils.isEmpty(appKey)
+                || StringUtils.isEmpty(masterSecret)) {
+            throw new IllegalArgumentException("appKey and masterSecret are both required.");
+        }
+        if (appKey.length() != 24 
+                || masterSecret.length() != 24
+                || PUSH_PATTERNS.matcher(appKey).find()
+                || PUSH_PATTERNS.matcher(masterSecret).find()) {
+            throw new IllegalArgumentException("appKey and masterSecret format is incorrect. "
+                    + "They should be 24 size, and be composed with alphabet and numbers. "
+                    + "Please confirm that they are coming from JPush Web Portal.");
+        }
+    }
+
 
 	public class SimpleHostnameVerifier implements HostnameVerifier {
 

src/cn/jpush/api/common/ValidateRequestParams.java

@@ -43,6 +43,7 @@ public PushClient(String masterSecret, String appKey) {
         this._masterSecret = masterSecret;
         this._appKey = appKey;
         this._authCode = getAuthorizationBase64(_appKey, _masterSecret);
+        checkBasic(appKey, masterSecret);
 	}
 
     public PushClient(String masterSecret, String appKey, boolean apnsProduction, long timeToLive) {

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

@@ -32,6 +32,8 @@ public static Builder newBuilder() {
     public static Notification alert(String alert) {
         return newBuilder()
                 .addPlatformNotification(AndroidNotification.alert(alert))
+                .addPlatformNotification(IosNotification.alert(alert))
+                .addPlatformNotification(MpnsNotification.alert(alert))
                 .setAlert(alert).build();
     }
 

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

@@ -2,6 +2,7 @@
 
 import java.lang.reflect.Type;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import cn.jpush.api.common.BaseHttpClient;
 import cn.jpush.api.common.ResponseResult;
@@ -24,6 +25,7 @@ public class ReportClient extends BaseHttpClient {
 	public ReportClient(String masterSecret, String appKey) {
         this._masterSecret = masterSecret;
         this._appKey = appKey;
+        checkBasic(appKey, masterSecret);
 	}
 
 
@@ -52,7 +54,38 @@ public ReceivedsResult getResportReceived(String msgIds, String authCode) {
         return receivedsResult;
     }
 
-}
+    
+    private final static Pattern MSGID_PATTERNS = Pattern.compile("[^0-9, ]");
 
+    public static void checkMsgids(String msgIds) {
+        if (StringUtils.isTrimedEmpty(msgIds)) {
+            throw new IllegalArgumentException("msgIds param is required.");
+        }
+        
+        if (MSGID_PATTERNS.matcher(msgIds).find()) {
+            throw new IllegalArgumentException("msgIds param format is incorrect. "
+                    + "It should be msg_id (number) which response from JPush Push API. "
+                    + "If there are many, use ',' as interval. ");
+        }
+        
+        msgIds = msgIds.trim();
+        if (msgIds.endsWith(",")) {
+            msgIds = msgIds.substring(0, msgIds.length() - 1);
+        }
+        
+        String[] splits = msgIds.split(",");
+        try {
+            for (String s : splits) {
+                s = s.trim();
+                if (!StringUtils.isEmpty(s)) {
+                    Integer.parseInt(s);
+                }
+            }
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("Every msg_id should be valid Integer number which splits by ','");
+        }
+    }
+
+}
 
 

src/cn/jpush/api/report/ReportClient.java

@@ -3,9 +3,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import cn.jpush.api.push.model.notification.AndroidNotification;
-import cn.jpush.api.push.model.notification.Notification;
-
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
@@ -29,10 +26,21 @@ public void testIllegal2() {
     public void testAlertAll() {
         Notification notification = Notification.alert("alert");
         JsonObject json = new JsonObject();
+        json.add("alert", new JsonPrimitive("alert"));
+        
         JsonObject android = new JsonObject();
         android.add("alert", new JsonPrimitive("alert"));
-        json.add("alert", new JsonPrimitive("alert"));
+        
+        JsonObject ios = new JsonObject();
+        ios.add("alert", new JsonPrimitive("alert"));
+        ios.add("sound", new JsonPrimitive(""));
+
+        JsonObject mpns = new JsonObject();
+        mpns.add("alert", new JsonPrimitive("alert"));
+
         json.add("android", android);
+        json.add("ios", ios);
+        json.add("mpns", mpns);
 
         Assert.assertEquals("", json, notification.toJSON());