karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: use ActivityType instead of passing it's id around as String.

Browse Source 
Part of #1608.
This commit is contained in:
Dennis Guse
2023-06-24 19:30:00 +02:00
parent 779681088c
commit 425ea0f216
34 changed files with 162 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/util/TrackUtils.java
+11 -11
View File
@@ -27,32 +27,32 @@ import de.dennisguse.opentracks.data.models.Track;
*
* @author Jimmy Shih
*/
//TOOD Refactor ActivityType handling in here!
@Deprecated //TODO Refactor: all this should happen somewhere else (ContentProviderUtils?)
public class TrackUtils {
private TrackUtils() {
}
public static void updateTrack(Context context, Track track, String name, String activityType, String description, ContentProviderUtils contentProviderUtils) {
updateTrack(context, track, name, activityType, ActivityType.findByLocalizedString(context, activityType)
.getId(), description, contentProviderUtils);
public static void updateTrack(Context context, Track track, String name, String activityTypeLocalized, String description, ContentProviderUtils contentProviderUtils) {
updateTrack(context, track, name, activityTypeLocalized, ActivityType.findByLocalizedString(context, activityTypeLocalized), description, contentProviderUtils);
}
public static void updateTrack(Context context, Track track, String name, String activityType, String iconValue, String description, ContentProviderUtils contentProviderUtils) {
public static void updateTrack(Context context, Track track, String name, String activityTypeLocalized, ActivityType activityType, String description, ContentProviderUtils contentProviderUtils) {
boolean update = false;
if (name != null) {
track.setName(name);
update = true;
}
if (activityType != null) {
track.setActivityType(activityType);
if (activityTypeLocalized != null) {
track.setActivityTypeLocalized(activityTypeLocalized);
update = true;
}
if (iconValue != null) {
track.setActivityTypeId(iconValue);
} else if (activityType != null) {
track.setActivityTypeId(ActivityType.findByLocalizedString(context, activityType)
.getId());
if (activityType != null) {
track.setActivityType(activityType);
} else if (activityTypeLocalized != null) {
track.setActivityType(ActivityType.findByLocalizedString(context, activityTypeLocalized)
);
}
if (description != null) {
track.setDescription(description);