1 files changed, 8 insertions, 8 deletions
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index 4ddec72..0217c08 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -47,7 +47,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
     private int attempts = 0;
     private CheckBox tweetCheck = null;
     private LinearLayout tweetBox = null;
-    private cgTrackable trackable;
+    private Trackable trackable;
 
     private Handler showProgressHandler = new Handler() {
         @Override
@@ -127,12 +127,12 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
             }
         }
 
-        trackable = app.getTrackableByGeocode(geocode);
+        trackable = cgData.loadTrackable(geocode);
 
         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) {
@@ -207,7 +207,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
         tweetCheck.setChecked(true);
 
         if (CollectionUtils.isEmpty(possibleLogTypes)) {
-            possibleLogTypes = cgTrackable.getPossibleLogTypes();
+            possibleLogTypes = Trackable.getPossibleLogTypes();
         }
 
         final Button buttonPost = (Button) findViewById(R.id.post);
@@ -311,7 +311,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
                     possibleLogTypes.addAll(typesPre);
                 }
             } catch (Exception e) {
-                Log.e("LogTrackableActivity.LoadDataThread.run: " + e.toString());
+                Log.e("LogTrackableActivity.LoadDataThread.run", e);
             }
 
             loadDataHandler.sendEmptyMessage(0);
@@ -349,15 +349,15 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
 
             return status;
         } catch (Exception e) {
-            Log.e("LogTrackableActivity.postLogFn: " + e.toString());
+            Log.e("LogTrackableActivity.postLogFn", e);
         }
 
         return StatusCode.LOG_POST_ERROR;
     }
 
-    public static void startActivity(final Context context, final cgTrackable trackable) {
+    public static void startActivity(final Context context, final Trackable 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);