Commit Graph

5054 Commits

Author SHA1 Message Date
Dominik Schürmann
29e9b2fa1e Dont import more than 100 User IDs (OKC-01-002) 2015-09-25 01:38:43 +02:00
Dominik Schürmann
b10b14d9bc Check that the encrypt input uris are not linked to our own internal storage (OKC-01-010) 2015-09-25 01:02:21 +02:00
Dominik Schürmann
9a6aa07089 Prevent database downgrade (OKC-01-012) 2015-09-25 00:01:24 +02:00
Dominik Schürmann
21b83d8fa4 Reject filenames with slashes completly 2015-09-24 23:32:51 +02:00
Dominik Schürmann
756ee28fb0 Cleanup FileHelper 2015-09-24 23:15:19 +02:00
Dominik Schürmann
63f1b84914 Remove save support for Android < 4.4 (OKC-01-014) 2015-09-24 22:57:11 +02:00
Dominik Schürmann
f924e7d40c Fix some illegal state exceptions 2015-09-24 19:03:33 +02:00
Dominik Schürmann
688c5f545b Fix genitiv in strings 2015-09-24 18:40:04 +02:00
Dominik Schürmann
74281d6203 Confirm design 2015-09-24 18:30:14 +02:00
Dominik Schürmann
fd80d48f50 phrase confirmation 2015-09-24 14:11:20 +02:00
Dominik Schürmann
de8eed664f Merge branch 'master' of github.com:open-keychain/open-keychain 2015-09-21 16:49:30 +02:00
Dominik Schürmann
3a9709a35d Use api.keybase.io 2015-09-21 16:49:23 +02:00
Vincent Breitmoser
624299b3f1 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-09-21 14:41:32 +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
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
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
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
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
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
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
Bob Mottram
6b89b146b1 Fix build instruction 2015-09-18 14:49:29 +01: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
Dominik Schürmann
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
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
Dominik Schürmann
acbb857f24 Add K-9 Mail warning toast 2015-09-17 10:16:59 +02:00
Vincent Breitmoser
f77a6a85ee mime: don't decrypt in mime parsing only test 2015-09-17 00:54:33 +02:00
Vincent Breitmoser
1b8cdf5462 update openpgp-api-lib with OpenPgpMetadata changes 2015-09-16 22:58:23 +02:00
Vincent Breitmoser
d5bde6997e fail with warning if we get data from the AOSP mail client (see #290) 2015-09-16 21:03:49 +02:00
Vincent Breitmoser
5e0c40346e multidecrypt: attempt file deletion only once at most 2015-09-16 20:57:46 +02:00
Vincent Breitmoser
76465fc687 mime: add failure case if openpgp processing fails! 2015-09-16 20:48:46 +02:00
Vincent Breitmoser
01038d6a26 mime: add logging messages 2015-09-16 20:45:12 +02:00
Vincent Breitmoser
4722ecb955 actually use cleaned text if we read from clipboard 2015-09-16 20:36:19 +02:00
Vincent Breitmoser
93421e902c mime: handle non-mime data, just pass it through 2015-09-16 20:36:06 +02:00
Vincent Breitmoser
38a27855a9 multidecrypt: disable delete if not from ACTION_VIEW 2015-09-16 20:07:04 +02:00
Vincent Breitmoser
6624d1f830 mime: respect charset header (default to utf-8) 2015-09-16 19:54:57 +02:00
Vincent Breitmoser
ece06b1933 multidecrypt: use bottom sheet for longclick options 2015-09-16 19:52:26 +02:00
Vincent Breitmoser
9ac7b33a4e enable view intent with text/plain (related #290) 2015-09-16 17:47:44 +02:00