From 62ee4681b03fafe8b59492210b2ba5cd9b0ff1bc Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 17 Nov 2015 21:05:55 +0100 Subject: [PATCH] Fixed crash --- .../eu/faircode/netguard/ActivitySettings.java | 15 ++++++++------- .../main/java/eu/faircode/netguard/Util.java | 17 +++++++++-------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index 85ae83d8..fceb919b 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -176,13 +176,14 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere sb.append(String.format("Interactive %B\r\n", Util.isInteractive(this))); for (Network network : cm.getAllNetworks()) { NetworkInfo ni = cm.getNetworkInfo(network); - sb.append(ni.getTypeName()) - .append("/") - .append(ni.getSubtypeName()) - .append(" ") - .append(ni.getDetailedState()) - .append(ni.isRoaming() ? " ROAMING" : "") - .append("\r\n"); + if (ni != null) + sb.append(ni.getTypeName()) + .append("/") + .append(ni.getSubtypeName()) + .append(" ") + .append(ni.getDetailedState()) + .append(ni.isRoaming() ? " ROAMING" : "") + .append("\r\n"); } sb.append(String.format("WiFi %B\r\n", Util.isWifiActive(this))); sb.append(String.format("Metered %B\r\n", Util.isMeteredNetwork(this))); diff --git a/app/src/main/java/eu/faircode/netguard/Util.java b/app/src/main/java/eu/faircode/netguard/Util.java index ea0a9580..2d07bbdb 100644 --- a/app/src/main/java/eu/faircode/netguard/Util.java +++ b/app/src/main/java/eu/faircode/netguard/Util.java @@ -176,14 +176,15 @@ public class Util { ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); for (Network network : cm.getAllNetworks()) { NetworkInfo ni = cm.getNetworkInfo(network); - sb.append("Network: ") - .append(ni.getTypeName()) - .append("/") - .append(ni.getSubtypeName()) - .append(" ") - .append(ni.getDetailedState()) - .append(ni.isRoaming() ? " R" : "") - .append("\r\n"); + if (ni != null) + sb.append("Network: ") + .append(ni.getTypeName()) + .append("/") + .append(ni.getSubtypeName()) + .append(" ") + .append(ni.getDetailedState()) + .append(ni.isRoaming() ? " R" : "") + .append("\r\n"); } SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);