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

Extract "is ported" data from HLR Lookup responses

Browse Source
This commit is contained in:
Jon Chambers
2026-01-28 17:24:12 -05:00
committed by ravi-signal
parent ff8194ae5f
commit c0d0d5f5da
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
service/src/main/java/org/whispersystems/textsecuregcm/telephony/hlrlookup/HlrLookupCarrierDataProvider.java
View File

@@ -147,7 +147,8 @@ public class HlrLookupCarrierDataProvider implements CarrierDataProvider {
networkDetails.name(),
lineType(result.telephoneNumberType()),
mccFromMccMnc(networkDetails.mccmnc()),
mncFromMccMnc(networkDetails.mccmnc()), Optional.empty()));
mncFromMccMnc(networkDetails.mccmnc()),
isPorted(result.isPorted())));
}
private static Tag getCreditsSpentTag(final HlrLookupResult hlrLookupResult) {
@@ -174,15 +175,12 @@ public class HlrLookupCarrierDataProvider implements CarrierDataProvider {
@VisibleForTesting
static CarrierData.LineType lineType(@Nullable final String telephoneNumberType) {
if (telephoneNumberType == null) {
return CarrierData.LineType.UNKNOWN;
}
return switch (telephoneNumberType) {
case "MOBILE" -> CarrierData.LineType.MOBILE;
case "LANDLINE", "MOBILE_OR_LANDLINE" -> CarrierData.LineType.LANDLINE;
case "VOIP" -> CarrierData.LineType.NON_FIXED_VOIP;
case "UNKNOWN" -> CarrierData.LineType.UNKNOWN;
case null -> CarrierData.LineType.UNKNOWN;
default -> CarrierData.LineType.OTHER;
};
}
@@ -198,6 +196,15 @@ public class HlrLookupCarrierDataProvider implements CarrierDataProvider {
return Optional.empty();
}
@VisibleForTesting
static Optional<Boolean> isPorted(@Nullable final String isPorted) {
return switch (isPorted) {
case "YES" -> Optional.of(true);
case "NO" -> Optional.of(false);
case null, default -> Optional.empty();
};
}
@VisibleForTesting
static HlrLookupResponse parseResponse(final String responseJson) throws JsonProcessingException {
return OBJECT_MAPPER.readValue(responseJson, HlrLookupResponse.class);

3
service/src/main/java/org/whispersystems/textsecuregcm/telephony/hlrlookup/HlrLookupResult.java
View File

@@ -15,5 +15,6 @@ record HlrLookupResult(String error,
NetworkDetails originalNetworkDetails,
String currentNetwork,
NetworkDetails currentNetworkDetails,
String telephoneNumberType) {
String telephoneNumberType,
String isPorted) {
}