From 74d4421ab08a66428dfd45b64cea8787226150dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 12 May 2016 15:05:01 +0300 Subject: Fix NPE in NetworkReceiver --- .../org/sufficientlysecure/keychain/receiver/NetworkReceiver.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/receiver/NetworkReceiver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/receiver/NetworkReceiver.java index 7c103a9a3..c49ab8a34 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/receiver/NetworkReceiver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/receiver/NetworkReceiver.java @@ -20,8 +20,9 @@ public class NetworkReceiver extends BroadcastReceiver { ConnectivityManager conn = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo networkInfo = conn.getActiveNetworkInfo(); - boolean isTypeWifi = (networkInfo.getType() == ConnectivityManager.TYPE_WIFI); - boolean isConnected = networkInfo.isConnected(); + boolean isTypeWifi = (networkInfo != null) && + (networkInfo.getType() == ConnectivityManager.TYPE_WIFI); + boolean isConnected = (networkInfo != null) && networkInfo.isConnected(); if (isTypeWifi && isConnected) { -- cgit v1.2.3