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
Dominik Schürmann
0b24ec04a6
clarify readme
2014-04-03 12:14:58 +02:00
Vincent Breitmoser
a7eff41ced
Break a lot of stuff. Also, database redesign.
...
Change entire database design. This introduces a lot of changes,
notably all URIs and almost all projections. Some features (like key
deletion) have been simply commented out for now since they need
serious reconsideration. There are a couple of new TODOs marking places
where more work is needed.
The migration path works fine from what I tested. The old database is
not deleted for now, ie, it is reimported at every start of the
application making all intermediate changes transient.
Tested and working (for me):
- All activities in the main drawer
- Multiselect and Search
- ViewKeyActivity, with and without secret key available
- CertifyKeyActivity
- SelectSecretKeyActivity (from CertifyKeyActivity)
- SelectPublicKeyActivity (from encrypt activity)
What doesn't work:
- Actually certifying keys (pending a TODO in ProviderHelper)
- Importing keys doesn't preserve secret keys
- "Encrypt to this contact" doesn't pass key
- Editing keys. All controls are disabled, I'm not sure why... (is this
even my fault?)
- Deleting keys
What I didn't test:
- Key export
- API stuff
- Creating keys (since editing doesn't even work)
2014-04-03 01:34:35 +02:00
Dominik Schürmann
34ad14ccec
Merge pull request #508 from thi/naming-adjustments
...
Naming adjustments
2014-04-02 20:29:26 +02:00
Thialfihar
7a66ccb5ee
Rename "canEdit" to "canBeEdited"
2014-04-02 15:43:29 +02:00
Thialfihar
c4c9713da4
Rename "armour" to "armor"
2014-04-02 15:36:32 +02:00
Thialfihar
6ac13d9f69
Rename "pass phrase" to "passphrase"
2014-04-02 15:32:35 +02:00
Dominik Schürmann
62bd817f86
Cleanup example code
2014-04-02 15:19:51 +02:00
Dominik Schürmann
26837f2a80
Started changelog for 2.5
2014-04-02 14:00:46 +02:00
Dominik Schürmann
fc29fadd51
Fix build
2014-04-02 13:54:38 +02:00
Dominik Schürmann
846b379eb2
Merge pull request #507 from thi/fix-wildcard-imports
...
Fix wildcard imports
2014-04-02 13:41:15 +02:00
Thialfihar
c45c0f4a92
Add wildcard import warning to checkstyle configuration
2014-04-02 13:37:12 +02:00
Thialfihar
77a6c509f7
Replace wildcard imports with explicit imports
2014-04-02 13:37:12 +02:00
Thialfihar
a3a5085afb
Spacing corrections
2014-04-02 13:37:12 +02:00
Dominik Schürmann
269f7feb89
Update from transifex
2014-04-02 11:48:05 +02:00
Dominik Schürmann
64358bb3f8
Merge pull request #502 from thi/conform-to-style-guide
...
Conform to style guide, #466
2014-04-02 11:26:46 +02:00
Thialfihar
22fe3832ba
Suppress checkstyle for some files
2014-04-02 10:51:02 +02:00
Thialfihar
592ab31d86
Add missing and curly brackets and fix others
...
Style guide demands them even for single-line blocks, and opening
curly brackets never appear on a line on their own.
2014-04-02 10:51:02 +02:00
Thialfihar
82e5d14fb1
Rearrange too long lines
2014-04-02 10:51:02 +02:00
Thialfihar
d5983b324f
Adjust variable/member naming to conform to style guide
...
In some cases change member accessibility, so the naming matches.
Also, some key words were reordered to comply with JLS suggestions.
2014-04-02 10:51:02 +02:00
Thialfihar
dd4a1e3f52
Trivial spacing changes to conform to style guide
2014-04-02 10:51:02 +02:00
Thialfihar
8e503bd263
Adjust copyright headers
2014-04-02 10:51:02 +02:00
Thialfihar
e92658f44d
Adjust import order
2014-04-02 10:51:02 +02:00
Ashley Hughes
5583fd513e
always ask
2014-04-02 01:28:53 +01:00
Ashley Hughes
9764d3fcb9
confirm that empty IDs are really wanted
2014-04-02 01:26:51 +01:00
Ashley Hughes
a38d22757c
new ID sigs already added, so do save them
2014-04-02 00:08:36 +01:00
Ashley Hughes
6d4a09f989
allow blank IDs, allow adding new IDs and let them be master
2014-04-02 00:00:24 +01:00
Ashley Hughes
2ad616ed3f
pass through info that keys are new without relying on new keys orginally being empty
2014-04-01 23:37:13 +01:00
Ashley Hughes
abfe416503
sort out saving empty string IDs
2014-04-01 23:02:35 +01:00
Dominik Schürmann
d8001f9bbd
Menu cleanup
2014-04-01 19:31:57 +02:00
Dominik Schürmann
c414dd2fe9
Dont show encrypted data before decryption from clipboard
2014-04-01 19:00:14 +02:00
Dominik Schürmann
07fdd6363f
Change path to OpenKeychain
2014-04-01 18:49:19 +02:00
Dominik Schürmann
d0947e8377
Only allow private keys associated to accounts of an app
2014-04-01 18:44:36 +02:00
Dominik Schürmann
2c5991b199
Add API image
2014-04-01 17:19:51 +02:00
Dominik Schürmann
2f9cb69a1e
Cleanup
2014-04-01 17:13:53 +02:00
Dominik Schürmann
ecca54d4d5
Automatically select newly created key in api accounts
2014-04-01 17:08:56 +02:00
Dominik Schürmann
ddfb7e10e8
Fully qualified imports
2014-04-01 16:39:18 +02:00
Dominik Schürmann
acc2e208cf
Remove DECRYPT_ASSUME_SYMMETRIC
2014-04-01 16:18:16 +02:00
Dominik Schürmann
53605855ee
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain
2014-04-01 16:15:55 +02:00
Dominik Schürmann
7000ab37fd
default to allow symmetric decryption
2014-04-01 16:15:50 +02:00
Dominik Schürmann
247ad6207a
Merge pull request #501 from Valodim/master
...
factor out android dependencies from PgpKeyOperation, and add JUnit/Robolectric testing stubs
2014-04-01 16:13:41 +02:00
