From 86a42f3c7c9d2e771d8ab97117b6702d77ca62c5 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 21 Jul 2019 21:07:20 +0200 Subject: [PATCH] Use TEXT instead of String for SQLite. --- .../android/apps/mytracks/content/TracksColumns.java | 8 ++++---- .../google/android/apps/mytracks/content/Waypoint.aidl | 2 -- .../apps/mytracks/content/WaypointsColumns.java | 10 +++++----- 3 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 src/main/java/com/google/android/apps/mytracks/content/Waypoint.aidl diff --git a/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java b/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java index 032fcedcc..edb3f8052 100644 --- a/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java +++ b/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java @@ -78,9 +78,9 @@ public interface TracksColumns extends BaseColumns { String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" // table + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " // id - + NAME + " STRING, " // name - + DESCRIPTION + " STRING, " // description - + CATEGORY + " STRING, " // category + + NAME + " TEXT, " // name + + DESCRIPTION + " TEXT, " // description + + CATEGORY + " TEXT, " // category + STARTID + " INTEGER, " // start id + STOPID + " INTEGER, " // stop id + STARTTIME + " INTEGER, " // start time @@ -101,5 +101,5 @@ public interface TracksColumns extends BaseColumns { + ELEVATIONGAIN + " FLOAT, " // elevation gain + MINGRADE + " FLOAT, " // min grade + MAXGRADE + " FLOAT, " // max grade - + ICON + " STRING);"; // icon + + ICON + " TEXT);"; // icon } diff --git a/src/main/java/com/google/android/apps/mytracks/content/Waypoint.aidl b/src/main/java/com/google/android/apps/mytracks/content/Waypoint.aidl deleted file mode 100644 index fece6fd44..000000000 --- a/src/main/java/com/google/android/apps/mytracks/content/Waypoint.aidl +++ /dev/null @@ -1,2 +0,0 @@ -package com.google.android.apps.mytracks.content; -parcelable Waypoint; \ No newline at end of file diff --git a/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java b/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java index 37f37a460..64e4490be 100644 --- a/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java +++ b/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java @@ -69,10 +69,10 @@ public interface WaypointsColumns extends BaseColumns { String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + _ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " - + NAME + " STRING, " - + DESCRIPTION + " STRING, " - + CATEGORY + " STRING, " - + ICON + " STRING, " + + NAME + " TEXT, " + + DESCRIPTION + " TEXT, " + + CATEGORY + " TEXT, " + + ICON + " TEXT, " + TRACKID + " INTEGER, " + TYPE + " INTEGER, " + LENGTH + " FLOAT, " @@ -98,6 +98,6 @@ public interface WaypointsColumns extends BaseColumns { + ELEVATIONGAIN + " FLOAT, " + MINGRADE + " FLOAT, " + MAXGRADE + " FLOAT, " - + PHOTOURL + " STRING" + + PHOTOURL + " TEXT" + ");"; }