Add ContextAPI

code/API/ContextApi.java

@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2009-2010 Chris Smith
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.co.md87.android.contextapi;
+
+import android.net.Uri;
+
+/**
+ * Provides access to constants used to access the exported API of the Context
+ * Analyser.
+ *
+ * @author chris
+ */
+public class ContextApi {
+
+    public static class Intents {
+        public static final String ACTIVITY_CHANGED
+                = "uk.co.md87.android.contextanalyser.ACTIVITY_CHANGED";
+        public static final String CONTEXT_CHANGED
+                = "uk.co.md87.android.contextanalyser.CONTEXT_CHANGED";
+        public static final String PREDICTION_AVAILABLE
+                = "uk.co.md87.android.contextanalyser.PREDICTION_AVAILABLE";
+
+        public static class ContextTypes {
+            public static final int PLACE = 1;
+        }
+    }
+
+    public static class 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";
+
+        public static class ColumnNames {
+            public static final String _ID = "_id";
+            public static final String NAME = "name";
+            public static final String LATITUDE = "lat";
+            public static final String LONGITUDE = "lon";
+            public static final String DURATION = "duration";
+            public static final String VISIT_COUNT = "times";
+            public static final String LAST_VISIT = "lastvisit";
+        }
+
+    }
+
+    public static class 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";
+
+        public static class ColumnNames {
+            public static final String _ID = "_id";
+            public static final String START = "start";
+            public static final String END = "end";
+            public static final String STEPS = "steps";
+            public static final String NUMBER = "number";
+        }
+
+    }
+
+    public static class JourneySteps {
+
+        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";
+
+        public static class ColumnNames {
+            public static final String _ID = "_id";
+            public static final String ACTIVITY = "activity";
+            public static final String REPETITIONS = "repetitions";
+            public static final String JOURNEY = "journey";
+            public static final String NEXT = "next";
+        }
+
+    }
+
+    public static class Predictions {
+
+        public static final Uri CONTENT_URI = Uri.parse("content://uk.co.md87"
+                + ".android.contextanalyser.predictionscontentprovider/destination");
+
+        public static final String CONTENT_TYPE = "vnd.contextanalyser.prediction";
+
+        public static class ColumnNames {
+            public static final String _ID = "_id";
+            public static final String PLACE = "place";
+            public static final String COUNT = "count";
+        }
+
+    }
+
+    public static class Activities {
+
+        public static final Uri CONTENT_URI = Uri.parse("content://uk.co.md87"
+                + ".android.contextanalyser.activitiescontentprovider/current");
+
+        public static final String CONTENT_TYPE = "vnd.contextanalyser.activity";
+
+        public static class ColumnNames {
+            public static final String ACTIVITY = "activity";
+        }
+    }
+
+}

code/LocalePlugin/src/uk/co/md87/android/contextanalyser/locale/Receiver.java

@@ -26,9 +26,11 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
-import android.net.Uri;
 import android.os.Bundle;
 
+import uk.co.md87.android.contextapi.ContextApi.Activities;
+import uk.co.md87.android.contextapi.ContextApi.Intents;
+
 /**
  * Receives broadcast intents from Locale and the Context Analyser.
  *
@@ -46,12 +48,12 @@ public class Receiver extends BroadcastReceiver {
             }
 
             final Cursor cursor = context.getContentResolver().query(
-                    Uri.parse("content://uk.co.md87.android.contextanalyser."
-                    + "activitiescontentprovider/current"),
-                    new String[] { "activity" }, null, null, null);
+                    Activities.CONTENT_URI,
+                    new String[] { Activities.ColumnNames.ACTIVITY }, null, null, null);
 
             if (cursor.moveToFirst()) {
-                final String activity = cursor.getString(cursor.getColumnIndex("activity"));
+                final String activity = cursor.getString(
+                        cursor.getColumnIndex(Activities.ColumnNames.ACTIVITY));
 
                 if (activity.equals(bundle.getString("activity"))) {
                     setResultCode(com.twofortyfouram.Intent.RESULT_CONDITION_SATISFIED);
@@ -61,7 +63,7 @@ public class Receiver extends BroadcastReceiver {
             } else {
                 setResultCode(com.twofortyfouram.Intent.RESULT_CONDITION_UNKNOWN);
             }
-        } else if ("uk.co.md87.android.contextanalyser.ACTIVITY_CHANGED".equals(intent.getAction())) {
+        } else if (Intents.ACTIVITY_CHANGED.equals(intent.getAction())) {
             final Intent broadcast = new Intent(com.twofortyfouram.Intent.ACTION_REQUEST_QUERY);
             broadcast.putExtra(com.twofortyfouram.Intent.EXTRA_ACTIVITY, EditActivity.class.getName());
             context.sendBroadcast(intent);

code/LocalePlugin/src/uk/co/md87/android/contextapi

@@ -0,0 +1 @@
+../../../../../../API

code/PlacesDisplay/src/uk/co/md87/android/common

@@ -1 +0,0 @@
-../../../../../../Common/

code/PlacesDisplay/src/uk/co/md87/android/contextapi

@@ -0,0 +1 @@
+../../../../../../API

code/PlacesDisplay/src/uk/co/md87/android/placesdisplay/PlacesDisplay.java

@@ -43,8 +43,8 @@ import com.google.android.maps.OverlayItem;
 import java.util.Date;
 import java.util.List;
 
-import uk.co.md87.android.common.ExceptionHandler;
-import uk.co.md87.android.common.model.Place;
+import uk.co.md87.android.contextapi.ContextApi;
+import uk.co.md87.android.contextapi.ContextApi.Places.ColumnNames;
 
 /**
  * Activity which displays all known places on a map.
@@ -58,8 +58,6 @@ public class PlacesDisplay extends MapActivity {
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this));
-
         FlurryAgent.onStartSession(this, "XXXXGE95S8R54R6M7S6X");
 
         final String pkg = "uk.co.md87.android.contextanalyser";
@@ -104,20 +102,20 @@ public class PlacesDisplay extends MapActivity {
                 Resources.getSystem().getDrawable(android.R.drawable.btn_star_big_on));
         List<Overlay> mapOverlays = mapView.getOverlays();
 
-        final Cursor cursor = managedQuery(Place.CONTENT_URI,
-                new String[] { Place.LATITUDE, Place.LONGITUDE,
-                Place.NAME, Place.LAST_VISIT, Place.VISIT_COUNT },
+        final Cursor cursor = managedQuery(ContextApi.Places.CONTENT_URI,
+                new String[] { ColumnNames.LATITUDE, ColumnNames.LONGITUDE,
+                ColumnNames.NAME, ColumnNames.LAST_VISIT, ColumnNames.VISIT_COUNT },
                 null, null, null);
 
         final java.text.DateFormat dateFormat = DateFormat.getDateFormat(this);
         final java.text.DateFormat timeFormat = DateFormat.getTimeFormat(this);
 
         if (cursor.moveToFirst()) {
-            final int latitudeColumn = cursor.getColumnIndex(Place.LATITUDE);
-            final int longitudeColumn = cursor.getColumnIndex(Place.LONGITUDE);
-            final int nameColumn = cursor.getColumnIndex(Place.NAME);
-            final int lastVisitColumn = cursor.getColumnIndex(Place.LAST_VISIT);
-            final int visitCountColumn = cursor.getColumnIndex(Place.VISIT_COUNT);
+            final int latitudeColumn = cursor.getColumnIndex(ColumnNames.LATITUDE);
+            final int longitudeColumn = cursor.getColumnIndex(ColumnNames.LONGITUDE);
+            final int nameColumn = cursor.getColumnIndex(ColumnNames.NAME);
+            final int lastVisitColumn = cursor.getColumnIndex(ColumnNames.LAST_VISIT);
+            final int visitCountColumn = cursor.getColumnIndex(ColumnNames.VISIT_COUNT);
 
             do {
                 final double latitude = cursor.getDouble(latitudeColumn);

code/PlacesDisplay/src/uk/co/md87/android/placesdisplay/PlacesItemisedOverlay.java

@@ -24,10 +24,11 @@ package uk.co.md87.android.placesdisplay;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.util.Log;
 import android.widget.Toast;
+
 import com.google.android.maps.ItemizedOverlay;
 import com.google.android.maps.OverlayItem;
+
 import java.util.ArrayList;
 import java.util.List;