From e7dede56ca92f5f4a0cec847b7893d0918301efd Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Mon, 16 Jul 2018 10:34:31 +0200
Subject: [PATCH] fix NPE in KeychainService

---
 .../sufficientlysecure/keychain/service/KeychainService.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
index c3e9d9384..bdaee7166 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainService.java
@@ -87,7 +87,9 @@ public class KeychainService extends Service implements Progressable {
     public int onStartCommand(final Intent intent, int flags, int startId) {
 
         if (intent.getAction() != null && intent.getAction().equals(ACTION_CANCEL)) {
-            mActionCanceled.cancel();
+            if (mActionCanceled != null) {
+                mActionCanceled.cancel();
+            }
             return START_NOT_STICKY;
         }