aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-041-0/+23
|\
| * Simplify PassphraseDialogFragment usageThialfihar2014-04-041-0/+23
| | | | | | | | | | Move boiler plate code into a simple static show() method, which only requires a Handler and can be used ad hoc in any FragmentActivity.
* | db-overhaul: fix delete key from ViewKeyActivityVincent Breitmoser2014-04-041-10/+3
| |
* | db-overhaul: workaround api level 11Vincent Breitmoser2014-04-042-7/+7
| |
* | db-overhaul: minor stuff, mostly ProviderHelperVincent Breitmoser2014-04-042-2/+4
| |
* | db-overhaul: more work on new providerVincent Breitmoser2014-04-032-13/+8
| | | | | | | | | | | | | | | | | | | | 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-032-95/+45
|/
* Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-033-40/+42
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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-022-5/+7
| |
| * 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-022-10/+6
| |
* | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-032-5/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* More experimental work on decrypt fragmentsDominik Schürmann2014-03-301-1/+28
|
* Rename old mentionings of APG-named thingsThialfihar2014-03-231-2/+2
| | | | | Mostly in comments, most importantly: STORE_PATH now ends in /KeychainBlobs instead of /ApgBlobs
* reformat mergeDominik Schürmann2014-03-211-56/+59
|
* Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-211-92/+115
|\ | | | | New Fix for #410
| * Fix GPL HeadersNikhil Peter Raj2014-03-211-1/+1
| |
| * Fix for #410Nikhil Peter Raj2014-03-211-92/+115
| |
* | Fix fingerprint handlingDominik Schürmann2014-03-201-1/+1
|/
* Blocked ok button for generating weak (<1024) RSA key.gogowitczak2014-03-181-16/+23
|
* More code style fixes for /uiuberspot2014-03-137-14/+19
|
* First code style changes in uiuberspot2014-03-1310-81/+62
|
* fix plenty of lint warnings, make some for loops into foreach, remove unused ↵uberspot2014-03-111-1/+2
| | | | imports and throw exceptions
* getString before init of KeychainIntentHandlerDominik Schürmann2014-03-101-7/+6
|
* Fix progress_generating and reformatDominik Schürmann2014-03-102-8/+11
|
* removed useless semicolons, fixed some parameters in documenation, ↵uberspot2014-03-072-3/+3
| | | | simplified some conditionals
* remove unused imports and unthrown exceptionsuberspot2014-03-071-1/+0
|
* remove icon from nfc dialogDominik Schürmann2014-03-061-1/+0
|
* corrected commitAnkush2014-03-072-9/+9
| | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338
* #226: Async key gen task is stopped if progress is canceledJessica Yuen2014-03-022-10/+15
|
* #226: Activity no longer closes if progress is canceled for key creation in ↵Jessica Yuen2014-03-022-5/+11
| | | | EditKeyActivity
* #226: Added cancel option to ProgressDialogFragments. Create Key is now ↵Jessica Yuen2014-03-022-6/+26
| | | | cancelable.
* cleanupDominik Schürmann2014-02-274-40/+22
|
* Added GPL headersNikhil Peter Raj2014-02-272-11/+31
|
* Complete fix for #304Nikhil Peter Raj2014-02-271-0/+147
|
* Partial fix for #304Nikhil Peter Raj2014-02-261-0/+66
|
* Final fix for #266Nikhil Peter Raj2014-02-262-2/+2
| | | | | -Fix implemented using setIcon() as setIconAttribute() is not valid for API less than 11
* Fix for #266Nikhil Peter Raj2014-02-252-2/+3
| | | | | -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
|
* work on lookup key, fix some illegal state exceptions with hackDominik Schürmann2014-02-041-136/+0
|
* expose key server APIDominik Schürmann2014-02-021-1/+1
|
* Hacks to make dialogs on Android 2.3 black on white, and not black on blackDominik Schürmann2014-02-022-3/+8
|
* Switch from ActionBarSherlock to ActionBarCompatDominik Schürmann2014-02-029-35/+22
|
* Fix QR Code URIDominik Schürmann2014-02-011-6/+3
|
* Reworking import, testing needed...Dominik Schürmann2014-02-011-4/+4
|
* No bouncy castle objects in key viewDominik Schürmann2014-02-011-3/+1
|
* Fix layout, add API notes to README, register fingerprint URIs, some ↵Dominik Schürmann2014-02-011-53/+59
| | | | reformatting (sry)
* language fixDominik Schürmann2014-01-291-1/+1
|
* New Gradle project structureDominik Schürmann2014-01-279-0/+1547
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 12:18:25 +0000