1 files changed, 52 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/utils/LogTemplateProvider.java b/main/src/cgeo/geocaching/utils/LogTemplateProvider.java
index 98201b5..76fa0f7 100644
--- a/main/src/cgeo/geocaching/utils/LogTemplateProvider.java
+++ b/main/src/cgeo/geocaching/utils/LogTemplateProvider.java
@@ -1,6 +1,7 @@
 package cgeo.geocaching.utils;
 
 import cgeo.geocaching.Geocache;
+import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Trackable;
 import cgeo.geocaching.connector.ConnectorFactory;
@@ -35,22 +36,25 @@ public final class LogTemplateProvider {
         private Geocache cache;
         private Trackable trackable;
         private boolean offline = false;
+        private LogEntry logEntry;
 
-        public LogContext(final Geocache cache) {
-            this(cache, false);
+        public LogContext(final Geocache cache, LogEntry logEntry) {
+            this(cache, logEntry, false);
         }
 
-        public LogContext(final Trackable trackable) {
+        public LogContext(final Trackable trackable, final LogEntry logEntry) {
             this.trackable = trackable;
+            this.logEntry = logEntry;
         }
 
         public LogContext(final boolean offline) {
-            this(null, offline);
+            this(null, null, offline);
         }
 
-        public LogContext(final Geocache cache, final boolean offline) {
+        public LogContext(final Geocache cache, LogEntry logEntry, final boolean offline) {
             this.cache = cache;
             this.offline = offline;
+            this.logEntry = logEntry;
         }
 
         public final Geocache getCache() {
@@ -64,6 +68,10 @@ public final class LogTemplateProvider {
         public final boolean isOffline() {
             return offline;
         }
+
+        public final LogEntry getLogEntry() {
+            return logEntry;
+        }
     }
 
     public abstract static class LogTemplate {
@@ -178,6 +186,45 @@ public final class LogTemplateProvider {
                 return StringUtils.EMPTY;
             }
         });
+        templates.add(new LogTemplate("NAME", R.string.init_signature_template_name) {
+            @Override
+            public String getValue(LogContext context) {
+                Trackable trackable = context.getTrackable();
+                if (trackable != null) {
+                    return trackable.getName();
+                }
+                Geocache cache = context.getCache();
+                if (cache != null) {
+                    return cache.getName();
+                }
+                return StringUtils.EMPTY;
+            }
+        });
+        templates.add(new LogTemplate("URL", R.string.init_signature_template_url) {
+
+            @Override
+            public String getValue(LogContext context) {
+                Trackable trackable = context.getTrackable();
+                if (trackable != null) {
+                    return trackable.getUrl();
+                }
+                Geocache cache = context.getCache();
+                if (cache != null) {
+                    return cache.getUrl();
+                }
+                return StringUtils.EMPTY;
+            }
+        });
+        templates.add(new LogTemplate("LOG", R.string.init_signature_template_log) {
+            @Override
+            public String getValue(LogContext context) {
+                LogEntry logEntry = context.getLogEntry();
+                if (logEntry != null) {
+                    return logEntry.getDisplayText();
+                }
+                return StringUtils.EMPTY;
+            }
+        });
         return templates;
     }