updates

CyclePhillyAndroid/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.cyclephilly.android"
+    package="org.phillyopen.mytracks.cyclephilly"
     android:versionCode="8"
     android:versionName="1.2"
     android:installLocation="auto">
@@ -10,10 +10,10 @@
         android:targetSdkVersion="19" />
 
     <permission
-         android:name="org.cyclephilly.android.permission.MAPS_RECEIVE"
+         android:name="org.phillyopen.mytracks.cyclephilly.permission.MAPS_RECEIVE"
          android:protectionLevel="signature"/>
 
-	<uses-permission  android:name="org.cyclephilly.android.permission.MAPS_RECEIVE"/>
+	<uses-permission  android:name="org.phillyopen.mytracks.cyclephilly.permission.MAPS_RECEIVE"/>
 	<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -32,7 +32,7 @@
         android:label="@string/app_name"
         android:allowBackup="true" >
         <activity
-            android:name="org.cyclephilly.android.MainInput"
+            android:name="org.phillyopen.mytracks.cyclephilly.MainInput"
             android:label="@string/app_name"
             android:launchMode="singleTask" >
             <intent-filter>
@@ -63,24 +63,24 @@
             android:launchMode="singleTop" >
         </activity>
         <activity
-            android:name="org.cyclephilly.android.UserInfoActivity"
+            android:name="org.phillyopen.mytracks.cyclephilly.UserInfoActivity"
             android:finishOnTaskLaunch="true"
             android:launchMode="singleInstance" >
         </activity>
         <activity
-            android:name="org.cyclephilly.android.LicenseActivity"
+            android:name="org.phillyopen.mytracks.cyclephilly.LicenseActivity"
             android:finishOnTaskLaunch="true"
             android:launchMode="singleInstance" >
         </activity>
 
         <service
-            android:name="org.cyclephilly.android.RecordingService"
+            android:name="org.phillyopen.mytracks.cyclephilly.RecordingService"
             android:enabled="true"
             android:exported="false" >
         </service>
 
         <service
-		    android:name="org.cyclephilly.android.ActivityRecognitionIntentService"
+		    android:name="org.phillyopen.mytracks.cyclephilly.ActivityRecognitionIntentService"
 		    android:exported="false">
 		</service>
 

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/ActivityRecognitionIntentService.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/ActivityRecognitionIntentService.java

@@ -1,4 +1,4 @@
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import com.google.android.gms.location.ActivityRecognitionResult;
 import com.google.android.gms.location.DetectedActivity;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/BikeRackInfoWindow.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/BikeRackInfoWindow.java

@@ -1,4 +1,4 @@
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import android.view.LayoutInflater;
 import android.view.View;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/CyclePoint.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/CyclePoint.java

@@ -28,7 +28,7 @@
  *   along with CycleTracks.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import com.google.android.gms.maps.model.LatLng;
 

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/DbAdapter.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/DbAdapter.java

@@ -29,7 +29,7 @@
  */
 
 
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import android.content.ContentValues;
 import android.content.Context;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/ErrorDialogFragment.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/ErrorDialogFragment.java

@@ -1,4 +1,4 @@
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import android.app.Dialog;
 import android.os.Bundle;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/FireService.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/FireService.java

@@ -1,4 +1,4 @@
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import java.net.URI;
 

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/IRecordService.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/IRecordService.java

@@ -28,7 +28,7 @@
  *   along with CycleTracks.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 public interface IRecordService {
 	public int  getState();

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/LicenseActivity.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/LicenseActivity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import android.app.Activity;
 import android.os.Bundle;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/MainInput.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/MainInput.java

@@ -28,9 +28,8 @@
  *   along with CycleTracks.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
-import org.cyclephilly.android.WindDirection;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -42,9 +41,6 @@
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.SQLException;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Matrix;
 import android.location.LocationManager;
 import android.net.Uri;
 import android.os.Bundle;
@@ -59,24 +55,17 @@
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.Button;
-import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.firebase.client.*;
-import com.firebase.simplelogin.SimpleLogin;
-import com.firebase.simplelogin.SimpleLoginAuthenticatedHandler;
-import com.firebase.simplelogin.User;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 
-import org.json.JSONObject;
-
 import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/MapTileProvider.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/MapTileProvider.java

@@ -1,4 +1,4 @@
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import java.net.URL;
 import java.net.MalformedURLException;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/RecordingActivity.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/RecordingActivity.java

@@ -28,7 +28,7 @@
  *   along with CycleTracks.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import android.app.Dialog;
 import android.app.PendingIntent;
@@ -42,7 +42,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
-import android.os.Message;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
@@ -53,9 +52,7 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 import java.util.TimeZone;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -67,7 +64,7 @@
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.android.gms.location.ActivityRecognitionClient;
 
-import org.cyclephilly.android.R;
+import org.phillyopen.mytracks.cyclephilly.R;
 
 public class RecordingActivity extends FragmentActivity implements ConnectionCallbacks, OnConnectionFailedListener {
 

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/RecordingService.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/RecordingService.java

@@ -28,7 +28,7 @@
  *   along with CycleTracks.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -49,7 +49,7 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.cyclephilly.android.R;
+import org.phillyopen.mytracks.cyclephilly.R;
 
 public class RecordingService extends Service implements LocationListener {
 	RecordingActivity recordActivity;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/SaveTrip.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/SaveTrip.java

@@ -28,7 +28,7 @@
  *   along with CycleTracks.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import android.app.Activity;
 import android.app.AlertDialog;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/ShowMap.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/ShowMap.java

@@ -28,7 +28,7 @@
  *   along with CycleTracks.  If not, see <http://www.gnu.org/licenses/>.
  */
 //
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import java.text.DateFormat;
 import java.util.ArrayList;
@@ -55,7 +55,7 @@
 import com.google.android.gms.maps.model.Polyline;
 import com.google.android.gms.maps.model.PolylineOptions;
 
-import org.cyclephilly.android.R;
+import org.phillyopen.mytracks.cyclephilly.R;
 
 public class ShowMap extends FragmentActivity {
 	List<Polyline> mapTracks;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/ShowMapNearby.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/ShowMapNearby.java

@@ -1,4 +1,4 @@
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import android.content.Context;
 import android.graphics.Color;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/TripData.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/TripData.java

@@ -28,7 +28,7 @@
  *   along with CycleTracks.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import java.text.DateFormat;
 import java.util.ArrayList;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/TripUploader.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/TripUploader.java

@@ -28,7 +28,7 @@
  *   along with CycleTracks.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import java.lang.String;
 import android.content.Context;
@@ -66,7 +66,7 @@
 import java.util.Map.Entry;
 import java.util.Vector;
 
-import org.cyclephilly.android.R;
+import org.phillyopen.mytracks.cyclephilly.R;
 
 public class TripUploader extends AsyncTask <Long, Integer, Boolean> {
     Context mCtx;
@@ -280,7 +280,7 @@ boolean uploadOneTrip(long currentTripId) {
             e.printStackTrace();
             return result;
         }
-        Log.v("PostData", nameValuePairs.toString());
+        //Log.v("PostData", nameValuePairs.toString());
 
         // set connection timeouts for HTTPClient
         HttpParams httpParameters = new BasicHttpParams();
@@ -305,7 +305,7 @@ boolean uploadOneTrip(long currentTripId) {
             JSONObject responseData = new JSONObject(responseString);
 
             ////////////////////////////
-            Log.d("server response", responseData.toString());
+            //Log.d("server response", responseData.toString());
             ///////////////////////////
 
             if (responseData.getString("status").equals("success")) {
@@ -336,7 +336,7 @@ protected Boolean doInBackground(Long... tripid) {
         Boolean result = uploadOneTrip(tripid[0]);
 
         // TODO: not always working?
-        Log.d("uploading trip", tripid[0].toString());
+        //Log.d("uploading trip", tripid[0].toString());
         //////////////////////////////////////////////
 
         // Then, automatically try and send previously-completed trips
@@ -349,7 +349,7 @@ protected Boolean doInBackground(Long... tripid) {
             //pd.setMessage("Sent. You have previously unsent trips; submitting those now.");
 
         	////////////
-        	Log.d("previously unsent count", cur.getCount() + " previously unsent trips");
+        	//Log.d("previously unsent count", cur.getCount() + " previously unsent trips");
         	////////////
 
             while (!cur.isAfterLast()) {
@@ -363,7 +363,7 @@ protected Boolean doInBackground(Long... tripid) {
         for (Long trip: unsentTrips) {
             result &= uploadOneTrip(trip);
             ///////////////
-            Log.d("uploading unsent trip", trip.toString());
+            //Log.d("uploading unsent trip", trip.toString());
             ///////////////
 
         }

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/UserInfoActivity.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/UserInfoActivity.java

@@ -16,12 +16,12 @@
  * 	 @author Billy Charlton <billy.charlton@sfcta.org>
  *
  */
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.cyclephilly.android.R;
+import org.phillyopen.mytracks.cyclephilly.R;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;

CyclePhillyAndroid/src/main/java/org/cyclephilly/android/WindDirection.java → CyclePhillyAndroid/src/main/java/org/phillyopen/mytracks/cyclephilly/WindDirection.java

@@ -19,9 +19,8 @@
  *   along with CycleTracks.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.cyclephilly.android;
+package org.phillyopen.mytracks.cyclephilly;
 
-import java.lang.Character;
 import java.util.Arrays;
 import java.lang.String;