diff --git a/commons/pom.xml b/commons/pom.xml index 896b62db0..3730eb707 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -19,7 +19,7 @@ org.mediawiki api - 1.2 + 1.3 com.actionbarsherlock diff --git a/commons/src/main/java/org/wikimedia/commons/EventLog.java b/commons/src/main/java/org/wikimedia/commons/EventLog.java index 6b50915c3..e027f55bc 100644 --- a/commons/src/main/java/org/wikimedia/commons/EventLog.java +++ b/commons/src/main/java/org/wikimedia/commons/EventLog.java @@ -4,6 +4,7 @@ import android.os.AsyncTask; import android.os.Build; import android.text.TextUtils; import de.akquinet.android.androlog.Log; +import org.apache.http.client.utils.URLEncodedUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/commons/src/main/java/org/wikimedia/commons/Utils.java b/commons/src/main/java/org/wikimedia/commons/Utils.java index 6ffd1661c..d45b0001c 100644 --- a/commons/src/main/java/org/wikimedia/commons/Utils.java +++ b/commons/src/main/java/org/wikimedia/commons/Utils.java @@ -12,10 +12,7 @@ import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactoryConfigurationError; -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringWriter; +import java.io.*; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; @@ -96,8 +93,8 @@ public class Utils { public static String urlEncode(String url) { try { - return urlCodec.encode(url); - } catch (EncoderException e) { + return urlCodec.encode(url, "utf-8"); + } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } }