1 files changed, 18 insertions, 16 deletions

diff --git a/main/src/cgeo/geocaching/CompassActivity.java b/main/src/cgeo/geocaching/CompassActivity.java
index 36dcf27..531e07d 100644
--- a/main/src/cgeo/geocaching/CompassActivity.java
+++ b/main/src/cgeo/geocaching/CompassActivity.java
@@ -3,7 +3,7 @@ package cgeo.geocaching;
 import butterknife.ButterKnife;
 import butterknife.InjectView;
 
-import cgeo.geocaching.activity.AbstractActivity;
+import cgeo.geocaching.activity.AbstractActionBarActivity;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Units;
@@ -38,7 +38,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-public class CompassActivity extends AbstractActivity {
+public class CompassActivity extends AbstractActionBarActivity {
 
     private static final int COORDINATES_OFFSET = 10;
 
@@ -69,7 +69,7 @@ public class CompassActivity extends AbstractActivity {
     private boolean hasMagneticFieldSensor;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.compass_activity);
 
         final SensorManager sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
@@ -79,7 +79,7 @@ public class CompassActivity extends AbstractActivity {
         }
 
         // get parameters
-        Bundle extras = getIntent().getExtras();
+        final Bundle extras = getIntent().getExtras();
         if (extras != null) {
             final String geocode = extras.getString(EXTRAS_GEOCODE);
             if (StringUtils.isNotEmpty(geocode)) {
@@ -98,7 +98,7 @@ public class CompassActivity extends AbstractActivity {
                 }
             }
         } else {
-            Intent pointIntent = new Intent(this, NavigateAnyPointActivity.class);
+            final Intent pointIntent = new Intent(this, NavigateAnyPointActivity.class);
             startActivity(pointIntent);
 
             finish();
@@ -129,7 +129,7 @@ public class CompassActivity extends AbstractActivity {
     }
 
     @Override
-    public void onConfigurationChanged(Configuration newConfig) {
+    public void onConfigurationChanged(final Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
         setContentView(R.layout.compass_activity);
@@ -167,7 +167,7 @@ public class CompassActivity extends AbstractActivity {
     }
 
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
+    public boolean onPrepareOptionsMenu(final Menu menu) {
         super.onPrepareOptionsMenu(menu);
         menu.findItem(R.id.menu_switch_compass_gps).setTitle(res.getString(Settings.isUseCompass() ? R.string.use_gps : R.string.use_compass));
         menu.findItem(R.id.menu_tts_start).setVisible(!SpeechService.isRunning());
@@ -176,34 +176,36 @@ public class CompassActivity extends AbstractActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        final int id = item.getItemId();
         switch (id) {
             case R.id.menu_map:
                 CGeoMap.startActivityCoords(this, dstCoords, null, null);
                 return true;
             case R.id.menu_switch_compass_gps:
-                boolean oldSetting = Settings.isUseCompass();
+                final boolean oldSetting = Settings.isUseCompass();
                 Settings.setUseCompass(!oldSetting);
                 invalidateOptionsMenuCompatible();
                 return true;
             case R.id.menu_edit_destination:
-                Intent pointIntent = new Intent(this, NavigateAnyPointActivity.class);
+                final Intent pointIntent = new Intent(this, NavigateAnyPointActivity.class);
                 startActivity(pointIntent);
 
                 finish();
                 return true;
             case R.id.menu_tts_start:
                 SpeechService.startService(this, dstCoords);
+                invalidateOptionsMenuCompatible();
                 return true;
             case R.id.menu_tts_stop:
                 SpeechService.stopService(this);
+                invalidateOptionsMenuCompatible();
                 return true;
             default:
                 if (LoggingUI.onMenuItemSelected(item, this, cache)) {
                     return true;
                 }
-                int coordinatesIndex = id - COORDINATES_OFFSET;
+                final int coordinatesIndex = id - COORDINATES_OFFSET;
                 if (coordinatesIndex >= 0 && coordinatesIndex < coordinates.size()) {
                     final IWaypoint coordinate = coordinates.get(coordinatesIndex);
                     title = coordinate.getName();
@@ -217,7 +219,7 @@ public class CompassActivity extends AbstractActivity {
                     return true;
                 }
         }
-        return false;
+        return super.onOptionsItemSelected(item);
     }
 
     private void setTitle() {
@@ -255,7 +257,7 @@ public class CompassActivity extends AbstractActivity {
         headingView.setText(Math.round(cacheHeading) + "°");
     }
 
-    private GeoDirHandler geoDirHandler = new GeoDirHandler() {
+    private final GeoDirHandler geoDirHandler = new GeoDirHandler() {
         @Override
         public void updateGeoDir(final IGeoData geo, final float dir) {
             try {
@@ -283,7 +285,7 @@ public class CompassActivity extends AbstractActivity {
                 }
 
                 updateNorthHeading(DirectionProvider.getDirectionNow(dir));
-            } catch (RuntimeException e) {
+            } catch (final RuntimeException e) {
                 Log.w("Failed to LocationUpdater location.");
             }
         }
@@ -299,7 +301,7 @@ public class CompassActivity extends AbstractActivity {
             final String info) {
         coordinates.clear();
         if (coordinatesWithType != null) {
-            for (IWaypoint coordinate : coordinatesWithType) {
+            for (final IWaypoint coordinate : coordinatesWithType) {
                 if (coordinate != null) {
                     coordinates.add(coordinate);
                 }