fixed a NPE

git-svn-id: file:///home/svnroot-zephyrsoft/projects/checknetwork/trunk@188 f37aa4ac-6963-46a2-a1ff-558a307fa857
mathisdt · Mar 3, 2013 · 2ab46eb · 2ab46eb
1 parent 9cdbafe
commit 2ab46eb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/org/zephyrsoft/checknetwork/ConnectivityChecker.java b/src/org/zephyrsoft/checknetwork/ConnectivityChecker.java
@@ -38,9 +38,9 @@ protected Void doInBackground(Void... params) {
 				ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
 				NetworkInfo netInfo = cm.getActiveNetworkInfo();
 				String networkType = "unknown";
-				if (netInfo.getType() == ConnectivityManager.TYPE_WIFI) {
+				if (netInfo != null && netInfo.getType() == ConnectivityManager.TYPE_WIFI) {
 					networkType = "wifi";
-				} else if (netInfo.getType() == ConnectivityManager.TYPE_MOBILE) {
+				} else if (netInfo != null && netInfo.getType() == ConnectivityManager.TYPE_MOBILE) {
 					networkType = "mobile data";
 				}
 				boolean connectionOK = (netInfo != null && netInfo.isConnected());
@@ -78,7 +78,7 @@ protected Void doInBackground(Void... params) {
 
 	private void tryToReconnect(Context context, ConnectivityManager cm) {
 		NetworkInfo netInfo = cm.getActiveNetworkInfo();
-		if (netInfo.getType() == ConnectivityManager.TYPE_WIFI) {
+		if (netInfo != null && netInfo.getType() == ConnectivityManager.TYPE_WIFI) {
 			Logger.info("toggling wifi connection");
 			setWifiEnabled(context, false);
 			try {