aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider
Commit message (Collapse)AuthorAgeFilesLines
* mime: create more general InputDataOperation, which for now and does basic ↵Vincent Breitmoser2015-09-151-7/+15
| | | | mime parsing
* sort confirmed keys before unconfirmed primary ones (OKC-01-011)Vincent Breitmoser2015-09-111-0/+5
|
* perform fingerprint check after canonicalization (OKC-01-009)Vincent Breitmoser2015-09-111-2/+13
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-293-17/+55
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-114-39/+34
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-091-1/+1
| | |
| * | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-153-50/+69
| |\ \ | | | | | | | | | | | | | | | | | | | | 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-1/+3
| | | |
| * | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-092-7/+15
| | | |
| * | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-092-1/+16
| | | |
| * | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-082-3/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-051-6/+0
| | | | |
| * | | | do a TON of UI workVincent Breitmoser2015-03-053-20/+30
| | | | |
| * | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-0/+5
| | | | |
| * | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-024-49/+185
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-142-12/+121
| | | | | |
| * | | | | make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-134-62/+94
| | | | | |
* | | | | | introduced constants for keyserver sync, fixed sync issueAdithya Abraham Philip2015-08-201-9/+4
| | | | | |
* | | | | | introduced keyserver sync adapterAdithya Abraham Philip2015-08-204-2/+141
| | | | | |
* | | | | | Improve comments and reasons in PgpConstants, simple checks for insecure ↵Dominik Schürmann2015-08-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | asymmetric keys
* | | | | | Introduce constants in OpenPgpSignature and DecryptionResult for ↵Dominik Schürmann2015-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos
* | | | | | comment for database fixVincent Breitmoser2015-07-081-0/+2
| | | | | |
* | | | | | apply database fix for bogus rows introduced by issue #1402Vincent Breitmoser2015-07-081-4/+12
| | | | | |
* | | | | | Package cert not sigDominik Schürmann2015-07-071-2/+2
| | | | | |
* | | | | | cleanup, NonNull annotation, never return null in PgpDecryptVerifyVincent Breitmoser2015-07-061-0/+3
| | | | | |
* | | | | | some cleanup and documentationVincent Breitmoser2015-07-061-1/+4
| | | | | |
* | | | | | added proxy support to OperationHelperAdithya Abraham Philip2015-07-031-2/+2
| | | | | |
* | | | | | ensuring code style is preservedAdithya Abraham Philip2015-07-031-4/+6
| | | | | |
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-302-46/+90
|\ \ \ \ \ \
| * | | | | | Use signature-level signature for TemporaryStorageProvider and describe the ↵Dominik Schürmann2015-06-291-15/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | security model
| * | | | | | Add brackets in KeychainProviderDominik Schürmann2015-06-291-30/+43
| | | | | | |
| * | | | | | Use application/octet-stream as default type in TemporaryStorageProviderDominik Schürmann2015-06-291-1/+1
| | | | | | |
* | | | | | | split import and export opsAdithya Abraham Philip2015-06-271-3/+3
| | | | | | |
* | | | | | | introduced CryptoOperationHelper in ImportKeysActivityAdithya Abraham Philip2015-06-271-2/+2
|/ / / / / /
* | | | | | Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-261-0/+3
|\ \ \ \ \ \
| * | | | | | instrument: first couple of tests for OpenPGP APIVincent Breitmoser2015-06-261-0/+3
| | | | | | |
* | | | | | | fix original file deletion (and instrumentation)Vincent Breitmoser2015-06-231-3/+6
| | | | | | |
* | | | | | | fix decrypt view intents, save mimetype in storage provider, and thumbnail ↵Vincent Breitmoser2015-06-201-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | loading in decrypt list
* | | | | | | add mimetype and streamtype support in TemporaryStorageProviderVincent Breitmoser2015-06-201-4/+52
| | | | | | |
* | | | | | | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-171-4/+9
|\| | | | | |
| * | | | | | fix rest of resource leaks (#1351)Vincent Breitmoser2015-06-171-4/+9
| | | | | | |
* | | | | | | Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| * | | | | | preliminary EditKeyTestVincent Breitmoser2015-06-171-1/+1
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-112-2/+3
|\| | | | | |
| * | | | | | Allow debug build besides release buildDominik Schürmann2015-06-102-2/+3
| | | | | | |
* | | | | | | multi-decrypt: implement save operation (missing actual copy)Vincent Breitmoser2015-06-031-0/+5
|/ / / / / /
* | | | | | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-301-2/+2
| | | | | |
* | | | | | update database to trigger consolidateVincent Breitmoser2015-05-281-1/+3
| | | | | |
* | | | | | improve robustness of SecretKeyType handlingVincent Breitmoser2015-05-281-1/+1
| | | | | |
* | | | | | set to stripped by default, rather than "unavailable"Vincent Breitmoser2015-05-281-1/+1
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 11:40:36 +0000