Android/lineage-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SensitivePn: Take into account multiple SIMs for sensitive numbers

Browse Source 
* Instead of only checking the current or default MCC to hide a number,
  see if any of the connected networks would hide a number
* This makes sure that e.g. for multiple sims (e.g. living next to the
  country border, having one sim for each country) and accidentially using
  the wrong sim for a call, the number would still get hidden

Change-Id: I2692d00217d3143fd55122cee9064528bb09352d
This commit is contained in:
Michael W
2019-09-07 23:26:35 +02:00
committed by Luca Stefani
parent f4e2968123
commit b5462e3657
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sdk/src/java/org/lineageos/internal/phone/SensitivePhoneNumbers.java
View File

@@ -20,6 +20,7 @@ package org.lineageos.internal.phone;
import android.content.Context;
import android.os.Environment;
import android.telephony.PhoneNumberUtils;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
@@ -35,6 +36,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
public class SensitivePhoneNumbers {
private final String LOG_TAG = this.getClass().getSimpleName();
@@ -96,17 +98,37 @@ public class SensitivePhoneNumbers {
}
public boolean isSensitiveNumber(Context context, String numberToCheck, int subId) {
TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
subId = SubscriptionManager.getDefaultSubscriptionId();
List<SubscriptionInfo> list = subManager.getActiveSubscriptionInfoList();
if (list != null) {
// Test all subscriptions so an accidential use of a wrong sim also hides the number
for (SubscriptionInfo subInfo : list) {
String mcc = String.valueOf(subInfo.getMcc());
if (isSensitiveNumber(numberToCheck, mcc)) {
return true;
}
}
} else {
// Fall back to check with the passed subId
TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
subId = SubscriptionManager.getDefaultSubscriptionId();
}
String networkUsed = telephonyManager.getNetworkOperator(subId);
if (!TextUtils.isEmpty(networkUsed)) {
String networkMCC = networkUsed.substring(0, 3);
return isSensitiveNumber(numberToCheck, networkMCC);
}
}
String networkUsed = telephonyManager.getNetworkOperator(subId);
if (!TextUtils.isEmpty(networkUsed)) {
String networkMCC = networkUsed.substring(0, 3);
if (mSensitiveNumbersMap.containsKey(networkMCC)) {
for (String num : mSensitiveNumbersMap.get(networkMCC)) {
return false;
}
private boolean isSensitiveNumber(String numberToCheck, String mcc) {
if (!TextUtils.isEmpty(numberToCheck)) {
if (mSensitiveNumbersMap.containsKey(mcc)) {
for (String num : mSensitiveNumbersMap.get(mcc)) {
if (PhoneNumberUtils.compare(numberToCheck, num)) {
return true;
}