fix #1957 open MarkerEditActivity to receive external marker

src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java

@@ -88,9 +88,9 @@ public static TrackData createTestingTrack(Track.Id trackId) {
         stats.setTotalDistance(Distance.of(0));
         stats.setTotalTime(Duration.ofMillis(0));
         List<Marker> markers = List.of(
-                new Marker("Marker 1", "Marker description 1", "Marker category 3", "", trackId, stats, trackPoints.get(1), null),
-                new Marker("Marker 2", "Marker description 2", "Marker category 3", "", trackId, stats, trackPoints.get(4), null),
-                new Marker("Marker 3", "Marker description 3", "Marker category 3", "", trackId, stats, trackPoints.get(5), null)
+                new Marker("Marker 1", "Marker description 1", "Marker category 3", "", trackId, trackPoints.get(1), null),
+                new Marker("Marker 2", "Marker description 2", "Marker category 3", "", trackId, trackPoints.get(4), null),
+                new Marker("Marker 3", "Marker description 3", "Marker category 3", "", trackId, trackPoints.get(5), null)
         );
 
         return new TrackData(track, trackPoints, markers);
@@ -152,7 +152,7 @@ public static Marker createMarkerWithPhoto(Context context, Track.Id trackId, Tr
         stats.setTotalDistance(Distance.of(0));
         stats.setTotalTime(Duration.ofMillis(0));
 
-        return new Marker("Marker name", "Marker description", "Marker category", "", trackId, stats, trackPoint, photoUrl);
+        return new Marker("Marker name", "Marker description", "Marker category", "", trackId, trackPoint, photoUrl);
     }
 
     public static List<TrackPoint> getTrackPoints(ContentProviderUtils contentProviderUtils, Track.Id trackId) {

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java

@@ -141,7 +141,7 @@ public void setUp() throws TimeoutException {
         Distance sensorDistance = Distance.of(10); // recording distance interval
 
         sendLocation(trackPointCreator, "2020-02-02T02:02:03Z", 3, 14, 10, 13, 15, 10, 1f);
-        service.insertMarker("Marker 1", "Marker 1 category", "Marker 1 desc", null);
+        service.insertMarker("Marker 1", "Marker 1 category", "Marker 1 desc", null, null, null);
 
         // A sensor-only TrackPoint
         trackPointCreator.setClock("2020-02-02T02:02:04Z");
@@ -156,7 +156,7 @@ public void setUp() throws TimeoutException {
         mockSensorData(trackPointCreator, 5f, Distance.of(2), 69f, 3f, 50f, null); // Distance will be added to next TrackPoint
 
         sendLocation(trackPointCreator, "2020-02-02T02:02:17Z", 3, 14.001, 10, 13, 15, 10, 0f);
-        service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null);
+        service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null, null, null);
 
         trackPointCreator.setClock("2020-02-02T02:02:18Z");
         trackPointCreator.getSensorManager().sensorDataSet = new SensorDataSet();

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceMarkerTest.java

@@ -98,20 +98,42 @@ public void notRecording_testInsertMarker() {
         assertFalse(service.isRecording());
 
         // when
-        Marker.Id markerId = service.insertMarker(null, null, null, null);
+        Marker.Id markerId = service.insertMarker(null, null, null, null, null, null);
 
         // then
         assertNull(markerId);
     }
 
+    @MediumTest
+    @Test
+    public void notRecording_but_TrackId_and_TrackPoint_provided_testInsertMarker() {
+        // given
+        var trackId = service.startNewTrack();
+        service.endCurrentTrack();
+        assertFalse(service.isRecording());
+
+        // when
+        Marker.Id markerId = service.insertMarker(null, null, null, null, trackId, new TrackPoint(50.0, 9.0, null, Instant.now()));
+
+        // then
+        assertNotEquals(new Marker.Id(-1L), markerId);
+        Marker wpt = contentProviderUtils.getMarker(markerId);
+        assertEquals(context.getString(R.string.marker_icon_url), wpt.getIcon());
+        assertEquals(context.getString(R.string.marker_name_format, 1), wpt.getName());
+        assertEquals(trackId, wpt.getTrackId());
+        assertEquals(50.0, wpt.getLatitude(), 0.01);
+        assertEquals(9.0, wpt.getLongitude(), 0.01);
+        assertNotNull(wpt.getLocation());
+    }
+
     @MediumTest
     @Test
     public void recording_noGPSfix_cannotCreateMarker() {
         // given
         service.startNewTrack();
 
         // when
-        Marker.Id markerId = service.insertMarker(null, null, null, null);
+        Marker.Id markerId = service.insertMarker(null, null, null, null, null, null);
 
         // then
         assertNull(markerId);
@@ -128,22 +150,20 @@ public void recording_GPSfix_createsMarker() {
         service.stopUpdateRecordingData();
 
         assertTrue(service.isRecording());
-        trackPointCreator.onNewTrackPoint(
-                new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:03Z"))
-                        .setLatitude(10)
-                        .setLongitude(10)
-        );
+        TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:03Z"))
+                .setLatitude(10)
+                .setLongitude(10);
+        trackPointCreator.onNewTrackPoint(trackPoint);
 
         // when
-        Marker.Id markerId = service.insertMarker(null, null, null, null);
+        Marker.Id markerId = service.insertMarker(null, null, null, null, trackId, trackPoint);
 
         // then
         assertNotEquals(new Marker.Id(-1L), markerId);
         Marker wpt = contentProviderUtils.getMarker(markerId);
         assertEquals(context.getString(R.string.marker_icon_url), wpt.getIcon());
         assertEquals(context.getString(R.string.marker_name_format, 1), wpt.getName());
         assertEquals(trackId, wpt.getTrackId());
-        assertEquals(0.0, wpt.getLength().toM(), 0.01);
         assertNotNull(wpt.getLocation());
 
         trackPointCreator.setClock("2020-02-02T02:02:04Z");

src/main/AndroidManifest.xml

@@ -314,14 +314,24 @@ limitations under the License.
         </activity>
 
         <activity
-            android:name=".ui.markers.MarkerDetailActivity"
+            android:name=".publicapi.ShowMarkerActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="de.dennisguse.opentracks.MarkerDetails" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".publicapi.CreateMarkerActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="de.dennisguse.opentracks.CreateMarker" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".ui.markers.MarkerDetailActivity" />
         <activity android:name=".ui.markers.MarkerEditActivity" />
         <activity android:name=".ui.markers.MarkerListActivity" />
 

src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java

@@ -33,6 +33,7 @@
 import de.dennisguse.opentracks.data.TrackDataHub;
 import de.dennisguse.opentracks.data.models.ActivityType;
 import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.databinding.TrackRecordingBinding;
 import de.dennisguse.opentracks.fragments.ChooseActivityTypeDialogFragment;
 import de.dennisguse.opentracks.fragments.StatisticsRecordingFragment;
@@ -269,9 +270,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
 
         if (item.getItemId() == R.id.track_detail_insert_marker) {
+            TrackPoint trackPoint = trackRecordingServiceConnection.getTrackRecordingService().getLastStoredTrackPointWithLocation();
+            if (trackPoint == null) {
+                return true;
+            }
             Intent intent = IntentUtils
                     .newIntent(this, MarkerEditActivity.class)
-                    .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, trackId);
+                    .putExtra(MarkerEditActivity.EXTRA_TRACK_ID, trackId)
+                    .putExtra(MarkerEditActivity.EXTRA_LOCATION, trackPoint.getLocation());
             startActivity(intent);
             return true;
         }

src/main/java/de/dennisguse/opentracks/chart/ChartView.java

@@ -152,31 +152,6 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float ve
             return true;
         }
 
-        @Override
-        public boolean onSingleTapConfirmed(MotionEvent event) {
-            // Check if the y event is within markerHeight of the marker center
-            if (Math.abs(event.getY() - topBorder - spacer - markerHeight / 2f) < markerHeight) {
-                int minDistance = Integer.MAX_VALUE;
-                Marker nearestMarker = null;
-                synchronized (markers) {
-                    for (Marker marker : markers) {
-                        int distance = Math.abs(getX(getMarkerXValue(marker)) - (int) event.getX() - getScrollX());
-                        if (distance < minDistance) {
-                            minDistance = distance;
-                            nearestMarker = marker;
-                        }
-                    }
-                }
-                if (nearestMarker != null && minDistance < markerWidth) {
-                    Intent intent = IntentUtils.newIntent(getContext(), MarkerDetailActivity.class)
-                            .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, nearestMarker.getId());
-                    getContext().startActivity(intent);
-                    return true;
-                }
-            }
-
-            return false;
-        }
     });
 
     private final ScaleGestureDetector detectorZoom = new ScaleGestureDetector(getContext(), new ScaleGestureDetector.SimpleOnScaleGestureListener() {
@@ -589,7 +564,6 @@ protected void onDraw(Canvas canvas) {
 
             clipToGraphArea(canvas);
             drawDataSeries(canvas);
-            drawMarker(canvas);
             drawGrid(canvas);
 
             canvas.restore();
@@ -630,30 +604,6 @@ private void drawDataSeries(Canvas canvas) {
         }
     }
 
-    private void drawMarker(Canvas canvas) {
-        synchronized (markers) {
-            for (Marker marker : markers) {
-                double xValue = getMarkerXValue(marker);
-                double markerIconSizeInXaxisUnits = maxX*markerWidth/effectiveWidth / zoomLevel;
-                if (xValue > maxX + markerIconSizeInXaxisUnits * (1-MARKER_X_ANCHOR)) {
-                    continue; // there is no chance that this marker will be visible
-                }
-                canvas.save();
-                float x = getX(getMarkerXValue(marker));
-                canvas.drawLine(x, topBorder + spacer + markerHeight / 2, x, topBorder + effectiveHeight, markerPaint);
-                // if marker is not near the end of the track then draw it normally
-                if (xValue < maxX - markerIconSizeInXaxisUnits*(1-MARKER_X_ANCHOR)) {
-                    canvas.translate(x - (markerWidth * MARKER_X_ANCHOR), topBorder + spacer);
-                } else { // marker at the end needs to be drawn mirrored so that it is more visible
-                    canvas.translate(x + (markerWidth * MARKER_X_ANCHOR), topBorder + spacer);
-                    canvas.scale(-1, 1);
-                }
-                markerPin.draw(canvas);
-                canvas.restore();
-            }
-        }
-    }
-
     /**
      * Draws the grid.
      *
@@ -1042,14 +992,6 @@ private int getY(ChartValueSeries chartValueSeries, double value) {
         return topBorder + yAxisOffset + (int) ((1 - percentage) * rangeHeight);
     }
 
-    private double getMarkerXValue(Marker marker) {
-        if (chartByDistance) {
-            return marker.getLength().toKM_Miles(unitSystem);
-        } else {
-            return marker.getDuration().toMillis();
-        }
-    }
-
     /**
      * Gets a paint's Rect for a string.
      *

src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java

@@ -377,8 +377,6 @@ public Marker createMarker(Cursor cursor) {
         int categoryIndex = cursor.getColumnIndexOrThrow(MarkerColumns.CATEGORY);
         int iconIndex = cursor.getColumnIndexOrThrow(MarkerColumns.ICON);
         int trackIdIndex = cursor.getColumnIndexOrThrow(MarkerColumns.TRACKID);
-        int lengthIndex = cursor.getColumnIndexOrThrow(MarkerColumns.LENGTH);
-        int durationIndex = cursor.getColumnIndexOrThrow(MarkerColumns.DURATION);
         int longitudeIndex = cursor.getColumnIndexOrThrow(MarkerColumns.LONGITUDE);
         int latitudeIndex = cursor.getColumnIndexOrThrow(MarkerColumns.LATITUDE);
         int timeIndex = cursor.getColumnIndexOrThrow(MarkerColumns.TIME);
@@ -419,13 +417,6 @@ public Marker createMarker(Cursor cursor) {
         if (!cursor.isNull(iconIndex)) {
             marker.setIcon(cursor.getString(iconIndex));
         }
-        if (!cursor.isNull(lengthIndex)) {
-            marker.setLength(Distance.of(cursor.getFloat(lengthIndex)));
-        }
-        if (!cursor.isNull(durationIndex)) {
-            marker.setDuration(Duration.ofMillis(cursor.getLong(durationIndex)));
-        }
-
         if (!cursor.isNull(photoUrlIndex)) {
             marker.setPhotoUrl(cursor.getString(photoUrlIndex));
         }
@@ -542,9 +533,6 @@ ContentValues createContentValues(@NonNull Marker marker) {
         values.put(MarkerColumns.CATEGORY, marker.getCategory());
         values.put(MarkerColumns.ICON, marker.getIcon());
         values.put(MarkerColumns.TRACKID, marker.getTrackId().id());
-        values.put(MarkerColumns.LENGTH, marker.getLength().toM());
-        values.put(MarkerColumns.DURATION, marker.getDuration().toMillis());
-
         values.put(MarkerColumns.LONGITUDE, (int) (marker.getLongitude() * 1E6));
         values.put(MarkerColumns.LATITUDE, (int) (marker.getLatitude() * 1E6));
         values.put(MarkerColumns.TIME, marker.getTime().toEpochMilli());

src/main/java/de/dennisguse/opentracks/data/CustomSQLiteOpenHelper.java

@@ -29,7 +29,7 @@ class CustomSQLiteOpenHelper extends SQLiteOpenHelper {
 
     private static final String TAG = CustomSQLiteOpenHelper.class.getSimpleName();
 
-    private static final int DATABASE_VERSION = 37;
+    private static final int DATABASE_VERSION = 38;
 
     private final Context context;
 
@@ -81,6 +81,7 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                 case 35 -> upgradeFrom34to35(db);
                 case 36 -> upgradeFrom35to36(db);
                 case 37 -> upgradeFrom36to37(db);
+                case 38 -> upgradeFrom37to38(db);
                 default -> throw new RuntimeException("Not implemented: upgrade to " + toVersion);
             }
         }
@@ -105,6 +106,7 @@ public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                 case 34 -> downgradeFrom35to34(db);
                 case 35 -> downgradeFrom36to35(db);
                 case 36 -> downgradeFrom37to36(db);
+                case 37 -> downgradeFrom38to37(db);
                 default -> throw new RuntimeException("Not implemented: downgrade to " + toVersion);
             }
         }
@@ -644,4 +646,28 @@ private void downgradeFrom37to36(SQLiteDatabase db) {
         db.endTransaction();
     }
 
+    private void upgradeFrom37to38(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("ALTER TABLE markers RENAME TO markers_old");
+        db.execSQL("CREATE TABLE markers (_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, description TEXT, category TEXT, icon TEXT, trackid INTEGER NOT NULL, longitude INTEGER, latitude INTEGER, time INTEGER, elevation FLOAT, accuracy FLOAT, bearing FLOAT, photoUrl TEXT, FOREIGN KEY (trackid) REFERENCES tracks(_id) ON UPDATE CASCADE ON DELETE CASCADE)");
+        db.execSQL("INSERT INTO markers SELECT _id, name, description, category, icon, trackid, longitude, latitude, time, elevation, accuracy, bearing, photoUrl FROM markers_old");
+        db.execSQL("DROP TABLE markers_old");
+
+        db.execSQL("CREATE INDEX markers_trackid_index ON markers(trackid)");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
+    private void downgradeFrom38to37(SQLiteDatabase db) {
+        db.beginTransaction();
+
+        db.execSQL("ALTER TABLE markers ADD COLUMN length FLOAT");
+        db.execSQL("ALTER TABLE markers ADD COLUMN duration INTEGER");
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+    }
+
 }