aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Fix sks-keyservers.net sub poolmar-v-in2014-06-241-1/+1
| | | | | |
| * | | | | Update Keyservers to use hkps as neededmar-v-in2014-06-243-2/+25
| | | | | |
| * | | | | 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-232-35/+34
| | | | | | | | | | | | | | | | | | | | | | | | TODO: Fix add as well
| * | | | | Add hkps support for sks-keyservers.netmar-v-in2014-06-232-65/+77
| | | | | |
| * | | | | Add TlsHelper (designed to be used with sks-keyservers.net)mar-v-in2014-06-231-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA
* | | | | | Merge pull request #688 from da-kid/masterDominik Schürmann2014-06-241-1/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix for #687
| * | | | | Fix for #687Daniel Albert2014-06-241-1/+5
| | | | | |
* | | | | | Merge submodulesDominik Schürmann2014-06-242-6/+25
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | borrow tests from Haskell OpenPGPArt O Cathain2014-06-232-6/+25
| | | | | |
* | | | | | Merge pull request #686 from mar-v-in/minidnsVincent2014-06-232-15/+18
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | Use minidns instead of dnsjava
| * | | | Switch to dnsjavamar-v-in2014-06-232-15/+18
| | |_|/ | |/| |
* | | | Merge branch 'master' of https://github.com/da-kid/open-keychainDaniel Albert2014-06-232-63/+110
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #681 from timbray/masterDominik Schürmann2014-06-231-0/+3
| |\ \ \ | | | | | | | | | | Handle empty keybase.io query, should fix #675
| | * | | Handle empty keybase.io query, should fix #675Tim Bray2014-06-221-0/+3
| | | | |
| * | | | new edit key: change passphraseDominik Schürmann2014-06-221-63/+107
| |/ / /
* / / / Fixed Issue #683 which caused OK to crash upon importing keys which contain ↵Daniel Albert2014-06-231-0/+6
|/ / / | | | | | | | | | percent signs.
* | | new edit key: diff for existing user idsDominik Schürmann2014-06-226-26/+384
| | |
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-227-131/+93
|\| |
| * | ditch outdated certifyKey operationVincent Breitmoser2014-06-221-54/+0
| | |
| * | use arraylists instead of arrays in savekeyringparcelVincent Breitmoser2014-06-221-14/+14
| | |
| * | fix indentation in various key import methodsVincent Breitmoser2014-06-221-60/+64
| | |
| * | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-2213-283/+478
| |\ \
| * | | 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-223-2/+12
| | | |
* | | | Rename adapterDominik Schürmann2014-06-226-29/+39
| |/ / |/| |
* | | Merge pull request #672 from artbristol/functional-testingDominik Schürmann2014-06-216-51/+126
|\ \ \ | | | | | | | | VERY basic test for save keyring
| * | | VERY basic test for save keyringArt O Cathain2014-06-216-51/+126
| |/ /
* | | Cleanup pull keybase codeDominik Schürmann2014-06-211-6/+1
| | |
* | | Merge pull request #668 from timbray/masterDominik Schürmann2014-06-212-222/+29
|\ \ \ | | | | | | | | Moved Keybase stuff into KeybaseLib submodule
| * | | Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-202-222/+29
| | | |
* | | | Start new designed activityDominik Schürmann2014-06-215-8/+326
| |/ / |/| |
* | | Fix qr code finallyDominik Schürmann2014-06-204-19/+31
| | |
* | | import: forward motion events to activity regardlessVincent Breitmoser2014-06-201-0/+12
| | |
* | | Work on Qr code importDominik Schürmann2014-06-205-43/+70
|/ /
* | Fix keybase importDominik Schürmann2014-06-203-2/+5
| |
* | Use actionbar button for log activityDominik Schürmann2014-06-202-4/+48
| |
* | Fix onTouchEvent delegation, with workaround for Android bugDominik Schürmann2014-06-201-6/+7
| |
* | Fix update from keyserver flowDominik Schürmann2014-06-202-5/+7
| |
* | Merge pull request #658 from artbristol/functional-testingVincent2014-06-202-0/+92
|\ \ | |/ |/| Start on Robolectric integration test
| * Fix hard-coded sizeArt O Cathain2014-06-161-3/+6
| |
| * Start on Robolectric integration testArt O Cathain2014-06-162-0/+89
| |
* | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ↵mar-v-in2014-06-1914-379/+193
|\ \ | | | | | | | | | improve-file
| * | Fix app name in PGP header, closing #663Dominik Schürmann2014-06-191-1/+1
| | |
| * | Fixing fingerprint search, part 1Dominik Schürmann2014-06-191-80/+88
| | |
| * | Remove unused code to import splitted qr codesDominik Schürmann2014-06-191-77/+1
| | |
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-193-124/+3
| |\ \
| | * | remove obsolete subkey binding check from signature verificationVincent Breitmoser2014-06-193-124/+3
| | | |
| * | | New callback model for ImportKeysActivityDominik Schürmann2014-06-197-108/+95
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 08:06:41 +0000