Commit Graph

1254 Commits

Author SHA1 Message Date
Vincent Breitmoser
7c79902a82 Merge branch 'master' into encrypted-export 2015-10-01 17:28:43 +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
Dominik Schürmann
051e4b8a79 Improve NFC exception handling, fixes RuntimeExceptions 2015-09-30 12:45:21 +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
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
0e613aff2e Merge remote-tracking branch 'origin/master' into encrypted-export 2015-09-28 18:27:29 +02:00
Vincent Breitmoser
676a863b14 export: more cleanup and splitting into subroutines 2015-09-26 03:39:52 +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
35ef837286 enc-backup: use only one fragment after all 2015-09-25 03:38:53 +02:00
Dominik Schürmann
29e9b2fa1e Dont import more than 100 User IDs (OKC-01-002) 2015-09-25 01:38:43 +02:00
Vincent Breitmoser
edd1e45db7 enc-backup: handle bad code more nicely 2015-09-25 01:38:22 +02:00
Vincent Breitmoser
408c4a896c enc-backup: ask for backup code again 2015-09-25 01:38:13 +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
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
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
d94ebb2269 encrypted export WIP 2015-09-19 15:29:44 +02:00
Vincent Breitmoser
e7185bd1b8 fix fallback for non-mime data 2015-09-19 15:27:04 +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
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
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
93421e902c mime: handle non-mime data, just pass it through 2015-09-16 20:36:06 +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
326834fd58 mime: add logging to InputDataOperation 2015-09-15 23:06:15 +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
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