Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use email field to match email in KeychainProvider | fiaxh | 2016-04-12 | 1 | -4/+4 |
| | | | | fixes #1699 | ||||
* | update null-check for duplicates, and add matching indexes to name and email ↵ | Vincent Breitmoser | 2016-03-16 | 1 | -6/+5 |
| | | | | columns | ||||
* | small update to duplicate detection | Vincent Breitmoser | 2016-03-15 | 1 | -2/+5 |
| | |||||
* | Updated HAS_DUPLICATE_USER_ID in KeychainProvider to use name and email ↵ | fjodor | 2016-03-10 | 1 | -2/+2 |
| | | | | address instead of user id #1745 | ||||
* | Save split user ids in database #1745 | fjodor | 2016-03-07 | 1 | -0/+3 |
| | | | | Save split user ids in database | ||||
* | external-provider: add permission check for status query | Vincent Breitmoser | 2016-02-24 | 1 | -1/+1 |
| | |||||
* | keylist: filter results by all user ids for search (fixes #1645) | Vincent Breitmoser | 2015-12-29 | 1 | -5/+16 |
| | |||||
* | some optimizations and indexes for the main key list query | Vincent Breitmoser | 2015-11-15 | 1 | -8/+6 |
| | |||||
* | provider: add debug variable to explain query plans | Vincent Breitmoser | 2015-11-15 | 1 | -4/+28 |
| | |||||
* | decrypt: skip all encountered marker packets (fix #1582) | Vincent Breitmoser | 2015-11-15 | 1 | -0/+1 |
| | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -11/+35 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | linked-ids: rename RawLinkedIdentity to UriAttribute | Vincent Breitmoser | 2015-05-09 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 1 | -1/+9 |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 1 | -1/+3 |
| | | | |||||
| * | | add linked id certs uri to KeychainProvider | Vincent Breitmoser | 2015-03-09 | 1 | -5/+13 |
| | | | |||||
| * | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 1 | -0/+7 |
| | | | |||||
| * | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 1 | -6/+13 |
| | | | | |||||
| * | | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 1 | -11/+51 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Breitmoser | 2015-01-14 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-13 | 1 | -35/+57 |
| | | | | | |||||
* | | | | | introduced keyserver sync adapter | Adithya Abraham Philip | 2015-08-20 | 1 | -0/+37 |
| | | | | | |||||
* | | | | | Add brackets in KeychainProvider | Dominik Schürmann | 2015-06-29 | 1 | -30/+43 |
| |_|_|/ |/| | | | |||||
* | | | | Query for duplicate user ids | Dominik Schürmann | 2015-03-15 | 1 | -1/+9 |
| |_|/ |/| | | |||||
* | | | Debug options | Dominik Schürmann | 2015-03-05 | 1 | -1/+1 |
| |/ |/| | |||||
* | | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | | Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of ↵ | Dominik Schürmann | 2015-01-30 | 1 | -1/+1 |
|\ \ | | | | | | | | | | https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8 | ||||
| * | | Add explicit casting to be able to compile with java8 | ligi | 2015-01-29 | 1 | -1/+1 |
| | | | |||||
* | | | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 1 | -3/+27 |
| | | | |||||
* | | | Introduce allowed keys table per API client | Dominik Schürmann | 2015-01-29 | 1 | -3/+19 |
|/ / | |||||
* | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -6/+6 |
| | | |||||
* | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -1/+3 |
| | | |||||
* | | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-14 | 1 | -35/+57 |
|/ | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | ||||
* | implement preliminary MultiCertifyActivity (most heavy lifting is done) | Vincent Breitmoser | 2014-10-04 | 1 | -7/+19 |
| | |||||
* | key spinner fixes | Dominik Schürmann | 2014-09-21 | 1 | -6/+6 |
| | |||||
* | New key flags icons, subkey adapter redesign, support authanticate flag in ↵ | Dominik Schürmann | 2014-09-20 | 1 | -0/+12 |
| | | | | database | ||||
* | move IS_REVOKED table prefix to the right places | Vincent Breitmoser | 2014-09-13 | 1 | -1/+1 |
| | | | | Fixes #849 | ||||
* | nullpointer check in KeychainProvider | Dominik Schürmann | 2014-09-11 | 1 | -1/+1 |
| | |||||
* | nullpointer check in KeychainProvider | Dominik Schürmann | 2014-09-11 | 1 | -0/+4 |
| | |||||
* | flag revoked, epired and unavailable keys in selection spinner | Vincent Breitmoser | 2014-09-07 | 1 | -0/+2 |
| | |||||
* | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -0/+2 |
| | |||||
* | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 1 | -0/+1 |
| | |||||
* | consolidate: use KeychainProvider for deletion operation | Vincent Breitmoser | 2014-08-20 | 1 | -0/+5 |
| | |||||
* | small bug in has_certify | mar-v-in | 2014-08-14 | 1 | -1/+1 |
| | |||||
* | add HAS_CERTIFY (not sure why it's missing) | mar-v-in | 2014-08-14 | 1 | -0/+11 |
| | |||||
* | Handle keys without expiry date right | mar-v-in | 2014-08-14 | 1 | -2/+2 |
| | | | Fixes #765 | ||||
* | Add convenience method to unified keyrings to determine whether a keyring is ↵ | mar-v-in | 2014-08-12 | 1 | -0/+3 |
| | | | | expired, fix is_revoked for certain usages | ||||
* | wrapped-key-ring: no UncachedSecretKeyRing after all | Vincent Breitmoser | 2014-06-02 | 1 | -1/+1 |
| | |||||
* | use long rather than String to build uris by key | Vincent Breitmoser | 2014-05-21 | 1 | -1/+1 |
| | |||||
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 1 | -1/+1 |
| |