Fixed a bug which prevented chats or contacts from being loaded

Author: Louuke

build/classes/java/main/icu/jnet/whatsjava/Main$1.class

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

build/classes/java/main/icu/jnet/whatsjava/Main.class

@@ -25,17 +25,17 @@ public static Object[] jsonToObjects(String json) {
 		if(json != null) {
 			JsonArray node = JsonParser.parseString(json).getAsJsonArray();
 
-			if(!node.get(1).isJsonNull() && !node.get(2).isJsonNull()) {
+			if(!node.get(1).isJsonNull()) {
 				JsonObject attributes = node.get(1).getAsJsonObject();
 				// Attributes key values
 				Set<String> keys = attributes.keySet();
 
-				// Contains node content
-				JsonArray childrenArray = node.get(2).getAsJsonArray();
-
 				if (keys.contains("type")) {
 					String typeValue = attributes.get("type").getAsString();
 
+					// Contains node content
+					JsonArray childrenArray = node.get(2).isJsonArray() ? node.get(2).getAsJsonArray() : null;
+
 					switch (typeValue) {
 						case "message":
 							objects = messageToObject(childrenArray);

gradle/wrapper/gradle-wrapper.jar

@@ -10,11 +10,11 @@
 import icu.jnet.whatsjava.listener.ClientActionInterface;
 import icu.jnet.whatsjava.listener.ClientActionListener;
 import icu.jnet.whatsjava.messages.WAMessageParser;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Base64;
+import java.util.List;
 
 public class WABackendConnector extends WebSocketAdapter implements PayloadGenerator {
 
@@ -34,11 +34,8 @@ public class WABackendConnector extends WebSocketAdapter implements PayloadGener
     // WebSocket object that is used for communication with the WhatsApp web server.
     protected WebSocket ws;
 
-    // Last received messages from onTextMessage callback
-    private final TimeLimitedList<String> onTextMessageBuffer = new TimeLimitedList<>();
-    // Last received messages from onBinaryMessage callback
-    private final TimeLimitedList<String> onBinaryMessageBuffer = new TimeLimitedList<>();
-
+    // Last received messages from onTextMessage and onBinaryMessage callback
+    private final List<String> textMessageBuffer = new ArrayList<>();
 
     public WABackendConnector() {
         this.auth = AuthCredentials.loadAuthCredentials(credentialsPath);
@@ -209,19 +206,15 @@ String sendBinary(String json, byte[] waTags, String... search) {
      * @return
      */
     private String waitForTextMessage(String... search) {
+        textMessageBuffer.clear();
         if(search.length > 0) {
             for(int i = 0; i < 200; i++) {
                 for(String s : search) {
-                    for(String message : onTextMessageBuffer) {
+                    for(String message : textMessageBuffer) {
                         if(message.contains(s)) {
                             return message;
                         }
                     }
-                    for(String message : onBinaryMessageBuffer) {
-                        if (message.contains(s)) {
-                            return message;
-                        }
-                    }
                 }
                 Utils.waitMill(100);
             }
@@ -231,7 +224,7 @@ private String waitForTextMessage(String... search) {
 
     @Override
     public void onTextMessage(WebSocket websocket, String message) throws Exception {
-        onTextMessageBuffer.add(message);
+        textMessageBuffer.add(message);
     }
 
     @Override
@@ -241,7 +234,7 @@ public void onBinaryMessage(WebSocket websocket, byte[] binaryMessage) throws Ex
 
         // Use protobuf to make messages of the type "message" human readable
         String decoded = new BinaryDecoder().decode(decrypted);
-        onBinaryMessageBuffer.add(decoded);
+        textMessageBuffer.add(decoded);
         WAMessageParser.jsonToObjects(decoded);
     }