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

Check whether dialable only am: dbc43316cf am: 45741a4489 am: f1f488257c

Browse Source 
Change-Id: Ie4dba4cb8405e839e8927d0346d1a4c377bf0e82
This commit is contained in:
Taesu Lee
2020-05-25 21:36:43 +00:00
committed by Automerger Merge Worker
parent 167852a942 f1f488257c
commit 395876eb17
2 changed files with 17 additions and 9 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(); final ParticipantData participant = this.getOtherParticipant();
if (participant != null) { if (participant != null) {
final String phoneNumber = participant.getSendDestination(); final String phoneNumber = participant.getSendDestination();
if (!TextUtils.isEmpty(phoneNumber) && MmsSmsUtils.isPhoneNumber(phoneNumber)) { if (!TextUtils.isEmpty(phoneNumber) && MmsSmsUtils.isDialable(phoneNumber)) {
return phoneNumber; return phoneNumber;
} }
} }

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

@@ -100,19 +100,27 @@ public class MmsSmsUtils {
return match.matches(); 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 == '+';
}
/** /**
* Returns true if the number is a Phone number * Returns true if the address is a dialable phone number.
* *
* @param number the input number to be tested * @param address the input address to be tested
* @return true if number is a Phone number * @return true if address is a dialable phone number
*/ */
public static boolean isPhoneNumber(final String number) { public static boolean isDialable(final String address) {
if (TextUtils.isEmpty(number)) { if (TextUtils.isEmpty(address)) {
return false; return false;
} }
for (int i = 0, count = address.length(); i < count; i++) {
final Matcher match = Patterns.PHONE.matcher(number); if (!isDialable(address.charAt(i))) {
return match.matches(); return false;
}
}
return true;
} }
/** /**