Merge 286d043 into 30d071d

bugsnag · Aug 20, 2018 · 53cc0fd · 53cc0fd
2 parents 30d071d + 286d043
commit 53cc0fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.X.X (TBD)
+
+### Bug fixes
+
+* Catch Exception within DefaultDelivery class [#361](https://github.com/bugsnag/bugsnag-android/pull/361)
+
 ## 4.6.0 (2018-08-02)
 
 * Android P compatibility fixes - ensure available information on StrictMode violations is collected [#350](https://github.com/bugsnag/bugsnag-android/pull/350)

diff --git a/sdk/src/main/java/com/bugsnag/android/DefaultDelivery.java b/sdk/src/main/java/com/bugsnag/android/DefaultDelivery.java
@@ -14,6 +14,7 @@
 
 class DefaultDelivery implements Delivery {
 
+    private static final int HTTP_BAD_REQUEST = 400;
     private final ConnectivityManager connectivityManager;
 
     DefaultDelivery(ConnectivityManager connectivityManager) {
@@ -79,6 +80,9 @@ int deliver(String urlString,
             return conn.getResponseCode();
         } catch (IOException exception) {
             throw new DeliveryFailureException("IOException encountered in request", exception);
+        } catch (Exception exception) {
+            Logger.warn("Unexpected error delivering payload", exception);
+            return HTTP_BAD_REQUEST;
         } finally {
             IOUtils.close(conn);
         }