Make common files independent of content providers

code/Common/model/Journey.java

@@ -24,8 +24,6 @@ package uk.co.md87.android.common.model;
 
 import android.net.Uri;
 
-import uk.co.md87.android.contextanalyser.JourneysContentProvider;
-
 /**
  * A journey is a sequence of actions which were observed as the user travelled
  * between one known {@link Place} and another.
@@ -40,8 +38,8 @@ public class Journey {
     public static final String STEPS = "steps";
     public static final String NUMBER = "number";
 
-    public static final Uri CONTENT_URI = Uri.parse("content://"
-                + JourneysContentProvider.AUTHORITY + "/journeys");
+    public static final Uri CONTENT_URI = Uri.parse("content://uk.co.md87"
+            + ".android.contextanalyser.journeyscontentprovider/journeys");
     public static final String CONTENT_TYPE = "vnd.contextanalyser.journey";
 
     private final long id;

code/Common/model/JourneyStep.java

@@ -23,7 +23,6 @@
 package uk.co.md87.android.common.model;
 
 import android.net.Uri;
-import uk.co.md87.android.contextanalyser.JourneysContentProvider;
 
 /**
  * A journey step is a single activity which occurred one or more times in a
@@ -39,8 +38,8 @@ public class JourneyStep {
     public static final String JOURNEY = "journey";
     public static final String NEXT = "next";
 
-    public static final Uri CONTENT_URI = Uri.parse("content://"
-                + JourneysContentProvider.AUTHORITY + "/steps");
+    public static final Uri CONTENT_URI = Uri.parse("content://uk.co.md87"
+            + ".android.contextanalyser.journeyscontentprovider/steps");
     public static final String CONTENT_TYPE = "vnd.contextanalyser.journeystep";
 
     private final long id;

code/Common/model/Place.java

@@ -24,8 +24,6 @@ package uk.co.md87.android.common.model;
 
 import android.net.Uri;
 
-import uk.co.md87.android.contextanalyser.PlacesContentProvider;
-
 /**
  * A place is a named location which has some significance for the user. Most
  * places come about when the user remains stationary for a period of time.
@@ -39,8 +37,8 @@ public class Place {
     public static final String LATITUDE = "lat";
     public static final String LONGITUDE = "lon";
 
-    public static final Uri CONTENT_URI = Uri.parse("content://"
-                + PlacesContentProvider.AUTHORITY + "/places");
+    public static final Uri CONTENT_URI = Uri.parse("content://uk.co.md87"
+            + ".android.contextanalyser.placescontentprovider/places");
     public static final String CONTENT_TYPE = "vnd.contextanalyser.location";
 
     private final long id;