cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,040 Commits 1 Branch 0 Tags
3a9709a35d3cf5cd2e93e49b75745226fd59ae2d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 3a9709a35d Use api.keybase.io 2015-09-21 16:49:23 +02:00
Dominik Schürmann 7d9e44afd7 Fix deps verification 2015-09-21 14:11:00 +02:00
Dominik Schürmann 9ee61dc0df Pin keybase certificate 2015-09-21 14:05:49 +02:00
Dominik Schürmann ad2c8867e6 Use more modular Keybase lib with OkHttp wrapper 2015-09-21 12:49:02 +02:00
Dominik Schürmann 0b181743a3 Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on add (OKC-01-018) 2015-09-20 22:42:50 +02:00
Dominik Schürmann 03269815f1 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-09-18 22:51:19 +02:00
Dominik Schürmann f253c9e206 Fix DECRYPT_DATA intent 2015-09-18 22:51:13 +02:00
Dominik SchürmannandVincent Breitmoser 82ee9d440b Use material overflow icon in decrypt list 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
	OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
 2015-09-17 16:24:20 +02:00
Dominik Schürmann acbb857f24 Add K-9 Mail warning toast 2015-09-17 10:16:59 +02:00
Dominik SchürmannandVincent Breitmoser ce105d955f Add text icon in decrypt list 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
 2015-09-16 17:21:38 +02:00
Dominik Schürmann f4f59abcfd Change mailinglist 2015-09-15 23:09:32 +02:00
Dominik Schürmann afda9d86f8 Merge pull request #1522 from 0-kaladin/mipmap 
Fixes #1520
 2015-09-05 23:27:03 +02:00
Dominik Schürmann e9836372b4 Use new HashSet<>(Arrays.asList()) instead of static 2015-09-04 13:39:03 +02:00
Dominik Schürmann c63d000252 Merge pull request #1518 from 0-kaladin/master 
Fixes open-keychain/open-keychain#1515
 2015-09-03 21:01:07 +02:00
Dominik Schürmann bff302f808 Show linked identity menu item and linked identities only when feature is enabled 2015-08-29 17:27:04 +02:00
Dominik Schürmann feef4a93ab Reword experimental settings 2015-08-29 17:19:58 +02:00
Dominik Schürmann 3c25dc2b0c Improve decrypt strings 2015-08-28 17:47:56 +02:00
Dominik Schürmann 8a780c9c49 Support OpenPGP API v9 2015-08-28 17:46:57 +02:00
Dominik Schürmann faf23e4655 Merge branch 'mgeier63-master' 2015-08-28 17:30:52 +02:00
Dominik Schürmann 76522d90fa Cleanup OpenPgpService2 code, update openpgp-api lib 2015-08-28 17:14:40 +02:00
Dominik Schürmann b5b3ba0c7b Revert "service side support for https://github.com/open-keychain/openpgp-api/pull/3" 
This reverts commit 298e42d3aa.
 2015-08-28 17:08:50 +02:00
Dominik Schürmann 2569984601 Merge branch 'master' of https://github.com/mgeier63/open-keychain into mgeier63-master 2015-08-28 17:08:10 +02:00
Dominik Schürmann 765ec094c9 Make keybase an experimental feature 2015-08-28 15:18:11 +02:00
Dominik Schürmann 905148f586 Add missing scrim drawable 2015-08-28 14:25:20 +02:00
Dominik Schürmann 6fa5f0b129 introduce text protection and fix color change after confirm 2015-08-28 14:22:52 +02:00
Dominik Schürmann bff9aa1401 Remove old comment 2015-08-28 13:50:12 +02:00
Dominik Schürmann 333ba5d032 Improve scrolling in key view 2015-08-28 13:10:30 +02:00
Dominik Schürmann 0aaa93ac04 Dont show FAB for expired, revoked keys 2015-08-28 11:50:13 +02:00
Dominik Schürmann 20f652350a Improve certify strings 2015-08-28 10:41:45 +02:00
Dominik Schürmann 55a150ea46 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-28 04:20:50 +02:00
Dominik Schürmann 2ad39c27d9 Collapsing Toolbar 2015-08-28 04:20:43 +02:00
Dominik Schürmann 1b5afc3247 Experimental word comparison 2015-08-27 21:53:33 +02:00
Dominik Schürmann 3f4150e4ef Fix theme setting 2015-08-27 15:58:33 +02:00
Dominik Schürmann cac0f8ec9e Prettify settings, rename some strings 2015-08-27 15:53:29 +02:00
Dominik Schürmann 905e738621 Use SwitchPreference more often 2015-08-27 14:05:58 +02:00
Dominik Schürmann c292b8d9c3 Experimental features settings reworked 2015-08-27 13:59:26 +02:00
Dominik Schürmann 7a98ffc90a Remove dead code 2015-08-27 12:34:54 +02:00
Dominik Schürmann ec7a3a7047 Experimental feature setting 2015-08-27 12:24:37 +02:00
Dominik Schürmann f92e5f663f fix msg_ip_merge_secret 2015-08-26 15:26:24 +02:00
Dominik Schürmann 5a7f2b2c12 Use CDATA to prevent transifex problems 2015-08-26 15:24:29 +02:00
Dominik Schürmann 1ac4ebfb28 Pull from transifex 2015-08-26 15:08:09 +02:00
Dominik Schürmann 588e84d4b1 Pull from transifex 2015-08-25 19:14:13 +02:00
Dominik Schürmann b3ed33c1c7 Merge pull request #1501 from open-keychain/multi-thread-fix 
Fixed crash during "update all"
 2015-08-24 02:38:55 +02:00
Dominik Schürmann 1144ebb94c API: Fix get sign key, related to OpenPgpKeyPreference bugs 2015-08-24 02:37:26 +02:00
Dominik Schürmann db5040a061 Update openpgp-api-lib 2015-08-24 01:12:51 +02:00
Dominik Schürmann f57f5ea032 Better del_rev_dialog_title 2015-08-24 00:49:32 +02:00
Dominik Schürmann 317580039a Better del_rev_dialog_message 2015-08-24 00:48:40 +02:00
Dominik Schürmann eb381df1fb Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-24 00:37:47 +02:00
Dominik Schürmann 7ba0b93ceb Move proxy pref values out of strings 2015-08-24 00:37:38 +02:00
Dominik Schürmann 5e2f24520b Merge pull request #1461 from open-keychain/keyserver-sync 
Periodic Keyserver Sync
 2015-08-20 17:55:55 +02:00
Dominik Schürmann e643e098e2 transifex: remove unused mappings 2015-08-20 14:11:25 +02:00
Dominik Schürmann 0d543a54af Revert "Fix pulling Serbian translation from Transifex" 
This reverts commit 0438416ec2.
 2015-08-20 14:08:32 +02:00
Dominik Schürmann 8b5ad65837 Merge pull request #1495 from pejakm/txsrfix 
Fix pulling Serbian translation from Transifex
 2015-08-20 13:51:45 +02:00
Dominik Schürmann 931342ae7d Version 3.5.1 2015-08-18 11:21:23 +02:00
Dominik Schürmann 2ef691b264 Fix theme problems 2015-08-18 11:19:50 +02:00
Dominik Schürmann 979605b5de Fix CryptoInputParcel handling for YubiKeys 2015-08-18 10:33:52 +02:00
Dominik Schürmann 2df3335965 Update about 2015-08-17 18:15:04 +02:00
Dominik Schürmann ed299e22b4 Add additional langs from transifex 2015-08-17 13:23:40 +02:00
Dominik Schürmann ad7c567f7c Version 3.5 2015-08-17 13:15:19 +02:00
Dominik Schürmann cc2e83c523 Pull from transifex 2015-08-17 13:14:28 +02:00
Dominik Schürmann 95ec041440 Changelog 3.5 2015-08-17 13:11:38 +02:00
Dominik Schürmann a3395112e0 Revoke master key only 2015-08-17 10:25:02 +02:00
Dominik Schürmann dbaf7070ea WIP mime parsing 2015-08-17 09:31:34 +02:00
Dominik Schürmann 01e68e044c Lock orientation for yubikey operations 2015-08-12 21:26:15 +02:00
Dominik Schürmann 2edb5349b0 Change license of NfcOperationActivity and fix copyright in BaseNfcActivity 2015-08-12 20:30:34 +02:00
Dominik Schürmann d14e0b2ed3 Fix theme bugs 2015-08-12 20:25:58 +02:00
Dominik Schürmann 483d5ab495 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-12 17:09:15 +02:00
Dominik Schürmann 0326bbce6b Adpt official theme naming schema 2015-08-12 17:09:07 +02:00
Dominik Schürmann 65517f0d06 Style dialog buttons 2015-08-12 17:00:09 +02:00
Dominik Schürmann a7392eb99d API: Better fallback for OpenPgpDecryptionResult 2015-08-12 15:58:41 +02:00
Dominik Schürmann 8ce4a9a252 Support API version 8 2015-08-10 22:08:26 +02:00
Dominik Schürmann 0314d36979 Update dependencies 2015-08-10 15:01:27 +02:00
Dominik Schürmann bc18054dc7 Increase s2k iterations back to 0x90 2015-08-10 14:35:15 +02:00
Dominik Schürmann 50fa1ac918 Merge pull request #1465 from open-keychain/requirements 
Min crypto requirements
 2015-08-10 14:30:15 +02:00
Dominik Schürmann 775ef71ce1 Disable new failing test for now 2015-08-10 14:25:50 +02:00
Dominik Schürmann ec76d56b82 Fix API backward compat 2015-08-10 14:18:15 +02:00
Dominik Schürmann acbb3edf9b Fix test cases, add test cases (still 1 failing) 2015-08-10 13:54:41 +02:00
Dominik Schürmann 74c80d4a9d Dont allow RSA_SIGN, RSA_ENCRYPT, deprecated in RFC 2015-08-10 13:54:25 +02:00
Dominik Schürmann 8719938306 Move TODOs into issue 2015-08-10 10:26:58 +02:00
Dominik Schürmann 3d8eda6e3e Improve comments and reasons in PgpConstants, simple checks for insecure asymmetric keys 2015-08-10 09:35:23 +02:00
Dominik Schürmann 7c40d89eea Use default compression in OpenPgpService 2015-08-09 21:49:56 +02:00
Dominik Schürmann dba145f5df Follow some of coorus recommendations: better selection of algo whitelist, ignore recipients preferred algos 2015-08-09 21:49:56 +02:00
Dominik Schürmann 57378be1c0 Introduce constants in OpenPgpSignature and DecryptionResult for unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos 2015-08-09 21:49:56 +02:00
Dominik Schürmann 3dbe0033dc Merge pull request #1473 from open-keychain/orbot-helper 
Updated OrbotHelper with the latest NetCipher
 2015-08-06 10:34:13 +02:00
Dominik Schürmann 8fb3d1e166 Merge pull request #1474 from open-keychain/themes-drawables 
Fixed crash on api < 21 due to drawable using attrs
 2015-08-06 10:31:59 +02:00
Dominik Schürmann 7086a67c2e Merge pull request #1456 from xSooDx/master 
ISSUE #1304: Change keybase strings
 2015-08-05 22:19:40 +02:00
Dominik Schürmann 9afc7f7bab Fix account_privacy_text 2015-08-05 18:19:39 +02:00
Dominik Schürmann 460f0d5f33 Update libs 2015-08-03 19:09:59 +02:00
Dominik Schürmann 9f8ea8257c Use gradle-all 2015-08-03 19:05:15 +02:00
Dominik Schürmann 974b7c37d4 Add privacy information to account screen 2015-08-03 15:13:08 +02:00
Dominik Schürmann 7474268ead Fix color and design in help activity 2015-08-03 13:24:04 +02:00
Dominik Schürmann 2687e533a6 Merge branch 'thialfihar-feature/add-theme-setting' 2015-07-25 15:55:30 +02:00
Dominik Schürmann a8b80b3ff4 Hide theme setting for now 2015-07-25 15:55:21 +02:00
Dominik Schürmann e0a381a00d Restore fab colors in key list 2015-07-25 15:47:49 +02:00
Dominik Schürmann 04f771a4f7 Fix crash with new theme 2015-07-25 15:46:36 +02:00
Dominik Schürmann 1dafd1b629 Merge pull request #1435 from open-keychain/revocation-on-deletion 
Revocation on deletion
 2015-07-15 17:26:41 +02:00
Dominik Schürmann bfe36019bd Remove unused icon 2015-07-13 18:19:50 +02:00
Dominik Schürmann 56d599dd76 Use support.v7.app.AlertDialog 2015-07-13 13:37:04 +02:00
Dominik Schürmann 6db7a1af99 Merge pull request #1438 from open-keychain/upload-error 
Check upload response code and throw AddKeyException
 2015-07-13 12:13:53 +02:00
Dominik Schürmann 47c07aa320 Version 3.4.1 2015-07-09 15:09:39 +02:00