aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
Commit message (Collapse)AuthorAgeFilesLines
* Replace spongycastle with bouncycastleDominik Schürmann2016-02-091-7/+7
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| * NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-33/+66
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| * | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-0/+30
| | |
* | | Improve comments and reasons in PgpConstants, simple checks for insecure ↵Dominik Schürmann2015-08-101-1/+8
| |/ |/| | | | | asymmetric keys
* | split up and mark unsafe expiry-related methodsVincent Breitmoser2015-02-261-2/+23
| |
* | ignore revoked user ids for primary key expiryVincent Breitmoser2015-02-261-18/+0
| |
* | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-5/+4
| |
* | only respect most recent signature for key flagsVincent Breitmoser2015-01-191-8/+38
| |
* | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-0/+30
|/
* deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-021-2/+4
|
* make getSignId a secret key operation, and respect unavailable keysVincent Breitmoser2014-10-021-6/+3
| | | | This one should remedy #811, but waiting for a test
* fix method visibility for testsVincent Breitmoser2014-09-281-2/+31
|
* move can.*() methods to CanonicalizedPublicKey, where they belongVincent Breitmoser2014-09-281-72/+0
|
* be more mindful of algorithm and usage flag interactionVincent Breitmoser2014-09-281-14/+2
| | | | Fixes #895
* New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵Dominik Schürmann2014-09-151-3/+5
| | | | non-decodable characters)
* Get certificates by raw user ids, be more liberal about accepted user id ↵Dominik Schürmann2014-09-131-10/+24
| | | | encodings
* getSignaturesForID can return null, check thisDominik Schürmann2014-09-131-12/+24
|
* If no key flags subpacket is present allow all key flags, fixes mailvelope keysDominik Schürmann2014-09-021-24/+47
|
* Remove version 3 checks, no longer supported in importDominik Schürmann2014-09-021-16/+16
|
* add ecc supportVincent Breitmoser2014-08-241-1/+22
|
* Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
|
* Add license headersDominik Schürmann2014-08-041-0/+17
|
* fix dumb mistake in modifySecretKeyVincent Breitmoser2014-08-011-5/+1
|
* canonicalize: fix for testsVincent Breitmoser2014-07-191-3/+0
|
* Fallback if no primary user id existsDominik Schürmann2014-07-161-0/+11
|
* modifyKey: make SubkeyChange operations workVincent Breitmoser2014-07-111-3/+9
|
* some UncachedKeyRing fixes, primary user id mostlyVincent Breitmoser2014-07-111-8/+62
|
* canonicalize: first step(s)Vincent Breitmoser2014-06-101-2/+10
|
* neatness refactoringVincent Breitmoser2014-06-041-1/+0
|
* new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-271-2/+19
|
* fix missing userIds in ImportKeysListEntryVincent Breitmoser2014-05-271-2/+8
|
* wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic typeVincent Breitmoser2014-05-231-1/+35
|
* wrapped-key-ring: introduce Uncached*Key objectsVincent Breitmoser2014-05-041-0/+140