code cleanup: fix Lint warnings about Locales

25 files changed, 95 insertions, 85 deletions

diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index 830d61a..67d50ab 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -118,7 +118,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
             return;
         }
 
-        geocode = cache.getGeocode().toUpperCase();
+        geocode = cache.getGeocode();
     }
 
     private void showInBrowser() {
@@ -251,7 +251,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
         final String cacheSize = cache.getSize() != CacheSize.UNKNOWN ? " (" + cache.getSize().getL10n() + ")" : "";
         details.add(R.string.cache_type, cacheType + cacheSize);
 
-        details.add(R.string.cache_geocode, cache.getGeocode().toUpperCase());
+        details.add(R.string.cache_geocode, cache.getGeocode());
         details.addCacheState(cache);
 
         details.addDistance(cache, cacheDistance);
@@ -276,7 +276,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
 
             @Override
             public void onClick(View arg0) {
-                CacheDetailActivity.startActivity(AbstractPopupActivity.this, geocode.toUpperCase());
+                CacheDetailActivity.startActivity(AbstractPopupActivity.this, geocode);
                 finish();
             }
         });
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 1445073..01cd3ce 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -250,8 +250,8 @@ public class CacheDetailActivity extends AbstractActivity {
 
         // try to get data from URI
         if (geocode == null && guid == null && uri != null) {
-            String uriHost = uri.getHost().toLowerCase();
-            String uriPath = uri.getPath().toLowerCase();
+            String uriHost = uri.getHost().toLowerCase(Locale.US);
+            String uriPath = uri.getPath().toLowerCase(Locale.US);
             String uriQuery = uri.getQuery();
 
             if (uriQuery != null) {
@@ -265,11 +265,11 @@ public class CacheDetailActivity extends AbstractActivity {
                 guid = uri.getQueryParameter("guid");
 
                 if (StringUtils.isNotBlank(geocode)) {
-                    geocode = geocode.toUpperCase();
+                    geocode = geocode.toUpperCase(Locale.US);
                     guid = null;
                 } else if (StringUtils.isNotBlank(guid)) {
                     geocode = null;
-                    guid = guid.toLowerCase();
+                    guid = guid.toLowerCase(Locale.US);
                 } else {
                     showToast(res.getString(R.string.err_detail_open));
                     finish();
@@ -277,7 +277,7 @@ public class CacheDetailActivity extends AbstractActivity {
                 }
             } else if (uriHost.contains("coord.info")) {
                 if (uriPath != null && uriPath.startsWith("/gc")) {
-                    geocode = uriPath.substring(1).toUpperCase();
+                    geocode = uriPath.substring(1).toUpperCase(Locale.US);
                 } else {
                     showToast(res.getString(R.string.err_detail_open));
                     finish();
@@ -300,7 +300,7 @@ public class CacheDetailActivity extends AbstractActivity {
             if (StringUtils.isNotBlank(name)) {
                 title = name;
             } else if (null != geocode && StringUtils.isNotBlank(geocode)) { // can't be null, but the compiler doesn't understand StringUtils.isNotBlank()
-                title = geocode.toUpperCase();
+                title = geocode;
             }
             progress.show(this, title, res.getString(R.string.cache_dialog_loading_details), true, loadCacheHandler.cancelMessage());
         } catch (Exception e) {
@@ -695,9 +695,9 @@ public class CacheDetailActivity extends AbstractActivity {
 
         // action bar: title and icon (default: mystery icon)
         if (StringUtils.isNotBlank(cache.getName())) {
-            setTitle(cache.getName() + " (" + cache.getGeocode().toUpperCase() + ')');
+            setTitle(cache.getName() + " (" + cache.getGeocode() + ')');
         } else {
-            setTitle(cache.getGeocode().toUpperCase());
+            setTitle(cache.getGeocode());
         }
         ((TextView) findViewById(R.id.actionbar_title)).setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(cache.getType().markerId), null, null, null);
 
@@ -962,13 +962,13 @@ public class CacheDetailActivity extends AbstractActivity {
 
     public static void startActivity(final Context context, final String geocode) {
         final Intent detailIntent = new Intent(context, CacheDetailActivity.class);
-        detailIntent.putExtra("geocode", geocode.toUpperCase());
+        detailIntent.putExtra("geocode", geocode);
         context.startActivity(detailIntent);
     }
 
     public static void startActivity(final Context context, final String geocode, final int page) {
         final Intent detailIntent = new Intent(context, CacheDetailActivity.class);
-        detailIntent.putExtra("geocode", geocode.toUpperCase());
+        detailIntent.putExtra("geocode", geocode);
         detailIntent.putExtra(EXTRAS_PAGE, page);
         context.startActivity(detailIntent);
     }
@@ -1377,7 +1377,7 @@ public class CacheDetailActivity extends AbstractActivity {
             details.add(R.string.cache_name, span);
             details.add(R.string.cache_type, cache.getType().getL10n());
             details.addSize(cache);
-            details.add(R.string.cache_geocode, cache.getGeocode().toUpperCase());
+            details.add(R.string.cache_geocode, cache.getGeocode());
             details.addCacheState(cache);
 
             details.addDistance(cache, cacheDistanceView);
diff --git a/main/src/cgeo/geocaching/CachePopup.java b/main/src/cgeo/geocaching/CachePopup.java
index e01e4a0..5781d54 100644
--- a/main/src/cgeo/geocaching/CachePopup.java
+++ b/main/src/cgeo/geocaching/CachePopup.java
@@ -79,7 +79,7 @@ public class CachePopup extends AbstractPopupActivity {
             if (StringUtils.isNotBlank(cache.getName())) {
                 setTitle(cache.getName());
             } else {
-                setTitle(geocode.toUpperCase());
+                setTitle(geocode);
             }
 
             // actionbar icon
diff --git a/main/src/cgeo/geocaching/ImagesActivity.java b/main/src/cgeo/geocaching/ImagesActivity.java
index 0accf12..234a2e9 100644
--- a/main/src/cgeo/geocaching/ImagesActivity.java
+++ b/main/src/cgeo/geocaching/ImagesActivity.java
@@ -86,7 +86,7 @@ public class ImagesActivity extends AbstractActivity {
         final Intent logImgIntent = new Intent(fromActivity, ImagesActivity.class);
         // if resuming our app within this activity, finish it and return to the cache activity
         logImgIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET)
-                .putExtra(EXTRAS_GEOCODE, geocode.toUpperCase())
+                .putExtra(EXTRAS_GEOCODE, geocode)
                 .putExtra(EXTRAS_TYPE, imageType);
 
         // avoid forcing the array list as parameter type
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index 4ddec72..af56c6c 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -132,7 +132,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
         if (StringUtils.isNotBlank(trackable.getName())) {
             setTitle(res.getString(R.string.trackable_touch) + ": " + trackable.getName());
         } else {
-            setTitle(res.getString(R.string.trackable_touch) + ": " + trackable.getGeocode().toUpperCase());
+            setTitle(res.getString(R.string.trackable_touch) + ": " + trackable.getGeocode());
         }
 
         if (guid == null) {
@@ -357,7 +357,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
 
     public static void startActivity(final Context context, final cgTrackable trackable) {
         final Intent logTouchIntent = new Intent(context, LogTrackableActivity.class);
-        logTouchIntent.putExtra("geocode", trackable.getGeocode().toUpperCase());
+        logTouchIntent.putExtra("geocode", trackable.getGeocode());
         logTouchIntent.putExtra("guid", trackable.getGuid());
         logTouchIntent.putExtra("trackingcode", trackable.getTrackingcode());
         context.startActivity(logTouchIntent);
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index 5f2bddc..dd5f52d 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -28,6 +28,8 @@ import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 
+import java.util.Locale;
+
 public class SearchActivity extends AbstractActivity {
 
     private static final String EXTRAS_KEYWORDSEARCH = "keywordsearch";
@@ -104,7 +106,7 @@ public class SearchActivity extends AbstractActivity {
         final IConnector connector = ConnectorFactory.getConnector(geocode);
         if (connector instanceof ISearchByGeocode) {
             final Intent cachesIntent = new Intent(this, CacheDetailActivity.class);
-            cachesIntent.putExtra("geocode", geocode.toUpperCase());
+            cachesIntent.putExtra("geocode", geocode.toUpperCase(Locale.US));
             startActivity(cachesIntent);
             return true;
         }
@@ -113,7 +115,7 @@ public class SearchActivity extends AbstractActivity {
         final String trackable = BaseUtils.getMatch(query, GCConstants.PATTERN_TB_CODE, true, 0, "", false);
         if (StringUtils.isNotBlank(trackable)) {
             final Intent trackablesIntent = new Intent(this, cgeotrackable.class);
-            trackablesIntent.putExtra("geocode", trackable.toUpperCase());
+            trackablesIntent.putExtra("geocode", trackable.toUpperCase(Locale.US));
             startActivity(trackablesIntent);
             return true;
         }
@@ -402,7 +404,7 @@ public class SearchActivity extends AbstractActivity {
         }
 
         final Intent trackablesIntent = new Intent(this, cgeotrackable.class);
-        trackablesIntent.putExtra("geocode", trackableText.toUpperCase());
+        trackablesIntent.putExtra("geocode", trackableText.toUpperCase(Locale.US));
         startActivity(trackablesIntent);
     }
 
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java
index 443ef3a..8c9802e 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/VisitCacheActivity.java
@@ -42,6 +42,7 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 public class VisitCacheActivity extends AbstractLoggingActivity implements DateDialog.DateDialogParent {
     static final String EXTRAS_FOUND = "found";
@@ -261,7 +262,7 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
         if (StringUtils.isNotBlank(cache.getName())) {
             setTitle(res.getString(R.string.log_new_log) + ": " + cache.getName());
         } else {
-            setTitle(res.getString(R.string.log_new_log) + ": " + cache.getGeocode().toUpperCase());
+            setTitle(res.getString(R.string.log_new_log) + ": " + cache.getGeocode());
         }
 
         init();
@@ -335,7 +336,7 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
     }
 
     private static String ratingTextValue(final double rating) {
-        return String.format("%.1f", rating);
+        return String.format(Locale.getDefault(), "%.1f", rating);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/WaypointPopup.java b/main/src/cgeo/geocaching/WaypointPopup.java
index 7fbfe10..8596107 100644
--- a/main/src/cgeo/geocaching/WaypointPopup.java
+++ b/main/src/cgeo/geocaching/WaypointPopup.java
@@ -43,7 +43,7 @@ public class WaypointPopup extends AbstractPopupActivity {
             if (StringUtils.isNotBlank(waypoint.getName())) {
                 setTitle(waypoint.getName());
             } else {
-                setTitle(waypoint.getGeocode().toUpperCase());
+                setTitle(waypoint.getGeocode());
             }
 
             // actionbar icon
@@ -53,7 +53,7 @@ public class WaypointPopup extends AbstractPopupActivity {
             details = new CacheDetailsCreator(this, (LinearLayout) findViewById(R.id.waypoint_details_list));
 
             //Waypoint geocode
-            details.add(R.string.cache_geocode, waypoint.getPrefix().toUpperCase() + waypoint.getGeocode().toUpperCase().substring(2));
+            details.add(R.string.cache_geocode, waypoint.getPrefix() + waypoint.getGeocode().substring(2));
 
             // Edit Button
             final Button buttonEdit = (Button) findViewById(R.id.edit);
diff --git a/main/src/cgeo/geocaching/apps/AbstractLocusApp.java b/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
index ac6fc1c..8f61e72 100644
--- a/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
+++ b/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
@@ -22,6 +22,7 @@ import android.location.Location;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * for the Locus API:
@@ -30,7 +31,7 @@ import java.util.List;
  */
 public abstract class AbstractLocusApp extends AbstractApp {
     private static final String INTENT = Intent.ACTION_VIEW;
-    private static final SimpleDateFormat ISO8601DATE = new SimpleDateFormat("yyyy-MM-dd'T'");
+    private static final SimpleDateFormat ISO8601DATE = new SimpleDateFormat("yyyy-MM-dd'T'", Locale.US);
 
     protected AbstractLocusApp() {
         super(getString(R.string.caches_map_locus), INTENT);
@@ -47,11 +48,11 @@ public abstract class AbstractLocusApp extends AbstractApp {
 
     /**
      * Display a list of caches / waypoints in Locus
-     *
+     * 
      * @param objectsToShow
      *            which caches/waypoints to show
      * @param withCacheWaypoints
-     *            wether to give waypoints of caches to Locus or not
+     *            Whether to give waypoints of caches to Locus or not
      * @param activity
      */
     protected static boolean showInLocus(final List<?> objectsToShow, final boolean withCacheWaypoints, final boolean export,
@@ -85,7 +86,7 @@ public abstract class AbstractLocusApp extends AbstractApp {
             final ArrayList<PointsData> data = new ArrayList<PointsData>();
             data.add(pd);
             DisplayData.sendDataCursor(activity, data,
-                    "content://" + LocusDataStorageProvider.class.getCanonicalName().toLowerCase(),
+                    "content://" + LocusDataStorageProvider.class.getCanonicalName().toLowerCase(Locale.US),
                     export);
         }
 
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index bb167bd..76dca5b 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -420,7 +420,7 @@ public class cgCache implements ICache, IWaypoint {
         }
         Intent logVisitIntent = new Intent((Activity) fromActivity, VisitCacheActivity.class);
         logVisitIntent.putExtra(VisitCacheActivity.EXTRAS_ID, cacheId);
-        logVisitIntent.putExtra(VisitCacheActivity.EXTRAS_GEOCODE, geocode.toUpperCase());
+        logVisitIntent.putExtra(VisitCacheActivity.EXTRAS_GEOCODE, geocode);
         logVisitIntent.putExtra(VisitCacheActivity.EXTRAS_FOUND, found);
 
         ((Activity) fromActivity).startActivity(logVisitIntent);
@@ -640,7 +640,7 @@ public class cgCache implements ICache, IWaypoint {
         }
 
         StringBuilder subject = new StringBuilder("Geocache ");
-        subject.append(geocode.toUpperCase());
+        subject.append(geocode);
         if (StringUtils.isNotBlank(name)) {
             subject.append(" - ").append(name);
         }
@@ -994,7 +994,7 @@ public class cgCache implements ICache, IWaypoint {
     }
 
     public void setGeocode(String geocode) {
-        this.geocode = geocode;
+        this.geocode = StringUtils.upperCase(geocode);
     }
 
     public void setCacheId(String cacheId) {
diff --git a/main/src/cgeo/geocaching/cgTrackable.java b/main/src/cgeo/geocaching/cgTrackable.java
index c9b5623..d8f2280 100644
--- a/main/src/cgeo/geocaching/cgTrackable.java
+++ b/main/src/cgeo/geocaching/cgTrackable.java
@@ -38,8 +38,8 @@ public class cgTrackable implements ILogable {
     private String trackingcode = null;
 
     public String getUrl() {
-        if (StringUtils.startsWithIgnoreCase(geocode, "GK")) {
-            String hex = geocode.substring(3);
+        if (StringUtils.startsWithIgnoreCase(getGeocode(), "GK")) {
+            String hex = getGeocode().substring(3);
             try {
                 int id = Integer.parseInt(hex, 16);
                 return "http://geokrety.org/konkret.php?id=" + id;
@@ -48,7 +48,7 @@ public class cgTrackable implements ILogable {
                 return null;
             }
         }
-        return "http://www.geocaching.com//track/details.aspx?tracker=" + geocode.toUpperCase();
+        return "http://www.geocaching.com//track/details.aspx?tracker=" + geocode;
     }
 
     public String getGuid() {
@@ -65,7 +65,7 @@ public class cgTrackable implements ILogable {
     }
 
     public void setGeocode(String geocode) {
-        this.geocode = geocode;
+        this.geocode = StringUtils.upperCase(geocode);
     }
 
     public String getIconUrl() {
@@ -208,7 +208,7 @@ public class cgTrackable implements ILogable {
     }
 
     public boolean isLoggable() {
-        return !StringUtils.startsWithIgnoreCase(geocode, "GK");
+        return !StringUtils.startsWithIgnoreCase(getGeocode(), "GK");
     }
 
     public String getTrackingcode() {
diff --git a/main/src/cgeo/geocaching/cgWaypoint.java b/main/src/cgeo/geocaching/cgWaypoint.java
index 0e21c08..32cc526 100644
--- a/main/src/cgeo/geocaching/cgWaypoint.java
+++ b/main/src/cgeo/geocaching/cgWaypoint.java
@@ -156,7 +156,7 @@ public class cgWaypoint implements IWaypoint, Comparable<cgWaypoint> {
     }
 
     public String getUrl() {
-        return "http://www.geocaching.com//seek/cache_details.aspx?wp=" + geocode.toUpperCase();
+        return "http://www.geocaching.com//seek/cache_details.aspx?wp=" + geocode;
     }
 
     @Override
@@ -174,7 +174,7 @@ public class cgWaypoint implements IWaypoint, Comparable<cgWaypoint> {
     }
 
     public void setGeocode(String geocode) {
-        this.geocode = geocode;
+        this.geocode = StringUtils.upperCase(geocode);
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 57fdb9c..a9410ce 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -1003,7 +1003,7 @@ public class cgeocaches extends AbstractListActivity {
                 break;
             case MENU_CACHE_DETAILS:
                 final Intent cachesIntent = new Intent(this, CacheDetailActivity.class);
-                cachesIntent.putExtra("geocode", cache.getGeocode().toUpperCase());
+                cachesIntent.putExtra("geocode", cache.getGeocode());
                 cachesIntent.putExtra("name", cache.getName());
                 startActivity(cachesIntent);
                 break;
diff --git a/main/src/cgeo/geocaching/cgeonavigate.java b/main/src/cgeo/geocaching/cgeonavigate.java
index 64b7cd8..61870a5 100644
--- a/main/src/cgeo/geocaching/cgeonavigate.java
+++ b/main/src/cgeo/geocaching/cgeonavigate.java
@@ -293,7 +293,7 @@ public class cgeonavigate extends AbstractActivity {
 
         final Intent navigateIntent = new Intent(context, cgeonavigate.class);
         navigateIntent.putExtra(EXTRAS_COORDS, coords);
-        navigateIntent.putExtra(EXTRAS_GEOCODE, geocode.toUpperCase());
+        navigateIntent.putExtra(EXTRAS_GEOCODE, geocode);
         if (null != displayedName) {
             navigateIntent.putExtra(EXTRAS_NAME, displayedName);
         }
diff --git a/main/src/cgeo/geocaching/cgeotrackable.java b/main/src/cgeo/geocaching/cgeotrackable.java
index b8d01bb..e436249 100644
--- a/main/src/cgeo/geocaching/cgeotrackable.java
+++ b/main/src/cgeo/geocaching/cgeotrackable.java
@@ -35,6 +35,7 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Locale;
 
 public class cgeotrackable extends AbstractActivity {
     private static final int MENU_LOG_TOUCH = 1;
@@ -68,12 +69,12 @@ public class cgeotrackable extends AbstractActivity {
 
             try {
                 inflater = getLayoutInflater();
-                geocode = trackable.getGeocode().toUpperCase();
+                geocode = trackable.getGeocode();
 
                 if (StringUtils.isNotBlank(trackable.getName())) {
                     setTitle(Html.fromHtml(trackable.getName()).toString());
                 } else {
-                    setTitle(trackable.getName().toUpperCase());
+                    setTitle(trackable.getName());
                 }
 
                 findViewById(R.id.details_list_box).setVisibility(View.VISIBLE);
@@ -99,7 +100,7 @@ public class cgeotrackable extends AbstractActivity {
                 details.add(R.string.trackable_type, tbType);
 
                 // trackable geocode
-                details.add(R.string.trackable_code, trackable.getGeocode().toUpperCase());
+                details.add(R.string.trackable_code, trackable.getGeocode());
 
                 // trackable owner
                 TextView owner = details.add(R.string.trackable_owner, res.getString(R.string.trackable_unknown));
@@ -274,33 +275,33 @@ public class cgeotrackable extends AbstractActivity {
 
         // try to get data from URI
         if (geocode == null && guid == null && id == null && uri != null) {
-            String uriHost = uri.getHost().toLowerCase();
+            String uriHost = uri.getHost().toLowerCase(Locale.US);
             if (uriHost.contains("geocaching.com")) {
                 geocode = uri.getQueryParameter("tracker");
                 guid = uri.getQueryParameter("guid");
                 id = uri.getQueryParameter("id");
 
                 if (StringUtils.isNotBlank(geocode)) {
-                    geocode = geocode.toUpperCase();
+                    geocode = geocode.toUpperCase(Locale.US);
                     guid = null;
                     id = null;
                 } else if (StringUtils.isNotBlank(guid)) {
                     geocode = null;
-                    guid = guid.toLowerCase();
+                    guid = guid.toLowerCase(Locale.US);
                     id = null;
                 } else if (StringUtils.isNotBlank(id)) {
                     geocode = null;
                     guid = null;
-                    id = id.toLowerCase();
+                    id = id.toLowerCase(Locale.US);
                 } else {
                     showToast(res.getString(R.string.err_tb_details_open));
                     finish();
                     return;
                 }
             } else if (uriHost.contains("coord.info")) {
-                String uriPath = uri.getPath().toLowerCase();
+                String uriPath = uri.getPath().toLowerCase(Locale.US);
                 if (uriPath != null && uriPath.startsWith("/tb")) {
-                    geocode = uriPath.substring(1).toUpperCase();
+                    geocode = uriPath.substring(1).toUpperCase(Locale.US);
                     guid = null;
                     id = null;
                 } else {
@@ -322,7 +323,7 @@ public class cgeotrackable extends AbstractActivity {
         if (StringUtils.isNotBlank(name)) {
             message = Html.fromHtml(name).toString();
         } else if (StringUtils.isNotBlank(geocode)) {
-            message = geocode.toUpperCase();
+            message = geocode;
         } else {
             message = res.getString(R.string.trackable);
         }
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
index 69c2d5b..69f9878 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.connector.gc;
 
+import java.util.Locale;
 import java.util.regex.Pattern;
 
 /**
@@ -187,7 +188,7 @@ public final class GCConstants {
     public static long gccodeToGCId(final String gccode) {
         long gcid = 0;
         long base = GC_BASE31;
-        String geocodeWO = gccode.substring(2).toUpperCase();
+        String geocodeWO = gccode.substring(2).toUpperCase(Locale.US);
 
         if ((geocodeWO.length() < 4) || (geocodeWO.length() == 4 && SEQUENCE_GCID.indexOf(geocodeWO.charAt(0)) < 16)) {
             base = GC_BASE16;
diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java
index b713611..583e144 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCParser.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java
@@ -164,7 +164,7 @@ public abstract class GCParser {
 
             String inventoryPre = null;
 
-            cache.setGeocode(BaseUtils.getMatch(row, GCConstants.PATTERN_SEARCH_GEOCODE, true, 1, cache.getGeocode(), true).toUpperCase());
+            cache.setGeocode(BaseUtils.getMatch(row, GCConstants.PATTERN_SEARCH_GEOCODE, true, 1, cache.getGeocode(), true));
 
             // cache type
             cache.setType(CacheType.getByPattern(BaseUtils.getMatch(row, GCConstants.PATTERN_SEARCH_TYPE, true, 1, null, true)));
@@ -434,7 +434,7 @@ public abstract class GCParser {
             cache.setFavoritePoints(Integer.parseInt(BaseUtils.getMatch(tableInside, GCConstants.PATTERN_FAVORITECOUNT, true, "0")));
 
             // cache size
-            cache.setSize(CacheSize.getById(BaseUtils.getMatch(tableInside, GCConstants.PATTERN_SIZE, true, CacheSize.NOT_CHOSEN.id).toLowerCase()));
+            cache.setSize(CacheSize.getById(BaseUtils.getMatch(tableInside, GCConstants.PATTERN_SIZE, true, CacheSize.NOT_CHOSEN.id)));
         }
 
         // cache found
@@ -502,7 +502,7 @@ public abstract class GCParser {
                 while (matcherAttributesInside.find()) {
                     if (matcherAttributesInside.groupCount() > 1 && !matcherAttributesInside.group(2).equalsIgnoreCase("blank")) {
                         // by default, use the tooltip of the attribute
-                        String attribute = matcherAttributesInside.group(2).toLowerCase();
+                        String attribute = matcherAttributesInside.group(2).toLowerCase(Locale.US);
 
                         // if the image name can be recognized, use the image name as attribute
                         String imageName = matcherAttributesInside.group(1).trim();
@@ -510,7 +510,7 @@ public abstract class GCParser {
                             int start = imageName.lastIndexOf('/');
                             int end = imageName.lastIndexOf('.');
                             if (start >= 0 && end >= 0) {
-                                attribute = imageName.substring(start + 1, end).replace('-', '_').toLowerCase();
+                                attribute = imageName.substring(start + 1, end).replace('-', '_').toLowerCase(Locale.US);
                             }
                         }
                         attributes.add(attribute);
@@ -1265,7 +1265,7 @@ public abstract class GCParser {
         final cgTrackable trackable = new cgTrackable();
 
         // trackable geocode
-        trackable.setGeocode(BaseUtils.getMatch(page, GCConstants.PATTERN_TRACKABLE_GEOCODE, true, trackable.getGeocode()).toUpperCase());
+        trackable.setGeocode(BaseUtils.getMatch(page, GCConstants.PATTERN_TRACKABLE_GEOCODE, true, trackable.getGeocode()));
 
         // trackable id
         trackable.setGuid(BaseUtils.getMatch(page, GCConstants.PATTERN_TRACKABLE_GUID, true, trackable.getGuid()));
diff --git a/main/src/cgeo/geocaching/connector/gc/Tile.java b/main/src/cgeo/geocaching/connector/gc/Tile.java
index 5404446..73ded4d 100644
--- a/main/src/cgeo/geocaching/connector/gc/Tile.java
+++ b/main/src/cgeo/geocaching/connector/gc/Tile.java
@@ -17,6 +17,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Set;
 
 /**
@@ -99,7 +100,7 @@ public class Tile {
 
     /**
      * Calculate latitude/longitude for a given x/y position in this tile.
-     * 
+     *
      * @see <a
      *      href="http://developers.cloudmade.com/projects/tiles/examples/convert-coordinates-to-tile-numbers">Cloudmade</a>
      */
@@ -115,7 +116,7 @@ public class Tile {
 
     @Override
     public String toString() {
-        return String.format("(%d/%d), zoom=%d", tileX, tileY, zoomlevel);
+        return String.format(Locale.US, "(%d/%d), zoom=%d", tileX, tileY, zoomlevel);
     }
 
     /**
diff --git a/main/src/cgeo/geocaching/enumerations/CacheSize.java b/main/src/cgeo/geocaching/enumerations/CacheSize.java
index 155c9a5..a686dd6 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheSize.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheSize.java
@@ -5,6 +5,7 @@ import cgeo.geocaching.cgeoapplication;
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -34,7 +35,7 @@ public enum CacheSize {
     static {
         final HashMap<String, CacheSize> mapping = new HashMap<String, CacheSize>();
         for (CacheSize cs : values()) {
-            mapping.put(cs.id.toLowerCase(), cs);
+            mapping.put(cs.id.toLowerCase(Locale.US), cs);
         }
         // add medium as additional string for Regular
         mapping.put("medium", CacheSize.REGULAR);
@@ -51,7 +52,7 @@ public enum CacheSize {
             return result;
         }
         // only if String was not found, normalize it
-        final CacheSize resultNormalized = CacheSize.FIND_BY_ID.get(id.toLowerCase().trim());
+        final CacheSize resultNormalized = CacheSize.FIND_BY_ID.get(id.toLowerCase(Locale.US).trim());
         if (resultNormalized != null) {
             return resultNormalized;
         }
diff --git a/main/src/cgeo/geocaching/enumerations/CacheType.java b/main/src/cgeo/geocaching/enumerations/CacheType.java
index 730c989..251790f 100644
--- a/main/src/cgeo/geocaching/enumerations/CacheType.java
+++ b/main/src/cgeo/geocaching/enumerations/CacheType.java
@@ -5,6 +5,7 @@ import cgeo.geocaching.cgeoapplication;
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -59,14 +60,14 @@ public enum CacheType {
         final HashMap<String, CacheType> mappingPattern = new HashMap<String, CacheType>();
         for (CacheType ct : values()) {
             mappingId.put(ct.id, ct);
-            mappingPattern.put(ct.pattern.toLowerCase(), ct);
+            mappingPattern.put(ct.pattern.toLowerCase(Locale.US), ct);
         }
         FIND_BY_ID = Collections.unmodifiableMap(mappingId);
         FIND_BY_PATTERN = Collections.unmodifiableMap(mappingPattern);
     }
 
     public static CacheType getById(final String id) {
-        final CacheType result = (id != null) ? CacheType.FIND_BY_ID.get(id.toLowerCase().trim()) : null;
+        final CacheType result = (id != null) ? CacheType.FIND_BY_ID.get(id.toLowerCase(Locale.US).trim()) : null;
         if (result == null) {
             return UNKNOWN;
         }
@@ -74,7 +75,7 @@ public enum CacheType {
     }
 
     public static CacheType getByPattern(final String pattern) {
-        final CacheType result = (pattern != null) ? CacheType.FIND_BY_PATTERN.get(pattern.toLowerCase().trim()) : null;
+        final CacheType result = (pattern != null) ? CacheType.FIND_BY_PATTERN.get(pattern.toLowerCase(Locale.US).trim()) : null;
         if (result == null) {
             return UNKNOWN;
         }
diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java
index ac64ed1..82efd7e 100644
--- a/main/src/cgeo/geocaching/enumerations/LogType.java
+++ b/main/src/cgeo/geocaching/enumerations/LogType.java
@@ -5,6 +5,7 @@ import cgeo.geocaching.cgeoapplication;
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 
@@ -74,7 +75,7 @@ public enum LogType {
     }
 
     public static LogType getByIconName(final String imageType) {
-        final LogType result = imageType != null ? LogType.FIND_BY_ICONNAME.get(imageType.toLowerCase().trim()) : null;
+        final LogType result = imageType != null ? LogType.FIND_BY_ICONNAME.get(imageType.toLowerCase(Locale.US).trim()) : null;
         if (result == null) {
             return UNKNOWN;
         }
@@ -82,7 +83,7 @@ public enum LogType {
     }
 
     public static LogType getByType(final String type) {
-        final LogType result = type != null ? LogType.FIND_BY_TYPE.get(type.toLowerCase().trim()) : null;
+        final LogType result = type != null ? LogType.FIND_BY_TYPE.get(type.toLowerCase(Locale.US).trim()) : null;
         if (result == null) {
             return UNKNOWN;
         }
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index 221aa1e..879814e 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -287,7 +287,7 @@ public abstract class GPXParser extends FileParser {
                 // take the name as code, if nothing else is available
                 if (StringUtils.isBlank(cache.getGeocode())) {
                     if (StringUtils.isNotBlank(name)) {
-                        cache.setGeocode(name.trim().toUpperCase());
+                        cache.setGeocode(name.trim());
                     }
                 }
 
@@ -326,7 +326,7 @@ public abstract class GPXParser extends FileParser {
                 fixCache(cache);
 
                 if (cache.getName().length() > 2) {
-                    final String cacheGeocodeForWaypoint = "GC" + cache.getName().substring(2).toUpperCase();
+                    final String cacheGeocodeForWaypoint = "GC" + cache.getName().substring(2).toUpperCase(Locale.US);
 
                     // lookup cache for waypoint in already parsed caches
                     final cgCache cacheForWaypoint = cgeoapplication.getInstance().loadCache(cacheGeocodeForWaypoint, LoadFlags.LOAD_CACHE_OR_DB);
@@ -410,7 +410,7 @@ public abstract class GPXParser extends FileParser {
             public void end(String body) {
                 final String[] content = body.split("\\|");
                 if (content.length > 0) {
-                    type = content[0].toLowerCase().trim();
+                    type = content[0].toLowerCase(Locale.US).trim();
                 }
             }
         });
@@ -420,7 +420,7 @@ public abstract class GPXParser extends FileParser {
 
             @Override
             public void end(final String body) {
-                sym = body.toLowerCase();
+                sym = body.toLowerCase(Locale.US);
                 if (sym.contains("geocache") && sym.contains("found")) {
                     cache.setFound(true);
                 }
@@ -526,7 +526,7 @@ public abstract class GPXParser extends FileParser {
 
                 @Override
                 public void end(String body) {
-                    cache.setType(CacheType.getByPattern(validate(body.toLowerCase())));
+                    cache.setType(CacheType.getByPattern(validate(body)));
                 }
             });
 
@@ -535,7 +535,7 @@ public abstract class GPXParser extends FileParser {
 
                 @Override
                 public void end(String body) {
-                    cache.setSize(CacheSize.getById(validate(body.toLowerCase())));
+                    cache.setSize(CacheSize.getById(validate(body)));
                 }
             });
 
@@ -665,7 +665,7 @@ public abstract class GPXParser extends FileParser {
 
                     try {
                         if (attrs.getIndex("ref") > -1) {
-                            trackable.setGeocode(attrs.getValue("ref").toUpperCase());
+                            trackable.setGeocode(attrs.getValue("ref"));
                         }
                     } catch (Exception e) {
                         // nothing
@@ -745,7 +745,7 @@ public abstract class GPXParser extends FileParser {
 
                 @Override
                 public void end(String body) {
-                    final String logType = validate(body).toLowerCase();
+                    final String logType = validate(body);
                     log.type = LogType.getByType(logType);
                 }
             });
diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java
index b17b203..45bcca9 100644
--- a/main/src/cgeo/geocaching/files/LocParser.java
+++ b/main/src/cgeo/geocaching/files/LocParser.java
@@ -77,7 +77,7 @@ public final class LocParser extends FileParser {
         cache.setDifficulty(coord.getDifficulty());
         cache.setTerrain(coord.getTerrain());
         cache.setSize(coord.getSize());
-        cache.setGeocode(coord.getGeocode().toUpperCase());
+        cache.setGeocode(coord.getGeocode());
         cache.setReliableLatLon(true);
         if (StringUtils.isBlank(cache.getName())) {
             cache.setName(coord.getName());
@@ -149,8 +149,7 @@ public final class LocParser extends FileParser {
         final cgCache cache = new cgCache();
         final Matcher matcherGeocode = patternGeocode.matcher(pointString);
         if (matcherGeocode.find()) {
-            final String geocode = matcherGeocode.group(1).trim().toUpperCase();
-            cache.setGeocode(geocode.toUpperCase());
+            cache.setGeocode(matcherGeocode.group(1).trim());
         }
 
         final Matcher matcherName = patternName.matcher(pointString);
diff --git a/main/src/cgeo/geocaching/geopoint/DistanceParser.java b/main/src/cgeo/geocaching/geopoint/DistanceParser.java
index 5f02895..61d1ecd 100644
--- a/main/src/cgeo/geocaching/geopoint/DistanceParser.java
+++ b/main/src/cgeo/geocaching/geopoint/DistanceParser.java
@@ -1,5 +1,6 @@
 package cgeo.geocaching.geopoint;
 
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -26,7 +27,7 @@ public final class DistanceParser {
         }
 
         final float value = Float.parseFloat(matcher.group(1).replace(',', '.'));
-        final String unit = matcher.group(2).toLowerCase();
+        final String unit = matcher.group(2).toLowerCase(Locale.US);
 
         if (unit.equals("m") || (unit.length() == 0 && metricUnit)) {
             return value / 1000;
diff --git a/main/src/cgeo/geocaching/geopoint/GeopointFormatter.java b/main/src/cgeo/geocaching/geopoint/GeopointFormatter.java
index c706e77..892335c 100644
--- a/main/src/cgeo/geocaching/geopoint/GeopointFormatter.java
+++ b/main/src/cgeo/geocaching/geopoint/GeopointFormatter.java
@@ -61,13 +61,13 @@ public class GeopointFormatter
 
         switch (format) {
             case LAT_LON_DECDEGREE:
-                return String.format("%.6f %.6f", latSigned, lonSigned);
+                return String.format(Locale.getDefault(), "%.6f %.6f", latSigned, lonSigned);
 
             case LAT_LON_DECDEGREE_COMMA:
                 return String.format((Locale) null, "%.6f,%.6f", latSigned, lonSigned);
 
             case LAT_LON_DECMINUTE:
-                return String.format("%c %02d° %06.3f · %c %03d° %06.3f",
+                return String.format(Locale.getDefault(), "%c %02d° %06.3f · %c %03d° %06.3f",
                         gp.getLatDir(), gp.getLatDeg(), gp.getLatMinRaw(), gp.getLonDir(), gp.getLonDeg(), gp.getLonMinRaw());
 
             case LAT_LON_DECMINUTE_RAW:
@@ -75,7 +75,7 @@ public class GeopointFormatter
                         gp.getLatDir(), gp.getLatDeg(), gp.getLatMinRaw(), gp.getLonDir(), gp.getLonDeg(), gp.getLonMinRaw());
 
             case LAT_LON_DECSECOND:
-                return String.format("%c %02d° %02d' %06.3f\" · %c %03d° %02d' %06.3f\"",
+                return String.format(Locale.getDefault(), "%c %02d° %02d' %06.3f\" · %c %03d° %02d' %06.3f\"",
                         gp.getLatDir(), gp.getLatDeg(), gp.getLatMin(), gp.getLatSecRaw(),
                         gp.getLonDir(), gp.getLonDeg(), gp.getLonMin(), gp.getLonSecRaw());
 
@@ -83,19 +83,19 @@ public class GeopointFormatter
                 return String.format((Locale) null, "%.6f", latSigned);
 
             case LAT_DECMINUTE:
-                return String.format("%c %02d° %06.3f", gp.getLatDir(), gp.getLatDeg(), gp.getLatMinRaw());
+                return String.format(Locale.getDefault(), "%c %02d° %06.3f", gp.getLatDir(), gp.getLatDeg(), gp.getLatMinRaw());
 
             case LAT_DECMINUTE_RAW:
-                return String.format("%c %02d %06.3f", gp.getLatDir(), gp.getLatDeg(), gp.getLatMinRaw());
+                return String.format(Locale.getDefault(), "%c %02d %06.3f", gp.getLatDir(), gp.getLatDeg(), gp.getLatMinRaw());
 
             case LON_DECDEGREE_RAW:
                 return String.format((Locale) null, "%.6f", lonSigned);
 
             case LON_DECMINUTE:
-                return String.format("%c %03d° %06.3f", gp.getLonDir(), gp.getLonDeg(), gp.getLonMinRaw());
+                return String.format(Locale.getDefault(), "%c %03d° %06.3f", gp.getLonDir(), gp.getLonDeg(), gp.getLonMinRaw());
 
             case LON_DECMINUTE_RAW:
-                return String.format("%c %03d %06.3f", gp.getLonDir(), gp.getLonDeg(), gp.getLonMinRaw());
+                return String.format(Locale.getDefault(), "%c %03d %06.3f", gp.getLonDir(), gp.getLonDeg(), gp.getLonMinRaw());
         }
 
         // Keep the compiler happy even though it cannot happen