Commit Graph

6086 Commits

Author SHA1 Message Date
Dominik Schürmann
5987b6db26 Merge branch 'master' of github.com:open-keychain/open-keychain 2017-02-10 08:56:18 +01:00
Dominik Schürmann
a8246b2b4e Make graphics and resources folder lowercase 2017-02-10 08:56:02 +01:00
Vincent Breitmoser
1724636caf backport openpgp-api changes from K9 to OpenPgpAppPreference 2017-02-09 23:26:57 +01:00
Dominik Schürmann
5566cf7176 Do not encrypt filenames by default 2017-02-09 20:02:23 +01:00
Dominik Schürmann
84605097cb Merge pull request #2034 from open-keychain/secret-key-selection
redesign access and allowed secret key api dialogs
2017-02-08 02:33:52 +01:00
Vincent Breitmoser
1ae3ba9b72 pass all subkeys to request permission activity, select best out of these there 2017-02-08 02:10:04 +01:00
Vincent Breitmoser
eb349eb80f fix connected tests 2017-02-08 00:57:26 +01:00
Vincent Breitmoser
4be2f6e98e change RemoteRegisterActivity into a dialog 2017-02-08 00:57:26 +01:00
Vincent Breitmoser
9cdb5ae0a9 move remoteregister logic into presenter 2017-02-08 00:57:26 +01:00
Vincent Breitmoser
4498bd0d44 dialog can only handle one key access request at a time 2017-02-08 00:57:26 +01:00
Vincent Breitmoser
e06205ae55 redesign request key into dialog 2017-02-08 00:57:26 +01:00
Vincent Breitmoser
074be9e798 extract request key logic into presenter 2017-02-08 00:57:26 +01:00
Vincent Breitmoser
a9001b3b45 change "select allowed keys" into "request key permission" activity 2017-02-08 00:57:26 +01:00
Dominik Schürmann
5f56d3b85a Move intents into Constants class 2017-02-07 21:17:15 +01:00
Dominik Schürmann
6b4182d591 Merge pull request #2032 from rhari991/insecure-warning-on-card
Added insecure warning to import card
2017-02-07 20:38:51 +01:00
Dominik Schürmann
aeb76563c7 Merge pull request #2040 from open-keychain/remove-apg-upgrade
Remove AGP db upgrade
2017-02-07 20:38:29 +01:00
Dominik Schürmann
d8d1f24cbb Merge pull request #2041 from daquexian/fix_transparent_header
fix transparent header
2017-02-07 20:37:25 +01:00
daquexian
3f920455b2 fix transparent header 2017-02-07 23:59:53 +08:00
Dominik Schürmann
d75138e63b Remove AGP db upgrade 2017-02-07 13:28:59 +01:00
Dominik Schürmann
0777732fad Version 4.2.4 2017-02-07 13:20:28 +01:00
Dominik Schürmann
3f04eb68bb Merge pull request #2039 from open-keychain/upgrade-fix
emergency fix for crashing consolidate
2017-02-07 13:19:27 +01:00
Dominik Schürmann
8fa9f3b2ba emergency fix for crashing consolidate 2017-02-07 13:18:36 +01:00
Dominik Schürmann
e214108294 Version 4.2.3 2017-02-06 22:19:20 +01:00
Dominik Schürmann
b593c0d9e0 Update openpgp-api 2017-02-06 22:18:40 +01:00
Vincent Breitmoser
33790d9dc8 fix KeychainExternalProvider from tests 2017-02-06 21:00:25 +01:00
Vincent Breitmoser
237a0b1805 add simple tests for KeychainExternalProvider 2017-02-06 21:00:25 +01:00
Dominik Schürmann
68916c5838 More information in import_qr_code_wrong 2017-02-05 12:46:31 +01:00
Hari
ba1bd8d48a Added insecure warning to import card 2017-02-04 01:47:14 +05:30
Dominik Schürmann
015ef4aaae Merge pull request #2028 from rhari991/insecure-keys
Display insecure key warnings
2017-02-03 13:36:44 +01:00
Dominik Schürmann
e584e51ead Remove unused PQC package from BC 2017-02-03 13:24:36 +01:00
Hari
62a14399ea Added warnings for insecure keys 2017-02-03 16:11:29 +05:30
Dominik Schürmann
4a2a3bed06 Version 4.2.2 2017-02-02 17:26:00 +01:00
Dominik Schürmann
25494519cb Update build instructions 2017-02-02 13:23:53 +01:00
Dominik Schürmann
5935dad9e8 Merge pull request #2024 from open-keychain/build-env
Update build environment
2017-02-02 12:55:47 +01:00
Dominik Schürmann
70678ecd81 Update robolectric config 2017-02-02 11:36:12 +01:00
Dominik Schürmann
8d0c747bc9 Remove openkeychain-api gradle deps 2017-02-02 11:12:25 +01:00
Dominik Schürmann
8105cca6c1 Removed submodule openkeychain-api 2017-02-02 11:10:10 +01:00
Dominik Schürmann
2625da55ed Add OpenKeychainIntents into main git 2017-02-02 11:08:27 +01:00
Dominik Schürmann
b831cd5725 Update Robolectric to 3.2.2 2017-02-02 10:57:16 +01:00
Dominik Schürmann
694d03fb2d Update travis config 2017-02-02 10:56:00 +01:00
Dominik Schürmann
2b9144a863 Unify syntax in build.gradle 2017-02-02 10:55:52 +01:00
Dominik Schürmann
0fcdc3df58 Disable ProsGuard for debug builds 2017-02-02 10:55:34 +01:00
Dominik Schürmann
ad8e115d96 Remove unused TLS package in BC 2017-02-02 10:52:44 +01:00
Dominik Schürmann
f27e55fdce Update build env of submodules 2017-02-02 10:50:40 +01:00
Dominik Schürmann
7d09040cc6 Update build env 2017-02-02 10:50:30 +01:00
Dominik Schürmann
5b026386e1 Merge pull request #2018 from rhari991/ascii-armor-backup
Backup API, implement EXTRA_REQUEST_ASCII_ARMOR
2017-01-30 13:17:12 +01:00
Hari
28bf1a37a1 Added ascii armor option to the backup api 2017-01-29 22:14:54 +05:30
Dominik Schürmann
d2a2b11e66 Version 4.2.2-beta 2017-01-29 17:01:14 +01:00
Dominik Schürmann
146833916b Merge pull request #2011 from rhari991/restrict-sign-keys
API: Restrict secret keys for sign operation
2017-01-29 13:25:02 +01:00
Hari
4af5f7a93e Modified log message slightly 2017-01-28 01:51:25 +05:30