diff options
| author | Joey Castillo <jose.castillo@gmail.com> | 2015-05-13 06:01:42 -0400 |
|---|---|---|
| committer | Joey Castillo <jose.castillo@gmail.com> | 2015-05-13 14:36:34 -0400 |
| commit | 28b9068ae03b6c17b247a1d2fdf9b20d8a11a274 (patch) | |
| tree | 821b50d623d5aea38c17bf396cf281b8ef217bf1 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter | |
| parent | d21fb7733697a8f947604dbd1d6c608f5b2a21d5 (diff) | |
| download | open-keychain-28b9068ae03b6c17b247a1d2fdf9b20d8a11a274.tar.gz open-keychain-28b9068ae03b6c17b247a1d2fdf9b20d8a11a274.tar.bz2 open-keychain-28b9068ae03b6c17b247a1d2fdf9b20d8a11a274.zip | |
Adding keytocard flag to SubkeyChange: UI sets this flag to initiate keytocard; operation unsets it and fills in dummyDivert to finish it.
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java | 4 |
1 files changed, 2 insertions, 2 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 dfa5a39fb..87539ea05 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 @@ -179,7 +179,7 @@ public class SubkeysAdapter extends CursorAdapter { ? mSaveKeyringParcel.getSubkeyChange(keyId) : null; - if (change != null && (change.mDummyStrip || change.mDummyDivert != null)) { + if (change != null && (change.mDummyStrip || change.mMoveKeyToCard)) { if (change.mDummyStrip) { algorithmStr.append(", "); final SpannableString boldStripped = new SpannableString( @@ -188,7 +188,7 @@ public class SubkeysAdapter extends CursorAdapter { boldStripped.setSpan(new StyleSpan(Typeface.BOLD), 0, boldStripped.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); algorithmStr.append(boldStripped); } - if (change.mDummyDivert != null) { + if (change.mMoveKeyToCard) { algorithmStr.append(", "); final SpannableString boldDivert = new SpannableString( context.getString(R.string.key_divert) |