1 files changed, 11 insertions, 10 deletions

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);
         }