| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Only allow private keys associated to accounts of an app | Dominik Schürmann | 2014-04-01 | 1 | -2/+18 |
| | | |||||
| * | revert mistake | Ashley Hughes | 2014-03-29 | 1 | -1/+1 |
| | | |||||
| * | merge master | Ashley Hughes | 2014-03-29 | 1 | -56/+170 |
| |\ | |||||
| | * | Fix constraints and insert | Dominik Schürmann | 2014-03-26 | 1 | -5/+2 |
| | | | |||||
| | * | More experimental work on API accounts | Dominik Schürmann | 2014-03-25 | 1 | -37/+62 |
| | | | |||||
| | * | Extend provider for new api tables | Dominik Schürmann | 2014-03-23 | 1 | -12/+30 |
| | | | |||||
| | * | Move classes for OpenPGP API into remote package | Dominik Schürmann | 2014-03-23 | 1 | -5/+5 |
| | | | |||||
| | * | Fix GPL Headers | Nikhil Peter Raj | 2014-03-21 | 1 | -1/+1 |
| | | | |||||
| | * | Fix for #410 | Nikhil Peter Raj | 2014-03-21 | 1 | -7/+16 |
| | | | |||||
| | * | final code style changes | uberspot | 2014-03-13 | 1 | -36/+35 |
| | | | |||||
| | * | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 1 | -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 view | Vincent Breitmoser | 2014-03-08 | 1 | -0/+6 |
| | | | | |||||
| | | * | Normalize public key uri in KeyListFragment | Vincent Breitmoser | 2014-03-08 | 1 | -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) sane | Vincent Breitmoser | 2014-03-08 | 1 | -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 MasterKeyIds | uberspot | 2014-03-11 | 1 | -0/+40 |
| | | | | |||||
| | * | | Colorize fingerprint | uberspot | 2014-03-09 | 1 | -9/+3 |
| | | | | |||||
| | * | | Fix key id and fingerprint handling, use full key ids | Dominik Schürmann | 2014-03-09 | 1 | -5/+5 |
| | | | | |||||
| | * | | remove unused imports and unthrown exceptions | uberspot | 2014-03-07 | 1 | -2/+0 |
| | | | | |||||
| * | | | keep up with master | Ashley Hughes | 2014-03-07 | 1 | -1/+1 |
| |\| | | |||||
| | * | | corrected commit | Ankush | 2014-03-07 | 1 | -1/+1 |
| | |/ | | | | | | | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338 | ||||
| * | | master merge | Ashley Hughes | 2014-02-22 | 1 | -0/+28 |
| |\| | |||||
| | * | rework key view into fragments to later add certifications | Dominik Schürmann | 2014-02-09 | 1 | -0/+8 |
| | | | |||||
| | * | do not delete pub keys where secret key exists | Dominik Schürmann | 2014-02-06 | 1 | -0/+20 |
| | | | |||||
| * | | fix certify keys without sign flag | Ashley Hughes | 2014-02-04 | 1 | -7/+5 |
| |/ | |||||
| * | save fingerprint on save | Dominik Schürmann | 2014-02-01 | 1 | -0/+2 |
| | | |||||
| * | No bouncy castle objects in key view | Dominik Schürmann | 2014-02-01 | 1 | -1/+1 |
| | | |||||
| * | Fix layout, add API notes to README, register fingerprint URIs, some ↵ | Dominik Schürmann | 2014-02-01 | 1 | -134/+68 |
| | | | | | reformatting (sry) | ||||
| * | save keyring in-place, fixes #228, #203 | Dominik Schürmann | 2014-01-29 | 1 | -42/+70 |
| | | |||||
| * | New Gradle project structure | Dominik Schürmann | 2014-01-27 | 1 | -0/+809 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java