Add Twilio Verify methods to SmsSender
This commit is contained in:
parent
76cbf734ad
commit
f68390e96f
|
@ -8,9 +8,11 @@ package org.whispersystems.textsecuregcm.sms;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale.LanguageRange;
|
import java.util.Locale.LanguageRange;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
||||||
public class SmsSender {
|
public class SmsSender {
|
||||||
|
|
||||||
private final TwilioSmsSender twilioSender;
|
private final TwilioSmsSender twilioSender;
|
||||||
|
|
||||||
public SmsSender(TwilioSmsSender twilioSender) {
|
public SmsSender(TwilioSmsSender twilioSender) {
|
||||||
|
@ -29,4 +31,24 @@ public class SmsSender {
|
||||||
public void deliverVoxVerification(String destination, String verificationCode, List<LanguageRange> languageRanges) {
|
public void deliverVoxVerification(String destination, String verificationCode, List<LanguageRange> languageRanges) {
|
||||||
twilioSender.deliverVoxVerification(destination, verificationCode, languageRanges);
|
twilioSender.deliverVoxVerification(destination, verificationCode, languageRanges);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<Optional<String>> deliverSmsVerificationWithTwilioVerify(String destination, Optional<String> clientType,
|
||||||
|
String verificationCode, List<LanguageRange> languageRanges) {
|
||||||
|
// Fix up mexico numbers to 'mobile' format just for SMS delivery.
|
||||||
|
if (destination.startsWith("+52") && !destination.startsWith("+521")) {
|
||||||
|
destination = "+521" + destination.substring(3);
|
||||||
|
}
|
||||||
|
|
||||||
|
return twilioSender.deliverSmsVerificationWithVerify(destination, clientType, verificationCode, languageRanges);
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<Optional<String>> deliverVoxVerificationWithTwilioVerify(String destination, String verificationCode,
|
||||||
|
List<LanguageRange> languageRanges) {
|
||||||
|
|
||||||
|
return twilioSender.deliverVoxVerificationWithVerify(destination, verificationCode, languageRanges);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void reportVerificationSucceeded(String verificationSid) {
|
||||||
|
twilioSender.reportVerificationSucceeded(verificationSid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue