Skip to content

merge from dev #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2016
Merged

merge from dev #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f64fdb
fix commment
Liuchy1 Mar 17, 2016
8e94de2
Merge pull request #60 from Liuchy1/master
Liuchy1 Mar 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/cn/jpush/api/push/PushClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ public PushClient(String masterSecret, String appKey) {

/**
* This will be removed in the future. Please use ClientConfig{@link cn.jpush.api.common.ClientConfig} instead of this constructor.
* @param masterSecret API access secret of the appKey.
* @param appKey The KEY of one application on JPush.
* @param maxRetryTimes The max retry times.
*/
@Deprecated
public PushClient(String masterSecret, String appKey, int maxRetryTimes) {
Expand All @@ -64,6 +67,7 @@ public PushClient(String masterSecret, String appKey, int maxRetryTimes) {
* @param masterSecret API access secret of the appKey.
* @param appKey The KEY of one application on JPush.
* @param maxRetryTimes max retry times
* @param proxy The max retry times.
*/
@Deprecated
public PushClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy) {
Expand Down
12 changes: 5 additions & 7 deletions src/main/java/cn/jpush/api/push/model/notification/IosNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import java.util.Map;

/**
* APNs 通知类
* <p>
* <p><b>APNs 通知类</b></p>
* <br>
* 支持 APNs 默认的几个参数：
* <ul>
* <li>alert: 继承自父类 PlatformNotification 的 alert 属性；本类设置则覆盖。</li>
Expand All @@ -18,14 +18,12 @@
* <li>content-available: 用来支持后台推送。如果该值赋值为 1，表示开启后台推送。</li>
* <li>extras: JSON object. 支持更多的自定义字段信息。</li>
* </ul>
* </p>
* <p>
* <br>
* 需要特别留意的是，JPush SDK 会对以下几个值有特别的默认设置考虑：
* <ul>
* <li>badge: 默认为 "+1"。如果需要取消 badge 值，需要显式地调用 disableBadge().</li>
* <li>sound: 默认为 ""，即默认的声音提示。如果需要取消 sound 值，即不要声音，需要显式地调用 disableSound(). </li>
* <li>badge: 默认为 "+1"。如果需要取消 badge 值，需要显式地调用 disableBadge()。</li>
* <li>sound: 默认为 ""，即默认的声音提示。如果需要取消 sound 值，即不要声音，需要显式地调用 disableSound()。</li>
* </ul>
* </p>
*/
public class IosNotification extends PlatformNotification {
public static final String NOTIFICATION_IOS = "ios";
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/cn/jpush/api/report/ReportClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ public ReportClient(String masterSecret, String appKey) {

/**
* This will be removed in the future. Please use ClientConfig{@link cn.jpush.api.common.ClientConfig#setMaxRetryTimes} instead of this constructor.
* @param masterSecret API access secret of the appKey.
* @param appKey The KEY of one application on JPush.
* @param maxRetryTimes max retry times.
*
*/
@Deprecated
Expand All @@ -37,6 +40,10 @@ public ReportClient(String masterSecret, String appKey, int maxRetryTimes) {

/**
* This will be removed in the future. Please use ClientConfig{@link cn.jpush.api.common.ClientConfig#setMaxRetryTimes} instead of this constructor.
* @param masterSecret API access secret of the appKey.
* @param appKey The KEY of one application on JPush.
* @param maxRetryTimes max retry times
* @param proxy The max retry times.
*
*/
@Deprecated
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/cn/jpush/api/schedule/ScheduleClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ public ScheduleClient(String masterSecret, String appkey) {

/**
* This will be removed in the future. Please use ClientConfig{@link cn.jpush.api.common.ClientConfig#setMaxRetryTimes} instead of this constructor.
* @param masterSecret API access secret of the appKey.
* @param appKey The KEY of one application on JPush.
* @param maxRetryTimes The mas retry times.
*
*/
@Deprecated
Expand All @@ -42,7 +45,10 @@ public ScheduleClient(String masterSecret, String appKey, int maxRetryTimes) {

/**
* This will be removed in the future. Please use ClientConfig{@link cn.jpush.api.common.ClientConfig#setMaxRetryTimes} instead of this constructor.
*
* @param masterSecret API access secret of the appKey.
* @param appKey The KEY of one application on JPush.
* @param maxRetryTimes The mas retry times.
* @param proxy The proxy, if there is no proxy, should be null.
*/
@Deprecated
public ScheduleClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/cn/jpush/api/utils/Preconditions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
*
* <p>Projects which use {@code com.google.common} should generally avoid the use of {@link
* java.util.Objects#requireNonNull(Object)}. Instead, use whichever of {@link
* #checkNotNull(Object)} or {@link Verify#verifyNotNull(Object)} is appropriate to the situation.
* #checkNotNull(Object)} is appropriate to the situation.
* (The same goes for the message-accepting overloads.)
*
* <h3>Only {@code %s} is supported</h3>
Expand Down