Merge pull request #36 from Liuchy1/master

Liuchy1 · Liuchy1 · commit af5021592116 · 2015-11-23T17:24:07.000+08:00
add sms comment
diff --git a/src/main/java/cn/jpush/api/JPushClient.java b/src/main/java/cn/jpush/api/JPushClient.java
@@ -213,7 +213,7 @@ public PushResult sendNotificationAll(String alert) throws APIConnectionExceptio
      * If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
      *
      * @param alert The notification content.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @return push result
      * @throws APIConnectionException
      * @throws APIRequestException
@@ -243,7 +243,7 @@ public PushResult sendAndroidNotificationWithAlias(String title, String alert,
      *
      * @param title The notification title.
      * @param alert The notification content.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param extras The extra parameter.
      * @param alias The users' alias.
      * @return push result.
@@ -282,7 +282,7 @@ public PushResult sendAndroidNotificationWithRegistrationID(String title, String
      *
      * @param title The notification title.
      * @param alert The notification content.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param extras The extra parameter.
      * @param registrationID The registration id generated by JPush.
      * @return push result.
@@ -319,7 +319,7 @@ public PushResult sendIosNotificationWithAlias(String alert,
      * Send a notification to iOS with alias.
      * If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
      * @param alert The notification content.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param extras The extra parameter.
      * @param alias The users' alias.
      * @return push result.
@@ -366,7 +366,7 @@ public PushResult sendIosNotificationWithAlias(IosAlert alert,
      * If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
      *
      * @param alert The wrapper of APNs alert.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param extras The extra params.
      * @param alias The alias list.
      * @return push result.
@@ -413,7 +413,7 @@ public PushResult sendIosNotificationWithAlias(JsonObject alert,
      * If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
      *
      * @param alert The JSON object of APNs alert.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param extras The extra params.
      * @param alias The alias list.
      * @return push result.
@@ -451,7 +451,7 @@ public PushResult sendIosNotificationWithRegistrationID(String alert,
      * If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
      *
      * @param alert The notification content.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param extras The extra params.
      * @param registrationID The alias list.
      * @return push result.
@@ -498,7 +498,7 @@ public PushResult sendIosNotificationWithRegistrationID(IosAlert alert,
      * If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
      *
      * @param alert The wrapper of APNs alert.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param extras The extra params.
      * @param registrationID The registration ids.
      * @return push result.
@@ -545,7 +545,7 @@ public PushResult sendIosNotificationWithRegistrationID(JsonObject alert,
      * If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
      *
      * @param alert The JSON object of APNs alert.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param extras The extra params.
      * @param registrationID The registration ids.
      * @return push result.
@@ -580,7 +580,7 @@ public PushResult sendMessageAll(String msgContent) throws APIConnectionExceptio
      * If it doesn't received within the delay time,JPush will send a SMS to the corresponding users.
      *
      * @param msgContent The message content.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @return push result.
      * @throws APIConnectionException
      * @throws APIRequestException
@@ -612,7 +612,7 @@ public PushResult sendAndroidMessageWithAlias(String title, String msgContent, S
      *
      * @param title The message title.
      * @param msgContent The message content.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param alias The alias list.
      * @return push result.
      * @throws APIConnectionException
@@ -654,7 +654,7 @@ public PushResult sendAndroidMessageWithRegistrationID(String title, String msgC
      *
      * @param title The message title.
      * @param msgContent The message content.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param registrationID The registration id list.
      * @return push result.
      * @throws APIConnectionException
@@ -696,7 +696,7 @@ public PushResult sendIosMessageWithAlias(String title, String msgContent, Strin
      *
      * @param title The message title.
      * @param msgContent The message content.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param alias The alias list.
      * @return push result.
      * @throws APIConnectionException
@@ -738,7 +738,7 @@ public PushResult sendIosMessageWithRegistrationID(String title, String msgConte
      *
      * @param title The message title.
      * @param msgContent The message content.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param registrationID The registrationIds generated by JPush.
      * @return push result.
      * @throws APIConnectionException
@@ -780,7 +780,7 @@ public PushResult sendMessageWithRegistrationID(String title, String msgContent,
      *
      * @param title The message title.
      * @param msgContent The message content.
-     * @param sms The SMS content and delay time. If null, it doesn't work.
+     * @param sms The SMS content and delay time. If null, sms doesn't work, no effect on Push feature.
      * @param registrationID The registrationIds generated by JPush.
      * @return push result.
      * @throws APIConnectionException
diff --git a/src/main/java/cn/jpush/api/common/connection/NativeHttpClient.java b/src/main/java/cn/jpush/api/common/connection/NativeHttpClient.java
@@ -261,7 +261,7 @@ protected void initSSL() {
         TrustManager[] tmCerts = new javax.net.ssl.TrustManager[1];
         tmCerts[0] = new SimpleTrustManager();
 		try {
-			SSLContext sslContext = SSLContext.getInstance("TLSv1");
+			SSLContext sslContext = SSLContext.getInstance("TLSv1.1");
 			sslContext.init(null, tmCerts, null);
 			HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
 			
diff --git a/src/main/java/cn/jpush/api/push/model/SMS.java b/src/main/java/cn/jpush/api/push/model/SMS.java
@@ -20,7 +20,11 @@ public Builder newBuilder() {
     }
 
     /**
-     * Create a SMS content.
+     * Create a SMS content with a delay time.
+     * JPush will send a SMS if the message doesn't received within the delay time. If the delay time is 0, the SMS will be sent immediately.
+     * Please note the delay time only works on Android.
+     * If you are pushing to iOS, the SMS will be sent immediately, whether or not the delay time is 0.
+     *
      * @param content The SMS content.
      * @param delayTime The seconds you want to delay, should be greater than or equal to 0.
      * @return
