aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain-Test
Commit message (Collapse)AuthorAgeFilesLines
* fix certification in unit testsVincent Breitmoser2015-04-242-2/+2
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-247-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 CryptoInputParcelVincent Breitmoser2015-04-011-26/+22
| |
| * Update gradle plugin, update gradle test pluginDominik Schürmann2015-03-261-1/+1
| |
| * Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-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 promotionVincent Breitmoser2015-03-221-6/+29
| | |
| * | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+6
| | |
| * | fix unit tests (for real)Vincent Breitmoser2015-03-202-13/+20
| | |
| * | fix more unit tests (syntax)Vincent Breitmoser2015-03-204-49/+39
| | |
| * | fix unit tests (syntax)Vincent Breitmoser2015-03-201-18/+20
| | |
| * | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-209-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 structureVincent Breitmoser2015-03-181-5/+5
| | | |
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-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 pluginsDominik Schürmann2015-03-231-1/+1
| | |/ | |/|
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-2410-42/+121
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | Fix headerDominik Schürmann2015-03-191-1/+2
| | |
| * | Fix tests for Passphrase classDominik Schürmann2015-03-199-45/+67
| |/
| * object oriented split user idDominik Schürmann2015-03-161-0/+53
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-152-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 keysVincent Breitmoser2015-03-151-0/+6
| | | | | | | | fixes #1141
| * Use fixed version of com.squareup:fest-android, enable offline buildsDominik Schürmann2015-03-151-1/+1
| |
* | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-083-7/+48
|/
* unit test certification of user attributesVincent Breitmoser2015-03-081-8/+52
|
* add unit test for "no expiry where revoked user id still has expiry" caseVincent Breitmoser2015-02-261-2/+14
|
* split up and mark unsafe expiry-related methodsVincent Breitmoser2015-02-261-20/+20
|
* add check for filesize to encrypt/decrypt testsVincent Breitmoser2015-02-171-0/+18
|
* fix tests for new PgpSignEncryptInputVincent Breitmoser2015-02-021-29/+29
|
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-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 streamsVincent Breitmoser2015-01-271-0/+54
|
* introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-251-0/+126
|
* work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-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 SaveKeyringParcelVincent Breitmoser2015-01-241-1/+2
|
* move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-241-2/+2
|
* forgot another test case in prev. commitVincent Breitmoser2015-01-191-1/+2
|
* fix unit test for new key flag behaviorVincent Breitmoser2015-01-191-2/+2
|
* involve user attributes in unit tests for merge and canonicalize!Vincent Breitmoser2015-01-143-15/+73
|
* add basic tests for addition of user attributesVincent Breitmoser2015-01-141-0/+66
|
* tests: add a couple of CertifyOperation test casesVincent Breitmoser2015-01-031-0/+238
|
* encapsulate high level edit key into new operation classVincent Breitmoser2015-01-036-23/+22
|
* tests: add multiple keys with signature test caseVincent Breitmoser2015-01-021-0/+75
|
* get rid of RuntimeException control flow in UncachedKeyRing.fromStreamVincent Breitmoser2015-01-022-7/+5
|
* fix and test for bad certificate version numbers (#1012)Vincent Breitmoser2015-01-022-0/+34
| | | | closes #1012
* tests: for export, check that a token local cert actually exists before exportVincent Breitmoser2015-01-021-10/+22
|
* tests: add test for key exportVincent Breitmoser2015-01-021-0/+211
|
* small improvements regarding pin tests and loggingVincent Breitmoser2015-01-011-5/+23
|
* tests: be less verbose about inserting keyrings for encrypt/decryptVincent Breitmoser2015-01-011-2/+15
|
* tests: add multi key encryption/decryption test, new way for fake passphrase ↵Vincent Breitmoser2015-01-011-43/+123
| | | | cache
* fix unit tests (canonicalize after create)Vincent Breitmoser2015-01-012-0/+5
|
* add test case for PIN unlockVincent Breitmoser2014-12-301-2/+28
|
* fix unit tests for ChangeUnlockParcelVincent Breitmoser2014-12-305-16/+21
|