PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Commit graph

  • f97ac83a89 Move sks-keyservers.net CA into assets folder mar-v-in 2014-06-25 00:37:01 +02:00
  • a1bcbe72a3 new edit key: first version to add user ids Dominik Schürmann 2014-06-24 22:58:28 +02:00
  • 94bd2a675e Merge pull request #688 from da-kid/master Dominik Schürmann 2014-06-24 20:22:50 +02:00
  • bfd9de4721 Merge branch 'artbristol-functional-testing' Dominik Schürmann 2014-06-24 20:17:02 +02:00
  • 9ce7d29a2d Merge submodules Dominik Schürmann 2014-06-24 20:16:46 +02:00
  • 02bcd391bf Fix for #687 Daniel Albert 2014-06-24 20:15:48 +02:00
  • e84aa5a69d Rename registered apps to apps Dominik Schürmann 2014-06-24 13:54:24 +02:00
  • 38823b73a3 Merge branch 'master' into improve-file-more mar-v-in 2014-06-24 11:35:59 +02:00
  • 997faac90e Merge branch 'master' into hkps-by-default mar-v-in 2014-06-24 11:35:26 +02:00
  • 97de1592f0 Fix sks-keyservers.net sub pool mar-v-in 2014-06-24 11:27:35 +02:00
  • 04e64ac84e Update Keyservers to use hkps as needed mar-v-in 2014-06-24 11:26:52 +02:00
  • f039ef81ae Use URLEncoder instead of Uri.encode mar-v-in 2014-06-24 01:31:06 +02:00
  • 9a7fc6d464 Rewrote hkp add to work with hkps as well. Also removes HttpClient dependency (deprecated for android) mar-v-in 2014-06-24 00:57:04 +02:00
  • c865de4002 Merge pull request #686 from mar-v-in/minidns Vincent 2014-06-23 23:16:25 +02:00
  • ca3d77bae9 Merge branch 'hkps-by-default' of github.com:mar-v-in/open-keychain into hkps-by-default mar-v-in 2014-06-23 22:50:17 +02:00
  • e6629b53a2 Few fixes on hkps mar-v-in 2014-06-23 22:46:59 +02:00
  • 3ebbaae253 Add hkps support for sks-keyservers.net mar-v-in 2014-06-23 22:25:42 +02:00
  • b92a389ebc Add TlsHelper (designed to be used with sks-keyservers.net) mar-v-in 2014-06-23 01:59:20 +02:00
  • 2b18dc741a Switch to dnsjava mar-v-in 2014-06-23 22:02:18 +02:00
  • 6c42fe58bd Add minidns submodule mar-v-in 2014-06-23 21:46:17 +02:00
  • 2cd4f7eb93 Remove dnsjava module mar-v-in 2014-06-23 21:43:48 +02:00
  • 804f811998 Merge pull request #684 from da-kid/master Dominik Schürmann 2014-06-23 19:35:27 +02:00
  • 85bf24521d Merge branch 'master' of https://github.com/da-kid/open-keychain Daniel Albert 2014-06-23 19:24:42 +02:00
  • f68cf2a435 Fixed Issue #683 which caused OK to crash upon importing keys which contain percent signs. Daniel Albert 2014-06-23 19:10:50 +02:00
  • 109f74a922 https for submodules Art O Cathain 2014-06-23 17:54:19 +01:00
  • 13f785d0b0 borrow tests from Haskell OpenPGP Art O Cathain 2014-06-22 20:40:29 +01:00
  • a5d85b367d add OpenPGP-Haskell to test collateral Art O Cathain 2014-06-22 19:43:36 +01:00
  • bfd7c03b0a remove margin in import keys (leftover from nav drawer) Dominik Schürmann 2014-06-23 18:38:26 +02:00
  • 8f4e66348d Merge pull request #681 from timbray/master Dominik Schürmann 2014-06-23 13:42:58 +02:00
  • e8b96d1035 Disable pre-dexing, causes exceptions on some systems Dominik Schürmann 2014-06-23 13:44:25 +02:00
  • b48f727f98 Handle empty keybase.io query, should fix #675 Tim Bray 2014-06-22 22:37:05 -07:00
  • a14c041642 Add TlsHelper (designed to be used with sks-keyservers.net) mar-v-in 2014-06-23 01:59:20 +02:00
  • 514a4c668b new edit key: change passphrase Dominik Schürmann 2014-06-22 18:26:17 +02:00
  • b43fb63753 new edit key: diff for existing user ids Dominik Schürmann 2014-06-22 18:12:04 +02:00
  • 9e7e0be82c Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-more mar-v-in 2014-06-22 16:45:07 +02:00
  • 79fb23b095 Improve file more, Part 1 mar-v-in 2014-06-22 16:31:28 +02:00
  • 4db0194e6a Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-06-22 16:03:13 +02:00
  • 106e1fcf03 Rename adapter Dominik Schürmann 2014-06-22 16:03:03 +02:00
  • 9f947aefe6 ditch outdated certifyKey operation Vincent Breitmoser 2014-06-22 14:46:09 +02:00
  • 4d091d1784 use arraylists instead of arrays in savekeyringparcel Vincent Breitmoser 2014-06-22 14:45:40 +02:00
  • 37cee1322b fix indentation in various key import methods Vincent Breitmoser 2014-06-22 14:17:08 +02:00
  • 002a391a68 Merge remote-tracking branch 'origin/master' Vincent Breitmoser 2014-06-22 13:42:03 +02:00
  • 22ea9c6047 fix parcel method in ParcelableKeyRing Vincent Breitmoser 2014-06-22 13:41:54 +02:00
  • c52828d247 add buttons in edit key Dominik Schürmann 2014-06-22 13:33:50 +02:00
  • 857b15cbd5 use hashcode instead of keyid in import list (keyids may not be unique!) Vincent Breitmoser 2014-06-22 13:32:07 +02:00
  • 012b895e4f Update lib Dominik Schürmann 2014-06-22 12:03:40 +02:00
  • 9d20e68f11 Revert hint_keybase_search Dominik Schürmann 2014-06-22 10:59:50 +02:00
  • 4cc127e460 Merge pull request #672 from artbristol/functional-testing Dominik Schürmann 2014-06-21 21:31:25 +02:00
  • 0c3a478a43 Cleanup pull keybase code Dominik Schürmann 2014-06-21 21:31:00 +02:00
  • 4ae5c56b73 Merge pull request #668 from timbray/master Dominik Schürmann 2014-06-21 21:25:03 +02:00
  • 18430bef17 Start new designed activity Dominik Schürmann 2014-06-21 20:25:51 +02:00
  • 1e72f2cba5 Committed submodule Tim Bray 2014-06-21 10:32:11 -07:00
  • 0af2b27cb3 VERY basic test for save keyring Art O Cathain 2014-06-21 10:47:07 +01:00
  • a1525bffe2 Fix qr code finally Dominik Schürmann 2014-06-20 23:01:35 +02:00
  • 0d644e37b1 import: forward motion events to activity regardless Vincent Breitmoser 2014-06-20 22:25:13 +02:00
  • 0a790c7aa2 Work on Qr code import Dominik Schürmann 2014-06-20 22:28:08 +02:00
  • 17f43ad21b Moved Keybase stuff into KeybaseLib submodule Tim Bray 2014-06-20 09:26:04 -07:00
  • 6b7aa2767a Fix keybase import Dominik Schürmann 2014-06-20 15:58:32 +02:00
  • f0b8261ad3 Use actionbar button for log activity Dominik Schürmann 2014-06-20 15:49:54 +02:00
  • 717d66961b Fix onTouchEvent delegation, with workaround for Android bug Dominik Schürmann 2014-06-20 15:39:27 +02:00
  • 4aec28c237 Fix update from keyserver flow Dominik Schürmann 2014-06-20 15:14:34 +02:00
  • f47bb1e8e2 Merge pull request #658 from artbristol/functional-testing Vincent 2014-06-20 00:44:31 +02:00
  • 313e571a61 Merge pull request #664 from mar-v-in/improve-file Dominik Schürmann 2014-06-19 17:07:52 +02:00
  • 58706425d6 Merge branch 'master' of https://github.com/open-keychain/open-keychain into improve-file mar-v-in 2014-06-19 13:57:35 +02:00
  • 48c96184dc Fix app name in PGP header, closing #663 Dominik Schürmann 2014-06-19 11:56:36 +02:00
  • b1815ef24a revert to previous min version Art O Cathain 2014-06-19 07:52:37 +01:00
  • 3d8e6b303c Fixing fingerprint search, part 1 Dominik Schürmann 2014-06-19 01:26:21 +02:00
  • 47edcacf61 Remove unused code to import splitted qr codes Dominik Schürmann 2014-06-19 00:54:52 +02:00
  • f0487b0ca7 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-06-19 00:38:47 +02:00
  • 7fc188dbd6 New callback model for ImportKeysActivity Dominik Schürmann 2014-06-19 00:38:36 +02:00
  • b40b429bc0 remove obsolete subkey binding check from signature verification Vincent Breitmoser 2014-06-18 22:07:14 +02:00
  • 0db425b289 Reference ic_launcher instead of icon Dominik Schürmann 2014-06-18 23:19:54 +02:00
  • bce874db09 decrease size of search icons in import Dominik Schürmann 2014-06-18 23:06:58 +02:00
  • 5c6139f57a forward touch events to pager in import activity Vincent Breitmoser 2014-06-18 22:52:36 +02:00
  • a246dc9675 Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions Dominik Schürmann 2014-06-18 22:30:54 +02:00
  • 37a81af748 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-06-18 22:02:07 +02:00
  • d9ccef4899 consistent button design in import activity Dominik Schürmann 2014-06-18 22:01:58 +02:00
  • ada6a12174 fix key export Vincent Breitmoser 2014-06-18 21:54:59 +02:00
  • d9c937bbe7 Merge branch 'master' into improve-file mar-v-in 2014-06-18 21:43:54 +02:00
  • 4ad15739e2 canonicalize: missed two logging entries Vincent Breitmoser 2014-06-18 21:43:41 +02:00
  • 825f37eee4 Merge remote-tracking branch 'origin/master' Vincent Breitmoser 2014-06-18 21:09:20 +02:00
  • 5f20b8de1a Merge branch 'new-edit' Vincent Breitmoser 2014-06-18 21:09:04 +02:00
  • 8ffc959f07 Merge pull request #661 from mar-v-in/improve-contacts Dominik Schürmann 2014-06-18 20:56:38 +02:00
  • 3bffe4da55 generate public keyring from secret if not available Vincent Breitmoser 2014-06-18 20:55:44 +02:00
  • f8d895dea4 consolidate: almost sane logging Vincent Breitmoser 2014-06-18 20:13:01 +02:00
  • 134f8471c0 consolidate: add key import routines with consolidation Vincent Breitmoser 2014-06-18 19:39:16 +02:00
  • a1c3c41073 Reset importDone at the beginning of sync mar-v-in 2014-06-18 17:06:46 +02:00
  • b9d88de286 Wait for import to be done before writing contacts mar-v-in 2014-06-18 17:01:36 +02:00
  • 4bbaf6faa1 Remove abandoned contacts mar-v-in 2014-06-18 16:47:33 +02:00
  • 39a68c30f8 Code style mar-v-in 2014-06-18 16:08:35 +02:00
  • 0bcf7a39bf Continue contact db sync mar-v-in 2014-06-18 16:05:01 +02:00
  • f80228a08d consolidate: make it work Vincent Breitmoser 2014-06-18 13:43:18 +02:00
  • 1e45e5cd9a code cleanup in ProviderHelper and UncachedKeyRing Vincent Breitmoser 2014-06-18 10:00:21 +02:00
  • d8b0015d25 consolidate: add logging Vincent Breitmoser 2014-06-17 00:12:06 +02:00
  • b4974d922e consolidate: first draft Vincent Breitmoser 2014-06-16 23:52:06 +02:00
  • adf15d4d16 import-log: don't count self certs as unknown Vincent Breitmoser 2014-06-18 00:25:52 +02:00
  • c63f3c8a5d prepare ProviderHelper for consolidation before insert Vincent Breitmoser 2014-06-18 00:11:43 +02:00
  • 4d34361590 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-06-18 00:03:19 +02:00
  • 8c7a360d6e Redesign Import, still some todos and regression bugs Dominik Schürmann 2014-06-18 00:03:06 +02:00
  • 0013199b2d handle database error on secret key insert Vincent Breitmoser 2014-06-17 23:46:02 +02:00