cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE in NetworkReceiver

Browse Source
This commit is contained in:
Dominik Schürmann
2016-05-12 15:05:01 +03:00
parent f44bd23622
commit 74d4421ab0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/receiver/NetworkReceiver.java
View File

@@ -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) {