Merge pull request #367 from bugsnag/null-system-service

Add Null check when accessing system service
bugsnag · Aug 21, 2018 · b689975 · b689975
2 parents fe08a88 + 023f8ff
commit b689975
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Bug fixes
 
 * Catch Exception within DefaultDelivery class [#361](https://github.com/bugsnag/bugsnag-android/pull/361)
+* Add Null check when accessing system service [#367](https://github.com/bugsnag/bugsnag-android/pull/367)
 
 ## 4.6.0 (2018-08-02)
 

diff --git a/sdk/src/main/java/com/bugsnag/android/Client.java b/sdk/src/main/java/com/bugsnag/android/Client.java
@@ -233,6 +233,10 @@ private class ConnectivityChangeReceiver extends BroadcastReceiver {
         public void onReceive(Context context, Intent intent) {
             ConnectivityManager cm =
                 (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+            if (cm == null) {
+                return;
+            }
+
             NetworkInfo networkInfo = cm.getActiveNetworkInfo();
             boolean retryReports = networkInfo != null && networkInfo.isConnectedOrConnecting();
 

diff --git a/sdk/src/main/java/com/bugsnag/android/DefaultDelivery.java b/sdk/src/main/java/com/bugsnag/android/DefaultDelivery.java
@@ -2,6 +2,7 @@
 
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.support.annotation.Nullable;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -15,9 +16,9 @@
 class DefaultDelivery implements Delivery {
 
     private static final int HTTP_REQUEST_FAILED = 0;
-    private final ConnectivityManager connectivityManager;
+    @Nullable private final ConnectivityManager connectivityManager;
 
-    DefaultDelivery(ConnectivityManager connectivityManager) {
+    DefaultDelivery(@Nullable ConnectivityManager connectivityManager) {
         this.connectivityManager = connectivityManager;
     }
 
@@ -89,6 +90,10 @@ int deliver(String urlString,
     }
 
     private void checkHasNetworkConnection() throws DeliveryFailureException {
+        if (connectivityManager == null) {
+            return; // unlikely case, allow delivery attempt without checking connection first
+        }
+
         NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
 
         // conserve device battery by avoiding radio use

diff --git a/sdk/src/main/java/com/bugsnag/android/DeviceData.java b/sdk/src/main/java/com/bugsnag/android/DeviceData.java
@@ -365,6 +365,11 @@ private String getNetworkAccess() {
         try {
             ConnectivityManager cm =
                 (ConnectivityManager) appContext.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+            if (cm == null) {
+                return null;
+            }
+
             NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
             if (activeNetwork != null && activeNetwork.isConnectedOrConnecting()) {
                 if (activeNetwork.getType() == 1) {