fix NPE in KeychainService

2018-07-16 10:34:31 +02:00
parent a3021bbd83
commit e7dede56ca
1 changed files with 3 additions and 1 deletions
--- 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;
        }