1 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index 606daabed..f9ab58f5b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -365,6 +365,8 @@ public class PassphraseCacheService extends Service {
                 CachedPassphrase cachedPassphrase;
                 if (timeoutTtl == 0L) {
                     cachedPassphrase = CachedPassphrase.getPassphraseLock(passphrase, primaryUserID);
+                } else if (timeoutTtl >= Integer.MAX_VALUE) {
+                    cachedPassphrase = CachedPassphrase.getPassphraseNoTimeout(passphrase, primaryUserID);
                 } else {
                     cachedPassphrase = CachedPassphrase.getPassphraseTtlTimeout(passphrase, primaryUserID, timeoutTtl);
 
@@ -427,7 +429,10 @@ public class PassphraseCacheService extends Service {
 
                     // Stop all ttl alarms
                     for (int i = 0; i < mPassphraseCache.size(); i++) {
-                        am.cancel(buildIntent(this, mPassphraseCache.keyAt(i)));
+                        CachedPassphrase cachedPassphrase = mPassphraseCache.valueAt(i);
+                        if (cachedPassphrase.mTimeoutMode == TimeoutMode.TTL) {
+                            am.cancel(buildIntent(this, mPassphraseCache.keyAt(i)));
+                        }
                     }
                     mPassphraseCache.clear();