diff --git a/example/main/java/cn/jpush/api/examples/PushExample.java b/example/main/java/cn/jpush/api/examples/PushExample.java index 9f687a04..0e07c100 100644 --- a/example/main/java/cn/jpush/api/examples/PushExample.java +++ b/example/main/java/cn/jpush/api/examples/PushExample.java @@ -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; @@ -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); diff --git a/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java b/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java index c4ac52dc..33823fa6 100644 --- a/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java +++ b/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java @@ -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; diff --git a/src/test/java/cn/jpush/api/device/DeviceNormalRemoteTest.java b/src/test/java/cn/jpush/api/device/DeviceNormalRemoteTest.java index a4df3aa7..17d9e501 100644 --- a/src/test/java/cn/jpush/api/device/DeviceNormalRemoteTest.java +++ b/src/test/java/cn/jpush/api/device/DeviceNormalRemoteTest.java @@ -21,7 +21,7 @@ @RunWith(JUnitOrderedRunner.class) public class DeviceNormalRemoteTest extends BaseTest { - + // ------------------ device @Test @@ -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 {