Commit Graph

2069 Commits

Author SHA1 Message Date
Dominik Schürmann
8ee7dbfdb0 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-10 13:48:05 +02:00
Dominik Schürmann
2ac8be2858 Integrate NFC functionality into ViewKeyActivity 2014-04-10 13:47:58 +02:00
Dominik Schürmann
8fcb0cf98d Merge pull request #545 from danielhass/toast_replacement
Toast replacement
2014-04-10 11:26:53 +02:00
Daniel Haß
8ff9b768a3 Deleted wrong AppMsg 2014-04-10 00:08:26 +02:00
Dominik Schürmann
eba0640d3e Prettify more layouts, fix edit and encrypt intents from key view 2014-04-09 20:10:23 +02:00
Dominik Schürmann
6d00ca7fdb Temporary disable of master key id extraction from uri 2014-04-09 19:57:57 +02:00
Dominik Schürmann
21e6110b6d Prettify some layouts 2014-04-09 19:42:27 +02:00
Vincent Breitmoser
35f9189a82 certs: fix verification in ViewKeyActivity (how embarassing)
Fixes #541
2014-04-09 18:34:19 +02:00
Dominik Schürmann
9c41477a4d Fix gitignore for lint 2014-04-09 16:36:28 +02:00
Dominik Schürmann
30652a470f Fix certification layout 2014-04-09 16:35:27 +02:00
Dominik Schürmann
19b62d67b3 Fix NFC 2014-04-09 16:05:47 +02:00
Dominik Schürmann
a0a51c9f92 Fix save keyring, improve signature verification 2014-04-09 15:39:50 +02:00
Daniel Haß
2a9eaaa1fb Replaced Toasts in ViewKeyActivity 2014-04-09 15:14:29 +02:00
Daniel Haß
01991aa127 Removed unused Toast import in ViewKeyActivityJB 2014-04-09 15:11:17 +02:00
Daniel Haß
6c8157152e Replaced Toasts in ImportKeysOrCodeFragment 2014-04-09 15:11:17 +02:00
Dominik Schürmann
27eb7c0f1b Cleanup in SelectKeyCursorAdapter 2014-04-09 01:11:33 +02:00
Dominik Schürmann
9fb493418e Hide keyboard after hiding custom key length field 2014-04-09 00:58:24 +02:00
Dominik Schürmann
e9efd0ec87 Merge pull request #539 from gogowitczak/custom-key-length-info
Modified Spinner values for CreateKeyDialog. Added info for user about custom key length restrictions.
2014-04-09 00:51:58 +02:00
Dominik Schürmann
b682cb2ae5 KeychainIntentService instead of APG 2014-04-09 00:09:47 +02:00
Dominik Schürmann
8680b5b08e Fix DECRYPT and SEND intent 2014-04-09 00:05:16 +02:00
gogowitczak
19cab919af Modified Spinner values for CreateKeyDialog. Added info for user about custom key length restrictions. 2014-04-08 23:59:41 +02:00
Dominik Schürmann
8ab9a0a2d0 Use NotFoundException in more places 2014-04-08 23:41:21 +02:00
Dominik Schürmann
d81de8509b Fix decryption of messages/files encrypted for multiple public keys 2014-04-08 23:01:38 +02:00
Dominik Schürmann
a1efb24228 Introduce ProviderHelper.NotFoundException, remove dead code 2014-04-08 22:25:42 +02:00
Dominik Schürmann
946c1e115c Merge pull request #537 from thi/change-license-to-gpl
Change license to gpl
2014-04-08 12:29:08 +02:00
Thialfihar
f2d8378d81 Change license from ASLv2 to GPLv3 where possible 2014-04-08 11:59:35 +02:00
Thialfihar
42faf0eb07 Update copyright timespan for Thialfihar 2014-04-08 11:59:35 +02:00
Dominik Schürmann
02549bd439 Merge pull request #536 from gogowitczak/custom-key-length
Added possibility to enter custom key length.
2014-04-08 10:00:53 +02:00
gogowitczak
e76fc97dd6 Fixed coding style. 2014-04-08 00:59:59 +02:00
gogowitczak
fc0c084a62 Added possibility to enter custom key length. Added key length limitations, according to issue #102 and SpongyCastle specification. 2014-04-07 16:31:38 +02:00
Dominik Schürmann
97ecf25cb4 Merge pull request #531 from danielhass/toast_replacement
Futher Toast replacements
2014-04-07 14:06:35 +02:00
Daniel Haß
ddd0111704 Futher Toast replacements in CertifyKeyActivity 2014-04-07 10:48:57 +02:00
Dominik Schürmann
3c8be8bf85 Merge pull request #529 from gogowitczak/gradlebug-branch
Fixed gradle localTest bug on Windows.
2014-04-06 21:33:38 +02:00
gogowitczak
f89ab48d61 Fixed gradle localTest bug on Windows. 2014-04-06 21:25:46 +02:00
Dominik Schürmann
191dcf0c31 Comment out localTest due to bug on windows 2014-04-06 20:52:44 +02:00
Dominik Schürmann
834eb41932 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-06 17:40:16 +02:00
Dominik Schürmann
454b9baf11 License clarification in README 2014-04-06 17:39:56 +02:00
Dominik Schürmann
eb86021234 Merge pull request #522 from Valodim/master
show key expiry status similar to revocation
2014-04-06 17:11:07 +02:00
Vincent Breitmoser
b4e7d69b35 show key expiry status similar to revocation 2014-04-06 16:09:39 +02:00
Dominik Schürmann
c3bb2b9d34 Update README 2014-04-06 14:50:49 +02:00
Dominik Schürmann
5c19193ca2 Update travis link 2014-04-06 14:46:43 +02:00
Dominik Schürmann
fbb872c136 Update transifex config 2014-04-06 13:14:11 +02:00
Dominik Schürmann
2a9ecb845d Update README 2014-04-06 13:06:12 +02:00
Dominik Schürmann
6d11371905 Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00
Dominik Schürmann
17997dd362 Pull from transifex 2014-04-06 12:51:46 +02:00
Dominik Schürmann
d3d36485d5 Optimize comments, remove dead code 2014-04-06 11:55:41 +02:00
Dominik Schürmann
56cd3ab9c7 Use dark icon in warning dialogs in edit key 2014-04-06 11:48:31 +02:00
Dominik Schürmann
f7b1d84dd9 code style 2014-04-06 11:39:58 +02:00
Dominik Schürmann
a9172e809f copyright header correction, style fixes 2014-04-06 11:30:01 +02:00
Dominik Schürmann
a234d09f91 Merge pull request #520 from Valodim/certs
Certificate support
2014-04-06 11:23:30 +02:00