aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Externalize Parcelable cachingDominik Schürmann2015-04-101-59/+11
| |
| * fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-011-52/+6
| |
| * fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-304-70/+14
| |
| * pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-301-2/+0
| |
| * Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-2/+5
| |\
| * | Fixing crashes with new encrypt uiDominik Schürmann2015-03-291-2/+18
| | |
| * | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-1/+0
| | |
| * | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-2/+7
| | |
| * | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-214-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-212-9/+22
| | | | | | | | | | | | | | | | | | | | - 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
| | | |
| * | | fix unit tests (for real)Vincent Breitmoser2015-03-201-1/+3
| | | |
| * | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-202-9/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
| * | | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-203-34/+11
| | | | |
| * | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-193-8/+6
| | | | |
| * | | | yubikey certifications!Vincent Breitmoser2015-03-184-4/+85
| | | | |
| * | | | generalize nfc crypto input structureVincent Breitmoser2015-03-182-14/+4
| | | | |
* | | | | 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
| * | | | changed style to WARN, corrected error messageAdithya Abraham Philip2015-03-281-2/+5
| | |_|/ | |/| |
* | | | 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
| * | | Reworked Notify classManoj Khanna2015-03-204-16/+16
| | |/ | |/|
| * | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-192-8/+11
| |/
* | 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
| * add support for certification of user attributesVincent Breitmoser2015-03-081-2/+2
| |
| * Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-051-0/+2
| |
* | 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' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-041-0/+7
| |\ | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| | * added logging, notify for log exportAdithya Abraham Philip2015-03-011-0/+7
| | |
| * | Cleanup for styleMorgan Gangwere2015-03-031-13/+6
| | | | | | | | | | | | Some nitpicks were had. Also, change the null UUID to a constant.
| * | Fix root cause of #1077Morgan Gangwere2015-03-031-6/+70
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing lots of keys, lots of messages about the status of keys is generated, including some debug slime and general fluff that isn't really needed a lot of the time. As a result, a serious bug can come along after key imports or certain operations which cause a log to become parceled. This commit implements a pool to "dehydrate" logs into: they are placed into the pool (a ConcurrentHashMap) and a UUID assigned to them, which is parceled along. When the OperationResult is un-parceled, it reads in the appropriate UUID bits and rehydrates the appropriate log. In order to avoid any memory leaks, the log pool removes a reference to the log itself, allowing the log to die a natural death at the hands of the GC..
* | 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
| * Merge keybase-proof branchDominik Schürmann2015-02-271-0/+9
| |\
| | * Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-0/+9
| | |
| * | determine correct filesize during decryption from LiteralData packetVincent Breitmoser2015-02-171-0/+1
| | |
| * | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-015-119/+198
| | | | | | | | | | | | | | | | | | | | | - 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
| * | prevent recursive consolidateVincent Breitmoser2015-01-311-0/+1
| | |
| * | Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-295-198/+96
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle
| | * | use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-195-198/+96
| | | |
| * | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-273-0/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| | * | | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-272-0/+12
| | | | |
| | * | | move last parts of import logic from kis into operationVincent Breitmoser2015-01-262-0/+5
| | | | |
| * | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-262-3/+95
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| | * | | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-3/+3
| | | | |
| | * | | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-252-0/+60
| | | | |
| | * | | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-0/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 05:20:17 +0000