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

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
  if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
  APP_HOME=`cygpath --path --mixed "$APP_HOME"`
  CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
  JAVACMD=`cygpath --unix "$JAVACMD"`
 
  # We build the pattern for arguments to be converted via cygpath

gradle/wrapper/gradle-wrapper.jar

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradle/wrapper/gradle-wrapper.properties

@@ -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);

gradlew

@@ -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);
  }