5.0.2

Author: unity-thull

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [5.0.2](https://github.com/deltaDNA/android-sdk/releases/tag/5.0.2)
+
+## Fixed
+- Fixed a Null Pointer Exception that could occur when getting an error response from the GeoAPI endpoint
+
 ## [5.0.1](https://github.com/deltaDNA/android-sdk/releases/tag/5.0.1)
 
 ## Fixed

README-CN.md

@@ -43,7 +43,7 @@ allprojects {
 ```
 在你APP的构建脚本
 ```groovy
-compile 'com.deltadna.android:deltadna-sdk:5.0.1'
+compile 'com.deltadna.android:deltadna-sdk:5.0.2'
 ```
 
 ## 初始化

README.md

@@ -49,7 +49,7 @@ allprojects {
 In your app's build script:
 ```groovy
 dependencies {
-    implementation 'com.deltadna.android:deltadna-sdk:5.0.1'
+    implementation 'com.deltadna.android:deltadna-sdk:5.0.2'
 }
 ```
 The Java source and target compatibility needs to be set to 1.8 in you app's build script:

examples/demo-forget-me/src/main/java/com/deltadna/android/sdk/example/ExampleApplication.java

@@ -53,7 +53,7 @@ public void onSuccess(boolean requiresConsent) {
 
             @Override
             public void onFailure(Throwable exception) {
-                Log.e("EXAMPLE", "Failed to check for PIPL consent", exception);
+                Log.e("EXAMPLE", "Failed to check for PIPL consent " + exception.getMessage(), exception);
                 // Try again later.
             }
         });

examples/demo/src/main/java/com/deltadna/android/sdk/example/ExampleApplication.java

@@ -53,7 +53,7 @@ public void onSuccess(boolean requiresConsent) {
 
             @Override
             public void onFailure(Throwable exception) {
-                Log.e("EXAMPLE", "Failed to check for PIPL consent", exception);
+                Log.e("EXAMPLE", "Failed to check for PIPL consent " + exception.getMessage(), exception);
                 // Try again later.
             }
         });

examples/notifications-style/src/main/java/com/deltadna/android/sdk/notifications/example/ExampleApplication.java

@@ -45,7 +45,7 @@ public void onSuccess(boolean requiresConsent) {
 
             @Override
             public void onFailure(Throwable exception) {
-                Log.e("EXAMPLE", "Failed to check for PIPL consent", exception);
+                Log.e("EXAMPLE", "Failed to check for PIPL consent " + exception.getMessage(), exception);
                 // Try again later.
             }
         });

examples/notifications/src/main/java/com/deltadna/android/sdk/notifications/example/ExampleApplication.java

@@ -46,7 +46,7 @@ public void onSuccess(boolean requiresConsent) {
 
             @Override
             public void onFailure(Throwable exception) {
-                Log.e("EXAMPLE", "Failed to check for PIPL consent", exception);
+                Log.e("EXAMPLE", "Failed to check for PIPL consent " + exception.getMessage(), exception);
                 // Try again later.
             }
         });

gradle.properties

@@ -1,5 +1,5 @@
 GROUP=com.deltadna.android
-VERSION_NAME=5.0.1
+VERSION_NAME=5.0.2
 
 POM_DESCRIPTION=deltaDNA SDK for Android
 POM_URL=https://github.com/deltaDNA/android-sdk

library-notifications/README-CN.md

@@ -41,8 +41,8 @@ allprojects {
 ```
 在你APP的构建脚本
 ```groovy
-compile 'com.deltadna.android:deltadna-sdk:5.0.1'
-compile 'com.deltadna.android:deltadna-sdk-notifications:5.0.1'
+compile 'com.deltadna.android:deltadna-sdk:5.0.2'
+compile 'com.deltadna.android:deltadna-sdk-notifications:5.0.2'
 ```
 
 ## 整合

library-notifications/README.md

@@ -46,8 +46,8 @@ allprojects {
 In your app's build script:
 ```groovy
 dependencies {
-    implementation 'com.deltadna.android:deltadna-sdk:5.0.1'
-    implementation 'com.deltadna.android:deltadna-sdk-notifications:5.0.1'
+    implementation 'com.deltadna.android:deltadna-sdk:5.0.2'
+    implementation 'com.deltadna.android:deltadna-sdk-notifications:5.0.2'
 }
 ```
 

library/src/main/java/com/deltadna/android/sdk/consent/GeoIpNetworkClient.java

@@ -30,6 +30,22 @@ public void fetchGeoIpResponse(Callback callback) {
             @Override
             public void onCompleted(Response<JSONObject> response) {
                 try {
+                    if (response == null) {
+                        callback.OnFailure(new Exception("GeoIP returned a null response, please try again."));
+                        return;
+                    }
+                    if (!response.isSuccessful()) {
+                        String errorMessage = "GeoIP request failed with error code " + response.code;
+                        if (response.error != null) {
+                            errorMessage += " " + response.error;
+                        }
+                        callback.OnFailure(new Exception(errorMessage));
+                        return;
+                    }
+                    if (response.body == null) {
+                        callback.OnFailure(new Exception("GeoIP returned a null body but a success code, this may indicate an unexpected response. Please try again."));
+                        return;
+                    }
                     String identifier = response.body.getString("identifier");
                     callback.OnSuccess(identifier);
                 } catch (JSONException e) {