aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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' 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 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
| * | 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-131-0/+2
| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml
| * | add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-121-0/+15
| | |
* | | Experimental API support for detached signatures (not tested)Dominik Schürmann2015-01-081-0/+16
|/ /
* | make certify routines more robust (#1016)Vincent Breitmoser2015-01-031-0/+1
| |
* | add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-031-0/+1
| |
* | encapsulate high level edit key into new operation classVincent Breitmoser2015-01-033-15/+76
| |
* | extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-021-6/+8
| |
* | small improvements regarding pin tests and loggingVincent Breitmoser2015-01-011-0/+2
| |
* | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-301-0/+1
| |
* | introduce handling of notation direct key signatures, and experimental pin ↵Vincent Breitmoser2014-12-301-1/+3
|/ | | | notation packet
* Display error on certification attempt with yubikeyVincent Breitmoser2014-10-261-0/+1
| | | | Closes #978
* implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-261-2/+8
|
* Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-261-0/+1
| | | | Fixes #974
* more rewordingVincent Breitmoser2014-10-251-2/+2
|
* change the way merging is loggedVincent Breitmoser2014-10-251-0/+4
|
* add logging to import and change order of import, keyservers firstVincent Breitmoser2014-10-251-0/+11
|
* Externalize QR Code scanning and import into its own activity for better ↵Dominik Schürmann2014-10-231-0/+2
| | | | code separation
* forgot committing ExportResult classVincent Breitmoser2014-10-131-0/+60
|
* rewrite export with new operation styleVincent Breitmoser2014-10-131-0/+18
|
* DeleteResult: add custom createNotifyVincent Breitmoser2014-10-111-0/+96
|
* move delete into operation classVincent Breitmoser2014-10-112-1/+67
|
* move around package structure a bitVincent Breitmoser2014-10-1010-0/+1659