aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
Commit message (Collapse)AuthorAgeFilesLines
* PgpSignEncryptOperation refactoringAndrea Torlaschi2016-05-101-4/+4
|
* (WIP) Change password when key is stripped #1692Alex Fong2016-05-041-0/+2
| | | | | | | | | | | Approach: Find the first unstripped secret key and use it for passphrase verification All unstripped keys will have their passphrase changed to new passphrase, if possible. Current Progress: Changing the passphrase of keys works fine. Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword" may be possible if given the go-ahead.
* Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-141-0/+1
| | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* get rid of code path for pin and notation data handlingVincent Breitmoser2016-03-231-2/+0
|
* 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-011-7/+7
|
* Use more generic 'Security Token' where possible, add sutitle to create key ↵Dominik Schürmann2016-01-101-3/+3
| | | | what tokens are supported
* 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-041-0/+6
|
* uploadop: clean up, add loggingVincent Breitmoser2015-10-291-4/+11
|
* 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: more cleanup and splitting into subroutinesVincent Breitmoser2015-09-261-1/+0
| |
* | 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: add logging to InputDataOperationVincent Breitmoser2015-09-151-4/+27
|
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-141-24/+93
|\ | | | | | | | | | | | | | | 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-291-2/+23
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-79/+41
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | work on cookie scanning during creationVincent Breitmoser2015-03-241-2/+8
| | | |
| | * | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-13/+13
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * | | 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
| | * \ \ \ 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
| | * \ \ \ \ NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-65/+85
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | 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
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 13:25:45 +0000