aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
Commit message (Collapse)AuthorAgeFilesLines
...
| * perform fingerprint check after canonicalization (OKC-01-009)Vincent Breitmoser2015-09-112-14/+3
| |
| * add support for signed-only data in the backend (#1507)Vincent Breitmoser2015-09-101-0/+1
| |
| * Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-292-2/+72
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-061-6/+7
| | | |
| | * | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2414-274/+234
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java 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-04-092-11/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * | | | work on cookie scanning during creationVincent Breitmoser2015-03-241-2/+8
| | | | | |
| | * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-249-28/+34
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * | | | | support github resource (pa)Vincent Breitmoser2015-03-241-0/+1
| | | | | | |
| | * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-156-1/+108
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+0
| | | | | | | |
| | * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-083-18/+20
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * \ \ \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-6/+69
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| | * \ \ \ \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-14/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| | * | | | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0215-317/+686
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | small fixes to user attribute handlingVincent Breitmoser2015-01-141-0/+1
| | | | | | | | | | |
| | * | | | | | | | | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-0/+12
| | | | | | | | | | |
| | * | | | | | | | | support addition of user attributesVincent Breitmoser2015-01-121-0/+2
| | | | | | | | | | |
| | * | | | | | | | | add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-121-0/+15
| | | | | | | | | | |
| | * | | | | | | | | even more intermediate resultVincent Breitmoser2015-01-122-0/+79
| | | | | | | | | | |
| * | | | | | | | | | Remove dead codeDominik Schürmann2015-08-271-2/+2
| | | | | | | | | | |
| * | | | | | | | | | fixed update all crashAdithya Abraham Philip2015-08-241-55/+31
| | | | | | | | | | |
| * | | | | | | | | | mention filename to export to in logVincent Breitmoser2015-08-222-0/+3
| | | | | | | | | | |
| * | | | | | | | | | introduced constants for keyserver sync, fixed sync issueAdithya Abraham Philip2015-08-203-6/+5
| | | | | | | | | | |
| * | | | | | | | | | reworked keyserversyncadapterservice flowAdithya Abraham Philip2015-08-201-9/+1
| | | | | | | | | | |
| * | | | | | | | | | introduced keyserver sync adapterAdithya Abraham Philip2015-08-201-11/+26
| | | | | | | | | | |
| * | | | | | | | | | Revoke master key onlyDominik Schürmann2015-08-171-43/+5
| | | | | | | | | | |
* | | | | | | | | | | WIP mime parsingDominik Schürmann2015-08-173-0/+430
|/ / / / / / / / / /
* | | | | | | | | | Improve comments and reasons in PgpConstants, simple checks for insecure ↵Dominik Schürmann2015-08-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asymmetric keys
* | | | | | | | | | Follow some of coorus recommendations: better selection of algo whitelist, ↵Dominik Schürmann2015-08-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignore recipients preferred algos
* | | | | | | | | | Introduce constants in OpenPgpSignature and DecryptionResult for ↵Dominik Schürmann2015-08-091-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos
* | | | | | | | | | fixed multi-deletion bug, moved logic into DeleteKeyDialogActivityAdithya Abraham Philip2015-07-152-2/+5
| | | | | | | | | |
* | | | | | | | | | upload only public key in revocationAdithya Abraham Philip2015-07-132-1/+15
| | | | | | | | | |
* | | | | | | | | | added licenses, cleaned up code, fixed warningsAdithya Abraham Philip2015-07-138-25/+47
| | | | | | | | | |
* | | | | | | | | | added retry on upload failureAdithya Abraham Philip2015-07-133-2/+16
| | | | | | | | | |
* | | | | | | | | | allowed operations to modify CryptoInputParcel they receiveAdithya Abraham Philip2015-07-1317-43/+55
| | | | | | | | | |
* | | | | | | | | | prevented passphrase caching on revocationAdithya Abraham Philip2015-07-132-1/+4
| | | | | | | | | |
* | | | | | | | | | use only one DeleteDialogActivityAdithya Abraham Philip2015-07-131-1/+1
| | | | | | | | | |
* | | | | | | | | | implemented revocation on deletionAdithya Abraham Philip2015-07-139-11/+326
| | | | | | | | | |
* | | | | | | | | | fixed QR code scan and serialKeyImport progressAdithya Abraham Philip2015-07-081-1/+3
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1424 from open-keychain/import-proxyDominik Schürmann2015-07-081-1/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Shifted proxy logic to ImportKeysListCloudLoader
| * | | | | | | | | | shifted proxy checking to ImportKeysListCloudLoaderAdithya Abraham Philip2015-07-081-1/+7
| | | | | | | | | | |
* | | | | | | | | | | fix symmetric passphrase caching (fixes #1401)Vincent Breitmoser2015-07-082-2/+7
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-082-3/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | addition of subkeys for divert-to-card primary keys is not supportedVincent Breitmoser2015-07-081-0/+1
| | | | | | | | | | |
| * | | | | | | | | | better handling of divert-to-card keys for subkey modificationsVincent Breitmoser2015-07-081-0/+1
| | | | | | | | | | |
| * | | | | | | | | | try cache in certify operation (fixes #1242)Vincent Breitmoser2015-07-071-3/+12
| | | | | | | | | | |
* | | | | | | | | | | Temporary fix for multi exportDominik Schürmann2015-07-081-10/+12
|/ / / / / / / / / /
* | | | | | | | | | don't cache exporthelper, keep type for KeyItem in KeySpinnerVincent Breitmoser2015-07-061-11/+11
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 04:30:51 +0000