aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Builder pattern for PgpOperationIncomingDominik Schürmann2014-02-191-5/+8
| * Use builder pattern for sign and encryptDominik Schürmann2014-02-191-17/+32
| * PendingIntent to handle user inputDominik Schürmann2014-02-141-1/+1
| * work on lookup key, fix some illegal state exceptions with hackDominik Schürmann2014-02-041-5/+1
| * Certify not sign a key, added as button, does not belong to menuDominik Schürmann2014-02-041-8/+7
* | pass through deleted keysAshley Hughes2014-02-151-1/+4
* | save work, this code doesn't work...Ashley Hughes2014-02-131-3/+8
* | should have used refactor...Ashley Hughes2014-02-081-1/+1
|/
* Reworking import, testing needed...Dominik Schürmann2014-02-011-196/+196
* search worksDominik Schürmann2014-02-011-17/+8
* Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychainAshley Hughes2014-02-011-5/+11
|\
| * Started working on integration of keyserver query into import activityDominik Schürmann2014-02-011-5/+11
* | builds, but intents are not called or handled correctlyAshley Hughes2014-01-301-6/+9
* | save workAshley Hughes2014-01-301-7/+3
|/
* Give expiry dates to PgpKeyOperationDominik Schürmann2014-01-291-1/+5
* Use intent data instead of IDs for upload and sign, fixes #205Dominik Schürmann2014-01-291-4/+4
* New Gradle project structureDominik Schürmann2014-01-271-0/+869