mirror of https://github.com/M66B/NetGuard.git
Simplification
This commit is contained in:
parent
24dbd89fa3
commit
cfd56e2e03
|
@ -426,19 +426,16 @@ public class Util {
|
||||||
Method getNetworkOperator = null;
|
Method getNetworkOperator = null;
|
||||||
Method getNetworkOperatorName = null;
|
Method getNetworkOperatorName = null;
|
||||||
Method getDataEnabled = null;
|
Method getDataEnabled = null;
|
||||||
Method isNetworkRoaming = null;
|
|
||||||
try {
|
try {
|
||||||
getNetworkCountryIso = tm.getClass().getMethod("getNetworkCountryIsoForSubscription", int.class);
|
getNetworkCountryIso = tm.getClass().getMethod("getNetworkCountryIsoForSubscription", int.class);
|
||||||
getNetworkOperator = tm.getClass().getMethod("getNetworkOperatorForSubscription", int.class);
|
getNetworkOperator = tm.getClass().getMethod("getNetworkOperatorForSubscription", int.class);
|
||||||
getNetworkOperatorName = tm.getClass().getMethod("getNetworkOperatorName", int.class);
|
getNetworkOperatorName = tm.getClass().getMethod("getNetworkOperatorName", int.class);
|
||||||
getDataEnabled = tm.getClass().getMethod("getDataEnabled", int.class);
|
getDataEnabled = tm.getClass().getMethod("getDataEnabled", int.class);
|
||||||
isNetworkRoaming = tm.getClass().getMethod("isNetworkRoaming", int.class);
|
|
||||||
|
|
||||||
getNetworkCountryIso.setAccessible(true);
|
getNetworkCountryIso.setAccessible(true);
|
||||||
getNetworkOperator.setAccessible(true);
|
getNetworkOperator.setAccessible(true);
|
||||||
getNetworkOperatorName.setAccessible(true);
|
getNetworkOperatorName.setAccessible(true);
|
||||||
getDataEnabled.setAccessible(true);
|
getDataEnabled.setAccessible(true);
|
||||||
isNetworkRoaming.setAccessible(true);
|
|
||||||
} catch (NoSuchMethodException ex) {
|
} catch (NoSuchMethodException ex) {
|
||||||
Log.w(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
|
Log.w(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
|
||||||
}
|
}
|
||||||
|
@ -462,8 +459,7 @@ public class Util {
|
||||||
if (getNetworkCountryIso != null &&
|
if (getNetworkCountryIso != null &&
|
||||||
getNetworkOperator != null &&
|
getNetworkOperator != null &&
|
||||||
getNetworkOperatorName != null &&
|
getNetworkOperatorName != null &&
|
||||||
getDataEnabled != null &&
|
getDataEnabled != null)
|
||||||
isNetworkRoaming != null)
|
|
||||||
try {
|
try {
|
||||||
sb.append("Network ")
|
sb.append("Network ")
|
||||||
.append(si.getSimSlotIndex() + 1)
|
.append(si.getSimSlotIndex() + 1)
|
||||||
|
@ -475,7 +471,7 @@ public class Util {
|
||||||
.append(getNetworkOperator.invoke(tm, si.getSubscriptionId()))
|
.append(getNetworkOperator.invoke(tm, si.getSubscriptionId()))
|
||||||
.append(' ')
|
.append(' ')
|
||||||
.append(getNetworkOperatorName.invoke(tm, si.getSubscriptionId()))
|
.append(getNetworkOperatorName.invoke(tm, si.getSubscriptionId()))
|
||||||
.append((boolean) isNetworkRoaming.invoke(tm, si.getSubscriptionId()) ? " R" : "")
|
.append(sm.isNetworkRoaming(si.getSubscriptionId()) ? " R" : "")
|
||||||
.append(' ')
|
.append(' ')
|
||||||
.append(String.format("%B", getDataEnabled.invoke(tm, si.getSubscriptionId())))
|
.append(String.format("%B", getDataEnabled.invoke(tm, si.getSubscriptionId())))
|
||||||
.append("\r\n");
|
.append("\r\n");
|
||||||
|
|
Loading…
Reference in New Issue