From a6e275f8aae2225a7061e7ef8d3d3102b044127b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rom=C3=A1n?= Date: Wed, 9 Sep 2020 17:34:44 +0200 Subject: [PATCH] Several hidden bugfixes around Track.Id --- .../java/de/dennisguse/opentracks/SearchListActivity.java | 2 +- src/main/java/de/dennisguse/opentracks/TrackEditActivity.java | 2 +- .../java/de/dennisguse/opentracks/content/SearchEngine.java | 2 +- .../io/file/importer/AbstractFileTrackImporter.java | 2 +- .../dennisguse/opentracks/services/TrackRecordingService.java | 4 ++-- src/main/java/de/dennisguse/opentracks/util/IntentUtils.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java index 6c65938ac..3f1a56520 100644 --- a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java @@ -415,7 +415,7 @@ public class SearchListActivity extends AbstractListActivity implements DeleteMa String icon = track.getIcon(); String category = icon != null && !icon.equals("") ? null : track.getCategory(); - resultMap.put(IS_RECORDING_FIELD, track.getId() == recordingTrackId); + resultMap.put(IS_RECORDING_FIELD, track.getId().equals(recordingTrackId)); resultMap.put(IS_PAUSED_FIELD, recordingTrackPaused); resultMap.put(ICON_ID_FIELD, TrackIconUtils.getIconDrawable(icon)); resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.image_track); diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java index 1b953a841..8fe5df6b0 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java @@ -75,7 +75,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit contentProviderUtils = new ContentProviderUtils(this); track = contentProviderUtils.getTrack(trackId); if (track == null) { - Log.e(TAG, "No track for " + trackId); + Log.e(TAG, "No track for " + trackId.getId()); finish(); return; } diff --git a/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java b/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java index c9dd29c2a..d0169e5dc 100644 --- a/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java +++ b/src/main/java/de/dennisguse/opentracks/content/SearchEngine.java @@ -250,7 +250,7 @@ public class SearchEngine { score *= getTimeBoost(query, meanTimestamp); // Score the currently-selected track lower (user is already there, wouldn't be searching for it). - if (track.getId() == query.currentTrackId) { + if (track.getId().equals(query.currentTrackId)) { score *= CURRENT_TRACK_DEMOTION; } diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java index f0888c488..9cb0a3bb4 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java @@ -231,7 +231,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track trackId = new Track.Id(Long.parseLong(uri.getLastPathSegment())); } else { if (trackIds.size() > 0) { - throw new SAXException(createErrorMessage("Cannot import more than one track to an existing track " + importTrackId)); + throw new SAXException(createErrorMessage("Cannot import more than one track to an existing track " + importTrackId.getId())); } trackId = importTrackId; contentProviderUtils.clearTrack(trackId); diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index fc2a9a035..bc7a9685b 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java @@ -311,7 +311,7 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand void resumeTrack(Track.Id trackId) { Track track = contentProviderUtils.getTrack(trackId); if (track == null) { - Log.e(TAG, "Ignore resumeTrack. Track " + trackId + " does not exists."); + Log.e(TAG, "Ignore resumeTrack. Track " + trackId.getId() + " does not exists."); return; } @@ -335,7 +335,7 @@ public class TrackRecordingService extends Service implements HandlerServer.Hand Track track = contentProviderUtils.getTrack(recordingTrackId); if (track == null) { if (isRecording()) { - Log.w(TAG, "track is null, but recordingTrackId not -1L. " + recordingTrackId); + Log.w(TAG, "track is null, but recordingTrackId not -1L. " + recordingTrackId.getId()); updateRecordingState(null, true); } showNotification(false); diff --git a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java index 47e4e5af6..1007d19fa 100644 --- a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java @@ -87,7 +87,7 @@ public class IntentUtils { for (Track.Id trackId : trackIds) { Track track = contentProviderUtils.getTrack(trackId); if (track == null) { - Log.e(TAG, "TrackId " + trackId + " could not be resolved."); + Log.e(TAG, "TrackId " + trackId.getId() + " could not be resolved."); continue; }