Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 6 | -24/+27 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| | * | | | | support github resource (pa) | Vincent Breitmoser | 2015-03-24 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 1 | -2/+0 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 1 | -2/+4 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| | * \ \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 1 | -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-identities | Vincent Breitmoser | 2015-03-02 | 1 | -14/+0 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java | |||||
| | * | | | | | | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 9 | -299/+382 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 handling | Vincent Breitmoser | 2015-01-14 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -0/+12 | |
| | | | | | | | | | ||||||
| | * | | | | | | | support addition of user attributes | Vincent Breitmoser | 2015-01-12 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
| | * | | | | | | | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 1 | -0/+15 | |
| | | | | | | | | | ||||||
| | * | | | | | | | even more intermediate result | Vincent Breitmoser | 2015-01-12 | 2 | -0/+79 | |
| | | | | | | | | | ||||||
| * | | | | | | | | mention filename to export to in log | Vincent Breitmoser | 2015-08-22 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | introduced constants for keyserver sync, fixed sync issue | Adithya Abraham Philip | 2015-08-20 | 1 | -3/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | WIP mime parsing | Dominik Schürmann | 2015-08-17 | 2 | -0/+70 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Improve comments and reasons in PgpConstants, simple checks for insecure ↵ | Dominik Schürmann | 2015-08-10 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asymmetric keys | |||||
* | | | | | | | | Follow some of coorus recommendations: better selection of algo whitelist, ↵ | Dominik Schürmann | 2015-08-09 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignore recipients preferred algos | |||||
* | | | | | | | | Introduce constants in OpenPgpSignature and DecryptionResult for ↵ | Dominik Schürmann | 2015-08-09 | 1 | -10/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos | |||||
* | | | | | | | | fixed multi-deletion bug, moved logic into DeleteKeyDialogActivity | Adithya Abraham Philip | 2015-07-15 | 2 | -2/+5 | |
| | | | | | | | | ||||||
* | | | | | | | | upload only public key in revocation | Adithya Abraham Philip | 2015-07-13 | 1 | -0/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | added licenses, cleaned up code, fixed warnings | Adithya Abraham Philip | 2015-07-13 | 4 | -5/+22 | |
| | | | | | | | | ||||||
* | | | | | | | | added retry on upload failure | Adithya Abraham Philip | 2015-07-13 | 1 | -0/+9 | |
| | | | | | | | | ||||||
* | | | | | | | | allowed operations to modify CryptoInputParcel they receive | Adithya Abraham Philip | 2015-07-13 | 12 | -23/+44 | |
| | | | | | | | | ||||||
* | | | | | | | | use only one DeleteDialogActivity | Adithya Abraham Philip | 2015-07-13 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | implemented revocation on deletion | Adithya Abraham Philip | 2015-07-13 | 5 | -3/+132 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #1424 from open-keychain/import-proxy | Dominik Schürmann | 2015-07-08 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Shifted proxy logic to ImportKeysListCloudLoader | |||||
| * | | | | | | | | shifted proxy checking to ImportKeysListCloudLoader | Adithya Abraham Philip | 2015-07-08 | 1 | -1/+7 | |
| | | | | | | | | | ||||||
* | | | | | | | | | fix symmetric passphrase caching (fixes #1401) | Vincent Breitmoser | 2015-07-08 | 1 | -0/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | addition of subkeys for divert-to-card primary keys is not supported | Vincent Breitmoser | 2015-07-08 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | better handling of divert-to-card keys for subkey modifications | Vincent Breitmoser | 2015-07-08 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | nicer error msg if input data cannot be read | Vincent Breitmoser | 2015-07-06 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 3 | -4/+35 | |
| | | | | | | | | ||||||
* | | | | | | | | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | added OperationResult support to upload to keyserver | Adithya Abraham Philip | 2015-07-03 | 1 | -0/+4 | |
| | | | | | | | | ||||||
* | | | | | | | | Change PIN and Admin PIN after move to key operation | Dominik Schürmann | 2015-07-02 | 1 | -0/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | removed debug logs, added licenses | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+19 | |
| | | | | | | | | ||||||
* | | | | | | | | migrated Keybase verification | Adithya Abraham Philip | 2015-06-27 | 2 | -1/+72 | |
| | | | | | | | | ||||||
* | | | | | | | | implement deletion of files | Vincent Breitmoser | 2015-06-23 | 4 | -4/+4 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-18 | 1 | -9/+21 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | more stable nullable behavior in OperationLog | Vincent Breitmoser | 2015-06-18 | 1 | -9/+21 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -1/+5 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | |||||
| * | | | | | | | | return actual last log entry, including from sublogentryparcels | Vincent Breitmoser | 2015-06-17 | 1 | -1/+5 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 1 | -0/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this also fixes weird-bug Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | | | | | | | | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 1 | -0/+13 | |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this commit introduces the CachingDataDecryptorFactory, which wraps a DataDecryptorFactory but supports caching of decrypted session keys. this change also gets rid of runtimeexception based control flow in PgpDecryptVerify. | |||||
* | | | | | | | | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 1 | -10/+21 | |
| | | | | | | | | ||||||
* | | | | | | | | better error handling for bad encrypted data checksum | Vincent Breitmoser | 2015-05-30 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 2 | -5/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PgpDecryptVerify changes | |||||
* | | | | | | | | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1281 |