Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Shifted duplicate method implementations from KeyRing to openpgp-api submodule | Alex Fong | 2016-05-15 | 1 | -1/+2 |
| | |||||
* | Better handle user_id sidecases while splitting | fiaxh | 2016-04-12 | 1 | -1/+1 |
| | |||||
* | 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 | 2 | -7/+13 |
| | | | | columns | ||||
* | small update to duplicate detection | Vincent Breitmoser | 2016-03-15 | 1 | -2/+5 |
| | |||||
* | Merge pull request #1777 from fjodorver/master | Vincent | 2016-03-15 | 1 | -2/+2 |
|\ | | | | | Updated HAS_DUPLICATE_USER_ID in KeychainProvider #1745 | ||||
| * | 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 | ||||
* | | fix ridiculous database migration bug introduced by ↵ | Vincent Breitmoser | 2016-03-15 | 1 | -9/+7 |
| | | | | | | | | d6e4936fa54dc3577296dbadaeb556178dcad2c3 | ||||
* | | Merge pull request #1763 from fjodorver/master | Vincent | 2016-03-10 | 4 | -15/+38 |
|\| | | | | | WIP: Save split user ids in database #1745 | ||||
| * | Increased version DB and added a migration path from an old database format | fjodor | 2016-03-07 | 1 | -2/+5 |
| | | |||||
| * | Save split user ids in database #1745 | fjodor | 2016-03-07 | 4 | -13/+33 |
| | | | | | | | | Save split user ids in database | ||||
* | | Extend FileProvider to support name update | Andrea Torlaschi | 2016-03-05 | 1 | -2/+11 |
|/ | |||||
* | add some license headers | Vincent Breitmoser | 2016-02-24 | 3 | -0/+52 |
| | |||||
* | external-provider: add permission check for status query | Vincent Breitmoser | 2016-02-24 | 1 | -1/+1 |
| | |||||
* | external-provider: add (experimental) external provider | Vincent Breitmoser | 2016-02-24 | 1 | -0/+35 |
| | |||||
* | split off ApiDataAccessObject from ProviderHelper | Vincent Breitmoser | 2016-02-24 | 3 | -211/+284 |
| | |||||
* | Merge branch 'master' into performance | Vincent Breitmoser | 2016-02-10 | 1 | -1/+1 |
|\ | |||||
| * | Replace spongycastle with bouncycastle | Dominik Schürmann | 2016-02-09 | 1 | -1/+1 |
| | | |||||
* | | performance: avoid expensive getSecretKeyType call, use cached where possible | Vincent Breitmoser | 2016-02-05 | 2 | -4/+6 |
|/ | |||||
* | keylist: filter results by all user ids for search (fixes #1645) | Vincent Breitmoser | 2015-12-29 | 2 | -5/+22 |
| | |||||
* | fix accidental commit (thought I had removed that) | Vincent Breitmoser | 2015-11-15 | 1 | -3/+1 |
| | |||||
* | allow database downgrade for debug builds | Vincent Breitmoser | 2015-11-15 | 1 | -0/+4 |
| | |||||
* | some optimizations and indexes for the main key list query | Vincent Breitmoser | 2015-11-15 | 2 | -14/+22 |
| | |||||
* | 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 |
| | |||||
* | Improve file handling in TemporaryFileProvider | Dominik Schürmann | 2015-10-21 | 1 | -16/+21 |
| | |||||
* | Remove debug code | Dominik Schürmann | 2015-10-15 | 1 | -1/+1 |
| | |||||
* | Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for ↵ | Dominik Schürmann | 2015-10-15 | 1 | -30/+38 |
| | | | | db contract | ||||
* | use only primary and mutually bound subkeys for fingerprint verification | Vincent Breitmoser | 2015-10-06 | 1 | -2/+1 |
| | |||||
* | Prevent database downgrade (OKC-01-012) | Dominik Schürmann | 2015-09-25 | 1 | -1/+10 |
| | |||||
* | mime: create more general InputDataOperation, which for now and does basic ↵ | Vincent Breitmoser | 2015-09-15 | 1 | -7/+15 |
| | | | | mime parsing | ||||
* | sort confirmed keys before unconfirmed primary ones (OKC-01-011) | Vincent Breitmoser | 2015-09-11 | 1 | -0/+5 |
| | |||||
* | perform fingerprint check after canonicalization (OKC-01-009) | Vincent Breitmoser | 2015-09-11 | 1 | -2/+13 |
| | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 3 | -17/+55 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 4 | -39/+34 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml | ||||
| * | | 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 | 3 | -50/+69 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -7/+15 |
| | | | | |||||
| * | | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 2 | -1/+16 |
| | | | | |||||
| * | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 2 | -3/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | | | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 1 | -6/+0 |
| | | | | | |||||
| * | | | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 3 | -20/+30 |
| | | | | | |||||
| * | | | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 4 | -49/+185 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -12/+121 |
| | | | | | | |||||
| * | | | | | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-13 | 4 | -62/+94 |
| | | | | | | |||||
* | | | | | | introduced constants for keyserver sync, fixed sync issue | Adithya Abraham Philip | 2015-08-20 | 1 | -9/+4 |
| | | | | | | |||||
* | | | | | | introduced keyserver sync adapter | Adithya Abraham Philip | 2015-08-20 | 4 | -2/+141 |
| | | | | | | |||||
* | | | | | | Improve comments and reasons in PgpConstants, simple checks for insecure ↵ | Dominik Schürmann | 2015-08-10 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | asymmetric keys |