aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-14/+0
|\
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-029-299/+382
|\|
| * 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
| * | prevent recursive consolidateVincent Breitmoser2015-01-311-0/+1
| * | Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-295-198/+96
| |\ \
| | * | 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
| |\ \ \
| | * | | 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
| |\| | |
| | * | | 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
| | |/ /
| | * | 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
| | * | 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
| |/ /
* | | 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
|/ /
* | 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 no...Vincent Breitmoser2014-12-301-1/+3
|/
* Display error on certification attempt with yubikeyVincent Breitmoser2014-10-261-0/+1
* 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
* 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 code...Dominik Schürmann2014-10-231-0/+2
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 16:12:47 +0000