aboutsummaryrefslogtreecommitdiffstats
path: root/src/org/thialfihar
diff options
context:
space:
mode:
authorThialfihar <thialfihar@gmail.com>2010-06-04 21:52:20 +0000
committerThialfihar <thialfihar@gmail.com>2010-06-04 21:52:20 +0000
commita571ce7c5222d1f2246acdfada7c95e48a170dd4 (patch)
tree0de13d1eb3bf345684ed83d6154a08fbebb2fd95 /src/org/thialfihar
parente334a36194b10dca03de4a87e0c2e75582e30163 (diff)
downloadopen-keychain-a571ce7c5222d1f2246acdfada7c95e48a170dd4.tar.gz
open-keychain-a571ce7c5222d1f2246acdfada7c95e48a170dd4.tar.bz2
open-keychain-a571ce7c5222d1f2246acdfada7c95e48a170dd4.zip
make sure the Intent passed to Service.onStart() is not null, not sure why it would be, but saw such an exception on the market
Diffstat (limited to 'src/org/thialfihar')
-rw-r--r--src/org/thialfihar/android/apg/Service.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/thialfihar/android/apg/Service.java b/src/org/thialfihar/android/apg/Service.java
index 2c8fd8496..4457274ff 100644
--- a/src/org/thialfihar/android/apg/Service.java
+++ b/src/org/thialfihar/android/apg/Service.java
@@ -54,7 +54,9 @@ public class Service extends android.app.Service {
public void onStart(Intent intent, int startId) {
super.onStart(intent, startId);
- mPassPhraseCacheTtl = intent.getIntExtra(EXTRA_TTL, 15);
+ if (intent != null) {
+ mPassPhraseCacheTtl = intent.getIntExtra(EXTRA_TTL, 15);
+ }
if (mPassPhraseCacheTtl < 15) {
mPassPhraseCacheTtl = 15;
}