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
Vincent Breitmoser
a1e13f7893
calculate nfc packet on demand only
2014-04-04 11:38:59 +02:00
Vincent Breitmoser
2227705d65
db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivity
2014-04-04 11:28:26 +02:00
Vincent Breitmoser
d921cca913
db-overhaul: reintroduce by-mail and by-subkey queries
...
the only thing left to fix after the db upgrade (that I can think of
right now) are key exports
2014-04-04 01:56:02 +02:00
Vincent Breitmoser
59f4b4e3e7
db-overhaul: minor stuff, mostly ProviderHelper
2014-04-04 01:05:53 +02:00
Vincent Breitmoser
2620e0bfc8
db-overhaul: more work on new provider
...
specifics:
- secret keys are preserved when a new public key is inserted
- started work to give virtual columns a representation in the contract
class
- streamline ProviderHelper methods. the getUnifiedData method relies
on a api level 11 method, not sure yet how to fix/workaround that...
- many more small things work as they did before
2014-04-03 22:49:08 +02:00
Vincent Breitmoser
dedcfd8a72
more work on streamlining uris, and stripping ProviderHelper
2014-04-03 17:09:26 +02:00
Vincent Breitmoser
428e94bb57
ditch useless PgpKeyHelper.getMasterKey methods
2014-04-03 17:08:04 +02:00
Dominik Schürmann
b06f142c50
title for ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN
2014-04-03 16:51:34 +02:00
Dominik Schürmann
97e0b8d0c3
Callback for OpenPgpServiceConnection
2014-04-03 16:36:55 +02:00
Dominik Schürmann
0657f9289a
simplify OpenPgpServiceConnection
2014-04-03 16:27:13 +02:00
Dominik Schürmann
24454b9d88
Keychain API Demo 3
2014-04-03 16:03:15 +02:00
Dominik Schürmann
270c7ffa1f
Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into Valodim-db-overhaul
2014-04-03 15:45:21 +02:00
Dominik Schürmann
098823bd52
Disable tests
2014-04-03 15:26:51 +02:00
Dominik Schürmann
40e3b9cf79
version 2.5
2014-04-03 15:21:34 +02:00
Dominik Schürmann
3b91147b49
Update from transifex
2014-04-03 15:21:14 +02:00
Dominik Schürmann
c3091c2b5d
Changelog
2014-04-03 15:19:49 +02:00
Dominik Schürmann
04b0425d45
Key lookup for API
2014-04-03 15:18:05 +02:00
Dominik Schürmann
09411a62fa
Key lookup for API
2014-04-03 15:16:13 +02:00
Dominik Schürmann
2df4ccafb5
Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN
2014-04-03 15:02:55 +02:00
Vincent Breitmoser
34fca975d7
Merge remote-tracking branch 'origin/master' into db-overhaul
...
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/ProviderHelper.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
2014-04-03 14:56:35 +02:00
Dominik Schürmann
11b08c4d98
Cleanup DrawerActivity
2014-04-03 12:28:30 +02:00
