filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow call to phone numbers or voice mail numbers only am: 8b347325fa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1331094

Change-Id: Iaa1761772b4e7991e009fce48e692a99ebe09150
This commit is contained in:
Taesu Lee
2020-06-11 19:05:57 +00:00
committed by Automerger Merge Worker
parent 638c7a6817 8b347325fa
commit d067695cd8
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/messaging/datamodel/data/ConversationData.java
View File

@@ -700,7 +700,7 @@ public class ConversationData extends BindableData {
final ParticipantData participant = this.getOtherParticipant();
if (participant != null) {
final String phoneNumber = participant.getSendDestination();
if (!TextUtils.isEmpty(phoneNumber) && MmsSmsUtils.isDialable(phoneNumber)) {
if (!TextUtils.isEmpty(phoneNumber) && MmsSmsUtils.isPhoneNumber(phoneNumber)) {
return phoneNumber;
}
}

30
src/com/android/messaging/sms/MmsSmsUtils.java
View File

@@ -100,25 +100,29 @@ public class MmsSmsUtils {
return match.matches();
}
/** True if c is ISO-LATIN characters 0-9, *, # , + */
public static final boolean isDialable(char c) {
return (c >= '0' && c <= '9') || c == '*' || c == '#' || c == '+';
}
/**
* This pattern is intended for searching for carrier specific phone numbers starting with star
* sign and digits such as the voice mail number.
* (e.g. *20 Chile Claro)
*/
private static final Pattern PHONE_NUMBER_STARTING_WITH_STAR_PATTERN =
Pattern.compile("\\*[0-9]+");
/**
* Returns true if the address is a dialable phone number.
* Returns true if the number is a Phone number
*
* @param address the input address to be tested
* @return true if address is a dialable phone number
* @param number the input number to be tested
* @return true if number is a Phone number
*/
public static boolean isDialable(final String address) {
if (TextUtils.isEmpty(address)) {
public static boolean isPhoneNumber(final String number) {
if (TextUtils.isEmpty(number)) {
return false;
}
for (int i = 0, count = address.length(); i < count; i++) {
if (!isDialable(address.charAt(i))) {
return false;
}
Matcher match = Patterns.PHONE.matcher(number);
if (!match.matches()) {
match = PHONE_NUMBER_STARTING_WITH_STAR_PATTERN.matcher(number);
return match.matches();
}
return true;
}