moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity
1,699 Commits 12 Branches 24 Tags 116 MiB
8680b5b08e
Commit Graph

1699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
8680b5b08e Fix DECRYPT and SEND intent 2014-04-09 00:05:16 +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
Vincent Breitmoser
d5842940b5 certs: remove unused menu item 2014-04-06 07:26:07 +02:00
Vincent Breitmoser
8b6c31ba46 certs: change migration routine so certifications work 2014-04-06 05:29:46 +02:00
Vincent Breitmoser
bd8dc05b1c certs: display green dot for certified keys in KeyListFragment 2014-04-06 05:29:19 +02:00
Vincent Breitmoser
194fc7507b certs: forgot to add ids file 2014-04-06 05:07:14 +02:00
Vincent Breitmoser
d1b0d0fa5e Merge remote-tracking branch 'origin/master' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
 2014-04-06 04:35:05 +02:00
Vincent Breitmoser
456a634149 certs: ditch expiry, re-add data blob, improve ViewCertActivity 
GnuPG doesn't support expiry of user id certifications. The number
of rings with an expiration subpacket in a cert out there is likely
negligible.

ViewCertActivity now verifies the key and displays a status. For
revocation certs, the revocation reason is also shown.
 2014-04-06 04:27:55 +02:00
Vincent Breitmoser
f01a96f56e certs: fix ViewCertActivity 2014-04-06 03:15:59 +02:00
Vincent Breitmoser
6e2b21b6b7 certs: fix CertifyKeyActivity and improve user id list 2014-04-06 02:27:21 +02:00
Vincent Breitmoser
120e1eada7 certs: ditch selection spinner from certs view 2014-04-06 01:57:28 +02:00
Vincent Breitmoser
84857df703 certs: display cert type in cert view 2014-04-06 01:28:12 +02:00
Vincent Breitmoser
ed3798be8a certs: display uid status in uid list 2014-04-06 01:11:57 +02:00
Vincent Breitmoser
437da180fc certs: properly handle primary flag and revocation of uids 2014-04-06 00:59:11 +02:00
Dominik Schürmann
22a6bfb985 Use AppMsg in edit key 2014-04-05 23:43:07 +02:00
Dominik Schürmann
d0c6971273 Remove import activity from drawer, make it reachable from key list only 2014-04-05 23:40:11 +02:00
Dominik Schürmann
49bf040dae Use PgpKeyHelper.splitUserId in EncryptAsymmetricFragment 2014-04-05 23:23:36 +02:00
Dominik Schürmann
8ce837dbe4 Rework menu items 2014-04-05 23:07:49 +02:00
Dominik Schürmann
5af4f6b63f Fix nfc, make edit activity like a modal dialog, move all menu actions into view activity 2014-04-05 22:55:32 +02:00
Vincent Breitmoser
1b1304e6e0 certs: various improvements 
* recognize self-certifications
* save signature type
* save expiry time
* drop encoded data blob from db
 2014-04-05 22:35:27 +02:00
Vincent Breitmoser
2802718efb certs: more fixes, almost working now 2014-04-05 21:38:03 +02:00
Vincent Breitmoser
aa6f5118f5 Merge remote-tracking branch 'origin/master' into certs 
A lot of things are completely broken, but it compiles and doesn't crash
right away. Good enough for me.

Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
	OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
 2014-04-05 19:30:52 +02:00