2 files changed, 17 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index 5c6d0f5..47fc4c3 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -16,7 +16,9 @@ import cgeo.geocaching.ui.dialog.DateDialog;
 import cgeo.geocaching.ui.dialog.Dialogs;
 import cgeo.geocaching.utils.Formatter;
 import cgeo.geocaching.utils.Log;
+import cgeo.geocaching.utils.LogTemplateProvider;
 import cgeo.geocaching.utils.LogTemplateProvider.LogContext;
+import cgeo.geocaching.utils.LogTemplateProvider.LogTemplate;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +31,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.view.ContextMenu;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -347,12 +350,12 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
         DataStore.saveTrackable(trackable);
     }
 
-    public static void startActivity(final Context context, final Trackable trackable) {
+    public static Intent getIntent(final Context context, final Trackable trackable) {
         final Intent logTouchIntent = new Intent(context, LogTrackableActivity.class);
         logTouchIntent.putExtra(Intents.EXTRA_GEOCODE, trackable.getGeocode());
         logTouchIntent.putExtra(Intents.EXTRA_GUID, trackable.getGuid());
         logTouchIntent.putExtra(Intents.EXTRA_TRACKING_CODE, trackable.getTrackingcode());
-        context.startActivity(logTouchIntent);
+        return logTouchIntent;
     }
 
     @Override
@@ -389,4 +392,15 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
         }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(final Menu menu) {
+        final boolean result = super.onCreateOptionsMenu(menu);
+        for (final LogTemplate template : LogTemplateProvider.getTemplatesWithoutSignature()) {
+            if (template.getTemplateString().equals("NUMBER")) {
+                menu.findItem(R.id.menu_templates).getSubMenu().removeItem(template.getItemId());
+            }
+        }
+        return result;
+    }
+
 }
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 81516c3..a427ced 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -206,7 +206,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
     public boolean onOptionsItemSelected(final MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_log_touch:
-                LogTrackableActivity.startActivity(this, trackable);
+                startActivity(LogTrackableActivity.getIntent(this, trackable));
                 return true;
             case R.id.menu_browser_trackable:
                 startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(trackable.getUrl())));