Change of some internal method names

Author: Louuke

build.gradle

@@ -1,7 +1,6 @@
 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 'java'
+	id "com.github.johnrengelman.shadow" version "6.1.0"
 }
 
 jar {
@@ -22,22 +21,22 @@ dependencies {
 	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'
+	implementation group: 'com.google.zxing', name: 'core', version: '3.4.0'
 
 	// https://mvnrepository.com/artifact/at.favre.lib/hkdf
-	compile group: 'at.favre.lib', name: 'hkdf', version: '1.0.2'
+	implementation group: 'at.favre.lib', name: 'hkdf', version: '1.0.2'
 
 	// https://mvnrepository.com/artifact/com.neovisionaries/nv-websocket-client
-	compile 'com.neovisionaries:nv-websocket-client:2.10'
+	implementation 'com.neovisionaries:nv-websocket-client:2.10'
 
 	// Use JUnit test framework
 	testImplementation 'junit:junit:4.12'

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

@@ -94,8 +94,8 @@ private void login() {
 
 		// Random clientId as 16 base64-encoded bytes
 		String clientId = credentials.getClientId();
-		String loginRequest = Utils.buildWebsocketJsonRequest(RequestType.LOGIN, clientId);
-		
+		String loginRequest = Utils.buildWebSocketJsonRequest(RequestType.LOGIN, clientId);
+
 		ws.sendText(loginRequest);
 	}
 
@@ -105,7 +105,7 @@ private void restoreSession() {
 		String serverToken = credentials.getServerToken();
 		String clientId = credentials.getClientId();
 
-		String restoreRequest = Utils.buildWebsocketJsonRequest(RequestType.RESTORE_SESSION, 
+		String restoreRequest = Utils.buildWebSocketJsonRequest(RequestType.RESTORE_SESSION,
 				clientToken, serverToken, clientId);
 
 		ws.sendText(restoreRequest);
@@ -127,15 +127,15 @@ private void solveChallenge(String message) {
 		String serverToken = credentials.getServerToken();
 		String clientId = credentials.getClientId();
 
-		String challengeRequest = Utils.buildWebsocketJsonRequest(RequestType.SOLVE_CHALLENGE, 
+		String challengeRequest = Utils.buildWebSocketJsonRequest(RequestType.SOLVE_CHALLENGE,
 				signedChallengeBase64, serverToken, clientId);
 
 		ws.sendText(challengeRequest);
 	}
 
 	// QR code expired request a new one
 	protected void requestNewServerId() {
-		ws.sendText(Utils.buildWebsocketJsonRequest(RequestType.NEW_SERVER_ID, ""));
+		ws.sendText(Utils.buildWebSocketJsonRequest(RequestType.NEW_SERVER_ID, ""));
 	}
 
 	// Gets called after a successful login
@@ -219,14 +219,13 @@ public void onTextMessage(WebSocket websocket, String message) {
 		if(message.contains("\"Props\"") && !loggedIn) {
 			confirmLogin();
 		}
-			
 
 		String clientId = credentials.getClientId();
 
         switch(expectedResponse) {
         	// Logging in procedure
         	case ExpectedResponse.LOGIN:
-            	// If we can not find any data of a previous session we create a new one
+            	// If we can not find any information of a previous session we create a new one
 
             	if(credentials.getClientToken() == null) {
             		// Request new qr code
@@ -249,7 +248,7 @@ public void onTextMessage(WebSocket websocket, String message) {
         			int status = Utils.encodeValidJson(message).get("status").getAsInt();
 
         			if(status != 200) {
-        				// A error occurred during authentication
+        				// An error occurred during authentication
         				// Old session data is invalid so it gets deleted
         				AuthCredentialsHelper.deletePreviousSession(authCredentialsPath);
         				disconnect();

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

@@ -83,8 +83,8 @@ public static int getMessageCount() {
 		return wsRequestCount;
 	}
 
-	// Create a new websocket json request string
-	public static String buildWebsocketJsonRequest(int requestType, String... content) {
+	// Create a new WebSocket json request string
+	public static String buildWebSocketJsonRequest(int requestType, String... content) {
 		String messageTag = getMessageTag();
 
 		String request = "";
@@ -110,9 +110,8 @@ public static String buildWebsocketJsonRequest(int requestType, String... conten
 				request = "[\"admin\",\"Conn\",\"reref\"]";
 				break;
 		}
-		
-		request = messageTag + "," + request;
-		return request;
+
+		return messageTag + "," + request;
 	}
 
 	// Create a new WebSocket binary request array