Update twilio patch again

this time i tested it!
This commit is contained in:
Finn 2018-12-04 23:24:00 -08:00
parent 6b8592d1d6
commit 079776702f

View file

@ -1,11 +1,12 @@
diff --git a/src/main/java/org/whispersystems/textsecuregcm/sms/SmsSender.java b/src/main/java/org/whispersystems/textsecuregcm/sms/SmsSender.java diff --git a/src/main/java/org/whispersystems/textsecuregcm/sms/SmsSender.java b/src/main/java/org/whispersystems/textsecuregcm/sms/SmsSender.java
index 8b62e0f..3bde269 100644 index 8b62e0f..0e68bb0 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/sms/SmsSender.java --- a/src/main/java/org/whispersystems/textsecuregcm/sms/SmsSender.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/sms/SmsSender.java +++ b/src/main/java/org/whispersystems/textsecuregcm/sms/SmsSender.java
@@ -17,27 +17,17 @@ @@ -16,15 +16,12 @@
*/
package org.whispersystems.textsecuregcm.sms; package org.whispersystems.textsecuregcm.sms;
-
-import com.twilio.sdk.TwilioRestException; -import com.twilio.sdk.TwilioRestException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -15,11 +16,10 @@ index 8b62e0f..3bde269 100644
-@SuppressWarnings("OptionalUsedAsFieldOrParameterType") -@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
public class SmsSender { public class SmsSender {
-
- static final String SMS_IOS_VERIFICATION_TEXT = "Your Signal verification code: %s\n\nOr tap: sgnl://verify/%s"; static final String SMS_IOS_VERIFICATION_TEXT = "Your Signal verification code: %s\n\nOr tap: sgnl://verify/%s";
- static final String SMS_VERIFICATION_TEXT = "Your Signal verification code: %s"; @@ -33,11 +30,8 @@ public class SmsSender {
- static final String VOX_VERIFICATION_TEXT = "Your Signal verification code is: ";
-
private final Logger logger = LoggerFactory.getLogger(SmsSender.class); private final Logger logger = LoggerFactory.getLogger(SmsSender.class);
- private final TwilioSmsSender twilioSender; - private final TwilioSmsSender twilioSender;
@ -31,7 +31,7 @@ index 8b62e0f..3bde269 100644
} }
public void deliverSmsVerification(String destination, Optional<String> clientType, String verificationCode) public void deliverSmsVerification(String destination, Optional<String> clientType, String verificationCode)
@@ -48,20 +38,12 @@ public class SmsSender { @@ -48,20 +42,12 @@ public class SmsSender {
destination = "+521" + destination.substring(3); destination = "+521" + destination.substring(3);
} }