From b211c3d829d487bd0df735a1d9185639f806e61c Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Tue, 29 May 2012 16:48:14 -0400 Subject: [PATCH] Added a null check on mIntent before trying to access it's information closes #87 Signed-off-by: Ricky Barrette --- .../TwentyCodes/android/SkyHook/SkyHookService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java b/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java index a077c77..0f7ff20 100644 --- a/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java +++ b/LocationLib/src/com/TwentyCodes/android/SkyHook/SkyHookService.java @@ -177,11 +177,13 @@ public class SkyHookService extends Service implements GeoPointLocationListener, this.mIntent = intent; - if (intent.hasExtra(INTENT_EXTRA_PERIOD_BETWEEN_UPDATES)) - mPeriod = intent.getLongExtra(INTENT_EXTRA_PERIOD_BETWEEN_UPDATES, 60000L); - - if (intent.hasExtra(INTENT_EXTRA_REQUIRED_ACCURACY)) - mRequiredAccuracy = intent.getIntExtra(INTENT_EXTRA_REQUIRED_ACCURACY, -1); + if(intent != null){ + if (intent.hasExtra(INTENT_EXTRA_PERIOD_BETWEEN_UPDATES)) + mPeriod = intent.getLongExtra(INTENT_EXTRA_PERIOD_BETWEEN_UPDATES, 60000L); + + if (intent.hasExtra(INTENT_EXTRA_REQUIRED_ACCURACY)) + mRequiredAccuracy = intent.getIntExtra(INTENT_EXTRA_REQUIRED_ACCURACY, -1); + } } /**