Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 1 | -1/+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 | ||||
| * | updated robolectric to support new android support libs | William Faulk | 2015-05-03 | 1 | -1/+2 |
| | | |||||
* | | fix certification in unit tests | Vincent Breitmoser | 2015-04-24 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 7 | -105/+129 |
|\| | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | fix PgpEncryptDecryptTest for CryptoInputParcel | Vincent Breitmoser | 2015-04-01 | 1 | -26/+22 |
| | | |||||
| * | Update gradle plugin, update gradle test plugin | Dominik Schürmann | 2015-03-26 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | ||||
| * | | fix unit test and add new for divert-to-card promotion | Vincent Breitmoser | 2015-03-22 | 1 | -6/+29 |
| | | | |||||
| * | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 1 | -0/+6 |
| | | | |||||
| * | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 2 | -13/+20 |
| | | | |||||
| * | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 4 | -49/+39 |
| | | | |||||
| * | | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -18/+20 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 9 | -45/+68 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | ||||
| * | | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 1 | -5/+5 |
| | | | | |||||
* | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | | | Update build env and plugins | Dominik Schürmann | 2015-03-23 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 10 | -42/+121 |
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | | Fix header | Dominik Schürmann | 2015-03-19 | 1 | -1/+2 |
| | | | |||||
| * | | Fix tests for Passphrase class | Dominik Schürmann | 2015-03-19 | 9 | -45/+67 |
| |/ | |||||
| * | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -0/+53 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 2 | -1/+7 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | fix expiry of master keys | Vincent Breitmoser | 2015-03-15 | 1 | -0/+6 |
| | | | | | | | | fixes #1141 | ||||
| * | Use fixed version of com.squareup:fest-android, enable offline builds | Dominik Schürmann | 2015-03-15 | 1 | -1/+1 |
| | | |||||
* | | minor changes, add convertFingerprintToKeyId method | Vincent Breitmoser | 2015-03-08 | 3 | -7/+48 |
|/ | |||||
* | unit test certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -8/+52 |
| | |||||
* | add unit test for "no expiry where revoked user id still has expiry" case | Vincent Breitmoser | 2015-02-26 | 1 | -2/+14 |
| | |||||
* | split up and mark unsafe expiry-related methods | Vincent Breitmoser | 2015-02-26 | 1 | -20/+20 |
| | |||||
* | add check for filesize to encrypt/decrypt tests | Vincent Breitmoser | 2015-02-17 | 1 | -0/+18 |
| | |||||
* | fix tests for new PgpSignEncryptInput | Vincent Breitmoser | 2015-02-02 | 1 | -29/+29 |
| | |||||
* | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -12/+11 |
| | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 1 | -0/+54 |
| | |||||
* | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 1 | -0/+126 |
| | |||||
* | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 1 | -2/+51 |
| | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card | ||||
* | allow explicit re-certification in SaveKeyringParcel | Vincent Breitmoser | 2015-01-24 | 1 | -1/+2 |
| | |||||
* | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 1 | -2/+2 |
| | |||||
* | forgot another test case in prev. commit | Vincent Breitmoser | 2015-01-19 | 1 | -1/+2 |
| | |||||
* | fix unit test for new key flag behavior | Vincent Breitmoser | 2015-01-19 | 1 | -2/+2 |
| | |||||
* | involve user attributes in unit tests for merge and canonicalize! | Vincent Breitmoser | 2015-01-14 | 3 | -15/+73 |
| | |||||
* | add basic tests for addition of user attributes | Vincent Breitmoser | 2015-01-14 | 1 | -0/+66 |
| | |||||
* | tests: add a couple of CertifyOperation test cases | Vincent Breitmoser | 2015-01-03 | 1 | -0/+238 |
| | |||||
* | encapsulate high level edit key into new operation class | Vincent Breitmoser | 2015-01-03 | 6 | -23/+22 |
| | |||||
* | tests: add multiple keys with signature test case | Vincent Breitmoser | 2015-01-02 | 1 | -0/+75 |
| | |||||
* | get rid of RuntimeException control flow in UncachedKeyRing.fromStream | Vincent Breitmoser | 2015-01-02 | 2 | -7/+5 |
| | |||||
* | fix and test for bad certificate version numbers (#1012) | Vincent Breitmoser | 2015-01-02 | 2 | -0/+34 |
| | | | | closes #1012 | ||||
* | tests: for export, check that a token local cert actually exists before export | Vincent Breitmoser | 2015-01-02 | 1 | -10/+22 |
| | |||||
* | tests: add test for key export | Vincent Breitmoser | 2015-01-02 | 1 | -0/+211 |
| | |||||
* | small improvements regarding pin tests and logging | Vincent Breitmoser | 2015-01-01 | 1 | -5/+23 |
| | |||||
* | tests: be less verbose about inserting keyrings for encrypt/decrypt | Vincent Breitmoser | 2015-01-01 | 1 | -2/+15 |
| | |||||
* | tests: add multi key encryption/decryption test, new way for fake passphrase ↵ | Vincent Breitmoser | 2015-01-01 | 1 | -43/+123 |
| | | | | cache | ||||
* | fix unit tests (canonicalize after create) | Vincent Breitmoser | 2015-01-01 | 2 | -0/+5 |
| |