aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
Commit message (Collapse)AuthorAgeFilesLines
* ssh authentication supportHEADmasterhsm2016-05-291-0/+2
|
* Use email field to match email in KeychainProviderfiaxh2016-04-121-4/+4
| | | | fixes #1699
* update null-check for duplicates, and add matching indexes to name and email ↵Vincent Breitmoser2016-03-161-6/+5
| | | | columns
* small update to duplicate detectionVincent Breitmoser2016-03-151-2/+5
|
* Updated HAS_DUPLICATE_USER_ID in KeychainProvider to use name and email ↵fjodor2016-03-101-2/+2
| | | | address instead of user id #1745
* Save split user ids in database #1745fjodor2016-03-071-0/+3
| | | | Save split user ids in database
* external-provider: add permission check for status queryVincent Breitmoser2016-02-241-1/+1
|
* keylist: filter results by all user ids for search (fixes #1645)Vincent Breitmoser2015-12-291-5/+16
|
* some optimizations and indexes for the main key list queryVincent Breitmoser2015-11-151-8/+6
|
* provider: add debug variable to explain query plansVincent Breitmoser2015-11-151-4/+28
|
* decrypt: skip all encountered marker packets (fix #1582)Vincent Breitmoser2015-11-151-0/+1
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-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 UriAttributeVincent Breitmoser2015-05-091-1/+1
| |
| * Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-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/identifierVincent Breitmoser2015-03-131-1/+3
| | |
| * | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-091-5/+13
| | |
| * | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-0/+7
| | |
| * | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-081-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | do a TON of UI workVincent Breitmoser2015-03-051-6/+13
| | | |
| * | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-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 Breitmoser2015-01-141-1/+3
| | | | |
| * | | | make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-131-35/+57
| | | | |
* | | | | introduced keyserver sync adapterAdithya Abraham Philip2015-08-201-0/+37
| | | | |
* | | | | Add brackets in KeychainProviderDominik Schürmann2015-06-291-30/+43
| |_|_|/ |/| | |
* | | | Query for duplicate user idsDominik Schürmann2015-03-151-1/+9
| |_|/ |/| |
* | | Debug optionsDominik Schürmann2015-03-051-1/+1
| |/ |/|
* | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-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ürmann2015-01-301-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 java8ligi2015-01-291-1/+1
| | |
* | | Saving of allowed keysDominik Schürmann2015-01-291-3/+27
| | |
* | | Introduce allowed keys table per API clientDominik Schürmann2015-01-291-3/+19
|/ /
* | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-6/+6
| |
* | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-1/+3
| |
* | make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-141-35/+57
|/ | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
* implement preliminary MultiCertifyActivity (most heavy lifting is done)Vincent Breitmoser2014-10-041-7/+19
|
* key spinner fixesDominik Schürmann2014-09-211-6/+6
|
* New key flags icons, subkey adapter redesign, support authanticate flag in ↵Dominik Schürmann2014-09-201-0/+12
| | | | database
* move IS_REVOKED table prefix to the right placesVincent Breitmoser2014-09-131-1/+1
| | | | Fixes #849
* nullpointer check in KeychainProviderDominik Schürmann2014-09-111-1/+1
|
* nullpointer check in KeychainProviderDominik Schürmann2014-09-111-0/+4
|
* flag revoked, epired and unavailable keys in selection spinnerVincent Breitmoser2014-09-071-0/+2
|
* add ecc supportVincent Breitmoser2014-08-241-0/+2
|
* Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
|
* consolidate: use KeychainProvider for deletion operationVincent Breitmoser2014-08-201-0/+5
|
* small bug in has_certifymar-v-in2014-08-141-1/+1
|
* add HAS_CERTIFY (not sure why it's missing)mar-v-in2014-08-141-0/+11
|
* Handle keys without expiry date rightmar-v-in2014-08-141-2/+2
| | | Fixes #765
* Add convenience method to unified keyrings to determine whether a keyring is ↵mar-v-in2014-08-121-0/+3
| | | | expired, fix is_revoked for certain usages
* wrapped-key-ring: no UncachedSecretKeyRing after allVincent Breitmoser2014-06-021-1/+1
|
* use long rather than String to build uris by keyVincent Breitmoser2014-05-211-1/+1
|