diff options
Diffstat (limited to 'src/com/android/messaging/util/BlacklistSync.java')
| -rw-r--r-- | src/com/android/messaging/util/BlacklistSync.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/messaging/util/BlacklistSync.java b/src/com/android/messaging/util/BlacklistSync.java index 44253c4..3ab14d8 100644 --- a/src/com/android/messaging/util/BlacklistSync.java +++ b/src/com/android/messaging/util/BlacklistSync.java @@ -54,6 +54,8 @@ public class BlacklistSync extends AsyncTask<Void, Void, Void> { if (cursor != null && cursor.getCount() > 0) { int normalizedNumberIndex = cursor.getColumnIndex("normalized_number"); int blockedIndex = cursor.getColumnIndex("message"); + int nonNormalizedNumberIndex = cursor.getColumnIndex("number"); + int regexIndex = cursor.getColumnIndex("is_regex"); int updateCount; if (normalizedNumberIndex < 0 || blockedIndex < 0) { cursor.close(); @@ -66,6 +68,8 @@ public class BlacklistSync extends AsyncTask<Void, Void, Void> { String number = cursor.getString(normalizedNumberIndex); String blocked = cursor.getString(blockedIndex); boolean isBlocked = blocked.compareTo("1") == 0; + String formattedNumber = cursor.getInt(regexIndex) != 0 + ? cursor.getString(nonNormalizedNumberIndex) : null; updateCount = BugleDatabaseOperations.updateDestination(db, number, isBlocked, false); if (updateCount == 0) { @@ -75,7 +79,7 @@ public class BlacklistSync extends AsyncTask<Void, Void, Void> { db.beginTransaction(); try { ParticipantData participant = ParticipantData - .getFromRawPhoneBySystemLocale(number); + .getFromRawPhoneBySystemLocale(number, formattedNumber); BugleDatabaseOperations.getOrCreateParticipantInTransaction(db, participant); BugleDatabaseOperations.updateDestination(db, number, |