Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for the new Benin phone format.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-11-22 12:40:39 -05:00
committed by GitHub
parent 06aa9b5171
commit abb9919ba1
3 changed files with 75 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/org/thoughtcrime/securesms/contacts/sync/FuzzyPhoneNumberHelper.java
View File

@@ -4,8 +4,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import org.whispersystems.signalservice.api.push.ServiceId.ACI;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
@@ -22,7 +20,7 @@ import java.util.Set;
*/
class FuzzyPhoneNumberHelper {
private final static List<FuzzyMatcher> FUZZY_MATCHERS = Arrays.asList(new MexicoFuzzyMatcher(), new ArgentinaFuzzyMatcher());
private final static List<FuzzyMatcher> FUZZY_MATCHERS = Arrays.asList(new MexicoFuzzyMatcher(), new ArgentinaFuzzyMatcher(), new BeninFuzzyMatcher());
/**
* This should be run on the list of eligible numbers for contact intersection so that we can
@@ -151,6 +149,41 @@ class FuzzyPhoneNumberHelper {
}
}
/**
* Benin has added an 01 after their +229 country code, e.g. both of these numbers are valid and map to the same logical number:
*
* +22912345678
* +2290112345678
*
* The format with the added 01 should be preferred.
*/
@VisibleForTesting
static class BeninFuzzyMatcher implements FuzzyMatcher {
@Override
public boolean matches(@NonNull String number) {
return (number.startsWith("+229") && number.length() == 12) || (number.startsWith("+22901") && number.length() == 14);
}
@Override
public @Nullable String getVariant(String number) {
if(number.startsWith("+229") && number.length() == 12) {
return "+22901" + number.substring("+229".length());
}
if(number.startsWith("+22901") && number.length() == 14) {
return "+229" + number.substring("+22901".length());
}
return null;
}
@Override
public boolean isPreferredVariant(@NonNull String number) {
return number.startsWith("+22901") && number.length() == 14;
}
}
public static class InputResult {
private final Set<String> numbers;
private final Map<String, String> originalToVariant;