aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
Commit message (Collapse)AuthorAgeFilesLines
...
* | inputdata: don't attempt mime decode on application/* except octet-streamVincent Breitmoser2015-09-301-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-283-39/+73
|\|
| * Dont import more than 100 User IDs (OKC-01-002)Dominik Schürmann2015-09-251-0/+1
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-211-14/+21
| |\
| | * Use more modular Keybase lib with OkHttp wrapperDominik Schürmann2015-09-211-14/+21
| | |
| * | mime: don't do mime parsing if the encrypted data has a filenameVincent Breitmoser2015-09-211-6/+10
| |/
| * inform storage provider of uri content-type for decrypted outputVincent Breitmoser2015-09-191-0/+6
| |
| * skip mime parsing if we already know the content type isn't suitableVincent Breitmoser2015-09-191-5/+18
| |
| * fix fallback for non-mime dataVincent Breitmoser2015-09-192-20/+23
| |
* | upload: re-add upload by bytesVincent Breitmoser2015-09-283-37/+45
| |
* | export: improve stream handling, performanceVincent Breitmoser2015-09-281-3/+12
| |
* | export: support encrypted export, first versionVincent Breitmoser2015-09-282-32/+78
| |
* | upload: identify key by masterKeyId onlyVincent Breitmoser2015-09-262-21/+21
| |
* | export: more cleanup and splitting into subroutinesVincent Breitmoser2015-09-262-49/+52
| |
* | export: externalize upload into its own operationVincent Breitmoser2015-09-264-106/+230
| |
* | export: clean up, fix possible infinite loopVincent Breitmoser2015-09-261-61/+54
| |
* | export: move execute operation to topVincent Breitmoser2015-09-261-40/+41
| |
* | remove "export to file" code path from export operationVincent Breitmoser2015-09-262-65/+5
|/
* mime: skip trailing unsigned parts, and ignore nested signed dataVincent Breitmoser2015-09-172-3/+17
|
* mime: support for signed-then-encrypted formatVincent Breitmoser2015-09-172-16/+140
|
* mime: add failure case if openpgp processing fails!Vincent Breitmoser2015-09-162-0/+6
|
* mime: add logging messagesVincent Breitmoser2015-09-162-19/+18
|
* mime: handle non-mime data, just pass it throughVincent Breitmoser2015-09-162-11/+41
|
* mime: respect charset header (default to utf-8)Vincent Breitmoser2015-09-162-12/+7
|
* multidecrypt: use bottom sheet for longclick optionsVincent Breitmoser2015-09-161-3/+5
|
* multidecrypt: display all outputUris as individual itemsVincent Breitmoser2015-09-161-1/+1
|
* mime: return one OpenPgpMetadata object per body partVincent Breitmoser2015-09-162-10/+32
|
* preliminary working mime parsing in DecryptListFragment! (beware WIP, here ↵Vincent Breitmoser2015-09-162-11/+23
| | | | be dragons!)
* mime: add logging to InputDataOperationVincent Breitmoser2015-09-152-49/+92
|
* mime: create more general InputDataOperation, which for now and does basic ↵Vincent Breitmoser2015-09-154-374/+202
| | | | mime parsing
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-146-158/+219
|\ | | | | | | | | | | | | | | 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-112-4/+12
| |
| * perform fingerprint check after canonicalization (OKC-01-009)Vincent Breitmoser2015-09-112-14/+3
| |
| * 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 tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-111-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| | * | check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-061-6/+7
| | | |
| | * | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2414-274/+234
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-092-11/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-249-28/+34
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * | | | | support github resource (pa)Vincent Breitmoser2015-03-241-0/+1
| | | | | | |
| | * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-156-1/+108
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| | * | | | | | remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+0
| | | | | | | |
| | * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-083-18/+20
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-14/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| | * | | | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0215-317/+686
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 11:05:16 +0000