cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,331 Commits 1 Branch 0 Tags
4ec51fcd9fc1a0871436cdb3d44428d6af23afac
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent BreitmoserandDominik Schürmann 4ec51fcd9f extend-uid: button and list to add user ids 2015-12-27 14:59:50 +01:00
Vincent BreitmoserandDominik Schürmann a041acab65 extend-uid: allow changes to user ids in edit mode 2015-12-27 14:59:50 +01:00
Vincent BreitmoserandDominik Schürmann 5b6bc24a0c extend-uid: add option icon for edit action mode 2015-12-27 14:59:33 +01:00
Vincent BreitmoserandDominik Schürmann 50248bd570 extended: init tabs with loader info 2015-12-27 14:58:18 +01:00
Vincent Breitmoser 7baa649e47 set spongycastle submodule to correct commit 2015-12-17 13:28:03 +01:00
Vincent Breitmoser e32c1a9ced api: add micalg result extra to detached signature api call 2015-12-17 01:08:23 +01:00
Vincent Breitmoser 5344307e22 linked: correctly show errors in linked id wizard 2015-12-14 18:33:47 +01:00
Vincent Breitmoser c9d93785b2 some work on benchmark operation (affects only debug build) 2015-12-13 00:31:51 +01:00
Vincent Breitmoser 64fbb0daec encryptkeycompletionview: don't use prefix 2015-12-13 00:31:04 +01:00
Vincent Breitmoser cb1527e2a1 encryptkeycompletionview: don't initialize to null on attach 2015-11-30 19:01:06 +01:00
Vincent Breitmoser df219b61c6 move custm api permission methods into helper class (composition over inheritance) 2015-11-27 23:40:04 +01:00
Vincent d4c121c2af Merge pull request #1543 from rohands/issue_mouseover_hints 
mouseover hints
 2015-11-16 03:10:02 +01:00
Vincent Breitmoser ba7deca7d8 travis: add --stacktrace parameter 2015-11-16 00:12:29 +01:00
Vincent Breitmoser 89d1b6e4dc fix unit tests (IllegalStateException) 2015-11-16 00:05:02 +01:00
Vincent Breitmoser b5b197a9c4 decryptlist: fix iterators 2015-11-15 23:25:39 +01:00
Vincent Breitmoser c4599798f9 fix delete file securely method and use for delete original file 2015-11-15 23:25:39 +01:00
Vincent bb79b44e7f add documentation on marker packet skipping 2015-11-15 20:33:47 +01:00
Vincent 827b8e4b94 Merge pull request #1591 from waffle-iron/master 
waffle.io Badge (sure why not)
 2015-11-15 03:39:59 +01:00
Vincent 85612acddd Merge pull request #1564 from open-keychain/v/decrypt-key-lookup 
key lookup improvements
 2015-11-15 03:38:48 +01:00
Vincent Breitmoser 8a4da8c1c3 Merge branch 'master' into v/decrypt-key-lookup 2015-11-15 03:38:07 +01:00
Vincent Breitmoser 7943604435 fix accidental commit (thought I had removed that) 2015-11-15 03:36:30 +01:00
Vincent Breitmoser b0cb0346c1 Merge branch 'master' into v/decrypt-key-lookup 2015-11-15 03:16:46 +01:00
Vincent Breitmoser a41e6e0c70 allow database downgrade for debug builds 2015-11-15 03:10:30 +01:00
Vincent Breitmoser abfa7d743c some optimizations and indexes for the main key list query 2015-11-15 03:08:31 +01:00
Vincent Breitmoser 0456caedf4 provider: add debug variable to explain query plans 2015-11-15 02:18:39 +01:00
Vincent Breitmoser 529b9518c1 decrypt: skip all encountered marker packets (fix #1582) 2015-11-15 01:01:09 +01:00
Vincent Breitmoser ba2c5c3bd0 inputdataop: leave content as-is if no header found (fixes #1592) 2015-11-14 23:37:33 +01:00
Vincent Breitmoser d263bade92 decryptlist: minor cleanups and documentation 2015-11-14 18:28:25 +01:00
Vincent Breitmoser e92bd4bea9 decryptlist: some cleanup and streamlining of control flow 2015-11-14 17:43:52 +01:00
Vincent Breitmoser 4c5fce8f26 openpgpservice: move stream closing into delegating method 2015-11-13 18:02:54 +01:00
Vincent Breitmoser 820c91d132 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-13 17:40:19 +01:00
Vincent Breitmoser 8f41f56ca1 decrypt: add tests for skipping stripped and unsuitable decryption subkeys 2015-11-13 17:40:11 +01:00
Vincent Breitmoser 004c944bb7 Merge remote-tracking branch 'origin/master' 2015-11-13 17:00:14 +01:00
Vincent Breitmoser 712e526ab5 Merge commit '816dce0334e8b8d9da3cb00d31d26033b17040a3' 2015-11-13 17:00:09 +01:00
Vincent Breitmoser 2d7dada888 decrypt: skip unavailable and unsuitable keys 2015-11-13 16:58:26 +01:00
Vincent Breitmoser 816dce0334 service: minor code cleanups in key retrieval 2015-11-09 02:10:13 +01:00
Vincent Breitmoser cf8d61f41e Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-09 02:05:12 +01:00
Vincent Breitmoser 5c47570e90 import: apply fixPgpMessage to text for import from clipboard 2015-11-06 12:09:27 +01:00
Vincent Breitmoser 33e8699be5 bench: add simple s2k benchmark (iterations for 100ms) 2015-11-04 21:27:24 +01:00
Vincent Breitmoser 0a266cdb4a bench: run ops multiple times and for an average time 2015-11-04 20:44:35 +01:00
Vincent Breitmoser 3ca8af060b Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-04 20:24:11 +01:00
Vincent Breitmoser a4518c43c2 bench: simple working benchmark 2015-11-04 20:24:06 +01:00
Vincent Breitmoser 8feed0b097 bench: add benchmark operation for testing 2015-11-04 19:09:51 +01:00
Vincent Breitmoser 3411a5c087 keylist: add "search for query" button to empty view 2015-11-02 15:57:35 +01:00
Vincent Breitmoser e45636c07a import: make operation cancelable (again), make "update all" cancelable 
(also, use unbounded blocking queue to fix update of more than 10 keys)
 2015-10-29 18:22:04 +01:00
Vincent Breitmoser 55e22e68b4 import: reduce number of threads a little, and code cleanup 2015-10-29 17:14:22 +01:00
Vincent Breitmoser ee79cc76d3 make use of proxies a Keyserver property 2015-10-29 16:58:20 +01:00
Vincent Breitmoser 1c83c33d35 editkey: always return EditKeyResult 2015-10-29 16:01:24 +01:00
Vincent Breitmoser a665dd60fb use Proxy.NO_PROXY instead of null value for no proxy 2015-10-29 15:43:16 +01:00
Vincent Breitmoser 64a09a8945 encrypttext: fix mimetype check logic (#1574) 2015-10-29 15:08:57 +01:00
Vincent Breitmoser a1330f78e4 uploadop: clean up, add logging 2015-10-29 14:50:29 +01:00
Vincent Breitmoser e89dba8f24 prevent crashes in EncryptKeyCompletionView (2) 2015-10-26 21:57:31 +01:00
Vincent Breitmoser c55ca09a06 import: move uri resolution into AsyncTask, prevent NetworkOnMainThreadException 2015-10-26 15:28:53 +01:00
Vincent Breitmoser 10407d34de decrypt: restart operation if interrupted by fragment recreation 2015-10-26 14:40:40 +01:00
Vincent Breitmoser 968d051877 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-10-26 13:48:25 +01:00
Vincent Breitmoser cab52c4013 fix FileHelper class for pre-lollipop devices 2015-10-26 12:52:39 +01:00
Vincent Breitmoser 4ed5514691 linked: fix crash on <= lollipop 2015-10-25 18:21:34 +01:00
Vincent Breitmoser cf51366bb7 decryptlist: re-decrypt after key lookup 2015-10-23 18:49:31 +02:00
Vincent Breitmoser 3b95fea379 decryptlist: implement key lookup (wip) 2015-10-23 18:26:13 +02:00
Vincent Breitmoser 787b17030f inputdataoperation: guess filetype from filename for generic application/ mime types 2015-10-23 16:40:09 +02:00
Vincent Breitmoser dafa604016 import: use filesize from content provider on input uri 2015-10-23 16:19:16 +02:00
Vincent Breitmoser eefb55e934 decryptlist: use generic file icon for application/octet-stream 2015-10-23 16:17:43 +02:00
Vincent Breitmoser e188817aba fix argument order screwup in FileHelper 2015-10-22 00:42:40 +02:00
Vincent Breitmoser 7eb9f5d5cf decrypt: special case single encrypted text -> directly display text, if not too large 2015-10-21 22:30:21 +02:00
Vincent Breitmoser 4e60f1bc75 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-10-21 21:58:30 +02:00
Vincent Breitmoser 1b98c07237 encrypttext: localization, and truncate overlong input 2015-10-21 21:58:24 +02:00
Vincent Breitmoser a4b99ae350 encrypttext: handle input via Intent.EXTRA_STREAM in addition to Intent.EXTRA_TEXT 2015-10-21 21:55:15 +02:00
Vincent Breitmoser d149bfd3db displaytextactivity: truncate displayed text if too long 2015-10-21 21:54:39 +02:00
Vincent Breitmoser f7bfe932ec fix crash due to malformed log entry 2015-10-21 17:11:02 +02:00
Vincent Breitmoser 86a7571c76 linked: fix colors for dark theme 2015-10-21 16:19:16 +02:00
Vincent Breitmoser 4172715064 re-add accidentally deleted string 2015-10-21 15:44:52 +02:00
Vincent Breitmoser 759ffc5a4b Merge branch 'master' into encrypted-export 2015-10-09 14:57:54 +02:00
Vincent Breitmoser eff4ae5551 Revert "viewkeyactivity: ask for passphrase for backup only if key has one" 
This reverts commit 3316cb65e6.

Committed to wrong branch, derp :)
 2015-10-09 14:56:46 +02:00
Vincent Breitmoser 315ed608ae viewkeyactivity: ask for passphrase for backup only if key has one 2015-10-09 14:56:02 +02:00
Vincent Breitmoser e67e8cd8c1 fix variable name mistake (wth did I commit there?!) 2015-10-09 14:28:25 +02:00
Vincent Breitmoser 3316cb65e6 viewkeyactivity: ask for passphrase for backup only if key has one 2015-10-09 13:11:25 +02:00
Vincent Breitmoser 83fef47ec8 make openInputStreamSafe static and move to FileHelper 2015-10-09 01:44:40 +02:00
Vincent Breitmoser 6cf7e3e541 Merge branch 'master' into encrypted-export 2015-10-08 20:05:56 +02:00
Vincent Breitmoser ba9b8f3a60 pgpdecryptverify: only use keys for verification which are allowed to sign (OKC-01-013) 2015-10-08 20:01:04 +02:00
Vincent Breitmoser 084d6f1d3d Merge remote-tracking branch 'origin/master' 2015-10-08 19:56:33 +02:00
Vincent Breitmoser 3bf653775b improve tests, get rid of some redundant checks 2015-10-08 19:55:28 +02:00
Vincent Breitmoser 81a462c2ac pgpdecryptverify: get rid of duplicate code path for binary signature verification 2015-10-08 19:54:50 +02:00
Vincent Breitmoser cda1ba47d2 pgpdecryptverify: fix non-onepass signature checking 2015-10-08 18:37:30 +02:00
Vincent Breitmoser ac28b6bbac test: add tests for detached and clearsign signatures 2015-10-08 18:36:55 +02:00
Vincent Breitmoser e29f9017f7 pgpsignencrypt: unsupported parameter combinations are a bug 2015-10-08 18:36:16 +02:00
Vincent Breitmoser d6076a998c pgpdecryptverify: externalize PgpSignatureChecker 2015-10-08 18:02:17 +02:00
Vincent Breitmoser e9fa891606 fix jacoco coverage 2015-10-08 18:01:40 +02:00
Vincent Breitmoser 4b2f561a73 pgpdecryptverify: move cleartext verification into SignatureChecker 2015-10-08 14:36:20 +02:00
Vincent Breitmoser fe8db664a8 pgpdecryptverify: refactor signature verification state into SignatureChecker subclass 2015-10-08 13:53:58 +02:00
Vincent Breitmoser f6de2712d3 pgpdecryptverify: fix one pass signature check, actually use bracketed structure 2015-10-07 18:57:43 +02:00
Vincent Breitmoser bafc108969 pgpdecryptverify: refactor signature processing 2015-10-06 17:34:47 +02:00
Vincent Breitmoser 8f40c6df51 use only primary and mutually bound subkeys for fingerprint verification 2015-10-06 15:06:36 +02:00
Vincent Breitmoser 7619083d5c decrypt: fix broken file save 2015-10-06 14:19:28 +02:00
Vincent Breitmoser 7c79902a82 Merge branch 'master' into encrypted-export 2015-10-01 17:28:43 +02:00
Vincent Breitmoser 4f13dc4fc5 spongy: use version which doesn't skip bad signatures 2015-10-01 17:08:50 +02:00
Vincent Breitmoser ea7560220a spongy: treat eddsa signatures as non-verifiable signatures 2015-10-01 15:30:38 +02:00
Vincent Breitmoser 7f1dbccb5b decrypt: revise card layout margins 2015-09-30 17:19:17 +02:00
Vincent Breitmoser 9ba66aa2ce import: special treatment for application/pgp-keys 2015-09-30 15:17:48 +02:00
Vincent Breitmoser 43e661790d import: simplify ImportKeysActivity, don't display search bar for fixed input 2015-09-30 14:41:15 +02:00
Vincent Breitmoser 4025acd13a enc-export: use BackupActivity for backup from ViewKeyActivity 2015-09-30 14:41:14 +02:00