diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-14 22:12:07 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-14 22:12:18 +0200 |
| commit | 09d37a5fa6b431bd7be91aca9a7bbae5af928453 (patch) | |
| tree | b116c3bdebb7b1865937832f99ecd7c879370299 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java | |
| parent | bc76941bc1e47bc3919f58e29436f8d2a77f3258 (diff) | |
| download | open-keychain-09d37a5fa6b431bd7be91aca9a7bbae5af928453.tar.gz open-keychain-09d37a5fa6b431bd7be91aca9a7bbae5af928453.tar.bz2 open-keychain-09d37a5fa6b431bd7be91aca9a7bbae5af928453.zip | |
fix keys with no expiry in ui code
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java index d457e75bd..6df84a056 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java @@ -183,7 +183,7 @@ public class SubkeysAdapter extends CursorAdapter { SaveKeyringParcel.SubkeyChange subkeyChange = mSaveKeyringParcel.getSubkeyChange(keyId); if (subkeyChange != null) { - if (subkeyChange.mExpiry == null) { + if (subkeyChange.mExpiry == null || subkeyChange.mExpiry == 0L) { expiryDate = null; } else { expiryDate = new Date(subkeyChange.mExpiry * 1000); |