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
Dominik Schürmann
db25433890
Change headers in encrypt activity to be more descriptive
2014-04-04 19:54:36 +02:00
Dominik Schürmann
72ade58a7a
Merge pull request #513 from Valodim/db-overhaul
...
Get everything working again after db overhaul
2014-04-04 19:36:52 +02:00
Vincent Breitmoser
54f20e1cd5
Merge remote-tracking branch 'origin/master' into db-overhaul
2014-04-04 18:50:20 +02:00
Vincent Breitmoser
d7c2488a0f
db-overhaul: fix key export (and some export-related ui changes)
2014-04-04 18:49:45 +02:00
Dominik Schürmann
e65de650a4
Merge pull request #512 from thi/simplify-passphrase-dialog-creation
...
Simplify passphrase dialog creation
2014-04-04 18:31:28 +02:00
Thialfihar
a523f53a96
Simplify PassphraseDialogFragment usage
...
Move boiler plate code into a simple static show() method, which only
requires a Handler and can be used ad hoc in any FragmentActivity.
2014-04-04 18:26:23 +02:00
Vincent Breitmoser
cf76a8553a
db-overhaul: fix delete key from ViewKeyActivity
2014-04-04 16:28:28 +02:00
Vincent Breitmoser
53e8afaee0
ViewKeyMainFragment cleanup (don't use inline queries!)
2014-04-04 14:37:07 +02:00
Vincent Breitmoser
958eba1c95
db-overhaul: fix DecryptAndVerify with and without known keys
2014-04-04 13:58:12 +02:00
Vincent Breitmoser
085ce11d9c
db-overhaul: workaround api level 11
2014-04-04 13:20:37 +02:00
Vincent Breitmoser
1b38a5b2e3
Merge remote-tracking branch 'origin/master' into db-overhaul
2014-04-04 13:18:43 +02:00
Vincent Breitmoser
a9f868a5e7
db-overhaul: different hack for type info (api level problem inside)
2014-04-04 11:39:23 +02:00
