Merge branch 'release' into upstream

Conflicts:
	main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java

1 files changed, 5 insertions, 3 deletions

diff --git a/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java b/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
index e7b830e..3aaeec1 100644
--- a/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
+++ b/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
@@ -3,7 +3,7 @@ package cgeo.geocaching.ui.logs;
 import cgeo.geocaching.ImagesActivity;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
-import cgeo.geocaching.activity.AbstractActivity;
+import cgeo.geocaching.activity.AbstractActionBarActivity;
 import cgeo.geocaching.network.SmileyImage;
 import cgeo.geocaching.ui.AbstractCachingListViewPageViewCreator;
 import cgeo.geocaching.ui.AnchorAwareLinkMovementMethod;
@@ -27,9 +27,9 @@ import java.util.List;
 
 public abstract class LogsViewCreator extends AbstractCachingListViewPageViewCreator {
 
-    protected final AbstractActivity activity;
+    protected final AbstractActionBarActivity activity;
 
-    public LogsViewCreator(final AbstractActivity activity) {
+    public LogsViewCreator(final AbstractActionBarActivity activity) {
         this.activity = activity;
     }
 
@@ -59,6 +59,8 @@ public abstract class LogsViewCreator extends AbstractCachingListViewPageViewCre
 
                 final LogEntry log = getItem(position);
                 fillViewHolder(convertView, holder, log);
+                final View logView = rowView.findViewById(R.id.log);
+                activity.addContextMenu(logView);
                 return rowView;
             }
         });