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

Force use of UCS-2 instead of GSM-7 for SMS to China (#297)

Browse Source
This commit is contained in:
Ehren Kret
2020-11-20 14:41:48 -06:00
committed by GitHub
parent 36aca49fc3
commit 00a3e562dc
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ import org.whispersystems.textsecuregcm.util.ExecutorUtils;
import org.whispersystems.textsecuregcm.util.SystemMapper;
import org.whispersystems.textsecuregcm.util.Util;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.IOException;
import java.net.URI;
@@ -113,7 +114,7 @@ public class TwilioSmsSender {
Map<String, String> requestParameters = new HashMap<>();
requestParameters.put("To", destination);
boolean usedSenderId = setOriginationRequestParameter(destination, requestParameters, enableSenderId);
requestParameters.put("Body", String.format(Locale.US, getBodyFormatString(clientType.orElse(null)), verificationCode));
requestParameters.put("Body", String.format(Locale.US, getBodyFormatString(destination, clientType.orElse(null)), verificationCode));
HttpRequest request = HttpRequest.newBuilder()
.uri(smsUri)
@@ -129,15 +130,23 @@ public class TwilioSmsSender {
.thenCompose(twilioResponse -> retrySendSmsVerificationIfApplicable(usedSenderId, twilioResponse, destination, clientType, verificationCode));
}
private String getBodyFormatString(@Nullable String clientType) {
private String getBodyFormatString(@Nonnull String destination, @Nullable String clientType) {
final String result;
if ("ios".equals(clientType)) {
return iosVerificationText;
result = iosVerificationText;
} else if ("android-ng".equals(clientType)) {
return androidNgVerificationText;
result = androidNgVerificationText;
} else if ("android-2020-01".equals(clientType)) {
return android202001VerificationText;
result = android202001VerificationText;
} else {
return genericVerificationText;
result = genericVerificationText;
}
if (destination.startsWith("+86")) { // is China
return result + "\u2008";
// Twilio recommends adding this character to the end of strings delivered to China because some carriers in
// China are blocking GSM-7 encoding and this will force Twilio to send using UCS-2 instead.
} else {
return result;
}
}