aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
Commit message (Collapse)AuthorAgeFilesLines
* Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcelAlex Fong2016-05-051-2/+2
|
* Refactoring: Removed PassphraseChangeParcel and placed its functionality ↵Alex Fong2016-05-051-2/+2
| | | | into ChangeUnlockParcel.
* (WIP) Change password when key is stripped #1692Alex Fong2016-05-041-1/+1
| | | | | | | | | | | Approach: Find the first unstripped secret key and use it for passphrase verification All unstripped keys will have their passphrase changed to new passphrase, if possible. Current Progress: Changing the passphrase of keys works fine. Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword" may be possible if given the go-ahead.
* Replace spongycastle with bouncycastleDominik Schürmann2016-02-091-7/+7
|
* Tests: Use ECC where possibleDominik Schürmann2016-01-031-1/+1
|
* Fix tests for min requirement of 2048 bitsDominik Schürmann2015-10-041-1/+1
|
* Raise min asymmetric key length for all ciphers to 2048 bitDominik Schürmann2015-10-041-2/+2
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fix test cases, add test cases (still 1 failing)Dominik Schürmann2015-08-101-3/+3
|
* made mSignatureTime optional in CryptoOperationHelperAdithya Abraham Philip2015-07-151-6/+6
|
* Tests not working anymore on travis after using new annotation parameterDominik Schürmann2015-07-091-3/+4
| | | | | | Revert "Get rid of robolectric workaround by using new annotation in robolectric 3.0" This reverts commit 85a47d22f9bb1e4aaf5770c67416a5532977658e.
* Get rid of robolectric workaround by using new annotation in robolectric 3.0Dominik Schürmann2015-07-091-4/+3
|
* Fix debug/release build separationDominik Schürmann2015-06-111-1/+2
|
* Use new officially supported way for local unit tests, many dependencies ↵Dominik Schürmann2015-06-111-0/+496
upgraded for this, temporary disabled separate debug builds
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 16:47:54 +0000