cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,090 Commits 1 Branch 0 Tags
eff4ae5551f286f4c870c3f9db44ceb73c3c2fcf
Commit Graph

1586 Commits

Author SHA1 Message Date
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
3316cb65e6 viewkeyactivity: ask for passphrase for backup only if key has one 2015-10-09 13:11:25 +02:00
Dominik Schürmann
1fb0ed8454 Revert "Check that the encrypt input uris are not linked to our own internal storage (OKC-01-010)" 
Fix was not sufficient

This reverts commit b10b14d9bc.
 2015-10-08 20:21:02 +02:00
Dominik Schürmann
1328309009 Remove ShareHelper: Not compat with Android >= 5, reduce code complexity 2015-10-08 18:47:28 +02:00
Vincent Breitmoser
8f40c6df51 use only primary and mutually bound subkeys for fingerprint verification 2015-10-06 15:06:36 +02:00
Dominik Schürmann
dfce5449c2 Raise min asymmetric key length for all ciphers to 2048 bit 2015-10-04 22:46:21 +02:00
Dominik Schürmann
eff59b4645 Show dialog before sharing log 2015-10-04 16:57:28 +02:00
Dominik Schürmann
405b959fb8 No show key button for RESULT_INVALID_SIGNATURE, Cleanup 2015-09-30 12:46:26 +02:00
Dominik Schürmann
1dd61cab41 Cleanup in BaseNfcActivity 2015-09-30 12:45:30 +02:00
Dominik Schürmann
051e4b8a79 Improve NFC exception handling, fixes RuntimeExceptions 2015-09-30 12:45:21 +02:00
Dominik Schürmann
08e25747da Fix crashes with Fluffys PGP applet 2015-09-30 12:45:15 +02:00
Dominik Schürmann
1d0e9bf60a Enable YubiKey creation 2015-09-30 12:45:10 +02:00
Dominik Schürmann
2535ecb91f Full 160 bit for phrase confirm, stuffed with ones 2015-09-29 14:38:30 +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
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
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
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
Vincent Breitmoser
4c1d48bd95 use intent icon as fallback if we get no thumbnail 2015-09-19 15:45:20 +02:00
Dominik Schürmann
f253c9e206 Fix DECRYPT_DATA intent 2015-09-18 22:51:13 +02:00
Vincent Breitmoser
fdb1a7384e multidcrypt: display k9 download only after decryption failure 2015-09-17 19:48:51 +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
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
4722ecb955 actually use cleaned text if we read from clipboard 2015-09-16 20:36:19 +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
97c55ee4bb multidecrypt: context menu per card, not per file 2015-09-16 17:47:16 +02:00
Dominik Schürmann
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
Vincent Breitmoser
24f2a9468c multidecrypt: display all outputUris as individual items 2015-09-16 02:56:14 +02:00
Vincent Breitmoser
81ce075df9 multidecrypt: prepare viewholder for file list 2015-09-16 02:19:23 +02:00
Vincent Breitmoser
5ac939387f multidecrypt: put drawable cache in map attribute 2015-09-16 02:11:13 +02:00
Vincent Breitmoser
f90f86ae04 fix messed up imports 2015-09-16 01:52:45 +02:00
Vincent Breitmoser
258e2e9a88 multidecrypt: change some method params, prepare for open/share of other outputs 2015-09-16 01:49:42 +02:00
Vincent Breitmoser
96865ccbaa multidecrypt: don't pass context to adapter 2015-09-16 01:20:16 +02:00
Vincent Breitmoser
13509a0b90 multidecrypt: inline setOnClickListener 2015-09-16 01:14:40 +02:00
Vincent Breitmoser
99fd1f4c22 preliminary working mime parsing in DecryptListFragment! (beware WIP, here be dragons!) 2015-09-16 00:05:21 +02:00
Vincent Breitmoser
3cd54581c3 mime: create more general InputDataOperation, which for now and does basic mime parsing 2015-09-15 03:02:05 +02:00
Vincent Breitmoser
3814ae7d53 Merge branch 'master' into mime4j 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-09-14 16:21:04 +02:00
Vincent Breitmoser
d5dd6a49c8 fix up navigation in keyserver select (fixes #1482) 2015-09-11 13:29:59 +02:00
Vincent Breitmoser
0d46a589e5 no chooser before DisplayTextActivity, can select from there (#1524) 2015-09-11 04:59:00 +02:00
Vincent Breitmoser
fd6141f0d2 add share item to decrypt file list (#1524) 2015-09-11 04:51:55 +02:00
Vincent Breitmoser
cdf67c3296 share rather than save log files (OKC-01-015) 2015-09-11 03:08:53 +02:00
Vincent Breitmoser
cb9a66e246 linked: improve fragment robustness, save cookies through destroyed fragment 2015-09-10 16:57:07 +02:00