15 Commits

Author	SHA1	Message	Date
Daniel Albert	d63534d655	Merge remote-tracking branch 'upstream/master' ... Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java	2014-07-16 18:49:16 +02:00
Dominik Schürmann	c1c831e52b	New first time screen	2014-07-16 09:49:37 +02:00
Daniel Albert	92c66743e0	Added Preference for concealing the PgpApplication	2014-07-12 19:19:12 +02:00
mar-v-in	f97ac83a89	Move sks-keyservers.net CA into assets folder	2014-06-25 00:37:01 +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	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	f55bc41682	Use Document API on KitKat for file encrypt/decrypt	2014-06-10 20:57:48 +02:00
mar-v-in	80e9998640	Show keys with android contacts ... This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.	2014-06-05 23:22:21 +02:00
Dominik Schürmann	e80d070aa9	Some comments to Constants	2014-04-14 13:52:09 +02:00
Dominik Schürmann	b04e6816f4	Removing remaining uses of Id, closing one of the oldest bugs #9	2014-04-14 13:48:20 +02:00
Thialfihar	f2d8378d81	Change license from ASLv2 to GPLv3 where possible	2014-04-08 11:59:35 +02:00
Thialfihar	42faf0eb07	Update copyright timespan for Thialfihar	2014-04-08 11:59:35 +02:00
Dominik Schürmann	6d11371905	Rename folder structure from OpenPGP Keychain to OpenKeychain	2014-04-06 12:57:42 +02:00