From 6fcc65a60591f76ad73d5bbcbf7342f137f10998 Mon Sep 17 00:00:00 2001
From: Ricky Barrette <rickbarrette@gmail.com>
Date: Sat, 21 Jul 2012 22:38:38 -0400
Subject: [PATCH] Cleaned up some code in the Location service and android gps
 classes

---
 LocationLib/AndroidManifest.xml               |  2 +-
 .../android/location/AndroidGPS.java          |  8 ------
 .../android/location/LocationService.java     | 28 ++-----------------
 3 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/LocationLib/AndroidManifest.xml b/LocationLib/AndroidManifest.xml
index df6d148..600c4d4 100644
--- a/LocationLib/AndroidManifest.xml
+++ b/LocationLib/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="15" />
+        android:targetSdkVersion="16" />
 
     <uses-feature
         android:name="android.hardware.location"
diff --git a/LocationLib/src/com/TwentyCodes/android/location/AndroidGPS.java b/LocationLib/src/com/TwentyCodes/android/location/AndroidGPS.java
index a94549d..f3d525c 100644
--- a/LocationLib/src/com/TwentyCodes/android/location/AndroidGPS.java
+++ b/LocationLib/src/com/TwentyCodes/android/location/AndroidGPS.java
@@ -137,14 +137,6 @@ public class AndroidGPS implements LocationListener {
 	 * @author ricky barrette
 	 */
 	private void requestUpdates() {
-		try {
-			mLocationManager.requestLocationUpdates(LocationManager.PASSIVE_PROVIDER, 0, 0, this);
-		} catch (final IllegalArgumentException e) {
-			e.printStackTrace();
-			/* We do no handle this exception as it is caused if the android version is < 1.6. since the PASSIVE_PROVIDER call is not required
-			 * to function we can ignore it.
-			 */
-		}
 		mLocationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, this);
 		mLocationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
 	}
diff --git a/LocationLib/src/com/TwentyCodes/android/location/LocationService.java b/LocationLib/src/com/TwentyCodes/android/location/LocationService.java
index 996d0df..65d5790 100644
--- a/LocationLib/src/com/TwentyCodes/android/location/LocationService.java
+++ b/LocationLib/src/com/TwentyCodes/android/location/LocationService.java
@@ -14,7 +14,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.location.Location;
 import android.location.LocationListener;
-import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -27,13 +26,6 @@ import com.TwentyCodes.android.debug.LocationLibraryConstants;
 
 /**
  * This service class will be used broadcast the users location either one time, or periodically.
- * To use as a one shot location service:
- * <blockquote><pre>PendingIntent pendingIntent = PendingIntent.getService(context, 0, LocationService.startService(context), 0);
- * or
- * Intent service = new Intent(context, LocationService.class);
- * context.startService(service);<pre></bloackquote>
- * To use as a recurring service:
- * <blockquote>LocationService.startService(this, (60000 * Integer.parseInt(ringer.getString(UPDATE_INTVERVAL , "5")))).run();</bloackquote>
  * @author ricky barrette
  */
 public class LocationService extends Service implements LocationListener {
@@ -65,7 +57,7 @@ public class LocationService extends Service implements LocationListener {
 		};
 	}
 	private WakeLock mWakeLock;
-	private long mPeriod = -1;
+	protected long mPeriod = -1;
 	private Location mLocation;
 	private int mStartId;
 	private AndroidGPS mLocationManager;
@@ -97,7 +89,7 @@ public class LocationService extends Service implements LocationListener {
 				locationUpdate.setAction(mIntent.getAction());
 			else
 				locationUpdate.setAction(LocationLibraryConstants.INTENT_ACTION_UPDATE);
-			locationUpdate.putExtra(LocationManager.KEY_LOCATION_CHANGED, mLocation);
+			locationUpdate.putExtra(LocationLibraryConstants.INTENT_EXTRA_LOCATION_CHANGED, mLocation);
 			sendBroadcast(locationUpdate);
 			stopSelf(mStartId);
 		}
@@ -174,21 +166,6 @@ public class LocationService extends Service implements LocationListener {
 
 	}
 
-	/**
-	 * To keep backwards compatibility we override onStart which is the equivalent of onStartCommand in pre android 2.x
-	 * @author ricky barrette
-	 */
-	@Override
-	public void onStart(final Intent intent, final int startId) {
-		if(Debug.DEBUG)
-			Log.i(TAG, "onStart.Service started with start id of: " + startId);
-		mStartId = startId;
-
-		parseIntent(intent);
-
-		mLocationManager.enableLocationUpdates(this);
-	}
-
 	/**
 	 * This method is called when startService is called. only used in 2.x android.
 	 * @author ricky barrette
@@ -208,7 +185,6 @@ public class LocationService extends Service implements LocationListener {
 	@Override
 	public void onStatusChanged(final String provider, final int status, final Bundle extras) {
 		// TODO Auto-generated method stub
-
 	}
 
 	/**