| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | prepare ProviderHelper for consolidation before insert | Vincent Breitmoser | 2014-06-18 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | new-edit: add logging to modifySecretKeyRing operation | Vincent Breitmoser | 2014-06-17 | 1 | -1/+4 | |
| | | | | ||||||
| | * | | new-edit: remove old save keyring stuff | Vincent Breitmoser | 2014-06-17 | 1 | -134/+22 | |
| | |/ | ||||||
| | * | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -33/+15 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle | |||||
| | * | | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 1 | -6/+6 | |
| | | | | ||||||
| * | | | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Modify KeychainIntentService to support I/O with URIs, allow input and ↵ | mar-v-in | 2014-06-08 | 1 | -172/+105 | |
| | |/ |/| | | | | | output to/from different types (eg. encrypt file and return byte array) | |||||
| * | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 1 | -6/+6 | |
| |\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| | * | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -6/+6 | |
| | | | ||||||
| * | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 1 | -112/+61 | |
| |\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| | * | make everything work again | Vincent Breitmoser | 2014-06-02 | 1 | -4/+5 | |
| | | | ||||||
| | * | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵ | Vincent Breitmoser | 2014-06-02 | 1 | -43/+11 | |
| | | | | | | | | | ImportKeysListEntry | |||||
| | * | wrapped-key-ring: no UncachedSecretKeyRing after all | Vincent Breitmoser | 2014-06-02 | 1 | -5/+4 | |
| | | | ||||||
| | * | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 1 | -20/+9 | |
| | | | ||||||
| | * | rename SaveKeyringParcel to OldSaveKeyringParcel | Vincent Breitmoser | 2014-05-27 | 1 | -1/+1 | |
| | | | ||||||
| | * | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 1 | -6/+8 | |
| | | | ||||||
| | * | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 1 | -11/+11 | |
| | |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| | * | | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 1 | -10/+14 | |
| | | | | ||||||
| | * | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 1 | -7/+59 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | |||||
| | * | | | wrapped-key-ring: get rid of bc objects in key editor | Vincent Breitmoser | 2014-05-04 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | wrapped-key-ring: no more pgp imports in PassphraseDialogFragment | Vincent Breitmoser | 2014-05-04 | 1 | -1/+3 | |
| | | | | | ||||||
| | * | | | wrapped-key-ring: more refactoring - no more pgp imports in ↵ | Vincent Breitmoser | 2014-05-03 | 1 | -52/+27 | |
| | | | | | | | | | | | | | | | | | KeychainIntentService! | |||||
| | * | | | wrapped-key-ring: move certification logic into secretkey | Vincent Breitmoser | 2014-05-03 | 1 | -29/+17 | |
| | | | | | ||||||
| | * | | | certification is always done with the master key | Vincent Breitmoser | 2014-05-03 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYS | mar-v-in | 2014-05-29 | 1 | -54/+15 | |
| | | | | | ||||||
| * | | | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS | mar-v-in | 2014-05-29 | 1 | -3/+4 | |
| | |_|/ |/| | | ||||||
| * | | | Rename KeyServer to Keyserver | Dominik Schürmann | 2014-05-18 | 1 | -5/+5 | |
| | | | | ||||||
| * | | | Rename fingerPrint to fingerprint | Thialfihar | 2014-05-14 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | Add extraData property in ImportKeyListEntry | Thialfihar | 2014-05-14 | 1 | -2/+2 | |
| | |/ |/| | | | | | | | | | This allows any KeyServer to store some extra data it might need. In the case of KeybaseKeyServer it is the username, which then can be grabbed directly, without the hack of storing it as userId. | |||||
| * | | proper null checks and closing of cursors everywhere | Vincent Breitmoser | 2014-05-08 | 1 | -3/+4 | |
| | | | ||||||
| * | | use setEncryptToSigner for asymmetric encryption | Vincent Breitmoser | 2014-05-08 | 1 | -0/+1 | |
| | | | | | | | | | (tested and works, closes #569) | |||||
| * | | Move logic classes for import into own sub-package | Dominik Schürmann | 2014-05-06 | 1 | -5/+4 | |
| | | | ||||||
| * | | tidy up IntentService | Tim Bray | 2014-04-30 | 1 | -2/+2 | |
| | | | ||||||
| * | | Clean up debug crud | Tim Bray | 2014-04-29 | 1 | -3/+0 | |
| | | | ||||||
| * | | can search openkeychain, retrieve & install & use keys from there | Tim Bray | 2014-04-29 | 1 | -0/+53 | |
| |/ | ||||||
| * | Rename setter methods for PgpDecryptVerify.Builder | Thialfihar | 2014-04-29 | 1 | -3/+3 | |
| | | ||||||
| * | Rename setter methods for PgpSignEncrypt.Builder | Thialfihar | 2014-04-29 | 1 | -11/+11 | |
| | | ||||||
| * | Rename ProgressDialogUpdater to Progressable | Thialfihar | 2014-04-29 | 1 | -6/+6 | |
| | | | | | | Also fix some inconsistent usages of "progress", now using "progressable" in all builders. | |||||
| * | Merge pull request #576 from Valodim/stripped-secretkeys | Dominik Schürmann | 2014-04-16 | 1 | -1/+1 | |
| |\ | | | | | Support stripped secretkeys | |||||
| | * | stripped support: add has_secret column to keys table | Vincent Breitmoser | 2014-04-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | Translations from transifex, fix some strings references | Dominik Schürmann | 2014-04-16 | 1 | -1/+1 | |
| |/ | ||||||
| * | Optimize imports | Dominik Schürmann | 2014-04-15 | 1 | -1/+0 | |
| | | ||||||
| * | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 1 | -5/+4 | |
| | | ||||||
| * | Handle new exceptions in KeychainIntentService | Dominik Schürmann | 2014-04-13 | 1 | -2/+23 | |
| | | ||||||
| * | Update license header for 2014 | Dominik Schürmann | 2014-04-13 | 1 | -1/+1 | |
| | | ||||||
| * | More changes to PgpSignEncrypt | Dominik Schürmann | 2014-04-12 | 1 | -0/+5 | |
| | | ||||||
| * | Clarify use of methods in PgpKeyHelper | Dominik Schürmann | 2014-04-11 | 1 | -1/+1 | |
| | | ||||||
| * | PgpDecryptVerify is now context-free | Dominik Schürmann | 2014-04-11 | 1 | -1/+10 | |
| | | ||||||
| * | PgpSignEncrypt is now context-free | Dominik Schürmann | 2014-04-11 | 1 | -1/+4 | |
| | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java