aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-2/+23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-79/+41
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | work on cookie scanning during creationVincent Breitmoser2015-03-241-2/+8
| | |
| * | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-13/+13
| |\ \ | | | | | | | | | | | | | | | | 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
| * \ \ \ \ NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-65/+85
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-121-0/+16
| | | | | | |
* | | | | | | 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
| | | | | | |
* | | | | | | 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
* | | | | | | fixed multi-deletion bug, moved logic into DeleteKeyDialogActivityAdithya Abraham Philip2015-07-151-1/+1
| | | | | | |
* | | | | | | upload only public key in revocationAdithya Abraham Philip2015-07-131-0/+2
| | | | | | |
* | | | | | | use only one DeleteDialogActivityAdithya Abraham Philip2015-07-131-1/+1
| | | | | | |
* | | | | | | implemented revocation on deletionAdithya Abraham Philip2015-07-131-0/+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
| | | | | | |
* | | | | | | 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
| | | | | | |
* | | | | | | migrated Keybase verificationAdithya Abraham Philip2015-06-271-1/+13
| | | | | | |
* | | | | | | implement deletion of filesVincent Breitmoser2015-06-231-1/+1
| | | | | | |
* | | | | | | more stable nullable behavior in OperationLogVincent Breitmoser2015-06-181-9/+21
| | | | | | |
* | | | | | | return actual last log entry, including from sublogentryparcelsVincent Breitmoser2015-06-171-1/+5
| | | | | | |
* | | | | | | prevent keybase key replacing keyserver keyAdithya Abraham Philip2015-05-311-0/+1
| | | | | | |
* | | | | | | better error handling for bad encrypted data checksumVincent Breitmoser2015-05-301-0/+1
| | | | | | |
* | | | | | | warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-281-0/+1
| | | | | | |
* | | | | | | don't show allowed key list if no key exists, and some minor ↵Vincent Breitmoser2015-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PgpDecryptVerify changes
* | | | | | | check fingerprint length after scanning qr codeVincent Breitmoser2015-05-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1281
* | | | | | | apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-171-0/+3
| | | | | | |
* | | | | | | Add check for exporting two keys to same smart card slot.Joey Castillo2015-05-131-0/+2
| | | | | | |
* | | | | | | Bugfixes and changes based on feedbackJoey Castillo2015-05-131-5/+3
| | | | | | |
* | | | | | | Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-131-0/+3
| | | | | | |
* | | | | | | Moved checks from fragment to operation, impoved logging.Joey Castillo2015-05-121-0/+5
| |_|_|_|_|/ |/| | | | |
* | | | | | Externalize Parcelable cachingDominik Schürmann2015-04-101-59/+11
| | | | | |
* | | | | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-1/+0
| | | | | |
* | | | | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-1/+0
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-211-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * | | | | Reworked Notify classManoj Khanna2015-03-201-13/+13
| | |_|_|/ | |/| | |
* | | | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-211-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify()
* | | | | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 04:32:53 +0000