Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fix possible nullpointer in AppsListFragment | Dominik Schürmann | 2014-09-02 | 1 | -2/+1 | |
| | ||||||
* | If no key flags subpacket is present allow all key flags, fixes mailvelope keys | Dominik Schürmann | 2014-09-02 | 1 | -24/+47 | |
| | ||||||
* | Remove version 3 checks, no longer supported in import | Dominik Schürmann | 2014-09-02 | 3 | -27/+24 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-09-02 | 1 | -1/+1 | |
| | ||||||
* | Catch security exception, known problem... | Dominik Schürmann | 2014-09-02 | 1 | -13/+23 | |
| | ||||||
* | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 7 | -36/+105 | |
| | ||||||
* | Lock drawer in EncryptFileActivity if called from intent | Vincent Breitmoser | 2014-09-01 | 2 | -0/+6 | |
| | | | | Closes #810 | |||||
* | rename EncryptMessageFragment -> EncryptTextFragment | Vincent Breitmoser | 2014-09-01 | 1 | -1/+1 | |
| | ||||||
* | remove redundant check from EncryptFileActivity | Vincent Breitmoser | 2014-09-01 | 1 | -5/+0 | |
| | ||||||
* | split EncryptActivity into Encrypt{Text,File}Activity | Vincent Breitmoser | 2014-09-01 | 7 | -151/+551 | |
| | ||||||
* | small ui changes in encrypt | Vincent Breitmoser | 2014-09-01 | 1 | -1/+1 | |
| | ||||||
* | remove broken(?) cancellation code | Vincent Breitmoser | 2014-09-01 | 2 | -59/+7 | |
| | ||||||
* | Experimental support for revoked, expired keys with signatures | Dominik Schürmann | 2014-09-01 | 2 | -37/+67 | |
| | ||||||
* | Prepare API for OpenPgpSignatureResult extensions | Dominik Schürmann | 2014-08-31 | 3 | -9/+17 | |
| | ||||||
* | Changelog 2.9 | Dominik Schürmann | 2014-08-31 | 1 | -1/+1 | |
| | ||||||
* | prevent nullpointer in ImportKeysServerFragment, return empty lists instead ↵ | Dominik Schürmann | 2014-08-31 | 1 | -2/+2 | |
| | | | | of null | |||||
* | Cleanup keyspinner layout, key id typeface monospace | Dominik Schürmann | 2014-08-31 | 1 | -10/+9 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-31 | 12 | -117/+246 | |
|\ | ||||||
| * | add cancel prevention mechanism, improve cancellation for key import | Vincent Breitmoser | 2014-08-31 | 5 | -21/+67 | |
| | | ||||||
| * | don't make our service sticky | Vincent Breitmoser | 2014-08-31 | 1 | -1/+1 | |
| | | ||||||
| * | add cancel support to edit key action | Vincent Breitmoser | 2014-08-31 | 6 | -26/+82 | |
| | | ||||||
| * | Add cancelable mechanism and support in key import | Vincent Breitmoser | 2014-08-31 | 8 | -90/+117 | |
| | | | | | | | | Closes #323 | |||||
* | | Better leyout for account settings | Dominik Schürmann | 2014-08-31 | 2 | -31/+20 | |
|/ | ||||||
* | remember "show advanced tabs" setting | Vincent Breitmoser | 2014-08-31 | 3 | -4/+18 | |
| | | | | Closes #669 | |||||
* | if there is only one private key, use it fo certification by default | Vincent Breitmoser | 2014-08-31 | 3 | -25/+30 | |
| | ||||||
* | use LoaderFragment for CertifyActivity | Vincent Breitmoser | 2014-08-31 | 4 | -375/+432 | |
| | ||||||
* | ditch NullProgressable | Vincent Breitmoser | 2014-08-30 | 3 | -38/+6 | |
| | ||||||
* | fix one log level | Vincent Breitmoser | 2014-08-30 | 1 | -1/+1 | |
| | ||||||
* | get rid of a deprecated method use | Vincent Breitmoser | 2014-08-30 | 1 | -1/+2 | |
| | ||||||
* | canonicalize: add check for algorithm type | Vincent Breitmoser | 2014-08-30 | 2 | -4/+36 | |
| | | | | closes #797 | |||||
* | show bitsizes in import key list again | Vincent Breitmoser | 2014-08-30 | 1 | -4/+4 | |
| | | | | closes #802 | |||||
* | Fix possible nullpointer in Preferences | Dominik Schürmann | 2014-08-29 | 1 | -0/+3 | |
| | ||||||
* | Fix crash in PgpKeyHelper | Dominik Schürmann | 2014-08-28 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 77 | -1309/+3041 | |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| * | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 22 | -174/+459 | |
| |\ | | | | | | | ECC support | |||||
| | * | add ecc support | Vincent Breitmoser | 2014-08-24 | 20 | -149/+454 | |
| | | | ||||||
| | * | Add ECDH and ECDSA values | Dominik Schürmann | 2014-08-21 | 1 | -0/+4 | |
| | | | ||||||
| | * | Fixing build with Spongy Castle 1.51 | Dominik Schürmann | 2014-08-21 | 2 | -30/+5 | |
| | | | ||||||
| * | | Fix NullPointerException in ImportKeysActivity | Dominik Schürmann | 2014-08-28 | 1 | -1/+3 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 2 | -10/+10 | |
| |\ \ | ||||||
| | * | | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 2 | -11/+10 | |
| | | | | ||||||
| * | | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 2 | -3/+14 | |
| |/ / | ||||||
| * | | Abort import of pubkeys where secret keys exist but new pubkey has more ↵ | Dominik Schürmann | 2014-08-27 | 2 | -9/+33 | |
| | | | | | | | | | | | | subkeys, fix #696 | |||||
| * | | Cleanup FoldableLinearLayout | Dominik Schürmann | 2014-08-27 | 1 | -6/+4 | |
| | | | ||||||
| * | | API: Fix re-seletion of keys on default account | Dominik Schürmann | 2014-08-23 | 2 | -9/+16 | |
| | | | ||||||
| * | | Fix contact sync | Dominik Schürmann | 2014-08-22 | 1 | -5/+5 | |
| | | | ||||||
| * | | Revert "No need for setSyncAutomatically, this is only for network tickles" | Dominik Schürmann | 2014-08-22 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 0c1e65bc8bbfed59d299e2f0ca7a6a30eef22664. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java | |||||
| * | | Add info about device with intent chooser bug | Dominik Schürmann | 2014-08-21 | 1 | -1/+1 | |
| |/ | ||||||
| * | Disable custom intent chooser | Dominik Schürmann | 2014-08-21 | 1 | -53/+54 | |
| | | ||||||
| * | Fix nullpointer when revoking keys | Dominik Schürmann | 2014-08-21 | 1 | -1/+2 | |
| | |