1 files changed, 10 insertions, 10 deletions

diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index 6d0f822..ae17077 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -10,17 +10,18 @@ import cgeo.geocaching.enumerations.WaypointType;
 import cgeo.geocaching.geopoint.DistanceParser;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.GeopointFormatter;
+import cgeo.geocaching.sensors.IGeoData;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.ui.dialog.CoordinatesInputDialog;
 import cgeo.geocaching.ui.dialog.Dialogs;
-import cgeo.geocaching.utils.GeoDirHandler;
+import cgeo.geocaching.sensors.GeoDirHandler;
 import cgeo.geocaching.utils.Log;
 import cgeo.geocaching.utils.TextUtils;
 
-import com.googlecode.androidannotations.annotations.EActivity;
-import com.googlecode.androidannotations.annotations.Extra;
-import com.googlecode.androidannotations.annotations.InstanceState;
-import com.googlecode.androidannotations.annotations.ViewById;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.Extra;
+import org.androidannotations.annotations.InstanceState;
+import org.androidannotations.annotations.ViewById;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -110,12 +111,14 @@ public class EditWaypointActivity extends AbstractActivity {
                             buttonLon.setText(waypoint.getCoords().format(GeopointFormatter.Format.LON_DECMINUTE));
                         }
                         waypointName.setText(Html.fromHtml(StringUtils.trimToEmpty(waypoint.getName())).toString());
+                        Dialogs.moveCursorToEnd(waypointName);
                         if (TextUtils.containsHtml(waypoint.getNote())) {
                             note.setText(Html.fromHtml(StringUtils.trimToEmpty(waypoint.getNote())).toString());
                         }
                         else {
                             note.setText(StringUtils.trimToEmpty(waypoint.getNote()));
                         }
+                        Dialogs.moveCursorToEnd(note);
                     }
                     final Geocache cache = DataStore.loadCache(geocode, LoadFlags.LOAD_CACHE_ONLY);
                     setCoordsModificationVisibility(ConnectorFactory.getConnector(geocode), cache);
@@ -199,14 +202,11 @@ public class EditWaypointActivity extends AbstractActivity {
 
     @Override
     public void onResume() {
-        super.onResume();
-
-        geoDirHandler.startGeo();
+        super.onResume(geoDirHandler.start());
     }
 
     @Override
     public void onPause() {
-        geoDirHandler.stopGeo();
         super.onPause();
     }
 
@@ -261,7 +261,7 @@ public class EditWaypointActivity extends AbstractActivity {
 
     final private GeoDirHandler geoDirHandler = new GeoDirHandler() {
         @Override
-        public void updateGeoData(final IGeoData geo) {
+        public void updateGeoDir(final IGeoData geo, final float dir) {
             if (geo.getCoords() == null) {
                 return;
             }