aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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 branch 'development' into linked-identitiesVincent Breitmoser2015-04-249-223/+153
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-2/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-246-24/+27
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * | | | support github resource (pa)Vincent Breitmoser2015-03-241-0/+1
| | | | | |
| | * | | | remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+0
| | | | | |
| | * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-081-2/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-029-299/+382
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | |
| * | | | | | | | mention filename to export to in logVincent Breitmoser2015-08-221-0/+1
| | | | | | | | |
| * | | | | | | | introduced constants for keyserver sync, fixed sync issueAdithya Abraham Philip2015-08-201-3/+2
| | | | | | | | |
* | | | | | | | | WIP mime parsingDominik Schürmann2015-08-172-0/+70
|/ / / / / / / /
* | | | | | | | 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-131-0/+2
| | | | | | | |
* | | | | | | | added licenses, cleaned up code, fixed warningsAdithya Abraham Philip2015-07-134-5/+22
| | | | | | | |
* | | | | | | | added retry on upload failureAdithya Abraham Philip2015-07-131-0/+9
| | | | | | | |
* | | | | | | | allowed operations to modify CryptoInputParcel they receiveAdithya Abraham Philip2015-07-1312-23/+44
| | | | | | | |
* | | | | | | | use only one DeleteDialogActivityAdithya Abraham Philip2015-07-131-1/+1
| | | | | | | |
* | | | | | | | implemented revocation on deletionAdithya Abraham Philip2015-07-135-3/+132
| | | | | | | |
* | | | | | | | 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-081-0/+1
|/ / / / / / / /
* | | | | | | | 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
| | | | | | | |
* | | | | | | | nicer error msg if input data cannot be readVincent Breitmoser2015-07-061-0/+1
| | | | | | | |
* | | | | | | | added proxy support to OperationHelperAdithya Abraham Philip2015-07-033-4/+35
| | | | | | | |
* | | | | | | | ensuring code style is preservedAdithya Abraham Philip2015-07-031-1/+1
| | | | | | | |
* | | | | | | | added OperationResult support to upload to keyserverAdithya Abraham Philip2015-07-031-0/+4
| | | | | | | |
* | | | | | | | Change PIN and Admin PIN after move to key operationDominik Schürmann2015-07-021-0/+2
| | | | | | | |
* | | | | | | | removed debug logs, added licensesAdithya Abraham Philip2015-06-271-0/+19
| | | | | | | |
* | | | | | | | migrated Keybase verificationAdithya Abraham Philip2015-06-272-1/+72
| | | | | | | |
* | | | | | | | implement deletion of filesVincent Breitmoser2015-06-234-4/+4
| | | | | | | |
* | | | | | | | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-181-9/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | more stable nullable behavior in OperationLogVincent Breitmoser2015-06-181-9/+21
| | | | | | | | |
* | | | | | | | | Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-171-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| * | | | | | | | return actual last log entry, including from sublogentryparcelsVincent Breitmoser2015-06-171-1/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-061-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this also fixes weird-bug Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java OpenKeychain/src/main/res/values/strings.xml
| * | | | | | | | prevent keybase key replacing keyserver keyAdithya Abraham Philip2015-05-311-0/+1
| | | | | | | | |
* | | | | | | | | introduce CachingDataDecryptorFactory towards cached session keysVincent Breitmoser2015-06-011-0/+13
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this commit introduces the CachingDataDecryptorFactory, which wraps a DataDecryptorFactory but supports caching of decrypted session keys. this change also gets rid of runtimeexception based control flow in PgpDecryptVerify.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 08:04:48 +0000