From ba0d6915e95cb47072cc20bb9ce2b99a2293211a Mon Sep 17 00:00:00 2001
From: imhao183 <wildfirechat86@gmail.com>
Date: Fri, 23 Apr 2021 10:51:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=97=A7=E7=9A=84IM=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/wildfirechat/push/Utility.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/wildfirechat/push/Utility.java b/src/main/java/cn/wildfirechat/push/Utility.java
index 95df12e..f8cc5e9 100644
--- a/src/main/java/cn/wildfirechat/push/Utility.java
+++ b/src/main/java/cn/wildfirechat/push/Utility.java
@@ -6,6 +6,7 @@ import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
 
 public class Utility {
     private static final Logger LOG = LoggerFactory.getLogger(Utility.class);
@@ -33,7 +34,7 @@ public class Utility {
         }
 
         int reason = -1;
-        if (pushData != null) {
+        if (!StringUtils.isEmpty(pushData)) {
             try {
                 JSONObject object = (JSONObject) (new JSONParser().parse(pushData));
                 Object oEndReason = object.get("r");
@@ -48,7 +49,10 @@ public class Utility {
             } catch (ParseException e) {
                 e.printStackTrace();
             }
+        } else {
+            return false;
         }
+
         LOG.info("End call reason is {}, convType is {}", reason, conversationType);
         if(reason > 0) {
             if(conversationType == 0) {