Merge pull request #2970 from wordpress-mobile/fix/get-combined-error-message-npe

jd-alexander · web-flow · commit 1dd96169f7b5 · 2024-03-11T14:17:22.000-05:00
Fixed the VolleyError NPE
diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseRequest.java b/fluxc/src/main/java/org/wordpress/android/fluxc/network/BaseRequest.java
@@ -136,6 +136,9 @@ public boolean hasVolleyError() {
         }
 
         public String getCombinedErrorMessage() {
+            if (volleyError == null) {
+                return message != null ? message : "";
+            }
             String volleyErrorMessage = volleyError.getMessage();
             if (volleyErrorMessage == null || volleyErrorMessage.isEmpty()) {
                 return message != null ? message : "";

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,9 @@ public boolean hasVolleyError() {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`public String getCombinedErrorMessage() {`
	`139`	`+ if (volleyError == null) {`
	`140`	`+ return message != null ? message : "";`
	`141`	`+ }`
`139`	`142`	`String volleyErrorMessage = volleyError.getMessage();`
`140`	`143`	`if (volleyErrorMessage == null \|\| volleyErrorMessage.isEmpty()) {`
`141`	`144`	`return message != null ? message : "";`