aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Commit message (Expand)AuthorAgeFilesLines
* 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