Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 04:38:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add android-2021-03 verification format

Browse Source
This commit is contained in:
Chris Eager
2021-03-17 16:55:10 -05:00
committed by Chris Eager
parent 63dac3bd9f
commit e5ae0572c5
4 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
service/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioConfiguration.java
View File

@@ -43,6 +43,9 @@ public class TwilioConfiguration {
@NotEmpty
private String android202001VerificationText;
@NotEmpty
private String android202103VerificationText;
@NotEmpty
private String genericVerificationText;
@@ -135,6 +138,15 @@ public class TwilioConfiguration {
this.android202001VerificationText = android202001VerificationText;
}
public String getAndroid202103VerificationText() {
return android202103VerificationText;
}
@VisibleForTesting
public void setAndroid202103VerificationText(String android202103VerificationText) {
this.android202103VerificationText = android202103VerificationText;
}
public String getGenericVerificationText() {
return genericVerificationText;
}

4
service/src/main/java/org/whispersystems/textsecuregcm/sms/TwilioSmsSender.java
View File

@@ -66,6 +66,7 @@ public class TwilioSmsSender {
private final Random random;
private final String androidNgVerificationText;
private final String android202001VerificationText;
private final String android202103VerificationText;
private final String iosVerificationText;
private final String genericVerificationText;
@@ -87,6 +88,7 @@ public class TwilioSmsSender {
this.random = new Random(System.currentTimeMillis());
this.androidNgVerificationText = twilioConfiguration.getAndroidNgVerificationText();
this.android202001VerificationText = twilioConfiguration.getAndroid202001VerificationText();
this.android202103VerificationText = twilioConfiguration.getAndroid202103VerificationText();
this.iosVerificationText = twilioConfiguration.getIosVerificationText();
this.genericVerificationText = twilioConfiguration.getGenericVerificationText();
this.smsUri = URI.create(baseUri + "/2010-04-01/Accounts/" + accountId + "/Messages.json");
@@ -134,6 +136,8 @@ public class TwilioSmsSender {
result = androidNgVerificationText;
} else if ("android-2020-01".equals(clientType)) {
result = android202001VerificationText;
} else if ("android-2021-03".equals(clientType)) {
result = android202103VerificationText;
} else {
result = genericVerificationText;
}