Commit Graph
100 Commits
Author SHA1 Message Date
Dominik Schürmann 418e922c78 Enable sync adapter, changelog 2014-08-20 23:26:01 +02:00
Dominik Schürmann 0b07c5258f Disable key import in sync adapter 2014-08-20 23:13:37 +02:00
Dominik Schürmann e8bc9083f2 improve certs_text 2014-08-20 23:01:27 +02:00
Dominik Schürmann 37caddca70 Upload key working 2014-08-20 22:51:00 +02:00
Dominik Schürmann 0f8958afb9 Upload key working 2014-08-20 22:17:16 +02:00
Dominik Schürmann fa25265e79 Fix key sharing 2014-08-20 21:51:01 +02:00
Dominik Schürmann e33e5b0003 Work on upload key 2014-08-20 21:44:51 +02:00
Dominik Schürmann 45706e6534 Notify duration, cleanup 2014-08-20 21:09:46 +02:00
Dominik Schürmann 937c91eefa Fix nullpointer in first time activity 2014-08-20 20:44:49 +02:00
Dominik Schürmann ccc1d2e006 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 20:24:24 +02:00
Dominik Schürmann 735040e193 return some more results 2014-08-20 20:24:19 +02:00
Dominik Schürmann 50c33ef322 progress dialog design fix 2014-08-20 20:13:25 +02:00
Dominik Schürmann e13c3bd1ac Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 20:08:56 +02:00
Dominik Schürmann 47bcc6149e return some more results 2014-08-20 20:08:51 +02:00
Dominik Schürmann 0e152d1db0 Merge branch 'master' of github.com:open-keychain/open-keychain
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-08-20 19:48:19 +02:00
Dominik Schürmann f46f2b6895 Fixes and temporary fixes for returning results 2014-08-20 19:46:44 +02:00
Dominik Schürmann c3b12bb3c2 Pull from transifex 2014-08-20 18:30:22 +02:00
Dominik Schürmann 70426041df Pull from transifex 2014-08-20 11:09:41 +02:00
Dominik Schürmann d6d68622ce Travis is now stable 2014-08-20 11:03:56 +02:00
Dominik Schürmann c00d619099 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 09:20:55 +02:00
Dominik Schürmann d26c6b1a08 Update keybase lib 2014-08-20 09:20:30 +02:00
Dominik Schürmann c86ef06a24 Merge pull request #782 from mar-v-in/issue-781
Fix mime types
2014-08-19 23:42:42 +02:00
Dominik Schürmann 16ab761006 Fix strings 2014-08-19 18:12:19 +02:00
Dominik Schürmann c42f6a04ed Start consolidate activity 2014-08-19 16:49:48 +02:00
Dominik Schürmann 4f8ddad9d3 ConsolidateDialogActivity 2014-08-19 16:40:57 +02:00
Dominik Schürmann 4be8c36b43 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-19 16:31:59 +02:00
Dominik Schürmann 5f8bbab569 Scroll fixes for certify activity 2014-08-19 16:31:51 +02:00
Dominik Schürmann 8d668d170c Notes about criticality 2014-08-19 15:23:37 +02:00
Dominik Schürmann 68cce5c0c8 Bouncy Castle link 2014-08-19 14:53:25 +02:00
Dominik Schürmann 9474749be1 Decrease iteration count, delayed for 2.9 2014-08-19 14:51:28 +02:00
Dominik Schürmann 26e82afa8e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-19 14:46:15 +02:00
Dominik Schürmann c1d05d0ee9 Change criticallity of subpackets after discussion 2014-08-19 14:16:46 +02:00
Dominik Schürmann 4a280f6ba3 Use higher s2k count 2014-08-19 11:11:58 +02:00
Dominik Schürmann d131693bb8 Use SHA512 instead of SHA1 and AES256 instead of CAST5 where possible 2014-08-19 10:58:38 +02:00
Dominik Schürmann b1bde6ead9 Mark packets critical 2014-08-19 10:42:35 +02:00
Dominik Schürmann 2c8bcffff3 add feature to key sig subpacket to indicate that we want MDC 2014-08-19 10:37:27 +02:00
Dominik Schürmann a2b3824556 New preferred hash and symmetric algos, removed SHA-1, 3DES, new ordering 2014-08-19 10:30:44 +02:00
Dominik Schürmann 6ffdafc0e6 Add license headers 2014-08-19 10:01:39 +02:00
Dominik Schürmann c1a265bfd1 certs header design 2014-08-19 10:01:31 +02:00
Dominik Schürmann 638c29792d Header for certs view 2014-08-19 09:52:15 +02:00
Dominik Schürmann a5d34478df Add subkey: at least one flag should be selected! 2014-08-18 11:13:52 +02:00
Dominik Schürmann 3e7ce0008f Fixes for expiry UI 2014-08-18 11:02:41 +02:00
Dominik Schürmann f206902002 Fixing date picker issues 2014-08-16 16:17:46 +02:00
Dominik Schürmann ccf58a92fa Fix flags UI in add subkey dialog 2014-08-16 13:42:55 +02:00
Dominik Schürmann c1f9c5e4b5 Fix ElGamal key creation, SUBKEY_BINDING cert must use algo of master key 2014-08-16 13:30:13 +02:00
Dominik Schürmann 4d698c896a Fix expiry when adding subkeys 2014-08-16 12:28:49 +02:00
Dominik Schürmann 474fc50b80 Always return a SaveKeyringResult from saving 2014-08-16 12:24:46 +02:00
Dominik Schürmann 188eeb79c9 Fix and simplify in OperationResultParcel 2014-08-16 12:13:30 +02:00
Dominik Schürmann bbe986743c API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables 2014-08-16 05:28:51 +02:00
Dominik Schürmann 443170b876 do not pre-select revoked or expired keys 2014-08-16 04:11:39 +02:00
Dominik Schürmann 8d60d9f103 Fix encrypt only 2014-08-16 03:59:58 +02:00
Dominik Schürmann b1dc663930 Remove old_apg 2014-08-15 11:07:21 +02:00
Dominik Schürmann b1fa5d9922 Remove subkeys.pgp.net keyserver from defaults 2014-08-15 11:00:45 +02:00
Dominik Schürmann 2c2860e86d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-15 10:19:51 +02:00
Dominik Schürmann cf450d24fb Remove subkeys.pgp.net keyserver, often down and no hkps 2014-08-15 10:19:46 +02:00
Dominik Schürmann bc76941bc1 Fix sticky list headers lib, fix travis 2014-08-14 19:30:59 +02:00
Dominik Schürmann 750ced4525 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-14 19:25:43 +02:00
Dominik Schürmann 0f60bcbc3d Pass through of master key id in SaveKeyringResult 2014-08-14 19:25:39 +02:00
Dominik Schürmann 28df004cbb Merge pull request #767 from mar-v-in/issue-763
Use dropdown in CertifyActivity
2014-08-14 18:53:40 +02:00
Dominik Schürmann a58440b85d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-14 18:51:44 +02:00
Dominik Schürmann 65e76f6e44 hacky fix to prevent key list from scrolling to top when opening nav drawer 2014-08-14 18:51:35 +02:00
Dominik Schürmann 110f8c4d52 Update sticky list headers 2014-08-14 17:00:36 +02:00
Dominik Schürmann 05da0f4328 change keybase hint following pull request #755 2014-08-14 16:20:24 +02:00
Dominik Schürmann 9ad09a3982 Automcomplete names and emails in keyserver tab 2014-08-14 16:12:42 +02:00
Dominik Schürmann 62f7bf6215 move v3 key import prevention into canonicalization method 2014-08-14 15:58:26 +02:00
Dominik Schürmann 0a1de8deea Do not import v3 keys, they are insecure! 2014-08-14 15:42:02 +02:00
Dominik Schürmann 225e248293 Remove MD5 support 2014-08-14 15:30:08 +02:00
Dominik Schürmann e72e47d92e Remove support for v3 sig generation 2014-08-14 15:24:37 +02:00
Dominik Schürmann 37edd0f390 API: Return metadata only for v4 api clients and above... 2014-08-14 13:10:38 +02:00
Dominik Schürmann 1a8606f194 API: Return metadata only for v4 api clients 2014-08-14 13:08:39 +02:00
Dominik Schürmann 2fa613ad62 Merge pull request #766 from mar-v-in/patch-1
Handle keys without expiry date right
2014-08-14 11:43:50 +02:00
Dominik Schürmann d0987edab9 Dont write version header by default 2014-08-14 11:44:47 +02:00
Dominik Schürmann f941431d63 Add user info dialog 2014-08-13 21:49:04 +02:00
Dominik Schürmann c7d5b09286 Move certify action down into actions section 2014-08-13 21:23:01 +02:00
Dominik Schürmann a20e019d5e Fix tests 2014-08-13 19:49:11 +02:00
Dominik Schürmann 32d63828c7 Fix tests 2014-08-13 19:36:22 +02:00
Dominik Schürmann 28b48506f6 Fix tests 2014-08-13 19:11:33 +02:00
Dominik Schürmann db12f782f2 API: User interaction when account keys are deleted 2014-08-13 18:48:42 +02:00
Dominik Schürmann 38da2af0e8 Better error handling for passphrase cache if key is missing 2014-08-13 16:37:28 +02:00
Dominik Schürmann e4c8674792 Merge pull request #760 from mar-v-in/fix-encrypt-intent
Fix encrypt intent
2014-08-13 13:20:21 +02:00
Dominik Schürmann fd055a893b Fix DECRYPT_METADATA api 2014-08-12 17:04:11 +02:00
Dominik Schürmann 9682826193 update api lib 2014-08-12 15:51:29 +02:00
Dominik Schürmann 2bca58742b Merge pull request #758 from mar-v-in/encrypt-only-show-relevant-keys
EncryptActivity: only show relevant keys
2014-08-12 14:15:11 +02:00
Dominik Schürmann a4a6314041 Fix API version support, update api lib 2014-08-12 13:54:46 +02:00
Dominik Schürmann ae5e75f4e1 Implement EXTRA_ORIGINAL_FILENAME for API 2014-08-11 23:57:11 +02:00
Dominik Schürmann acf5b99434 Update api lib 2014-08-11 21:26:52 +02:00
Dominik Schürmann 55d03f539e update api lib 2014-08-11 20:16:56 +02:00
Dominik Schürmann abf50c3750 Support mime type in metadata 2014-08-11 20:16:21 +02:00
Dominik Schürmann d5b40de70a Decrypt metadata api 2014-08-11 17:29:41 +02:00
Dominik Schürmann 59096b37fd Support API versions 3 and 4 2014-08-11 17:22:53 +02:00
Dominik Schürmann 82e66cd5b8 Update api lib 2014-08-11 17:19:58 +02:00
Dominik Schürmann b673565035 Get original filename for decryption 2014-08-11 17:10:47 +02:00
Dominik Schürmann 549feb69ed Add option to pass original filename to PgpSignEncrypt 2014-08-11 10:00:24 +02:00
Dominik Schürmann 94b7b1b5d8 progress for signing binary 2014-08-11 09:55:24 +02:00
Dominik Schürmann 867b89be0a More fixes for decryption progress 2014-08-11 01:31:51 +02:00
Dominik Schürmann 13f86890d6 Handle missing MDC as failed only if no valid signature is present 2014-08-10 21:50:46 +02:00
Dominik Schürmann 33a4d68520 More fixes for decryption progress 2014-08-10 21:09:10 +02:00
Dominik Schürmann c981902aba Handle missing integrity protection MDC packet as if integrity check would have failed.
An attacker could strip the MDC on its way to the receiver...
2014-08-10 20:59:13 +02:00
Dominik Schürmann b0821a3ddd Introduction of metadata api, starting to fix decryption progress 2014-08-10 20:44:02 +02:00
Dominik Schürmann 1abae04cda Fix compression setting for encryption of files 2014-08-10 20:27:34 +02:00