refactoring: move charset definition into TextUtils

2 files changed, 4 insertions, 9 deletions

diff --git a/main/src/cgeo/geocaching/network/Network.java b/main/src/cgeo/geocaching/network/Network.java
index 35ab668..ec6ec4f 100644
--- a/main/src/cgeo/geocaching/network/Network.java
+++ b/main/src/cgeo/geocaching/network/Network.java
@@ -43,7 +43,6 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
 
 public abstract class Network {
 
@@ -54,13 +53,6 @@ public abstract class Network {
 
     private static final String PATTERN_PASSWORD = "(?<=[\\?&])[Pp]ass(w(or)?d)?=[^&#$]+";
 
-    /**
-     * charset for requests
-     *
-     * @see "http://docs.oracle.com/javase/1.5.0/docs/api/java/nio/charset/Charset.html"
-     */
-    private static final Charset CHARSET_UTF8 = Charset.forName("UTF-8");
-
     private final static HttpParams clientParams = new BasicHttpParams();
 
     static {
@@ -145,7 +137,7 @@ public abstract class Network {
         final MultipartEntity entity = new MultipartEntity();
         for (final NameValuePair param : params) {
             try {
-                entity.addPart(param.getName(), new StringBody(param.getValue(), CHARSET_UTF8));
+                entity.addPart(param.getName(), new StringBody(param.getValue(), TextUtils.CHARSET_UTF8));
             } catch (final UnsupportedEncodingException e) {
                 Log.e("Network.postRequest: unsupported encoding for parameter " + param.getName(), e);
                 return null;
diff --git a/main/src/cgeo/geocaching/utils/TextUtils.java b/main/src/cgeo/geocaching/utils/TextUtils.java
index c4e1128..5acb3a0 100644
--- a/main/src/cgeo/geocaching/utils/TextUtils.java
+++ b/main/src/cgeo/geocaching/utils/TextUtils.java
@@ -6,6 +6,7 @@ package cgeo.geocaching.utils;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.eclipse.jdt.annotation.Nullable;
 
+import java.nio.charset.Charset;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -14,6 +15,8 @@ import java.util.regex.Pattern;
  */
 public final class TextUtils {
 
+    public static final Charset CHARSET_UTF8 = Charset.forName("UTF-8");
+
     private static final Pattern PATTERN_REMOVE_NONPRINTABLE = Pattern.compile("\\p{Cntrl}");
 
     private TextUtils() {