Changeset 662 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2008-06-26T19:50:30+02:00 (16 years ago)

Author:

framm

Message:

• patch for usernames with international characters. please revert this immediately if it causes any trouble. submitted by danilo@….

File:

• trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/OsmConnection.java

@@ -9 +9 @@
 import java.net.HttpURLConnection;
 import java.net.PasswordAuthentication;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CharacterCodingException;
 
 import javax.swing.JCheckBox;
@@ -129 +134 @@
         }
 
-        protected void addAuth(HttpURLConnection con) {
-        con.addRequestProperty("Authorization", "Basic "+Base64.encode(Main.pref.get("osm-server.username")+":"+Main.pref.get("osm-server.password")));
+        protected void addAuth(HttpURLConnection con) throws CharacterCodingException {
+            CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
+            String auth = Main.pref.get("osm-server.username") + ":" + Main.pref.get("osm-server.password");
+            ByteBuffer bytes = encoder.encode(CharBuffer.wrap(auth));
+            con.addRequestProperty("Authorization", "Basic "+Base64.encode(bytes));
     }
 }