Fix conversion error if attribute is null

Author: Louuke

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     // Apply the java-library plugin to add support for Java Library
     id 'java-library'
-    id "com.github.johnrengelman.shadow" version "6.0.0"
+    id "com.github.johnrengelman.shadow" version "6.1.0"
 }
 
 jar {
@@ -11,32 +11,33 @@ jar {
 }
 
 repositories {
-    // Use jcenter for resolving dependencies.
-    // You can declare any Maven/Ivy/file repository here.
-    jcenter()
+	mavenCentral()
 }
 
 dependencies {
 	// This dependency is used internally, and not exposed to consumers on their own compile classpath.
 	implementation 'com.google.guava:guava:28.0-jre'
 
+	// https://mvnrepository.com/artifact/com.google.code.gson/gson
 	implementation 'com.google.code.gson:gson:2.8.6'
 
 	// https://mvnrepository.com/artifact/commons-codec/commons-codec
-	compile group: 'commons-codec', name: 'commons-codec', version: '1.14'
+	implementation group: 'commons-codec', name: 'commons-codec', version: '1.14'
 
 	// https://mvnrepository.com/artifact/commons-io/commons-io
-	compile group: 'commons-io', name: 'commons-io', version: '2.7'
+	implementation group: 'commons-io', name: 'commons-io', version: '2.7'
 
 	// https://mvnrepository.com/artifact/org.whispersystems/curve25519-java
-	compile group: 'org.whispersystems', name: 'curve25519-java', version: '0.5.0'
+	implementation group: 'org.whispersystems', name: 'curve25519-java', version: '0.5.0'
 
 	// https://mvnrepository.com/artifact/com.google.zxing/core
-	compile group: 'com.google.zxing', name: 'core', version: '3.4.0'
-	
-	compile group: 'at.favre.lib', name: 'hkdf', version: '1.0.2'
+	implementation group: 'com.google.zxing', name: 'core', version: '3.4.0'
+
+	// https://mvnrepository.com/artifact/at.favre.lib/hkdf
+	implementation group: 'at.favre.lib', name: 'hkdf', version: '1.0.2'
 
-	compile 'com.neovisionaries:nv-websocket-client:2.10'
+	// https://mvnrepository.com/artifact/com.neovisionaries/nv-websocket-client
+	implementation group: 'com.neovisionaries', name: 'nv-websocket-client', version: '2.10'
 
 	// Use JUnit test framework
 	testImplementation 'junit:junit:4.12'

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

@@ -64,7 +64,7 @@ public WAClient(String authCredentialsPath) {
 	public WAClient openConnection() {
 		try {
 			disconnect();
-			
+
 			WebSocketFactory factory = new WebSocketFactory();
 			ws = factory.createSocket(WHATSAPP_SERVER);
 			ws.addHeader("Origin", HEADER_ORIGIN);

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

@@ -55,41 +55,43 @@ private static String generateMessageID() {
 	 */
 	public static Object[] jsonToObject(String json) {
 		JsonArray node = JsonParser.parseString(json).getAsJsonArray();
-		
-		JsonObject attributes = node.get(1).getAsJsonObject();
-		// Attributes key values
-		Set<String> keys = attributes.keySet();
-		
-		// Contains node content
-		JsonArray childrenArray = node.get(2).getAsJsonArray();
-		
 		Object[] objects = null;
-		
-		if(keys.contains("add")) { // Generic message
-			objects = messageToObject(childrenArray);
-		} else if(!keys.contains("duplicate") && keys.contains("type")) {
-			
-			String typeValue = attributes.get("type").getAsString();
-			
-			switch(typeValue) {
-				case "message":
-					// Also generic message but gets called as response of the loadConversation() method
-					objects = messageToObject(childrenArray);
-					break;
-				case "chat":
-					objects = chatToObject(childrenArray);
-					break;
-				case "contacts":
-					objects = contactToObject(childrenArray);
-					break;
-				case "status":
-					objects = statusToObject(childrenArray);
-					break;
-				case "emoji":
-					objects = emojiToObject(childrenArray);
-					break;
+
+		if(node.get(1) != null) {
+			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("add")) { // Generic message
+				objects = messageToObject(childrenArray);
+			} else if(!keys.contains("duplicate") && keys.contains("type")) {
+
+				String typeValue = attributes.get("type").getAsString();
+
+				switch(typeValue) {
+					case "message":
+						// Also generic message but gets called as response of the loadConversation() method
+						objects = messageToObject(childrenArray);
+						break;
+					case "chat":
+						objects = chatToObject(childrenArray);
+						break;
+					case "contacts":
+						objects = contactToObject(childrenArray);
+						break;
+					case "status":
+						objects = statusToObject(childrenArray);
+						break;
+					case "emoji":
+						objects = emojiToObject(childrenArray);
+						break;
+				}
 			}
 		}
+
 		return objects;
 	}
 

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

@@ -91,7 +91,7 @@ public static String buildWebsocketJsonRequest(int requestType, String... conten
 
 		switch(requestType) {
 			case RequestType.LOGIN:
-				request = "[\"admin\",\"init\",[2,2117,5],[\"Ubuntu\",\"Firefox\",\"Unknown\"],\""
+				request = "[\"admin\",\"init\",[2,2035,14],[\"Ubuntu\",\"Firefox\",\"Unknown\"],\""
 						+ "" + content[0] + "\",true]";
 				break;
 			case RequestType.RESTORE_SESSION: