2 files changed, 20 insertions, 15 deletions
diff --git a/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java b/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
index 23caf79..3aaeec1 100644
--- a/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
+++ b/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
@@ -4,8 +4,7 @@ import cgeo.geocaching.ImagesActivity;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
 import cgeo.geocaching.activity.AbstractActionBarActivity;
-import cgeo.geocaching.list.StoredList;
-import cgeo.geocaching.network.HtmlImage;
+import cgeo.geocaching.network.SmileyImage;
 import cgeo.geocaching.ui.AbstractCachingListViewPageViewCreator;
 import cgeo.geocaching.ui.AnchorAwareLinkMovementMethod;
 import cgeo.geocaching.ui.DecryptTextClickListener;
@@ -87,7 +86,7 @@ public abstract class LogsViewCreator extends AbstractCachingListViewPageViewCre
         if (TextUtils.containsHtml(logText)) {
             logText = log.getDisplayText();
             final UnknownTagsHandler unknownTagsHandler = new UnknownTagsHandler();
-            holder.text.setText(Html.fromHtml(logText, new HtmlImage(getGeocode(), false, StoredList.STANDARD_LIST_ID, false, holder.text),
+            holder.text.setText(Html.fromHtml(logText, new SmileyImage(getGeocode(), holder.text),
                     unknownTagsHandler), TextView.BufferType.SPANNABLE);
         } else {
             holder.text.setText(logText, TextView.BufferType.SPANNABLE);
diff --git a/main/src/cgeo/geocaching/ui/logs/TrackableLogsViewCreator.java b/main/src/cgeo/geocaching/ui/logs/TrackableLogsViewCreator.java
index 300f510..ecb6469 100644
--- a/main/src/cgeo/geocaching/ui/logs/TrackableLogsViewCreator.java
+++ b/main/src/cgeo/geocaching/ui/logs/TrackableLogsViewCreator.java
@@ -1,6 +1,7 @@
 package cgeo.geocaching.ui.logs;
 
 import cgeo.geocaching.CacheDetailActivity;
+import cgeo.geocaching.DataStore;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.Trackable;
 import cgeo.geocaching.TrackableActivity;
@@ -15,14 +16,16 @@ import java.util.List;
 
 public class TrackableLogsViewCreator extends LogsViewCreator {
 
-    private final Trackable trackable;
+    private Trackable trackable;
+    private final TrackableActivity trackableActivity;
 
     /**
      * @param trackableActivity
      */
-    public TrackableLogsViewCreator(TrackableActivity trackableActivity, final Trackable trackable) {
+    public TrackableLogsViewCreator(final TrackableActivity trackableActivity) {
         super(trackableActivity);
-        this.trackable = trackable;
+        this.trackableActivity = trackableActivity;
+        trackable = trackableActivity.getTrackable();
     }
 
     @Override
@@ -32,6 +35,7 @@ public class TrackableLogsViewCreator extends LogsViewCreator {
 
     @Override
     protected List<LogEntry> getLogs() {
+        trackable = trackableActivity.getTrackable();
         return trackable.getLogs();
     }
 
@@ -41,19 +45,21 @@ public class TrackableLogsViewCreator extends LogsViewCreator {
     }
 
     @Override
-    protected void fillCountOrLocation(LogViewHolder holder, final LogEntry log) {
+    protected void fillCountOrLocation(final LogViewHolder holder, final LogEntry log) {
         if (StringUtils.isBlank(log.cacheName)) {
             holder.countOrLocation.setVisibility(View.GONE);
         } else {
             holder.countOrLocation.setText(Html.fromHtml(log.cacheName));
-            final String cacheGuid = log.cacheGuid;
-            final String cacheName = log.cacheName;
-            holder.countOrLocation.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View arg0) {
-                    CacheDetailActivity.startActivityGuid(activity, cacheGuid, Html.fromHtml(cacheName).toString());
-                }
-            });
+            final String cacheCode = DataStore.getGeocodeForGuid(log.cacheGuid);
+            if (cacheCode != null) {
+                final String cacheName = log.cacheName;
+                holder.countOrLocation.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(final View arg0) {
+                        CacheDetailActivity.startActivity(activity, cacheCode, Html.fromHtml(cacheName).toString());
+                    }
+                });
+            }
         }
     }