From 490b797319fb5dafb20dbe892bc873d34352f207 Mon Sep 17 00:00:00 2001 From: lkorth Date: Fri, 8 Jan 2016 11:11:33 -0500 Subject: [PATCH] Fix NPE in DeviceMetadata Fixes #77 --- .../main/java/com/braintreepayments/api/DeviceMetadata.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BraintreeApi/src/main/java/com/braintreepayments/api/DeviceMetadata.java b/BraintreeApi/src/main/java/com/braintreepayments/api/DeviceMetadata.java index 620326afc2..2fb87fafa5 100644 --- a/BraintreeApi/src/main/java/com/braintreepayments/api/DeviceMetadata.java +++ b/BraintreeApi/src/main/java/com/braintreepayments/api/DeviceMetadata.java @@ -78,7 +78,10 @@ static String isDeviceRooted() { static String getNetworkType(Context context) { ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - return connectivityManager.getActiveNetworkInfo().getTypeName(); + if (connectivityManager.getActiveNetworkInfo() != null) { + return connectivityManager.getActiveNetworkInfo().getTypeName(); + } + return "none"; } /**