aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Remove debugging codeMichael Dietz2013-02-261-3/+0
| * | Fixed bug in secret key selection fragment where it was displaying public keysMichael Dietz2013-02-261-1/+4
| |/
* / describe allowBackup=falseDominik Schürmann2013-03-201-1/+4
|/
* extras for database broadcastDominik Schürmann2013-01-191-12/+20
* New broadcast on database change to inform other appsDominik Schürmann2013-01-183-60/+109
* Error handling when keyring is not foundDominik Schürmann2013-01-181-7/+13
* Fix edit key intent, api improvementsDominik Schürmann2013-01-183-27/+44
* new import iconDominik Schürmann2013-01-175-0/+14777
* new import iconDominik Schürmann2013-01-174-29/+1
* rename intent actions to use KEYRING instead of KEYDominik Schürmann2013-01-176-16/+18
* Intent action fixesDominik Schürmann2013-01-175-10/+18
* description and screenshotsDominik Schürmann2013-01-166-15/+6
* Fix intent filters for servicesDominik Schürmann2013-01-161-2/+2
* Rename fixesDominik Schürmann2013-01-164-18/+17
* Renaming APG to OpenPGP KeychainDominik Schürmann2013-01-16752-1253/+1198
* Make ApiService thread safeDominik Schürmann2013-01-102-27/+13
* Synchronizing methods in ApgKeyServiceDominik Schürmann2013-01-101-22/+40
* Explicit export of providerDominik Schürmann2013-01-091-0/+1
* Fixes to use import intents without file dataDominik Schürmann2013-01-091-2/+8
* nfc help headerDominik Schürmann2013-01-081-0/+1
* changelogDominik Schürmann2013-01-082-5/+7
* Fix import from key serverDominik Schürmann2013-01-081-2/+1
* Generic share of keyring via Android Intent SEND, renaming of own share intentsDominik Schürmann2013-01-088-32/+62
* Fixes, update Integration libDominik Schürmann2013-01-082-5/+58
* Fix many problems with import from filesDominik Schürmann2013-01-086-73/+101
* When exporting secret keyrings, also export public partDominik Schürmann2013-01-087-83/+72
* Improved import with preview of keyringsDominik Schürmann2013-01-0817-183/+451
* Share with NFC, Qr Code sharing refactored, Receiving NFC is not ready yetDominik Schürmann2013-01-0818-59/+459
* Externalize all import actions into ImportKeysActivityDominik Schürmann2013-01-0715-546/+663