Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | get rid of code path for pin and notation data handling | Vincent Breitmoser | 2016-03-23 | 1 | -2/+0 |
| | |||||
* | mime: try to decode with given charset or utf-8 while file is read | Vincent Breitmoser | 2016-02-22 | 1 | -0/+4 |
| | |||||
* | import: handle FileNotFoundException (fixes #1688) | Vincent Breitmoser | 2016-02-01 | 2 | -13/+14 |
| | |||||
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵ | Dominik Schürmann | 2016-01-10 | 1 | -3/+3 |
| | | | | what tokens are supported | ||||
* | api: add micalg result extra to detached signature api call | Vincent Breitmoser | 2015-12-17 | 1 | -0/+10 |
| | |||||
* | Merge pull request #1610 from open-keychain/facebook | Dominik Schürmann | 2015-12-10 | 1 | -0/+13 |
|\ | | | | | Basic Facebook Support | ||||
| * | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 1 | -0/+13 |
| | | |||||
* | | Issue#1605 solved | TedaLIEz | 2015-12-09 | 1 | -1/+6 |
|/ | |||||
* | decrypt: skip all encountered marker packets (fix #1582) | Vincent Breitmoser | 2015-11-15 | 1 | -1/+0 |
| | |||||
* | decrypt: skip unavailable and unsuitable keys | Vincent Breitmoser | 2015-11-13 | 1 | -0/+2 |
| | |||||
* | bench: add simple s2k benchmark (iterations for 100ms) | Vincent Breitmoser | 2015-11-04 | 1 | -0/+2 |
| | |||||
* | bench: run ops multiple times and for an average time | Vincent Breitmoser | 2015-11-04 | 1 | -2/+4 |
| | |||||
* | bench: simple working benchmark | Vincent Breitmoser | 2015-11-04 | 4 | -1/+12 |
| | |||||
* | bench: add benchmark operation for testing | Vincent Breitmoser | 2015-11-04 | 2 | -0/+52 |
| | |||||
* | editkey: always return EditKeyResult | Vincent Breitmoser | 2015-10-29 | 1 | -0/+5 |
| | |||||
* | uploadop: clean up, add logging | Vincent Breitmoser | 2015-10-29 | 3 | -8/+17 |
| | |||||
* | inputdataoperation: guess filetype from filename for generic application/ ↵ | Vincent Breitmoser | 2015-10-23 | 1 | -0/+1 |
| | | | | mime types | ||||
* | Renaming export strings to backup | Dominik Schürmann | 2015-10-15 | 1 | -12/+12 |
| | |||||
* | Support backupVersion ASCII Armor header | Dominik Schürmann | 2015-10-15 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 1 | -2/+3 |
|\ | |||||
| * | pgpsignencrypt: unsupported parameter combinations are a bug | Vincent Breitmoser | 2015-10-08 | 1 | -1/+0 |
| | | |||||
| * | pgpdecryptverify: fix one pass signature check, actually use bracketed structure | Vincent Breitmoser | 2015-10-07 | 1 | -0/+2 |
| | | |||||
| * | Raise min asymmetric key length for all ciphers to 2048 bit | Dominik Schürmann | 2015-10-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into encrypted-export | Vincent Breitmoser | 2015-09-28 | 1 | -1/+2 |
|\| | |||||
| * | Dont import more than 100 User IDs (OKC-01-002) | Dominik Schürmann | 2015-09-25 | 1 | -0/+1 |
| | | |||||
| * | fix fallback for non-mime data | Vincent Breitmoser | 2015-09-19 | 1 | -1/+1 |
| | | |||||
* | | export: support encrypted export, first version | Vincent Breitmoser | 2015-09-28 | 1 | -21/+0 |
| | | |||||
* | | export: more cleanup and splitting into subroutines | Vincent Breitmoser | 2015-09-26 | 1 | -1/+0 |
| | | |||||
* | | export: externalize upload into its own operation | Vincent Breitmoser | 2015-09-26 | 1 | -0/+73 |
| | | |||||
* | | remove "export to file" code path from export operation | Vincent Breitmoser | 2015-09-26 | 1 | -4/+0 |
|/ | |||||
* | mime: skip trailing unsigned parts, and ignore nested signed data | Vincent Breitmoser | 2015-09-17 | 1 | -0/+1 |
| | |||||
* | mime: support for signed-then-encrypted format | Vincent Breitmoser | 2015-09-17 | 1 | -1/+7 |
| | |||||
* | mime: add failure case if openpgp processing fails! | Vincent Breitmoser | 2015-09-16 | 1 | -0/+1 |
| | |||||
* | mime: add logging messages | Vincent Breitmoser | 2015-09-16 | 1 | -1/+1 |
| | |||||
* | mime: handle non-mime data, just pass it through | Vincent Breitmoser | 2015-09-16 | 1 | -0/+1 |
| | |||||
* | mime: respect charset header (default to utf-8) | Vincent Breitmoser | 2015-09-16 | 1 | -11/+0 |
| | |||||
* | multidecrypt: display all outputUris as individual items | Vincent Breitmoser | 2015-09-16 | 1 | -1/+1 |
| | |||||
* | mime: return one OpenPgpMetadata object per body part | Vincent Breitmoser | 2015-09-16 | 1 | -8/+23 |
| | |||||
* | preliminary working mime parsing in DecryptListFragment! (beware WIP, here ↵ | Vincent Breitmoser | 2015-09-16 | 1 | -2/+12 |
| | | | | be dragons!) | ||||
* | mime: add logging to InputDataOperation | Vincent Breitmoser | 2015-09-15 | 1 | -4/+27 |
| | |||||
* | mime: create more general InputDataOperation, which for now and does basic ↵ | Vincent Breitmoser | 2015-09-15 | 2 | -14/+29 |
| | | | | mime parsing | ||||
* | Merge branch 'master' into mime4j | Vincent Breitmoser | 2015-09-14 | 2 | -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 Breitmoser | 2015-09-11 | 1 | -17/+63 |
| | | |||||
| * | never import secret keys from keyserver (OKC-01-001) | Vincent Breitmoser | 2015-09-11 | 1 | -2/+3 |
| | | |||||
| * | perform fingerprint check after canonicalization (OKC-01-009) | Vincent Breitmoser | 2015-09-11 | 1 | -2/+2 |
| | | |||||
| * | add support for signed-only data in the backend (#1507) | Vincent Breitmoser | 2015-09-10 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 2 | -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-identities | Vincent Breitmoser | 2015-04-24 | 9 | -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-identities | Vincent Breitmoser | 2015-04-09 | 1 | -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 creation | Vincent Breitmoser | 2015-03-24 | 1 | -2/+8 |
| | | | | |