| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Shifted duplicate method implementations from KeyRing to openpgp-api submodule | Alex Fong | 2016-05-15 | 1 | -1/+2 |
| | | |||||
| * | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 1 | -7/+18 |
| | | |||||
| * | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -10/+8 |
| | | |||||
| * | Disable maybe methods in ImportKeysListEntry for now | Dominik Schürmann | 2015-03-10 | 1 | -2/+3 |
| | | |||||
| * | split up and mark unsafe expiry-related methods | Vincent Breitmoser | 2015-02-26 | 1 | -2/+2 |
| | | |||||
| * | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -1/+1 |
| | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
| * | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -6/+6 |
| | | |||||
| * | deal with non-existent user ids during import (#994) | Vincent Breitmoser | 2015-01-02 | 1 | -1/+2 |
| | | |||||
| * | Make bit size optional | Dominik Schürmann | 2014-10-05 | 1 | -2/+5 |
| | | |||||
| * | fix nullpointer ImportKeysListEntry (from pulltorefresh) | Vincent Breitmoser | 2014-09-23 | 1 | -2/+5 |
| | | | | | Fixes #873 | ||||
| * | Merge user ids in import list for better display | Dominik Schürmann | 2014-09-21 | 1 | -13/+54 |
| | | |||||
| * | Beautify key id (thanks to Tim Bray) | Dominik Schürmann | 2014-09-19 | 1 | -3/+3 |
| | | |||||
| * | Use key icons in import, prettify items | Dominik Schürmann | 2014-09-18 | 1 | -0/+1 |
| | | |||||
| * | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -4/+4 |
| | | | | | created ui.util for everything related to formatting | ||||
| * | Keys found on multiple servers are now imported from all of them | Tim Bray | 2014-09-13 | 1 | -7/+9 |
| | | |||||
| * | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 1 | -0/+7 |
| | | |||||
| * | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -8/+15 |
| | | |||||
| * | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 1 | -1/+1 |
| | | |||||
| * | use hashcode instead of keyid in import list (keyids may not be unique!) | Vincent Breitmoser | 2014-06-22 | 1 | -0/+10 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 1 | -58/+80 |
| |\ | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 1 | -63/+63 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | | * | Clean up keyimport.ImportKeysListEntry | Tim Bray | 2014-06-05 | 1 | -58/+58 |
| | | | | |||||
| | * | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 1 | -60/+10 |
| | |\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | * | | Store expired state within ImportKeysListEntry | mar-v-in | 2014-06-04 | 1 | -0/+11 |
| | | | | |||||
| | * | | Store origin with ImportKeysListEntry | mar-v-in | 2014-05-27 | 1 | -0/+11 |
| | | | | |||||
| * | | | canonicalize: first step(s) | Vincent Breitmoser | 2014-06-10 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵ | Vincent Breitmoser | 2014-06-02 | 1 | -24/+0 |
| | | | | | | | | | ImportKeysListEntry | ||||
| * | | fix missing userIds in ImportKeysListEntry | Vincent Breitmoser | 2014-05-27 | 1 | -2/+1 |
| | | | |||||
| * | | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 1 | -37/+12 |
| |/ | |||||
| * | Add highlighting to keyserver/keybase search | Thialfihar | 2014-05-16 | 1 | -0/+9 |
| | | |||||
| * | Rename fingerPrint to fingerprint | Thialfihar | 2014-05-14 | 1 | -8/+8 |
| | | |||||
| * | Add extraData property in ImportKeyListEntry | Thialfihar | 2014-05-14 | 1 | -0/+11 |
| | | | | | | | 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. | ||||
| * | Move logic classes for import into own sub-package | Dominik Schürmann | 2014-05-06 | 1 | -0/+268 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java