aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
Commit message (Expand)AuthorAgeFilesLines
* Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcelAlex Fong2016-05-051-2/+2
* Refactoring: Removed PassphraseChangeParcel and placed its functionality into...Alex Fong2016-05-051-2/+2
* (WIP) Change password when key is stripped #1692Alex Fong2016-05-041-1/+1
* 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
* 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
* 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 upgr...Dominik Schürmann2015-06-111-0/+496