aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-2/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
| * add edit button and secret key info to public key viewVincent Breitmoser2014-03-081-0/+6
| |
| * Normalize public key uri in KeyListFragmentVincent Breitmoser2014-03-081-0/+20
| | | | | | | | | | | | | | | | | | Find the explicit row id of the public key id given in the uri in KeyListFragment and work with that. This way, passing in uris by master key id, mail address, or any other criteria, works. Might be a good idea to add an actual check if the row id is non-zero here, but not sure how to do a "bad intent" thing
| * Make EditKeyActivity's uri handling (more) saneVincent Breitmoser2014-03-081-2/+2
| | | | | | | | | | This activity didn't actually use the uri for anything, but just chopped off the last path segment and interpreted it as row id. What the hell.
* | Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-111-0/+40
| |
* | Colorize fingerprintuberspot2014-03-091-9/+3
| |
* | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-091-5/+5
| |
* | remove unused imports and unthrown exceptionsuberspot2014-03-071-2/+0
| |
* | corrected commitAnkush2014-03-071-1/+1
|/ | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338
* rework key view into fragments to later add certificationsDominik Schürmann2014-02-091-0/+8
|
* do not delete pub keys where secret key existsDominik Schürmann2014-02-061-0/+20
|
* save fingerprint on saveDominik Schürmann2014-02-011-0/+2
|
* No bouncy castle objects in key viewDominik Schürmann2014-02-011-1/+1
|
* Fix layout, add API notes to README, register fingerprint URIs, some ↵Dominik Schürmann2014-02-011-134/+68
| | | | reformatting (sry)
* save keyring in-place, fixes #228, #203Dominik Schürmann2014-01-291-42/+70
|
* New Gradle project structureDominik Schürmann2014-01-271-0/+809
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 14:11:00 +0000