1 files changed, 7 insertions, 18 deletions

diff --git a/main/src/cgeo/geocaching/AbstractLoggingActivity.java b/main/src/cgeo/geocaching/AbstractLoggingActivity.java
index c3ba7d2..bca5db1 100644
--- a/main/src/cgeo/geocaching/AbstractLoggingActivity.java
+++ b/main/src/cgeo/geocaching/AbstractLoggingActivity.java
@@ -1,32 +1,29 @@
 package cgeo.geocaching;
 
-import cgeo.geocaching.activity.AbstractActivity;
+import cgeo.geocaching.activity.AbstractActionBarActivity;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.gc.GCConnector;
 import cgeo.geocaching.connector.gc.GCSmiliesProvider;
 import cgeo.geocaching.connector.gc.GCSmiliesProvider.Smiley;
 import cgeo.geocaching.connector.trackable.TravelBugConnector;
-import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.utils.LogTemplateProvider;
 import cgeo.geocaching.utils.LogTemplateProvider.LogContext;
 import cgeo.geocaching.utils.LogTemplateProvider.LogTemplate;
 
-import org.apache.commons.lang3.StringUtils;
-
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SubMenu;
 import android.widget.EditText;
 
-public abstract class AbstractLoggingActivity extends AbstractActivity {
+public abstract class AbstractLoggingActivity extends AbstractActionBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(final Menu menu) {
         getMenuInflater().inflate(R.menu.abstract_logging_activity, menu);
 
         final SubMenu menuLog = menu.findItem(R.id.menu_templates).getSubMenu();
-        for (final LogTemplate template : LogTemplateProvider.getTemplates()) {
+        for (final LogTemplate template : LogTemplateProvider.getTemplatesWithSignature()) {
             menuLog.add(0, template.getItemId(), 0, template.getResourceId());
         }
 
@@ -39,10 +36,7 @@ public abstract class AbstractLoggingActivity extends AbstractActivity {
     }
 
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        final boolean signatureAvailable = StringUtils.isNotBlank(Settings.getSignature());
-        menu.findItem(R.id.menu_signature).setVisible(signatureAvailable);
-
+    public boolean onPrepareOptionsMenu(final Menu menu) {
         boolean smileyVisible = false;
         final Geocache cache = getLogContext().getCache();
         if (cache != null && ConnectorFactory.getConnector(cache).equals(GCConnector.getInstance())) {
@@ -59,14 +53,9 @@ public abstract class AbstractLoggingActivity extends AbstractActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onOptionsItemSelected(final MenuItem item) {
         final int id = item.getItemId();
 
-        if (id == R.id.menu_signature) {
-            insertIntoLog(LogTemplateProvider.applyTemplates(Settings.getSignature(), getLogContext()), true);
-            return true;
-        }
-
         final LogTemplate template = LogTemplateProvider.getTemplate(id);
         if (template != null) {
             insertIntoLog(template.getValue(getLogContext()), true);
@@ -79,12 +68,12 @@ public abstract class AbstractLoggingActivity extends AbstractActivity {
             return true;
         }
 
-        return false;
+        return super.onOptionsItemSelected(item);
     }
 
     protected abstract LogContext getLogContext();
 
-    protected void insertIntoLog(String newText, final boolean moveCursor) {
+    protected void insertIntoLog(final String newText, final boolean moveCursor) {
         final EditText log = (EditText) findViewById(R.id.log);
         ActivityMixin.insertAtPosition(log, newText, moveCursor);
     }