Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix phone number serialization #1207

Merged
merged 7 commits into from
Oct 27, 2022
Merged

Fix phone number serialization #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a3d0462
Fix phone number serialization
maximrytych-ms Oct 19, 2022
47f7397
Fix version
maximrytych-ms Oct 20, 2022
c2ce341
Fix version
maximrytych-ms Oct 24, 2022
8c501ff
Change version in readme
maximrytych-ms Oct 24, 2022
75b418d
Fix version
maximrytych-ms Oct 25, 2022
46c9c1e
Revert version changes
maximrytych-ms Oct 26, 2022
5798dd9
Add bugfix comment to the changelog
maximrytych-ms Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sdk/communication/azure-communication-common/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
### Breaking Changes

### Bugs Fixed
- Fixed the logic of `PhoneNumberIdentifier` to always maintain the original phone number string whether it included the leading + sign or not.

### Other Changes

Expand Down
2 changes: 1 addition & 1 deletion ...-common/src/main/java/com/azure/android/communication/common/CommunicationIdentifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static CommunicationIdentifier fromRawId(String rawId) {
}

if (rawId.startsWith("4:")) {
return new PhoneNumberIdentifier("+" + rawId.substring("4:".length()));
return new PhoneNumberIdentifier(rawId.substring("4:".length()));
}
final String[] segments = rawId.split(":");
if (segments.length < 3) {
Expand Down
2 changes: 1 addition & 1 deletion ...on-common/src/main/java/com/azure/android/communication/common/PhoneNumberIdentifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public PhoneNumberIdentifier(String phoneNumber) {
throw new IllegalArgumentException("The initialization parameter [phoneNumber] cannot be null to empty.");
}
this.phoneNumber = phoneNumber;
this.setRawId("4:" + phoneNumber.replaceAll("^[+]", ""));
this.setRawId("4:" + phoneNumber);
}

/**
Expand Down
22 changes: 17 additions & 5 deletions ...on/src/test/java/com/azure/android/communication/common/CommunicationIdentifierTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ public void rawIdTakesPrecedenceInEqualityCheck() {
new PhoneNumberIdentifier("+14255550123").setRawId("Another Raw Id"));

assertEquals(new PhoneNumberIdentifier("+override").setRawId("4:14255550123"),
new PhoneNumberIdentifier("+14255550123"));
new PhoneNumberIdentifier("14255550123"));
assertEquals(new PhoneNumberIdentifier("+14255550123"),
new PhoneNumberIdentifier("+override").setRawId("4:14255550123"));
new PhoneNumberIdentifier("+override").setRawId("4:+14255550123"));
}

@Test
Expand All @@ -84,8 +84,12 @@ public void getRawIdOfIdentifier()
assertRawId(new MicrosoftTeamsUserIdentifier("45ab2481-1c1c-4005-be24-0ffb879b1130", false), "8:orgid:45ab2481-1c1c-4005-be24-0ffb879b1130");
assertRawId(new MicrosoftTeamsUserIdentifier("45ab2481-1c1c-4005-be24-0ffb879b1130", true), "8:teamsvisitor:45ab2481-1c1c-4005-be24-0ffb879b1130");
assertRawId(new MicrosoftTeamsUserIdentifier("45ab2481-1c1c-4005-be24-0ffb879b1130", true).setRawId("8:orgid:legacyFormat"), "8:orgid:legacyFormat");
assertRawId(new PhoneNumberIdentifier("+112345556789"), "4:112345556789");
assertRawId(new PhoneNumberIdentifier("+112345556789"), "4:+112345556789");
assertRawId(new PhoneNumberIdentifier("112345556789"), "4:112345556789");
assertRawId(new PhoneNumberIdentifier("+112345556789").setRawId("4:otherFormat"), "4:otherFormat");
assertRawId(new PhoneNumberIdentifier("otherFormat").setRawId("4:207ffef6-9444-41fb-92ab-20eacaae2768"), "4:207ffef6-9444-41fb-92ab-20eacaae2768");
assertRawId(new PhoneNumberIdentifier("otherFormat").setRawId("4:207ffef6-9444-41fb-92ab-20eacaae2768_207ffef6-9444-41fb-92ab-20eacaae2768"), "4:207ffef6-9444-41fb-92ab-20eacaae2768_207ffef6-9444-41fb-92ab-20eacaae2768");
assertRawId(new PhoneNumberIdentifier("otherFormat").setRawId("4:+112345556789_207ffef6-9444-41fb-92ab-20eacaae2768"), "4:+112345556789_207ffef6-9444-41fb-92ab-20eacaae2768");
assertRawId(new UnknownIdentifier("28:45ab2481-1c1c-4005-be24-0ffb879b1130"), "28:45ab2481-1c1c-4005-be24-0ffb879b1130");
assertRawId(new UnknownIdentifier("someFutureFormat"), "someFutureFormat");
}
Expand All @@ -103,8 +107,12 @@ public void createIdentifierFromRawId()
assertIdentifier("8:gcch:45ab2481-1c1c-4005-be24-0ffb879b1130", new MicrosoftTeamsUserIdentifier("45ab2481-1c1c-4005-be24-0ffb879b1130", false).setCloudEnvironment(CommunicationCloudEnvironment.GCCH));
assertIdentifier("8:teamsvisitor:45ab2481-1c1c-4005-be24-0ffb879b1130", new MicrosoftTeamsUserIdentifier("45ab2481-1c1c-4005-be24-0ffb879b1130", true).setCloudEnvironment(CommunicationCloudEnvironment.PUBLIC));
assertIdentifier("8:orgid:legacyFormat", new MicrosoftTeamsUserIdentifier("legacyFormat", false).setCloudEnvironment(CommunicationCloudEnvironment.PUBLIC));
assertIdentifier("4:112345556789", new PhoneNumberIdentifier("+112345556789"));
assertIdentifier("4:otherFormat", new PhoneNumberIdentifier("+otherFormat"));
assertIdentifier("4:112345556789", new PhoneNumberIdentifier("112345556789"));
assertIdentifier("4:+112345556789", new PhoneNumberIdentifier("+112345556789"));
assertIdentifier("4:otherFormat", new PhoneNumberIdentifier("otherFormat"));
assertIdentifier("4:207ffef6-9444-41fb-92ab-20eacaae2768", new PhoneNumberIdentifier("207ffef6-9444-41fb-92ab-20eacaae2768"));
assertIdentifier("4:207ffef6-9444-41fb-92ab-20eacaae2768_207ffef6-9444-41fb-92ab-20eacaae2768", new PhoneNumberIdentifier("207ffef6-9444-41fb-92ab-20eacaae2768_207ffef6-9444-41fb-92ab-20eacaae2768"));
assertIdentifier("4:+112345556789_207ffef6-9444-41fb-92ab-20eacaae2768", new PhoneNumberIdentifier("+112345556789_207ffef6-9444-41fb-92ab-20eacaae2768"));
assertIdentifier("28:45ab2481-1c1c-4005-be24-0ffb879b1130", new UnknownIdentifier("28:45ab2481-1c1c-4005-be24-0ffb879b1130"));

final IllegalArgumentException illegalArgumentException = assertThrows(IllegalArgumentException.class, () -> CommunicationIdentifier.fromRawId(null));
Expand All @@ -124,8 +132,12 @@ public void rawIdStaysTheSameAfterConversionToIdentifierAndBack()
assertRoundTrip("8:gcch:45ab2481-1c1c-4005-be24-0ffb879b1130");
assertRoundTrip("8:teamsvisitor:45ab2481-1c1c-4005-be24-0ffb879b1130");
assertRoundTrip("8:orgid:legacyFormat");
assertRoundTrip("4:+112345556789");
assertRoundTrip("4:112345556789");
assertRoundTrip("4:otherFormat");
assertRoundTrip("4:207ffef6-9444-41fb-92ab-20eacaae2768");
assertRoundTrip("4:207ffef6-9444-41fb-92ab-20eacaae2768_207ffef6-9444-41fb-92ab-20eacaae2768");
assertRoundTrip("4:+112345556789_207ffef6-9444-41fb-92ab-20eacaae2768");
assertRoundTrip("28:45ab2481-1c1c-4005-be24-0ffb879b1130");
}

Expand Down