Skip to content

update content-available and mutable-content field #83

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 1 commit into from
May 25, 2017
Merged

update content-available and mutable-content field #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions example/main/java/cn/jpush/api/examples/PushExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import cn.jiguang.common.ServiceHelper;
import cn.jiguang.common.connection.ApacheHttpClient;
import cn.jiguang.common.connection.HttpProxy;
import cn.jiguang.common.connection.NativeHttpClient;
import cn.jiguang.common.connection.NettyHttpClient;
import cn.jiguang.common.resp.ResponseWrapper;
Expand Down Expand Up @@ -77,8 +78,6 @@ public void onSucceed(ResponseWrapper responseWrapper) {
}

public static void testSendPush() {
// HttpProxy proxy = new HttpProxy("localhost", 3128);
// Can use this https proxy: https://github.com/Exa-Networks/exaproxy
ClientConfig clientConfig = ClientConfig.getInstance();
final JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, clientConfig);
String authCode = ServiceHelper.getBasicAuthorization(APP_KEY, MASTER_SECRET);
Expand Down
4 changes: 2 additions & 2 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 @@ -102,13 +102,13 @@ public JsonElement toJSON() {
}
}
if (contentAvailable) {
json.add(CONTENT_AVAILABLE, new JsonPrimitive(1));
json.add(CONTENT_AVAILABLE, new JsonPrimitive(true));
}
if (null != category) {
json.add(CATEGORY, new JsonPrimitive(category));
}
if (mutableContent) {
json.add(MUTABLE_CONTENT, new JsonPrimitive(1));
json.add(MUTABLE_CONTENT, new JsonPrimitive(true));
}

return json;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/cn/jpush/api/device/DeviceNormalRemoteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

@RunWith(JUnitOrderedRunner.class)
public class DeviceNormalRemoteTest extends BaseTest {

// ------------------ device

@Test
Expand All @@ -36,7 +36,7 @@ public void testUpdateDeviceTagAlias_add_remove_tags() throws APIConnectionExcep
DefaultResult result = jpushClient.updateDeviceTagAlias(REGISTRATION_ID1, "alias1", tagsToAdd, tagsToRemove);
assertTrue(result.isResultOK());
}

@Test
@TestOrder(order = 110)
public void testGetDeviceTagAlias_1() throws Exception {
Expand Down