Cleanup: rename category to activityType.

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

@@ -100,7 +100,7 @@ public class ContentProviderUtils {
         int uuidIndex = cursor.getColumnIndexOrThrow(TracksColumns.UUID);
         int nameIndex = cursor.getColumnIndexOrThrow(TracksColumns.NAME);
         int descriptionIndex = cursor.getColumnIndexOrThrow(TracksColumns.DESCRIPTION);
-        int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.CATEGORY);
+        int categoryIndex = cursor.getColumnIndexOrThrow(TracksColumns.ACTIVITY_TYPE);
         int startTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME);
         int startTimeOffsetIndex = cursor.getColumnIndexOrThrow(TracksColumns.STARTTIME_OFFSET);
         int stopTimeIndex = cursor.getColumnIndexOrThrow(TracksColumns.STOPTIME);
@@ -129,7 +129,7 @@ public class ContentProviderUtils {
             track.setDescription(cursor.getString(descriptionIndex));
         }
         if (!cursor.isNull(categoryIndex)) {
-            track.setCategory(cursor.getString(categoryIndex));
+            track.setActivityType(cursor.getString(categoryIndex));
         }
 
         if (!cursor.isNull(startTimeIndex)) {
@@ -290,7 +290,7 @@ public class ContentProviderUtils {
         values.put(TracksColumns.UUID, UUIDUtils.toBytes(track.getUuid()));
         values.put(TracksColumns.NAME, track.getName());
         values.put(TracksColumns.DESCRIPTION, track.getDescription());
-        values.put(TracksColumns.CATEGORY, track.getCategory());
+        values.put(TracksColumns.ACTIVITY_TYPE, track.getActivityType());
         values.put(TracksColumns.STARTTIME_OFFSET, track.getZoneOffset().getTotalSeconds());
         if (trackStatistics.getStartTime() != null) {
             values.put(TracksColumns.STARTTIME, trackStatistics.getStartTime().toEpochMilli());

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

@@ -30,9 +30,9 @@ public class TrackSelection implements ContentProviderUtils.ContentProviderSelec
         return this;
     }
 
-    public TrackSelection addCategory(String category) {
-        if (!this.categories.contains(category)) {
-            this.categories.add(category);
+    public TrackSelection addActivityType(String activityType) {
+        if (!this.categories.contains(activityType)) {
+            this.categories.add(activityType);
         }
         return this;
     }
@@ -53,7 +53,7 @@ public class TrackSelection implements ContentProviderUtils.ContentProviderSelec
         }
         if (!categories.isEmpty()) {
             selection += selection.isEmpty() ? "" : " AND ";
-            selection += String.format(TracksColumns.CATEGORY + " IN (%s)", TextUtils.join(",", Collections.nCopies(categories.size(), "?")));
+            selection += String.format(TracksColumns.ACTIVITY_TYPE + " IN (%s)", TextUtils.join(",", Collections.nCopies(categories.size(), "?")));
         }
         if (from != null && to != null) {
             selection += selection.isEmpty() ? "" : " AND ";

src/main/java/de/dennisguse/opentracks/data/models/Track.java

@@ -44,7 +44,7 @@ public class Track {
 
     private String name = "";
     private String description = "";
-    private String category = "";
+    private String activityType = "";
 
     private String icon = "";
 
@@ -97,12 +97,12 @@ public class Track {
         this.description = description;
     }
 
-    public String getCategory() {
-        return category;
+    public String getActivityType() {
+        return activityType;
     }
 
-    public void setCategory(String category) {
-        this.category = category;
+    public void setActivityType(String activityType) {
+        this.activityType = activityType;
     }
 
     public String getIcon() {

src/main/java/de/dennisguse/opentracks/data/tables/TracksColumns.java

@@ -39,7 +39,7 @@ public interface TracksColumns extends BaseColumns {
     String UUID = "uuid"; // identifier to make tracks globally unique (prevent re-import)
     String NAME = "name"; // track name
     String DESCRIPTION = "description"; // track description
-    String CATEGORY = "category"; // track activity type
+    String ACTIVITY_TYPE = "category"; // track activity type
     String STARTTIME = "starttime"; // track start time
     String STARTTIME_OFFSET = "starttime_offset"; // in plus/minus in seconds
     String STOPTIME = "stoptime"; // track stop time
@@ -63,7 +63,7 @@ public interface TracksColumns extends BaseColumns {
             + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
             + NAME + " TEXT, "
             + DESCRIPTION + " TEXT, "
-            + CATEGORY + " TEXT, "
+            + ACTIVITY_TYPE + " TEXT, "
             + STARTTIME + " INTEGER, "
             + STOPTIME + " INTEGER, "
             + NUMPOINTS + " INTEGER, "