Skip to content
This repository has been archived by the owner on May 15, 2024. It is now read-only.

Fixes #1661 use passed in phone as fallback if can't format #1756

Merged
merged 2 commits into from
Jul 12, 2021
Merged

Fixes #1661 use passed in phone as fallback if can't format #1756

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f599f48
Fixes #1661 use passed in phone as fallback if can't format
jamesmontemagno Apr 13, 2021
dd041a3
Merge branch 'main' into gh-1661
Redth Jul 12, 2021
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
8 changes: 4 additions & 4 deletions Xamarin.Essentials/PhoneDialer/PhoneDialer.android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ static void PlatformOpen(string number)
var phoneNumber = string.Empty;
#if __ANDROID_24__
if (Platform.HasApiLevelN)
phoneNumber = PhoneNumberUtils.FormatNumber(number, Java.Util.Locale.GetDefault(Java.Util.Locale.Category.Format).Country);
phoneNumber = PhoneNumberUtils.FormatNumber(number, Java.Util.Locale.GetDefault(Java.Util.Locale.Category.Format).Country) ?? phoneNumber;
else if (Platform.HasApiLevel(BuildVersionCodes.Lollipop))
#else
if (Platform.HasApiLevel(BuildVersionCodes.Lollipop))
#endif

phoneNumber = PhoneNumberUtils.FormatNumber(number, Java.Util.Locale.Default.Country);
phoneNumber = PhoneNumberUtils.FormatNumber(number, Java.Util.Locale.Default.Country) ?? phoneNumber;
else
#pragma warning disable CS0618
phoneNumber = PhoneNumberUtils.FormatNumber(number);
phoneNumber = PhoneNumberUtils.FormatNumber(number) ?? phoneNumber;
#pragma warning restore CS0618

// if we are an extension then we need to encode
if (phoneNumber.Contains(',') || phoneNumber.Contains(';'))
phoneNumber = URLEncoder.Encode(phoneNumber, "UTF-8");
phoneNumber = URLEncoder.Encode(phoneNumber, "UTF-8") ?? phoneNumber;

var dialIntent = ResolveDialIntent(phoneNumber);

Expand Down