Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -2/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 1 | -2/+3 |
| | | |||||
* | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 1 | -1/+17 |
|/ | |||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -3/+3 |
| | |||||
* | Show name only in passphrase dialog | Dominik Schürmann | 2015-03-03 | 1 | -1/+8 |
| | |||||
* | Prettify passphrase dialog, it no longer resizes on unlocking the key | Dominik Schürmann | 2015-03-03 | 1 | -24/+25 |
| | |||||
* | Remove old pattern lib, add new pattern lib | Dominik Schürmann | 2015-02-23 | 1 | -13/+11 |
| | |||||
* | fix small merge conflict oversight | Vincent Breitmoser | 2014-12-30 | 1 | -3/+0 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-12-30 | 1 | -32/+85 |
|\ | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | New work on PIN and lock pattern UI | Dominik Schürmann | 2014-12-29 | 1 | -32/+85 |
| | | |||||
* | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 1 | -0/+3 |
|/ | |||||
* | Added option for num keypad for YubiKey | Jerzy Kołosowski | 2014-10-13 | 1 | -1/+13 |
| | |||||
* | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 1 | -3/+4 |
| | |||||
* | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 1 | -2/+2 |
| | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | ||||
* | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 1 | -2/+2 |
| | |||||
* | more getActivity() checks | Vincent Breitmoser | 2014-10-03 | 1 | -2/+11 |
| | |||||
* | passphrasecache: cache by master key, introduce preference for cache by subkey | Vincent Breitmoser | 2014-09-23 | 1 | -5/+6 |
| | |||||
* | PassphraseDialogActivity usage in Remote API | Dominik Schürmann | 2014-09-17 | 1 | -19/+29 |
| | |||||
* | Fix cleartext verify | Dominik Schürmann | 2014-09-17 | 1 | -0/+7 |
| | |||||
* | Passphrase handling in encrypt | Dominik Schürmann | 2014-09-17 | 1 | -17/+22 |
| | |||||
* | Work on new result handling (WIP) | Dominik Schürmann | 2014-09-17 | 1 | -4/+4 |
| | |||||
* | deactivate screenshots in new PassphraseDialogActivity | Dominik Schürmann | 2014-09-13 | 1 | -0/+10 |
| | |||||
* | Add new PassphraseDialogActivity, a transparent activity that only holds the ↵ | Dominik Schürmann | 2014-09-13 | 1 | -0/+357 |
passphrase dialog |