aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-01-26 00:50:35 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-01-26 00:50:35 +0100
commite4e2d647c8cd8bf2d1e318c85d41173caf18adf4 (patch)
tree818de938506b7f5d0cda54117882c3d684936893 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java
parentb4781343d9b7556beaa2cf9aff42aba2c4ba7641 (diff)
downloadopen-keychain-e4e2d647c8cd8bf2d1e318c85d41173caf18adf4.tar.gz
open-keychain-e4e2d647c8cd8bf2d1e318c85d41173caf18adf4.tar.bz2
open-keychain-e4e2d647c8cd8bf2d1e318c85d41173caf18adf4.zip
Material Design: Full screen dialogs
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.java2
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 431cdc845..5ba09be7e 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
@@ -164,7 +164,7 @@ public class SubkeysAdapter extends CursorAdapter {
? mSaveKeyringParcel.getSubkeyChange(keyId)
: null;
- if (change.mDummyStrip) {
+ if (change != null && change.mDummyStrip) {
algorithmStr.append(", ");
final SpannableString boldStripped = new SpannableString(
context.getString(R.string.key_stripped)