aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
Commit message (Collapse)AuthorAgeFilesLines
* Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-151-1/+2
|
* Save split user ids in database #1745fjodor2016-03-071-13/+21
| | | | Save split user ids in database
* split off ApiDataAccessObject from ProviderHelperVincent Breitmoser2016-02-241-211/+19
|
* Merge branch 'master' into performanceVincent Breitmoser2016-02-101-1/+1
|\
| * Replace spongycastle with bouncycastleDominik Schürmann2016-02-091-1/+1
| |
* | performance: avoid expensive getSecretKeyType call, use cached where possibleVincent Breitmoser2016-02-051-3/+5
|/
* use only primary and mutually bound subkeys for fingerprint verificationVincent Breitmoser2015-10-061-2/+1
|
* sort confirmed keys before unconfirmed primary ones (OKC-01-011)Vincent Breitmoser2015-09-111-0/+5
|
* perform fingerprint check after canonicalization (OKC-01-009)Vincent Breitmoser2015-09-111-2/+13
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-5/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-identitiesVincent Breitmoser2015-05-111-26/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-49/+59
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-081-2/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-051-6/+0
| | | | |
| * | | | do a TON of UI workVincent Breitmoser2015-03-051-10/+7
| | | | |
| * | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-37/+87
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-11/+118
| | | | | |
| * | | | | make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-131-8/+11
| | | | | |
* | | | | | introduced constants for keyserver sync, fixed sync issueAdithya Abraham Philip2015-08-201-9/+4
| | | | | |
* | | | | | introduced keyserver sync adapterAdithya Abraham Philip2015-08-201-0/+71
| | | | | |
* | | | | | Improve comments and reasons in PgpConstants, simple checks for insecure ↵Dominik Schürmann2015-08-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | asymmetric keys
* | | | | | Introduce constants in OpenPgpSignature and DecryptionResult for ↵Dominik Schürmann2015-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos
* | | | | | Package cert not sigDominik Schürmann2015-07-071-2/+2
| | | | | |
* | | | | | cleanup, NonNull annotation, never return null in PgpDecryptVerifyVincent Breitmoser2015-07-061-0/+3
| | | | | |
* | | | | | some cleanup and documentationVincent Breitmoser2015-07-061-1/+4
| | | | | |
* | | | | | added proxy support to OperationHelperAdithya Abraham Philip2015-07-031-2/+2
| | | | | |
* | | | | | ensuring code style is preservedAdithya Abraham Philip2015-07-031-4/+6
| | | | | |
* | | | | | split import and export opsAdithya Abraham Philip2015-06-271-3/+3
| | | | | |
* | | | | | introduced CryptoOperationHelper in ImportKeysActivityAdithya Abraham Philip2015-06-271-2/+2
| | | | | |
* | | | | | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-301-2/+2
| | | | | |
* | | | | | improve robustness of SecretKeyType handlingVincent Breitmoser2015-05-281-1/+1
| | | | | |
* | | | | | set to stripped by default, rather than "unavailable"Vincent Breitmoser2015-05-281-1/+1
| | | | | |
* | | | | | allow user packets with only revocation packetVincent Breitmoser2015-05-281-4/+4
| |_|_|_|/ |/| | | |
* | | | | CleanupDominik Schürmann2015-05-101-21/+0
| | | | |
* | | | | Fixes and clarifications to app signature (or better certificate) pinningDominik Schürmann2015-05-101-5/+4
| |_|_|/ |/| | |
* | | | change user_id primary key in database, use keyring rather than unified ↵Vincent Breitmoser2015-03-111-10/+7
| | | | | | | | | | | | | | | | query in consolidate
* | | | API 7Dominik Schürmann2015-03-101-49/+59
| |_|/ |/| |
* | | Remove advanced preferences, move compression as menu item in encrypt ↵Dominik Schürmann2015-03-051-2/+1
| |/ |/| | | | | activites, select hash and encryption algo based on hardcoded preferred lists
* | save revocation instead of self-cert for revoked uidsVincent Breitmoser2015-02-261-12/+19
| |
* | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-12/+12
| | | | | | | | | | | | | | - 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 remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-311-1/+34
|\ \
| * | Rename app setting classes for consistencyDominik Schürmann2015-01-301-1/+0
| | |
| * | Fix saving of allowed keysDominik Schürmann2015-01-301-11/+5
| | |
| * | Saving of allowed keysDominik Schürmann2015-01-291-0/+40
| | |
* | | prevent recursive consolidateVincent Breitmoser2015-01-311-4/+8
|/ /
* | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-14/+14
| |
* | always show revoked user ids last!Vincent Breitmoser2015-01-191-4/+4
| |
* | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-11/+118
| |
* | make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-141-8/+11
|/ | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
* minor stuffVincent Breitmoser2015-01-031-0/+1
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 06:12:17 +0000