aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-174/+0
|
* db-overhaul: fix delete key from ViewKeyActivityVincent Breitmoser2014-04-041-10/+3
|
* db-overhaul: workaround api level 11Vincent Breitmoser2014-04-041-1/+1
|
* db-overhaul: more work on new providerVincent Breitmoser2014-04-031-12/+7
| | | | | | | | | | 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
* more work on streamlining uris, and stripping ProviderHelperVincent Breitmoser2014-04-031-89/+36
|
* Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-031-36/+37
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add missing and curly brackets and fix othersThialfihar2014-04-021-1/+2
| | | | | | | | | | Style guide demands them even for single-line blocks, and opening curly brackets never appear on a line on their own.
| * Rearrange too long linesThialfihar2014-04-021-4/+6
| |
| * Adjust variable/member naming to conform to style guideThialfihar2014-04-021-24/+27
| | | | | | | | | | In some cases change member accessibility, so the naming matches. Also, some key words were reordered to comply with JLS suggestions.
| * Trivial spacing changes to conform to style guideThialfihar2014-04-021-7/+2
| |
* | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-031-0/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* reformat mergeDominik Schürmann2014-03-211-56/+59
|
* Fix GPL HeadersNikhil Peter Raj2014-03-211-1/+1
|
* Fix for #410Nikhil Peter Raj2014-03-211-92/+115
|
* More code style fixes for /uiuberspot2014-03-131-3/+6
|
* First code style changes in uiuberspot2014-03-131-2/+1
|
* cleanupDominik Schürmann2014-02-271-11/+8
|
* Final fix for #266Nikhil Peter Raj2014-02-261-1/+1
| | | | | -Fix implemented using setIcon() as setIconAttribute() is not valid for API less than 11
* Fix for #266Nikhil Peter Raj2014-02-251-1/+1
| | | | | -Extra: Added the appropriate images to drawable folder from Android SDK source, can be used as alternative if required.
* do not delete pub keys where secret key existsDominik Schürmann2014-02-061-19/+80
|
* Switch from ActionBarSherlock to ActionBarCompatDominik Schürmann2014-02-021-3/+2
|
* language fixDominik Schürmann2014-01-291-1/+1
|
* New Gradle project structureDominik Schürmann2014-01-271-0/+151