aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #71 from felixb/fix-gradleDominik Schürmann2013-08-153-28/+33
|\| |
| * | fix gradle buildFelix Bechstein2013-08-153-28/+33
|/ /
* | Merge pull request #68 from m0rph3us1987/masterDominik Schürmann2013-08-091-1/+5
|\ \
| * | Type is set to text/plain so that encrypted messages can be sent with Whatsap...Enrico Oliverio2013-08-091-1/+5
|/ /
* | Merge pull request #64 from bcbarnes-gmx/Issue53Dominik Schürmann2013-07-2511-84/+48
|\ \
| * \ Merge branch 'master' into Issue53bcbarnes-gmx2013-07-241-0/+18
| |\ \ | |/ / |/| |
* | | Add coding style to READMEDominik Schürmann2013-07-231-0/+18
| * | Refactored action constantsbcbarnes-gmx2013-07-231-11/+11
| * | Implemented issue #53 - Change intent actions from extra ints to intent actionsbcbarnes-gmx2013-07-2311-84/+48
|/ /
* | Merge pull request #62 from bcbarnes-gmx/Issue61Dominik Schürmann2013-07-221-1/+1
|\ \
| * | Issue #61 - Unable to upload public keys to PKSbcbarnes-gmx2013-07-221-1/+1
|/ /
* | Merge pull request #60 from bcbarnes-gmx/Issue43Dominik Schürmann2013-07-224-9/+37
|\ \
| * | Change key bit length control into a dropdownbcbarnes-gmx2013-07-224-9/+37
|/ /
* | Merge pull request #59 from bcbarnes-gmx/Issue41Dominik Schürmann2013-07-223-5/+14
|\ \
| * | Issues #41 and #43bcbarnes-gmx2013-07-223-5/+14
|/ /
* | Merge pull request #58 from bcbarnes-gmx/Issue55Dominik Schürmann2013-07-221-1/+1
|\ \
| * | Implement issue #55bcbarnes-gmx2013-07-221-1/+1
* | | Merge pull request #57 from bcbarnes-gmx/Issue56Dominik Schürmann2013-07-223-4/+6
|\ \ \ | |_|/ |/| |
| * | Implemented issues #56bcbarnes-gmx2013-07-221-1/+2
| |/
| * Merge branch 'master' of git://github.com/ashh87/openpgp-keychainbcbarnes-gmx2013-07-193-3/+4
|/|
| * use Bouncycastle updated APIAsh Hughes2013-05-183-3/+4
* | debug infosDominik Schürmann2013-05-281-0/+2
* | Process safe implementation of PassphraseCacheService, First test for crypto ...Dominik Schürmann2013-05-286-385/+288
* | Crypto Provider implementation startDominik Schürmann2013-05-2823-86/+1492
* | gradle wrapperDominik Schürmann2013-05-251-2/+3
* | gradle wrapperDominik Schürmann2013-05-257-7/+18
* | Better than version check: gradle wrapperDominik Schürmann2013-05-251-2/+2
* | Check gradle version before buildingDominik Schürmann2013-05-251-1/+6
* | Update README for gradleDominik Schürmann2013-05-251-5/+11
* | move ActionBarSherlock lib, add gradle build filesDominik Schürmann2013-05-25443-34/+179
* | Merge pull request #51 from ashh87/masterDominik Schürmann2013-05-138-28/+14
|\|
| * enable passphrase changing for subkey only keychainsAsh Hughes2013-05-133-10/+3
| * 2/2 use forked spongycastle to speed up secret key importsAsh Hughes2013-05-136-18/+11
| * 1/2 use forked spongycastle to speed up secret key importsAsh Hughes2013-05-134-0/+0
|/
* Merge with ashh87s pull requestDominik Schürmann2013-03-2228-61/+392
|\
| * use certification keys to sign keyringsAsh Hughes2013-03-212-1/+45
| * change edit key for empty private master keysAsh Hughes2013-03-2110-9/+143
| * only sign keys if private key has capabilityAsh Hughes2013-03-193-1/+17
| * use db to mark keys which can certifyAsh Hughes2013-03-1812-7/+57
| * change how empty private cheks happen, speeds things upAsh Hughes2013-03-183-11/+12
| * select correct master key for signing public key withAsh Hughes2013-03-161-1/+2
| * Fix decrypt file selection and symmetric decryption failureAsh Hughes2013-03-152-3/+12
| * correctly encrypt using symmetric key if sign box checkedAsh Hughes2013-03-151-2/+3
| * tidy up codeAsh Hughes2013-03-142-20/+6
| * remove signing icon for master keys which can't signAsh Hughes2013-03-142-3/+33
| * fix issue 42Ash Hughes2013-03-141-2/+2
| * don't cache passphrase twiceAsh Hughes2013-03-141-1/+1
| * skip key 0 (master) on retry for passphraseAshley Hughes2013-03-141-1/+1
| * private keys without master keys and some fixes for things which broke along ...Ash Hughes2013-03-143-35/+95
* | Merge branch 'mdietz'Dominik Schürmann2013-03-201-1/+1
|\ \