aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results
Commit message (Collapse)AuthorAgeFilesLines
* mime: try to decode with given charset or utf-8 while file is readVincent Breitmoser2016-02-221-0/+4
|
* import: handle FileNotFoundException (fixes #1688)Vincent Breitmoser2016-02-012-13/+14
|
* Use more generic 'Security Token' where possible, add sutitle to create key ↵Dominik Schürmann2016-01-101-3/+3
| | | | what tokens are supported
* api: add micalg result extra to detached signature api callVincent Breitmoser2015-12-171-0/+10
|
* Merge pull request #1610 from open-keychain/facebookDominik Schürmann2015-12-101-0/+13
|\ | | | | Basic Facebook Support
| * added Facebook links support, reworked PreferencesAdithya Abraham Philip2015-12-061-0/+13
| |
* | Issue#1605 solvedTedaLIEz2015-12-091-1/+6
|/
* decrypt: skip all encountered marker packets (fix #1582)Vincent Breitmoser2015-11-151-1/+0
|
* decrypt: skip unavailable and unsuitable keysVincent Breitmoser2015-11-131-0/+2
|
* bench: add simple s2k benchmark (iterations for 100ms)Vincent Breitmoser2015-11-041-0/+2
|
* bench: run ops multiple times and for an average timeVincent Breitmoser2015-11-041-2/+4
|
* bench: simple working benchmarkVincent Breitmoser2015-11-044-1/+12
|
* bench: add benchmark operation for testingVincent Breitmoser2015-11-042-0/+52
|
* editkey: always return EditKeyResultVincent Breitmoser2015-10-291-0/+5
|
* uploadop: clean up, add loggingVincent Breitmoser2015-10-293-8/+17
|
* inputdataoperation: guess filetype from filename for generic application/ ↵Vincent Breitmoser2015-10-231-0/+1
| | | | mime types
* Renaming export strings to backupDominik Schürmann2015-10-151-12/+12
|
* Support backupVersion ASCII Armor headerDominik Schürmann2015-10-151-0/+1
|
* Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-081-2/+3
|\
| * pgpsignencrypt: unsupported parameter combinations are a bugVincent Breitmoser2015-10-081-1/+0
| |
| * pgpdecryptverify: fix one pass signature check, actually use bracketed structureVincent Breitmoser2015-10-071-0/+2
| |
| * Raise min asymmetric key length for all ciphers to 2048 bitDominik Schürmann2015-10-041-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-281-1/+2
|\|
| * Dont import more than 100 User IDs (OKC-01-002)Dominik Schürmann2015-09-251-0/+1
| |
| * fix fallback for non-mime dataVincent Breitmoser2015-09-191-1/+1
| |
* | export: support encrypted export, first versionVincent Breitmoser2015-09-281-21/+0
| |
* | export: more cleanup and splitting into subroutinesVincent Breitmoser2015-09-261-1/+0
| |
* | export: externalize upload into its own operationVincent Breitmoser2015-09-261-0/+73
| |
* | remove "export to file" code path from export operationVincent Breitmoser2015-09-261-4/+0
|/
* mime: skip trailing unsigned parts, and ignore nested signed dataVincent Breitmoser2015-09-171-0/+1
|
* mime: support for signed-then-encrypted formatVincent Breitmoser2015-09-171-1/+7
|
* mime: add failure case if openpgp processing fails!Vincent Breitmoser2015-09-161-0/+1
|
* mime: add logging messagesVincent Breitmoser2015-09-161-1/+1
|
* mime: handle non-mime data, just pass it throughVincent Breitmoser2015-09-161-0/+1
|
* mime: respect charset header (default to utf-8)Vincent Breitmoser2015-09-161-11/+0
|
* multidecrypt: display all outputUris as individual itemsVincent Breitmoser2015-09-161-1/+1
|
* mime: return one OpenPgpMetadata object per body partVincent Breitmoser2015-09-161-8/+23
|
* preliminary working mime parsing in DecryptListFragment! (beware WIP, here ↵Vincent Breitmoser2015-09-161-2/+12
| | | | be dragons!)
* mime: add logging to InputDataOperationVincent Breitmoser2015-09-151-4/+27
|
* mime: create more general InputDataOperation, which for now and does basic ↵Vincent Breitmoser2015-09-152-14/+29
| | | | mime parsing
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-142-24/+142
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java OpenKeychain/src/main/res/values/strings.xml
| * share rather than save log files (OKC-01-015)Vincent Breitmoser2015-09-111-17/+63
| |
| * never import secret keys from keyserver (OKC-01-001)Vincent Breitmoser2015-09-111-2/+3
| |
| * perform fingerprint check after canonicalization (OKC-01-009)Vincent Breitmoser2015-09-111-2/+2
| |
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 22:36:55 +0000