Skip to content

Commit 41fe859

Browse files
flakycovflakycov
committed
Merge branch 'master' of https://github.com/twilio/twilio-java 
2 parents 91d1e7c + 4c89885 commit 41fe859

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1238
-104
lines changed

‎CHANGES.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
twilio-java changelog
22
=====================
33

4+
[2018-01-22] Version 7.17.1
5+
----------------------------
6+
**Api**
7+
- Add `conference_sid` property on Recordings
8+
- Add proxy and sms usage key
9+
10+
**Chat**
11+
- Make user channels accessible by identity
12+
- Add notifications logs flag parameter
13+
14+
**Fax**
15+
- Added `ttl` parameter
16+
`ttl` is the number of minutes a fax is considered valid.
17+
18+
**Preview**
19+
- Add `call_delay`, `extension`, `verification_code`, and `verification_call_sids`.
20+
- Add `failure_reason` to HostedNumberOrders.
21+
- Add DependentHostedNumberOrders endpoint for AuthorizationDocuments preview API.
22+
23+
424
[2017-12-15] Version 7.17.0
525
----------------------------
626
**Library**

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (C) 2017, Twilio, Inc. <help@twilio.com>
3+
Copyright (C) 2018, Twilio, Inc. <help@twilio.com>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<artifactId>twilio</artifactId>
88
<packaging>jar</packaging>
99
<name>twilio</name>
10-
<version>7.17.1-SNAPSHOT</version>
10+
<version>7.17.2-SNAPSHOT</version>
1111
<description>Twilio Java Helper Library</description>
1212
<url>https://www.twilio.com</url>
1313
<licenses>

‎src/main/java/com/twilio/Twilio.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
public class Twilio {
1414

15-
public static final String VERSION = "7.17.0";
15+
public static final String VERSION = "7.17.1";
1616
public static final String JAVA_VERSION = System.getProperty("java.version");
1717

1818
private static String username;

‎src/main/java/com/twilio/rest/api/v2010/account/Recording.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ public static Recording fromJson(final InputStream json, final ObjectMapper obje
200200
private final String accountSid;
201201
private final String apiVersion;
202202
private final String callSid;
203+
private final String conferenceSid;
203204
private final DateTime dateCreated;
204205
private final DateTime dateUpdated;
205206
private final String duration;
@@ -221,6 +222,8 @@ private Recording(@JsonProperty("account_sid")
221222
final String apiVersion,
222223
@JsonProperty("call_sid")
223224
final String callSid,
225+
@JsonProperty("conference_sid")
226+
final String conferenceSid,
224227
@JsonProperty("date_created")
225228
final String dateCreated,
226229
@JsonProperty("date_updated")
@@ -250,6 +253,7 @@ private Recording(@JsonProperty("account_sid")
250253
this.accountSid = accountSid;
251254
this.apiVersion = apiVersion;
252255
this.callSid = callSid;
256+
this.conferenceSid = conferenceSid;
253257
this.dateCreated = DateConverter.rfc2822DateTimeFromString(dateCreated);
254258
this.dateUpdated = DateConverter.rfc2822DateTimeFromString(dateUpdated);
255259
this.duration = duration;
@@ -293,6 +297,17 @@ public final String getCallSid() {
293297
return this.callSid;
294298
}
295299

300+
/**
301+
* Returns The The unique id for the conference associated with the recording,
302+
* if a conference recording..
303+
*
304+
* @return The unique id for the conference associated with the recording, if a
305+
* conference recording.
306+
*/
307+
public final String getConferenceSid() {
308+
return this.conferenceSid;
309+
}
310+
296311
/**
297312
* Returns The The date this resource was created.
298313
*
@@ -427,6 +442,7 @@ public boolean equals(final Object o) {
427442
return Objects.equals(accountSid, other.accountSid) &&
428443
Objects.equals(apiVersion, other.apiVersion) &&
429444
Objects.equals(callSid, other.callSid) &&
445+
Objects.equals(conferenceSid, other.conferenceSid) &&
430446
Objects.equals(dateCreated, other.dateCreated) &&
431447
Objects.equals(dateUpdated, other.dateUpdated) &&
432448
Objects.equals(duration, other.duration) &&
@@ -447,6 +463,7 @@ public int hashCode() {
447463
return Objects.hash(accountSid,
448464
apiVersion,
449465
callSid,
466+
conferenceSid,
450467
dateCreated,
451468
dateUpdated,
452469
duration,
@@ -468,6 +485,7 @@ public String toString() {
468485
.add("accountSid", accountSid)
469486
.add("apiVersion", apiVersion)
470487
.add("callSid", callSid)
488+
.add("conferenceSid", conferenceSid)
471489
.add("dateCreated", dateCreated)
472490
.add("dateUpdated", dateUpdated)
473491
.add("duration", duration)

‎src/main/java/com/twilio/rest/api/v2010/account/RecordingReader.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public class RecordingReader extends Reader<Recording> {
2727
private DateTime absoluteDateCreated;
2828
private Range<DateTime> rangeDateCreated;
2929
private String callSid;
30+
private String conferenceSid;
3031

3132
/**
3233
* Construct a new RecordingReader.
@@ -80,6 +81,17 @@ public RecordingReader setCallSid(final String callSid) {
8081
return this;
8182
}
8283

84+
/**
85+
* The conference_sid.
86+
*
87+
* @param conferenceSid The conference_sid
88+
* @return this
89+
*/
90+
public RecordingReader setConferenceSid(final String conferenceSid) {
91+
this.conferenceSid = conferenceSid;
92+
return this;
93+
}
94+
8395
/**
8496
* Make the request to the Twilio API to perform the read.
8597
*
@@ -222,6 +234,10 @@ private void addQueryParams(final Request request) {
222234
request.addQueryParam("CallSid", callSid);
223235
}
224236

237+
if (conferenceSid != null) {
238+
request.addQueryParam("ConferenceSid", conferenceSid);
239+
}
240+
225241
if (getPageSize() != null) {
226242
request.addQueryParam("PageSize", Integer.toString(getPageSize()));
227243
}

‎src/main/java/com/twilio/rest/api/v2010/account/call/Recording.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ public static Recording fromJson(final InputStream json, final ObjectMapper obje
214214
private final String accountSid;
215215
private final String apiVersion;
216216
private final String callSid;
217+
private final String conferenceSid;
217218
private final DateTime dateCreated;
218219
private final DateTime dateUpdated;
219220
private final String duration;
@@ -234,6 +235,8 @@ private Recording(@JsonProperty("account_sid")
234235
final String apiVersion,
235236
@JsonProperty("call_sid")
236237
final String callSid,
238+
@JsonProperty("conference_sid")
239+
final String conferenceSid,
237240
@JsonProperty("date_created")
238241
final String dateCreated,
239242
@JsonProperty("date_updated")
@@ -262,6 +265,7 @@ private Recording(@JsonProperty("account_sid")
262265
this.accountSid = accountSid;
263266
this.apiVersion = apiVersion;
264267
this.callSid = callSid;
268+
this.conferenceSid = conferenceSid;
265269
this.dateCreated = DateConverter.rfc2822DateTimeFromString(dateCreated);
266270
this.dateUpdated = DateConverter.rfc2822DateTimeFromString(dateUpdated);
267271
this.duration = duration;
@@ -303,6 +307,15 @@ public final String getCallSid() {
303307
return this.callSid;
304308
}
305309

310+
/**
311+
* Returns The The conference_sid.
312+
*
313+
* @return The conference_sid
314+
*/
315+
public final String getConferenceSid() {
316+
return this.conferenceSid;
317+
}
318+
306319
/**
307320
* Returns The The date_created.
308321
*
@@ -426,6 +439,7 @@ public boolean equals(final Object o) {
426439
return Objects.equals(accountSid, other.accountSid) &&
427440
Objects.equals(apiVersion, other.apiVersion) &&
428441
Objects.equals(callSid, other.callSid) &&
442+
Objects.equals(conferenceSid, other.conferenceSid) &&
429443
Objects.equals(dateCreated, other.dateCreated) &&
430444
Objects.equals(dateUpdated, other.dateUpdated) &&
431445
Objects.equals(duration, other.duration) &&
@@ -445,6 +459,7 @@ public int hashCode() {
445459
return Objects.hash(accountSid,
446460
apiVersion,
447461
callSid,
462+
conferenceSid,
448463
dateCreated,
449464
dateUpdated,
450465
duration,
@@ -465,6 +480,7 @@ public String toString() {
465480
.add("accountSid", accountSid)
466481
.add("apiVersion", apiVersion)
467482
.add("callSid", callSid)
483+
.add("conferenceSid", conferenceSid)
468484
.add("dateCreated", dateCreated)
469485
.add("dateUpdated", dateUpdated)
470486
.add("duration", duration)

‎src/main/java/com/twilio/rest/api/v2010/account/usage/Record.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ public enum Category {
161161
PHONENUMBERS_SETUPS("phonenumbers-setups"),
162162
PHONENUMBERS_TOLLFREE("phonenumbers-tollfree"),
163163
PREMIUMSUPPORT("premiumsupport"),
164+
PROXY("proxy"),
164165
PV("pv"),
165166
PV_ROOM_PARTICIPANTS("pv-room-participants"),
166167
PV_ROOM_PARTICIPANTS_AU1("pv-room-participants-au1"),
@@ -193,6 +194,7 @@ public enum Category {
193194
SMS_OUTBOUND_LONGCODE("sms-outbound-longcode"),
194195
SMS_OUTBOUND_SHORTCODE("sms-outbound-shortcode"),
195196
SMS_MESSAGES_FEATURES("sms-messages-features"),
197+
SMS_MESSAGES_FEATURES_SENDERID("sms-messages-features-senderid"),
196198
SPEECH_RECOGNITION("speech-recognition"),
197199
SYNC("sync"),
198200
SYNC_ACTIONS("sync-actions"),

‎src/main/java/com/twilio/rest/api/v2010/account/usage/Trigger.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ public enum UsageCategory {
159159
PHONENUMBERS_SETUPS("phonenumbers-setups"),
160160
PHONENUMBERS_TOLLFREE("phonenumbers-tollfree"),
161161
PREMIUMSUPPORT("premiumsupport"),
162+
PROXY("proxy"),
162163
PV("pv"),
163164
PV_ROOM_PARTICIPANTS("pv-room-participants"),
164165
PV_ROOM_PARTICIPANTS_AU1("pv-room-participants-au1"),
@@ -191,6 +192,7 @@ public enum UsageCategory {
191192
SMS_OUTBOUND_LONGCODE("sms-outbound-longcode"),
192193
SMS_OUTBOUND_SHORTCODE("sms-outbound-shortcode"),
193194
SMS_MESSAGES_FEATURES("sms-messages-features"),
195+
SMS_MESSAGES_FEATURES_SENDERID("sms-messages-features-senderid"),
194196
SPEECH_RECOGNITION("speech-recognition"),
195197
SYNC("sync"),
196198
SYNC_ACTIONS("sync-actions"),

‎src/main/java/com/twilio/rest/api/v2010/account/usage/record/AllTime.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ public enum Category {
161161
PHONENUMBERS_SETUPS("phonenumbers-setups"),
162162
PHONENUMBERS_TOLLFREE("phonenumbers-tollfree"),
163163
PREMIUMSUPPORT("premiumsupport"),
164+
PROXY("proxy"),
164165
PV("pv"),
165166
PV_ROOM_PARTICIPANTS("pv-room-participants"),
166167
PV_ROOM_PARTICIPANTS_AU1("pv-room-participants-au1"),
@@ -193,6 +194,7 @@ public enum Category {
193194
SMS_OUTBOUND_LONGCODE("sms-outbound-longcode"),
194195
SMS_OUTBOUND_SHORTCODE("sms-outbound-shortcode"),
195196
SMS_MESSAGES_FEATURES("sms-messages-features"),
197+
SMS_MESSAGES_FEATURES_SENDERID("sms-messages-features-senderid"),
196198
SPEECH_RECOGNITION("speech-recognition"),
197199
SYNC("sync"),
198200
SYNC_ACTIONS("sync-actions"),

0 commit comments

Comments
 (0)