diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-04 23:21:49 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-04 23:21:49 +0200 |
| commit | 0a264bad28618139af0da128039a67ce85c66e53 (patch) | |
| tree | 0d38efc41b462d886ad68e898aff0b68e2c34b7c /OpenKeychain/src/main/java | |
| parent | 2b436b9a1980a03e253345238fdcd92d1bdcba15 (diff) | |
| parent | 015291eb61e39987cad42c0f9b0f98d24b6dbf99 (diff) | |
| download | open-keychain-0a264bad28618139af0da128039a67ce85c66e53.tar.gz open-keychain-0a264bad28618139af0da128039a67ce85c66e53.tar.bz2 open-keychain-0a264bad28618139af0da128039a67ce85c66e53.zip | |
Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
Diffstat (limited to 'OpenKeychain/src/main/java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java index 03cd6c431..a835f3652 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java @@ -239,12 +239,6 @@ public class MultiCertifyKeyFragment extends LoaderFragment if (!subGrouped) { // 1. This name should NOT be grouped with the previous, so we flush the buffer - /*/ Special case: only a single user id (first && last) - if (data.isFirst()) { - lastMasterKeyId = masterKeyId; - uids.add(userId); - }*/ - Parcel p = Parcel.obtain(); p.writeStringList(uids); byte[] d = p.marshall(); |