aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
Commit message (Collapse)AuthorAgeFilesLines
* Beautify key id (thanks to Tim Bray)Dominik Schürmann2014-09-191-3/+3
|
* Use key icons in import, prettify itemsDominik Schürmann2014-09-181-0/+1
|
* package reordering: merge util and helper, there were no real difference; ↵Dominik Schürmann2014-09-174-10/+10
| | | | created ui.util for everything related to formatting
* Fix construction of algorithmID in Keybase result listsTim Bray2014-09-151-2/+2
|
* Keys found on multiple servers are now imported from all of themTim Bray2014-09-134-9/+14
|
* Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵Tim Bray2014-09-132-2/+12
| | | | side is revoked/expired, the merge reflects that
* Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefsTim Bray2014-09-134-2/+195
|
* show bitsizes in import key list againVincent Breitmoser2014-08-301-4/+4
| | | | closes #802
* add ecc supportVincent Breitmoser2014-08-243-10/+17
|
* Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
|
* Upload key workingDominik Schürmann2014-08-201-0/+2
|
* Upload key workingDominik Schürmann2014-08-201-0/+3
|
* Work on upload keyDominik Schürmann2014-08-201-14/+24
|
* Optimize importsDominik Schürmann2014-08-051-5/+5
|
* Add license headersDominik Schürmann2014-08-041-0/+17
|
* Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-5/+5
|
* move classes around a bitVincent Breitmoser2014-08-011-97/+0
|
* lowercase all key ids from keyserverVincent Breitmoser2014-07-311-2/+2
|
* Robots like coffee too...Dominik Schürmann2014-07-311-4/+0
|
* Parcelable data over 1MB can not be send through binder, parcel into a cache ↵Dominik Schürmann2014-07-311-0/+101
| | | | file, fix #592
* Keyserver exception translateableDominik Schürmann2014-07-312-1/+8
|
* Smaller notesDominik Schürmann2014-07-311-0/+8
|
* Even better Exception handling with keyserver queriesDominik Schürmann2014-07-311-8/+10
|
* Exception handling with keyserver queriesDominik Schürmann2014-07-311-5/+13
|
* Fallback if no primary user id existsDominik Schürmann2014-07-161-1/+1
|
* Move sks-keyservers.net CA into assets foldermar-v-in2014-06-251-6/+4
|
* Merge branch 'master' into hkps-by-defaultmar-v-in2014-06-242-0/+9
|\
| * Merge pull request #686 from mar-v-in/minidnsVincent2014-06-231-10/+11
| |\ | | | | | | Use minidns instead of dnsjava
| * \ Merge branch 'master' of https://github.com/da-kid/open-keychainDaniel Albert2014-06-231-0/+3
| |\ \
| | * | Handle empty keybase.io query, should fix #675Tim Bray2014-06-221-0/+3
| | | |
| * | | Fixed Issue #683 which caused OK to crash upon importing keys which contain ↵Daniel Albert2014-06-231-0/+6
| |/ / | | | | | | | | | percent signs.
* | | Use URLEncoder instead of Uri.encodemar-v-in2014-06-241-2/+6
| | |
* | | Rewrote hkp add to work with hkps as well.mar-v-in2014-06-241-24/+13
| | | | | | | | | | | | Also removes HttpClient dependency (deprecated for android)
* | | Few fixes on hkpsmar-v-in2014-06-231-4/+3
| | | | | | | | | | | | TODO: Fix add as well
* | | Add hkps support for sks-keyservers.netmar-v-in2014-06-231-65/+42
| |/ |/|
* | Switch to dnsjavamar-v-in2014-06-231-10/+11
|/
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-221-103/+26
|\
| * Cleanup pull keybase codeDominik Schürmann2014-06-211-6/+1
| |
| * Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-201-101/+29
| |
* | fix parcel method in ParcelableKeyRingVincent Breitmoser2014-06-221-1/+3
| |
* | use hashcode instead of keyid in import list (keyids may not be unique!)Vincent Breitmoser2014-06-221-0/+10
|/
* Fix keybase importDominik Schürmann2014-06-201-1/+2
|
* New callback model for ImportKeysActivityDominik Schürmann2014-06-191-9/+10
|
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-134-78/+182
|\ | | | | | | | | | | | | | | | | | | 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-discoverymar-v-in2014-06-053-72/+71
| |\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| | * Clean up keyimport.ImportKeysListEntryTim Bray2014-06-051-58/+58
| | |
| | * Merge pull request #645 from timbray/masterDominik Schürmann2014-06-051-1/+2
| | |\ | | | | | | | | Don't show full fingerprint in key search result lists
| | | * fixed error messageTim Bray2014-06-041-1/+2
| | | |
| * | | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-042-60/+61
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | | Fix regex for hkp parsing to support multiple uidsmar-v-in2014-06-041-2/+2
| | | |