bcarrella
/
YetAnotherCallBlocker
mirror of https://gitlab.com/xynngh/YetAnotherCallBlocker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'normalize-numbers' into 'master' 

Search blacklist using normalized numbers too

Closes #73

See merge request xynngh/YetAnotherCallBlocker!39
This commit is contained in:
Leonardo Brondani Schenkel 2024-04-28 15:07:07 +00:00
parent 4bdc8be733 4d041bc2b8
commit 9e979cc179
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/dummydomain/yetanothercallblocker/data/NumberInfoService.java
View File

@ -1,5 +1,6 @@
package dummydomain.yetanothercallblocker.data;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import org.slf4j.Logger;
@ -8,6 +9,7 @@ import org.slf4j.LoggerFactory;
import java.util.Date;
import dummydomain.yetanothercallblocker.Settings;
import dummydomain.yetanothercallblocker.data.db.BlacklistItem;
import dummydomain.yetanothercallblocker.sia.model.database.CommunityDatabase;
import dummydomain.yetanothercallblocker.sia.model.database.CommunityDatabaseItem;
import dummydomain.yetanothercallblocker.sia.model.database.FeaturedDatabase;
@ -116,7 +118,12 @@ public class NumberInfoService {
if (blacklistService != null && settings.getBlacklistIsNotEmpty()) {
// avoid loading blacklist if blocking for other reason
if (full || getBlockingReason(numberInfo) == null) {
numberInfo.blacklistItem = blacklistService.getBlacklistItemForNumber(number);
BlacklistItem item = blacklistService.getBlacklistItemForNumber(number);
// try normalized number as well:
if(item == null) {
item = blacklistService.getBlacklistItemForNumber(normalizedNumber);
}
numberInfo.blacklistItem = item;
}
}
LOG.trace("getNumberInfo() blacklistItem={}", numberInfo.blacklistItem);