Commit Graph
100 Commits
Author SHA1 Message Date
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 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
Vincent Breitmoser 771d9d54b6 inputdata: don't attempt mime decode on application/* except octet-stream 2015-09-30 14:41:14 +02:00
Vincent Breitmoser f461d6b1d8 decryptverify: add trivial detection of pgp ascii-armored data 2015-09-30 14:41:09 +02:00
Vincent Breitmoser 5b6c04cbfb enc-export: handle onSaveInstanceState, add nicer layout for landscape 2015-09-29 05:33:30 +02:00
Vincent Breitmoser 2b6335e90b enc-export: add "back" button to fail state 2015-09-29 04:03:44 +02:00
Vincent Breitmoser 91c3577073 enc-export: add comments about debug mechanisms 2015-09-29 03:37:38 +02:00
Vincent Breitmoser b0b65abbc6 enc-export: localize snackbar strings 2015-09-29 03:35:55 +02:00
Vincent Breitmoser cca7ee80c5 enc-export: transifex compat 2015-09-29 03:27:21 +02:00
Vincent Breitmoser bc09d290f8 enc-export: localization, and layout compatibility 2015-09-29 03:25:36 +02:00
Vincent Breitmoser 4923f08152 enc-export: rename fragment to match class 2015-09-29 02:15:33 +02:00
Vincent Breitmoser 3513f4453b enc-export: implement save file as CREATE_DOCUMENT, with static fallback for pre-kitkat 2015-09-29 02:12:29 +02:00
Vincent Breitmoser 8091e3af49 enc-export: mv BackupCodeEntryFragment BackupCodeFragment 2015-09-29 02:09:26 +02:00
Vincent Breitmoser c630fe651f use annotations for android sdk constraints 2015-09-28 18:50:20 +02:00
Vincent Breitmoser 0e613aff2e Merge remote-tracking branch 'origin/master' into encrypted-export 2015-09-28 18:27:29 +02:00
Vincent Breitmoser b65a23f2d4 enc-export: easier mechanism to get backup code from edittexts 2015-09-28 18:05:09 +02:00
Vincent Breitmoser 97b2178a29 upload: re-add upload by bytes 2015-09-28 18:03:58 +02:00
Vincent Breitmoser 66442b9c96 enc-backup: working "save to file" 2015-09-28 04:50:21 +02:00
Vincent Breitmoser 7a9a0567ab enc-backup: working first version 2015-09-28 04:25:48 +02:00
Vincent Breitmoser e321f992f2 signencrypt: make sure we buffer the InputStream 2015-09-28 04:24:22 +02:00
Vincent Breitmoser 5f1259f3f7 export: improve stream handling, performance 2015-09-28 04:20:33 +02:00
Vincent Breitmoser 46e24058ba export: support encrypted export, first version 2015-09-28 00:03:11 +02:00
Vincent Breitmoser dc9e068790 upload: identify key by masterKeyId only 2015-09-26 18:10:30 +02:00
Vincent Breitmoser 676a863b14 export: more cleanup and splitting into subroutines 2015-09-26 03:39:52 +02:00
Vincent Breitmoser c93670f3c6 export: externalize upload into its own operation 2015-09-26 03:21:53 +02:00
Vincent Breitmoser 603eab729f export: clean up, fix possible infinite loop 2015-09-26 02:48:01 +02:00
Vincent Breitmoser 352e7685c2 export: move execute operation to top 2015-09-26 02:23:24 +02:00
Vincent Breitmoser 04fd2eeb79 remove "export to file" code path from export operation 2015-09-26 02:22:32 +02:00
Vincent Breitmoser 15c9fde27f enc-backup: fix copyright notices 2015-09-25 04:29:26 +02:00
Vincent Breitmoser 00783d7756 enc-backup: didn't like the check mark icon after all 2015-09-25 04:25:08 +02:00
Vincent Breitmoser f30ca1e92c enc-backup: use black check icon for button, and some cleanup 2015-09-25 04:17:47 +02:00
Vincent Breitmoser 097430b3e3 enc-backup: clean up backstack after restore 2015-09-25 04:08:42 +02:00
Vincent Breitmoser 7e175ac673 enc-backup: use ValueAnimator rather than ObjectAnimator for compatibility 2015-09-25 03:59:13 +02:00
Vincent Breitmoser 35ef837286 enc-backup: use only one fragment after all 2015-09-25 03:38:53 +02:00
Vincent Breitmoser edd1e45db7 enc-backup: handle bad code more nicely 2015-09-25 01:38:22 +02:00
Vincent Breitmoser eae7c188ec enc-backup: keep first generated code 2015-09-25 01:38:21 +02:00
Vincent Breitmoser 106a1f03dd enc-backup: some cleanup in code entry fragment 2015-09-25 01:38:21 +02:00
Vincent Breitmoser 408c4a896c enc-backup: ask for backup code again 2015-09-25 01:38:13 +02:00
Vincent Breitmoser 624299b3f1 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-09-21 14:41:32 +02:00
Vincent Breitmoser 2b83ed6cfc Merge branch 'master' of github.com:open-keychain/open-keychain 2015-09-21 11:49:12 +02:00
Vincent Breitmoser d8f664bd17 mime: don't do mime parsing if the encrypted data has a filename 2015-09-21 11:49:03 +02:00
Vincent Breitmoser 4c1d48bd95 use intent icon as fallback if we get no thumbnail 2015-09-19 15:45:20 +02:00
Vincent Breitmoser 35eee40d70 inform storage provider of uri content-type for decrypted output 2015-09-19 15:45:00 +02:00
Vincent Breitmoser d94ebb2269 encrypted export WIP 2015-09-19 15:29:44 +02:00
Vincent Breitmoser 5330a91fef skip mime parsing if we already know the content type isn't suitable 2015-09-19 15:27:14 +02:00
Vincent Breitmoser e7185bd1b8 fix fallback for non-mime data 2015-09-19 15:27:04 +02:00
Vincent 448140c276 Update README.md 2015-09-18 16:11:37 +02:00
Vincent 2d54c3f928 Merge pull request #1538 from bashrc/bashrc/build
Fix build instruction
2015-09-18 15:53:17 +02:00
Vincent 2ebcc942d4 Merge pull request #1487 from open-keychain/mime4j
support multipart mime structure in decrypted data
2015-09-18 14:11:49 +02:00
Vincent Breitmoser 8ad31e3251 mime: skip trailing unsigned parts, and ignore nested signed data 2015-09-17 22:13:20 +02:00
Vincent Breitmoser 955a1f4b26 mime: support for signed-then-encrypted format 2015-09-17 21:51:11 +02:00
Vincent Breitmoser fdb1a7384e multidcrypt: display k9 download only after decryption failure 2015-09-17 19:48:51 +02:00
Vincent Breitmoser ff2c552aa2 white share icon in log display activity 2015-09-17 16:17:32 +02:00
Vincent Breitmoser bbbc8dfd86 multidecrypt: black share icon in bottom sheet 2015-09-17 16:17:17 +02:00
Vincent Breitmoser 142a71480e Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4j 2015-09-17 13:45:32 +02:00
Vincent Breitmoser 7da80c84b7 multidecrypt: use chooser intent on click for everything but text/plain ACTION_SHOW 2015-09-17 13:45:09 +02:00