Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rename ExportTest to BackupOperationTest | Vincent Breitmoser | 2016-05-17 | 1 | -1/+1 |
| | |||||
* | refactor BackupOperation a bit, make more illegal states explicit | Vincent Breitmoser | 2016-05-17 | 1 | -5/+2 |
| | |||||
* | Merge branch 'master' into backup-api | Dominik Schürmann | 2016-05-07 | 4 | -11/+11 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java extern/openpgp-api-lib | ||||
| * | Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcel | Alex Fong | 2016-05-05 | 3 | -5/+5 |
| | | |||||
| * | Refactoring: Removed PassphraseChangeParcel and placed its functionality ↵ | Alex Fong | 2016-05-05 | 3 | -5/+5 |
| | | | | | | | | into ChangeUnlockParcel. | ||||
| * | (WIP) Change password when key is stripped #1692 | Alex Fong | 2016-05-04 | 4 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | get rid of code path for pin and notation data handling | Vincent Breitmoser | 2016-03-23 | 1 | -3/+4 |
| | | |||||
* | | Add backup API | Dominik Schürmann | 2016-03-01 | 1 | -4/+4 |
|/ | |||||
* | Merge branch 'master' into performance | Vincent Breitmoser | 2016-02-10 | 4 | -9/+9 |
|\ | |||||
| * | Replace spongycastle with bouncycastle | Dominik Schürmann | 2016-02-09 | 4 | -9/+9 |
| | | |||||
* | | performance: fix unit tests | Vincent Breitmoser | 2016-02-05 | 1 | -3/+3 |
|/ | |||||
* | Tests: Use ECC where possible | Dominik Schürmann | 2016-01-03 | 3 | -15/+15 |
| | |||||
* | some work on benchmark operation (affects only debug build) | Vincent Breitmoser | 2015-12-13 | 1 | -0/+81 |
| | |||||
* | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 1 | -6/+6 |
| | |||||
* | Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for ↵ | Dominik Schürmann | 2015-10-15 | 1 | -2/+2 |
| | | | | db contract | ||||
* | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 3 | -15/+15 |
|\ | |||||
| * | Fix tests for min requirement of 2048 bits | Dominik Schürmann | 2015-10-04 | 1 | -6/+6 |
| | | |||||
| * | Raise min asymmetric key length for all ciphers to 2048 bit | Dominik Schürmann | 2015-10-04 | 2 | -9/+9 |
| | | |||||
* | | decryptverify: add trivial detection of pgp ascii-armored data | Vincent Breitmoser | 2015-09-30 | 1 | -0/+3 |
| | | |||||
* | | export: improve stream handling, performance | Vincent Breitmoser | 2015-09-28 | 1 | -0/+16 |
| | | |||||
* | | export: support encrypted export, first version | Vincent Breitmoser | 2015-09-28 | 1 | -31/+178 |
| | | |||||
* | | export: more cleanup and splitting into subroutines | Vincent Breitmoser | 2015-09-26 | 1 | -4/+2 |
|/ | |||||
* | fix unit tests for new savePublicKeyRing method signature | Vincent Breitmoser | 2015-09-11 | 2 | -2/+2 |
| | |||||
* | fix unit test for linked ids | Vincent Breitmoser | 2015-09-06 | 1 | -1/+1 |
| | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | made mSignatureTime optional in CryptoOperationHelper | Adithya Abraham Philip | 2015-07-15 | 1 | -5/+8 |
| | |||||
* | Tests not working anymore on travis after using new annotation parameter | Dominik Schürmann | 2015-07-09 | 3 | -10/+13 |
| | | | | | | 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.0 | Dominik Schürmann | 2015-07-09 | 3 | -13/+10 |
| | |||||
* | fix PromoteKeyOperationTest | Vincent Breitmoser | 2015-07-06 | 1 | -11/+10 |
| | |||||
* | split import and export ops | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-11 | 1 | -5/+5 |
| | |||||
* | Fix debug/release build separation | Dominik Schürmann | 2015-06-11 | 3 | -3/+6 |
| | |||||
* | Use new officially supported way for local unit tests, many dependencies ↵ | Dominik Schürmann | 2015-06-11 | 3 | -0/+670 |
upgraded for this, temporary disabled separate debug builds |