aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain-Test
Commit message (Collapse)AuthorAgeFilesLines
* move stray test file to correct positionVincent Breitmoser2015-08-291-44/+0
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-0/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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
| * | 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
| * \ \ 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
| * \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-2410-42/+121
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ \ \ 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
| * | | | | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-083-7/+48
| | | | | | |
* | | | | | | Use new officially supported way for local unit tests, many dependencies ↵Dominik Schürmann2015-06-11126-6027/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | upgraded for this, temporary disabled separate debug builds
* | | | | | | fix small non-deterministic failure case in unit testVincent Breitmoser2015-05-311-1/+1
| | | | | | |
* | | | | | | adapt unit tests to PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-301-78/+101
| | | | | | |
* | | | | | | Merge branch 'master' into developmentVincent Breitmoser2015-05-281-0/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * | | | | | | don't show allowed key list if no key exists, and some minor ↵Vincent Breitmoser2015-05-281-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PgpDecryptVerify changes
| * | | | | | | tests: add attribute to PgpKeyOperationTestVincent Breitmoser2015-05-201-0/+19
| | | | | | | |
| * | | | | | | apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-171-2/+39
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | don't show allowed key list if no key exists, and some minor ↵Vincent Breitmoser2015-05-281-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PgpDecryptVerify changes
* | | | | | | apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-171-2/+39
| | | | | | |
* | | | | | | Removing unused SubkeyChange constructor.Joey Castillo2015-05-131-24/+4
| | | | | | |
* | | | | | | Adding unit tests for PgpKeyOperation keytocard functionality.Joey Castillo2015-05-131-1/+64
|/ / / / / /
* | | | | / updated robolectric to support new android support libsWilliam Faulk2015-05-031-1/+2
| |_|_|_|/ |/| | | |
* | | | | 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
| * | | | Update build env and pluginsDominik Schürmann2015-03-231-1/+1
| | |_|/ | |/| |
* | | | 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
| * | | Fix headerDominik Schürmann2015-03-191-1/+2
| | | |
| * | | Fix tests for Passphrase classDominik Schürmann2015-03-199-45/+67
| | | |
* | | | generalize nfc crypto input structureVincent Breitmoser2015-03-181-5/+5
|/ / /
* | / object oriented split user idDominik Schürmann2015-03-161-0/+53
| |/ |/|
* | 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
|/
* 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
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 15:02:31 +0000