Commit Graph
2195 Commits
Author SHA1 Message Date
Daniel Albert e8bb14ca26 Converted AsymetricKeyFragment to new button style 2014-06-29 15:28:24 +02:00
Daniel Albert 9091c22240 Added new button style and converted account_settings and the select_secret_key_layout to use it 2014-06-29 13:59:51 +02:00
Daniel Albert 4beff43a83 Updated file_dialog to use the new buttons 2014-06-29 13:21:33 +02:00
Daniel Albert e731dc139f Improved button style
centered buttons
removed commented-out button
2014-06-29 12:33:02 +02:00
Daniel Albert bd44516576 Added button_rounded style
converted decrypt_file_fragment to new style
2014-06-28 21:12:56 +02:00
Daniel Albert d19c97a714 Switched to the dark icons 2014-06-28 12:25:41 +02:00
Daniel Albert 567e5cc6a5 Added unlock icon, fixed drawer items, switched to icons from resource in drawer 2014-06-27 21:03:19 +02:00
Daniel Albert 1b90b46b00 Swapped out FontawesomeText with normal ImageView 2014-06-26 21:33:42 +02:00
Daniel Albert 607af7bcca Temporary fix for #648 2014-06-25 19:20:17 +02:00
Dominik Schürmann 150090852b Merge pull request #690 from mar-v-in/hkps-by-default
HKPS by default
2014-06-25 08:48:40 +02:00
mar-v-in f97ac83a89 Move sks-keyservers.net CA into assets folder 2014-06-25 00:37:01 +02:00
Dominik Schürmann 94bd2a675e Merge pull request #688 from da-kid/master
Fix for #687
2014-06-24 20:22:50 +02:00
Dominik Schürmann bfd9de4721 Merge branch 'artbristol-functional-testing' 2014-06-24 20:17:02 +02:00
Dominik Schürmann 9ce7d29a2d Merge submodules 2014-06-24 20:16:46 +02:00
Daniel Albert 02bcd391bf Fix for #687 2014-06-24 20:15:48 +02:00
Dominik Schürmann e84aa5a69d Rename registered apps to apps 2014-06-24 13:54:24 +02:00
mar-v-in 997faac90e Merge branch 'master' into hkps-by-default 2014-06-24 11:35:26 +02:00
mar-v-in 97de1592f0 Fix sks-keyservers.net sub pool 2014-06-24 11:27:35 +02:00
mar-v-in 04e64ac84e Update Keyservers to use hkps as needed 2014-06-24 11:26:52 +02:00
mar-v-in f039ef81ae Use URLEncoder instead of Uri.encode 2014-06-24 01:31:06 +02:00
mar-v-in 9a7fc6d464 Rewrote hkp add to work with hkps as well.
Also removes HttpClient dependency (deprecated for android)
2014-06-24 00:57:04 +02:00
Vincent c865de4002 Merge pull request #686 from mar-v-in/minidns
Use minidns instead of dnsjava
2014-06-23 23:16:25 +02:00
mar-v-in ca3d77bae9 Merge branch 'hkps-by-default' of github.com:mar-v-in/open-keychain into hkps-by-default 2014-06-23 22:50:17 +02:00
mar-v-in e6629b53a2 Few fixes on hkps
TODO: Fix add as well
2014-06-23 22:46:59 +02:00
mar-v-in 3ebbaae253 Add hkps support for sks-keyservers.net 2014-06-23 22:27:58 +02:00
mar-v-in b92a389ebc Add TlsHelper (designed to be used with sks-keyservers.net)
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
2014-06-23 22:26:02 +02:00
mar-v-in 2b18dc741a Switch to dnsjava 2014-06-23 22:02:18 +02:00
mar-v-in 6c42fe58bd Add minidns submodule 2014-06-23 21:46:17 +02:00
mar-v-in 2cd4f7eb93 Remove dnsjava module 2014-06-23 21:44:49 +02:00
Dominik Schürmann 804f811998 Merge pull request #684 from da-kid/master
Fix of #683
2014-06-23 19:35:27 +02:00
Daniel Albert 85bf24521d Merge branch 'master' of https://github.com/da-kid/open-keychain 2014-06-23 19:24:42 +02:00
Daniel Albert f68cf2a435 Fixed Issue #683 which caused OK to crash upon importing keys which contain percent signs. 2014-06-23 19:10:50 +02:00
Art O Cathain 109f74a922 https for submodules 2014-06-23 17:54:27 +01:00
Art O Cathain 13f785d0b0 borrow tests from Haskell OpenPGP 2014-06-23 17:54:27 +01:00
Art O Cathain a5d85b367d add OpenPGP-Haskell to test collateral 2014-06-23 17:54:27 +01:00
Dominik Schürmann bfd7c03b0a remove margin in import keys (leftover from nav drawer) 2014-06-23 18:38:26 +02:00
Dominik Schürmann 8f4e66348d Merge pull request #681 from timbray/master
Handle empty keybase.io query, should fix #675
2014-06-23 13:42:58 +02:00
Dominik Schürmann e8b96d1035 Disable pre-dexing, causes exceptions on some systems 2014-06-23 13:44:25 +02:00
Tim Bray b48f727f98 Handle empty keybase.io query, should fix #675 2014-06-22 22:37:05 -07:00
mar-v-in a14c041642 Add TlsHelper (designed to be used with sks-keyservers.net)
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
2014-06-23 01:59:20 +02:00
Dominik Schürmann 514a4c668b new edit key: change passphrase 2014-06-22 18:26:17 +02:00
Dominik Schürmann b43fb63753 new edit key: diff for existing user ids 2014-06-22 18:12:04 +02:00
Dominik Schürmann 4db0194e6a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-22 16:03:13 +02:00
Dominik Schürmann 106e1fcf03 Rename adapter 2014-06-22 16:03:03 +02:00
Vincent Breitmoser 9f947aefe6 ditch outdated certifyKey operation 2014-06-22 14:46:14 +02:00
Vincent Breitmoser 4d091d1784 use arraylists instead of arrays in savekeyringparcel 2014-06-22 14:45:40 +02:00
Vincent Breitmoser 37cee1322b fix indentation in various key import methods 2014-06-22 14:17:08 +02:00
Vincent Breitmoser 002a391a68 Merge remote-tracking branch 'origin/master' 2014-06-22 13:42:03 +02:00
Vincent Breitmoser 22ea9c6047 fix parcel method in ParcelableKeyRing 2014-06-22 13:41:54 +02:00
Dominik Schürmann c52828d247 add buttons in edit key 2014-06-22 13:33:50 +02:00