diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index cbf3834..41090bc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,13 +5,14 @@ Please include link to open issue if applicable. * If applicable ### Testing +- [ ] If these changes added new functionality, I tested them against the live API with real auth - [ ] I wrote tests covering these changes - [ ] I ran the full test suite and it passed ### Test run results, including date and time: ### Urban Airship Contribution Agreement -https://docs.urbanairship.com/contribution-agreement/ +[Link here](https://docs.google.com/forms/d/e/1FAIpQLScErfiz-fXSPpVZ9r8Di2Tr2xDFxt5MgzUel0__9vqUgvko7Q/viewform) - [ ] I've filled out and signed UA's contribution agreement form. diff --git a/CHANGELOG b/CHANGELOG index 7d58fce..b684740 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +2019-10-24 Release 5.2.0 + + Add device type filters for sms, email, and open channels. + 2019-05-29 Release 5.1.0 Add support for specifying an alternate endpoint URL for stream consumption. diff --git a/src/main/java/com/urbanairship/connect/client/model/request/filters/DeviceType.java b/src/main/java/com/urbanairship/connect/client/model/request/filters/DeviceType.java index 8e1c8f8..f559565 100644 --- a/src/main/java/com/urbanairship/connect/client/model/request/filters/DeviceType.java +++ b/src/main/java/com/urbanairship/connect/client/model/request/filters/DeviceType.java @@ -9,7 +9,7 @@ public enum DeviceType { - IOS("ios"), ANDROID("android"), AMAZON("amazon"); + IOS("ios"), ANDROID("android"), AMAZON("amazon"), SMS("sms"), OPEN("open"), EMAIL("email"); private final String serializedValue; diff --git a/src/test/java/com/urbanairship/connect/client/model/request/filters/DeviceTypeSerializationTest.java b/src/test/java/com/urbanairship/connect/client/model/request/filters/DeviceTypeSerializationTest.java index 493fd51..2edf16c 100644 --- a/src/test/java/com/urbanairship/connect/client/model/request/filters/DeviceTypeSerializationTest.java +++ b/src/test/java/com/urbanairship/connect/client/model/request/filters/DeviceTypeSerializationTest.java @@ -20,10 +20,13 @@ public void testSerialization() throws Exception { types.add(DeviceType.AMAZON); types.add(DeviceType.ANDROID); types.add(DeviceType.IOS); + types.add(DeviceType.SMS); + types.add(DeviceType.EMAIL); + types.add(DeviceType.OPEN); JsonElement obj = GsonUtil.getGson().toJsonTree(types); - JsonElement expected = parser.parse("[\"amazon\", \"android\", \"ios\"]"); + JsonElement expected = parser.parse("[\"amazon\", \"android\", \"ios\", \"sms\", \"email\", \"open\"]"); assertEquals(expected, obj); }