fix JabRef#6487 (draft)

XDZhelheim · Mar 18, 2021 · 5b723bd · 5b723bd
1 parent 2f8e151
commit 5b723bd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/main/java/org/jabref/logic/remote/client/RemoteClient.java b/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
@@ -3,6 +3,8 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 import javafx.util.Pair;
 
@@ -52,7 +54,11 @@ public boolean ping() {
      */
     public boolean sendCommandLineArguments(String[] args) {
         try (Protocol protocol = openNewConnection()) {
-            protocol.sendMessage(RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS, args);
+            String[] encodedArgs = args.clone();
+            for (int i = 0; i < encodedArgs.length; i++) {
+                encodedArgs[i] = URLEncoder.encode(encodedArgs[i], StandardCharsets.UTF_8);
+            }
+            protocol.sendMessage(RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS, encodedArgs);
             Pair<RemoteMessage, Object> response = protocol.receiveMessage();
             return response.getKey() == RemoteMessage.OK;
         } catch (IOException e) {

diff --git a/src/main/java/org/jabref/logic/remote/shared/Protocol.java b/src/main/java/org/jabref/logic/remote/shared/Protocol.java
@@ -4,6 +4,8 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.net.Socket;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 import javafx.util.Pair;
@@ -40,6 +42,9 @@ public void sendMessage(RemoteMessage type) throws IOException {
 
     public void sendMessage(RemoteMessage type, Object argument) throws IOException {
         LOGGER.info("send arg: " + argument.toString());
+//        if (type == RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS && argument instanceof String) {
+//            argument = URLEncoder.encode((String) argument, StandardCharsets.UTF_8);
+//        }
         out.writeObject(type);
         out.writeObject(argument);
         out.write('\0');
@@ -53,10 +58,16 @@ public Pair<RemoteMessage, Object> receiveMessage() throws IOException {
             int endOfMessage = in.read();
 
             LOGGER.info("recv type: " + type.toString());
+            if (type == RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS) {
+                for (int i = 0; i < ((String[]) argument).length; i++) {
+                    ((String[]) argument)[i] = URLDecoder.decode(((String[]) argument)[i], StandardCharsets.UTF_8);
+                }
+            }
+//            if (type == RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS && argument instanceof String) {
+//                argument = URLDecoder.decode((String) argument, StandardCharsets.UTF_8);
+//            }
             if (argument instanceof String[]) {
                 LOGGER.info(Arrays.toString((String[]) argument));
-//                argument = StringUtil.join((String[]) argument, " ", 0, ((String[]) argument).length);
-//                argument = new String[]{(String) argument};
             }
 
             if (endOfMessage != '\0') {