diff --git a/app/build.gradle b/app/build.gradle index a4fe42df..e1de6087 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ model { applicationId = "eu.faircode.netguard" minSdkVersion.apiLevel = 21 targetSdkVersion.apiLevel = 23 - versionCode = 2015120601 + versionCode = 2015120602 versionName = "0.50" archivesBaseName = "NetGuard-v$versionName-$versionCode" } diff --git a/app/src/main/java/eu/faircode/netguard/Util.java b/app/src/main/java/eu/faircode/netguard/Util.java index 72418b7e..1dbcb07d 100644 --- a/app/src/main/java/eu/faircode/netguard/Util.java +++ b/app/src/main/java/eu/faircode/netguard/Util.java @@ -124,7 +124,12 @@ public class Util { TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) { - int dataSubId = Settings.Global.getInt(context.getContentResolver(), "multi_sim_data_call", -1); + int dataSubId; + try { + dataSubId = Settings.Global.getInt(context.getContentResolver(), "multi_sim_data_call", -1); + } catch (Throwable ignored) { + dataSubId = -1; + } if (dataSubId >= 0) { SubscriptionManager sm = SubscriptionManager.from(context); SubscriptionInfo si = sm.getActiveSubscriptionInfo(dataSubId); @@ -406,7 +411,12 @@ public class Util { .append(sm.getActiveSubscriptionInfoCountMax()) .append("\r\n"); - int dataSubId = Settings.Global.getInt(context.getContentResolver(), "multi_sim_data_call", -1); + int dataSubId; + try { + dataSubId = Settings.Global.getInt(context.getContentResolver(), "multi_sim_data_call", -1); + } catch (Throwable ignored) { + dataSubId = -1; + } Method getNetworkCountryIso = null; Method getNetworkOperator = null; @@ -443,7 +453,11 @@ public class Util { .append(si.getDataRoaming() == SubscriptionManager.DATA_ROAMING_ENABLE ? " R" : "") .append(si.getSubscriptionId() == dataSubId ? " *" : "") .append("\r\n"); - if (getNetworkCountryIso != null && getNetworkOperator != null && getNetworkOperatorName != null && isNetworkRoaming != null) + if (getNetworkCountryIso != null && + getNetworkOperator != null && + getNetworkOperatorName != null && + getDataEnabled != null && + isNetworkRoaming != null) try { sb.append("Network ") .append(si.getSimSlotIndex() + 1)