| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Style guide demands them even for single-line blocks, and opening
curly brackets never appear on a line on their own.
|
| | |
|
| |
| |
| |
| |
| | |
In some cases change member accessibility, so the naming matches.
Also, some key words were reordered to comply with JLS suggestions.
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
-Fix implemented using setIcon() as setIconAttribute() is not valid for
API less than 11
|
|
|
|
|
| |
-Extra: Added the appropriate images to drawable folder from Android SDK
source, can be used as alternative if required.
|
| |
|
| |
|
| |
|
|
|