aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Commit message (Expand)AuthorAgeFilesLines
* db-overhaul: more work on new providerVincent Breitmoser2014-04-031-2/+2
* Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-031-19/+49
|\
| * Rename "pass phrase" to "passphrase"Thialfihar2014-04-021-9/+9
| * Fix buildDominik Schürmann2014-04-021-0/+2
| * Replace wildcard imports with explicit importsThialfihar2014-04-021-5/+31
| * Rearrange too long linesThialfihar2014-04-021-7/+13
| * Trivial spacing changes to conform to style guideThialfihar2014-04-021-1/+1
| * Adjust import orderThialfihar2014-04-021-2/+0
| * Automatically select newly created key in api accountsDominik Schürmann2014-04-011-0/+1
* | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-031-8/+7
|/
* PgpKeyOperation: factor out all android dependenciesVincent Breitmoser2014-04-011-10/+37
* Fix symmetric decryptionDominik Schürmann2014-04-011-3/+1
* Simplify encrypt and sign backendDominik Schürmann2014-04-011-98/+54
* Fix symmetric encryption and cleanupDominik Schürmann2014-04-011-3/+3
* create three keys by defaultAshley Hughes2014-03-311-1/+8
* change how new default keys are passed back, fix showing their usage flagsAshley Hughes2014-03-311-4/+11
* Decrypt mostly works againDominik Schürmann2014-03-301-28/+29
* More experimental work on decrypt fragmentsDominik Schürmann2014-03-301-18/+9
* merge masterAshley Hughes2014-03-291-103/+129
|\
| * Rename old mentionings of APG-named thingsThialfihar2014-03-231-1/+1
| * The current implementation of saving new generated key doesn't save the key d...Daniel Hammann2014-03-221-1/+9
| * Fix fingerprint handlingDominik Schürmann2014-03-201-2/+2
| * verify downloaded key by comparing fingerprintsDominik Schürmann2014-03-201-35/+45
| * Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-201-1/+1
| * Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-181-3/+6
| |\
| | * certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-171-2/+3
| | * certify: sign individual UIDsVincent Breitmoser2014-03-151-2/+2
| | * certify: revamp certifykeyactivityVincent Breitmoser2014-03-151-0/+2
| * | Fix export for new unified key list #409uberspot2014-03-151-24/+26
| |/
| * Fix code style in keychain/service/uberspot2014-03-131-15/+26
| * Optimize imports in all files, remove useless whitespace in some and fix inde...uberspot2014-03-131-43/+18
| * Export cancellable - minor changesgrait2014-03-131-1/+2
| * Export is cancellable nowgrait2014-03-131-2/+12
| * Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-111-9/+15
| * Fix progress_generating and reformatDominik Schürmann2014-03-101-1/+1
| * Fix progress_generating and reformatDominik Schürmann2014-03-101-4/+6
| * progress bar while key creation - added plurals based on no.of keys while key...grait2014-03-091-1/+2
| * progress is shown when creating the default key based on number of keys crea...grait2014-03-081-0/+7
* | keep up with masterAshley Hughes2014-03-071-13/+26
|\|
| * corrected commitAnkush2014-03-071-1/+1
| * name KeychainIntentService properlyDominik Schürmann2014-03-041-1/+1
| * Enforce private key for applications, verify signed-only texts without passph...Dominik Schürmann2014-03-041-11/+8
| * #226: Small fix to prevent message from being sent if IntentService is canceledJessica Yuen2014-03-031-0/+16
* | use parcel to save keys, but saving existing keys is disabled, pending a rewr...Ashley Hughes2014-03-061-37/+8
* | fix saving new key (tmp)Ashley Hughes2014-03-061-1/+6
* | pass through which keys are newAshley Hughes2014-02-221-1/+3
* | change how primary id changing is passed throughAshley Hughes2014-02-221-2/+5
* | master mergeAshley Hughes2014-02-221-38/+47
|\|
| * internal renaming, cleanupDominik Schürmann2014-02-211-8/+8
| * verification of cleartext signatures worksDominik Schürmann2014-02-211-11/+6