Changeset 856

Timestamp:

02/07/14 14:40:00 (10 years ago)

Author:

jts21

Message:

Explicitly set Charset to UTF-8 for FrameShare (hopefully it fixes unicode characters on FrameShare on Windows)

Location:

trunk/src/org/expeditee/network

Files:

• FrameServer.java (modified) (1 diff)
• FrameShare.java (modified) (5 diffs)
• ImageSaver.java (modified) (1 diff)
• ImageServer.java (modified) (3 diffs)

trunk/src/org/expeditee/network/FrameServer.java

@@ -57 +57 @@
                 }
 
-                buf = dString.getBytes();
+                buf = dString.getBytes(FrameShare.CHARSET);
 
                 // send the response to the client at "address" and "port"

trunk/src/org/expeditee/network/FrameShare.java

@@ -14 +14 @@
 import java.net.SocketException;
 import java.net.UnknownHostException;
+import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.HashMap;
@@ -35 +36 @@
 public class FrameShare {
 
+        public final static Charset CHARSET = Charset.forName("UTF-8");
+        
         public static boolean disableNetworking = false;
 
@@ -313 +316 @@
                 try(Socket socket = new Socket(peer.getAddress(), peer.getPort() + ImageServer.OFFSET)) {
                 socket.setSoTimeout(NetworkSettings.FrameShareTimeout.get() * 2);
-                byte[] fileName = imageName.getBytes(ImageServer.CHARSET);
+                byte[] fileName = imageName.getBytes(FrameShare.CHARSET);
                 int fileNameLen = fileName.length;
                 OutputStream os = socket.getOutputStream();
@@ -349 +352 @@
 
                 // store frame contents
-                return new String(packet.getData(), 0, packet
-                                .getLength());
+                return new String(packet.getData(), 0, packet.getLength(), FrameShare.CHARSET);
         }
 
@@ -419 +421 @@
                         // Now send the packet
                         fileContents = sw.getBuffer().toString();
-                        byte[] contentsBuf = fileContents.getBytes();
+                        byte[] contentsBuf = fileContents.getBytes(FrameShare.CHARSET);
 
                         // get a datagram socket

trunk/src/org/expeditee/network/ImageSaver.java

@@ -76 +76 @@
                                         byte[] fileName = new byte[fileNameLen];
                                         is.read(fileName);
-                                        files[i] = new File(FrameIO.IMAGES_PATH + new String(fileName, ImageServer.CHARSET));
+                                        files[i] = new File(FrameIO.IMAGES_PATH + new String(fileName, FrameShare.CHARSET));
                                         // pick out which files we want
                                         if(!files[i].exists()) {

trunk/src/org/expeditee/network/ImageServer.java

@@ -8 +8 @@
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.nio.charset.Charset;
 
 import org.expeditee.gui.FrameIO;
@@ -67 +66 @@
                     byte[] fileName = new byte[fileNameLen];
                     is.read(fileName);
-                    sendImage(new File(FrameIO.IMAGES_PATH + new String(fileName, ImageServer.CHARSET)), socket);
+                    sendImage(new File(FrameIO.IMAGES_PATH + new String(fileName, FrameShare.CHARSET)), socket);
                 this.socket.close();
             } catch (IOException e) {
@@ -74 +73 @@
                 }
         }
-        
-        public final static Charset CHARSET = Charset.forName("UTF-8");
         
         public final static int OFFSET = 5;