aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* cache key s2k type in database, for later useVincent Breitmoser2014-09-027-36/+105
* Lock drawer in EncryptFileActivity if called from intentVincent Breitmoser2014-09-012-0/+6
* rename EncryptMessageFragment -> EncryptTextFragmentVincent Breitmoser2014-09-011-1/+1
* remove redundant check from EncryptFileActivityVincent Breitmoser2014-09-011-5/+0
* split EncryptActivity into Encrypt{Text,File}ActivityVincent Breitmoser2014-09-017-151/+551
* small ui changes in encryptVincent Breitmoser2014-09-011-1/+1
* remove broken(?) cancellation codeVincent Breitmoser2014-09-012-59/+7
* Experimental support for revoked, expired keys with signaturesDominik Schürmann2014-09-012-37/+67
* Prepare API for OpenPgpSignatureResult extensionsDominik Schürmann2014-08-313-9/+17
* Changelog 2.9Dominik Schürmann2014-08-311-1/+1
* prevent nullpointer in ImportKeysServerFragment, return empty lists instead o...Dominik Schürmann2014-08-311-2/+2
* Cleanup keyspinner layout, key id typeface monospaceDominik Schürmann2014-08-311-10/+9
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-3112-117/+246
|\
| * add cancel prevention mechanism, improve cancellation for key importVincent Breitmoser2014-08-315-21/+67
| * don't make our service stickyVincent Breitmoser2014-08-311-1/+1
| * add cancel support to edit key actionVincent Breitmoser2014-08-316-26/+82
| * Add cancelable mechanism and support in key importVincent Breitmoser2014-08-318-90/+117
* | Better leyout for account settingsDominik Schürmann2014-08-312-31/+20
|/
* remember "show advanced tabs" settingVincent Breitmoser2014-08-313-4/+18
* if there is only one private key, use it fo certification by defaultVincent Breitmoser2014-08-313-25/+30
* use LoaderFragment for CertifyActivityVincent Breitmoser2014-08-314-375/+432
* ditch NullProgressableVincent Breitmoser2014-08-303-38/+6
* fix one log levelVincent Breitmoser2014-08-301-1/+1
* get rid of a deprecated method useVincent Breitmoser2014-08-301-1/+2
* canonicalize: add check for algorithm typeVincent Breitmoser2014-08-302-4/+36
* show bitsizes in import key list againVincent Breitmoser2014-08-301-4/+4
* Fix possible nullpointer in PreferencesDominik Schürmann2014-08-291-0/+3
* Fix crash in PgpKeyHelperDominik Schürmann2014-08-281-1/+1
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-2877-1309/+3041
|\
| * Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-2822-174/+459
| |\
| | * add ecc supportVincent Breitmoser2014-08-2420-149/+454
| | * Add ECDH and ECDSA valuesDominik Schürmann2014-08-211-0/+4
| | * Fixing build with Spongy Castle 1.51Dominik Schürmann2014-08-212-30/+5
| * | Fix NullPointerException in ImportKeysActivityDominik Schürmann2014-08-281-1/+3
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-272-10/+10
| |\ \
| | * | small language fixes for previous commitVincent Breitmoser2014-08-272-11/+10
| * | | Strip out duplicate user idsDominik Schürmann2014-08-272-3/+14
| |/ /
| * | Abort import of pubkeys where secret keys exist but new pubkey has more subke...Dominik Schürmann2014-08-272-9/+33
| * | Cleanup FoldableLinearLayoutDominik Schürmann2014-08-271-6/+4
| * | API: Fix re-seletion of keys on default accountDominik Schürmann2014-08-232-9/+16
| * | Fix contact syncDominik Schürmann2014-08-221-5/+5
| * | Revert "No need for setSyncAutomatically, this is only for network tickles"Dominik Schürmann2014-08-221-0/+1
| * | Add info about device with intent chooser bugDominik Schürmann2014-08-211-1/+1
| |/
| * Disable custom intent chooserDominik Schürmann2014-08-211-53/+54
| * Fix nullpointer when revoking keysDominik Schürmann2014-08-211-1/+2
| * Add account only on jelly bean and aboveDominik Schürmann2014-08-212-8/+15
| * No need for setSyncAutomatically, this is only for network ticklesDominik Schürmann2014-08-211-3/+5
| * Change account typeDominik Schürmann2014-08-214-7/+10
| * cleanupDominik Schürmann2014-08-211-71/+0
| * Fix result handling in account settingsDominik Schürmann2014-08-212-16/+13