From d53fe7bdd59c28de14a465ae3f9d6aaba5f43df0 Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Thu, 21 Jun 2012 09:33:30 -0400 Subject: [PATCH] I have moved all static keys from individual service classes to LocationLibraryConstants closes #112 Signed-off-by: Ricky Barrette --- LocationLib/bin/locationlib.jar | Bin 62506 -> 62392 bytes .../android/SkyHook/SkyHookService.java | 25 +++--------------- .../debug/LocationLibraryConstants.java | 12 +++++++++ .../android/location/LocationService.java | 24 +++-------------- 4 files changed, 20 insertions(+), 41 deletions(-) diff --git a/LocationLib/bin/locationlib.jar b/LocationLib/bin/locationlib.jar index 0b57fc4859c69308eb5e1a81fa07f6681f2dc925..db83dc2aa40dd503e70a99e78cbfc7efcb67f70c 100644 GIT binary patch delta 9735 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 delta 9903 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 W^6-z2p`e%_|Fm$Rpjy{{xBd@Fn!6wX diff --git a/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java b/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java index 0f7ff20..544a292 100644 --- a/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java +++ b/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java @@ -20,7 +20,6 @@ import android.util.Log; import com.TwentyCodes.android.debug.LocationLibraryConstants; import com.TwentyCodes.android.location.GeoPointLocationListener; -import com.TwentyCodes.android.location.BaseLocationReceiver; import com.google.android.maps.GeoPoint; import com.skyhookwireless.wps.RegistrationCallback; import com.skyhookwireless.wps.WPSContinuation; @@ -38,22 +37,6 @@ import com.skyhookwireless.wps.WPSReturnCode; * @author ricky barrette */ public class SkyHookService extends Service implements GeoPointLocationListener, RegistrationCallback{ - - /** - * Used to tell the service how frequently it needs to run. This is required if you want a multishot service - */ - public static final String INTENT_EXTRA_PERIOD_BETWEEN_UPDATES = "period_beween_updates"; - - /** - * Used to tell the service how accurate of a location you want reported - */ - public static final String INTENT_EXTRA_REQUIRED_ACCURACY = "required_accuracy"; - - /** - * Used to tell the service the update action to broadcast. If this is not supplied, {@link BaseLocationReceiver.INTENT_EXTRA_ACTION_UPDATE } will be used. - * @see BaseLocationReceiver.INTENT_EXTRA_ACTION_UPDATE - */ - public static final String INTENT_EXTRA_ACTION_UPDATE = "action_update"; public static final String TAG = "SkyHookService"; public static final int REQUEST_CODE = 32741942; @@ -178,11 +161,11 @@ public class SkyHookService extends Service implements GeoPointLocationListener, this.mIntent = intent; if(intent != null){ - if (intent.hasExtra(INTENT_EXTRA_PERIOD_BETWEEN_UPDATES)) - mPeriod = intent.getLongExtra(INTENT_EXTRA_PERIOD_BETWEEN_UPDATES, 60000L); + if (intent.hasExtra(LocationLibraryConstants.INTENT_EXTRA_PERIOD_BETWEEN_UPDATES)) + mPeriod = intent.getLongExtra(LocationLibraryConstants.INTENT_EXTRA_PERIOD_BETWEEN_UPDATES, 60000L); - if (intent.hasExtra(INTENT_EXTRA_REQUIRED_ACCURACY)) - mRequiredAccuracy = intent.getIntExtra(INTENT_EXTRA_REQUIRED_ACCURACY, -1); + if (intent.hasExtra(LocationLibraryConstants.INTENT_EXTRA_REQUIRED_ACCURACY)) + mRequiredAccuracy = intent.getIntExtra(LocationLibraryConstants.INTENT_EXTRA_REQUIRED_ACCURACY, -1); } } diff --git a/LocationLib/src/com/TwentyCodes/android/debug/LocationLibraryConstants.java b/LocationLib/src/com/TwentyCodes/android/debug/LocationLibraryConstants.java index 34072af..42e4b33 100644 --- a/LocationLib/src/com/TwentyCodes/android/debug/LocationLibraryConstants.java +++ b/LocationLib/src/com/TwentyCodes/android/debug/LocationLibraryConstants.java @@ -6,6 +6,8 @@ */ package com.TwentyCodes.android.debug; +import com.TwentyCodes.android.location.BaseLocationReceiver; + import android.hardware.SensorManager; import android.location.LocationManager; @@ -58,4 +60,14 @@ public final class LocationLibraryConstants { public static final String INTENT_ACTION_UPDATE = "TwentyCodes.intent.action.LocationUpdate"; public static final String INTENT_EXTRA_LOCATION_CHANGED = LocationManager.KEY_LOCATION_CHANGED; + + /** + * Used to tell the service how frequently it needs to run. This is required if you want a multishot service + */ + public static final String INTENT_EXTRA_PERIOD_BETWEEN_UPDATES = "period_beween_updates"; + + /** + * Used to tell the service how accurate of a location you want reported + */ + public static final String INTENT_EXTRA_REQUIRED_ACCURACY = "required_accuracy"; } \ No newline at end of file diff --git a/LocationLib/src/com/TwentyCodes/android/location/LocationService.java b/LocationLib/src/com/TwentyCodes/android/location/LocationService.java index f903451..8be7829 100644 --- a/LocationLib/src/com/TwentyCodes/android/location/LocationService.java +++ b/LocationLib/src/com/TwentyCodes/android/location/LocationService.java @@ -37,22 +37,6 @@ import com.TwentyCodes.android.debug.LocationLibraryConstants; * @author ricky barrette */ public class LocationService extends Service implements LocationListener { - - /** - * Used to tell the service how frequently it needs to run. This is required if you want a multishot service - */ - public static final String INTENT_EXTRA_PERIOD_BETWEEN_UPDATES = "period_beween_updates"; - - /** - * Used to tell the service how accurate of a location you want reported - */ - public static final String INTENT_EXTRA_REQUIRED_ACCURACY = "required_accuracy"; - - /** - * Used to tell the service the update action to broadcast. If this is not supplied, {@link BaseLocationReceiver.INTENT_EXTRA_ACTION_UPDATE } will be used. - * @see BaseLocationReceiver.INTENT_EXTRA_ACTION_UPDATE - */ - public static final String INTENT_EXTRA_ACTION_UPDATE = "action_update"; public static final String TAG = "LocationService"; private static final int REQUEST_CODE = 7893749; @@ -180,11 +164,11 @@ public class LocationService extends Service implements LocationListener { this.mIntent = intent; - if (intent.hasExtra(INTENT_EXTRA_PERIOD_BETWEEN_UPDATES)) - mPeriod = intent.getLongExtra(INTENT_EXTRA_PERIOD_BETWEEN_UPDATES, 60000L); + if (intent.hasExtra(LocationLibraryConstants.INTENT_EXTRA_PERIOD_BETWEEN_UPDATES)) + mPeriod = intent.getLongExtra(LocationLibraryConstants.INTENT_EXTRA_PERIOD_BETWEEN_UPDATES, 60000L); - if (intent.hasExtra(INTENT_EXTRA_REQUIRED_ACCURACY)) - mRequiredAccuracy = intent.getIntExtra(INTENT_EXTRA_REQUIRED_ACCURACY, -1); + if (intent.hasExtra(LocationLibraryConstants.INTENT_EXTRA_REQUIRED_ACCURACY)) + mRequiredAccuracy = intent.getIntExtra(LocationLibraryConstants.INTENT_EXTRA_REQUIRED_ACCURACY, -1); } /**