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 | 7 | -173/+470 |
|\ | |||||
| * | Fix provider for API_ACCOUNTS | Dominik Schürmann | 2014-03-26 | 3 | -10/+10 |
| | | |||||
| * | Fix constraints and insert | Dominik Schürmann | 2014-03-26 | 3 | -18/+25 |
| | | |||||
| * | Temporary fix for inserting by content provider | Dominik Schürmann | 2014-03-25 | 1 | -4/+4 |
| | | |||||
| * | Return account creation intent if account does not exists in db | Dominik Schürmann | 2014-03-25 | 2 | -21/+7 |
| | | |||||
| * | Fix update and insert for new api content provider | Dominik Schürmann | 2014-03-25 | 1 | -18/+14 |
| | | |||||
| * | More experimental work on api accounts | Dominik Schürmann | 2014-03-25 | 2 | -55/+17 |
| | | |||||
| * | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-25 | 1 | -1/+1 |
| |\ | |||||
| | * | Rename old mentionings of APG-named things | Thialfihar | 2014-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Mostly in comments, most importantly: STORE_PATH now ends in /KeychainBlobs instead of /ApgBlobs | ||||
| * | | More experimental work on API accounts | Dominik Schürmann | 2014-03-25 | 4 | -144/+127 |
| | | | |||||
| * | | Extend provider for new api tables | Dominik Schürmann | 2014-03-23 | 4 | -41/+222 |
| | | | |||||
| * | | Move classes for OpenPGP API into remote package | Dominik Schürmann | 2014-03-23 | 1 | -5/+5 |
| | | | |||||
| * | | New db table for api accounts | Dominik Schürmann | 2014-03-23 | 2 | -6/+25 |
| |/ | |||||
| * | raname to mKeychainDatabase | Dominik Schürmann | 2014-03-21 | 1 | -6/+6 |
| | | |||||
| * | Fix GPL Headers | Nikhil Peter Raj | 2014-03-21 | 1 | -1/+1 |
| | | |||||
| * | Fix for #410 | Nikhil Peter Raj | 2014-03-21 | 1 | -7/+16 |
| | | |||||
| * | certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha) | Vincent Breitmoser | 2014-03-15 | 1 | -0/+36 |
| | | |||||
| * | final code style changes | uberspot | 2014-03-13 | 7 | -86/+101 |
| | | |||||
| * | final ui code style changes | uberspot | 2014-03-13 | 1 | -1/+1 |
| | | |||||
| * | Cleanup and simplification | Dominik Schürmann | 2014-03-13 | 1 | -1/+1 |
| | | |||||
| * | drop unified uri in favor of generic /key_rings | Vincent Breitmoser | 2014-03-13 | 2 | -15/+10 |
| | | | | | | | | | | | | | | this works well in the uri schema, and we get notifications back with no effort. ....also remove a line I committed accidentally oO | ||||
| * | remove special treatment for unified list query | Vincent Breitmoser | 2014-03-13 | 1 | -39/+14 |
| | | | | | | | | | | | | note: the unified query /will/ need special treatment once certs are joined in, so I am leaving this as an artifact commit for later reference or point to revert to. | ||||
| * | keychainprovider cleanup, kindasorta | Vincent Breitmoser | 2014-03-13 | 1 | -55/+41 |
| | | | | | | | | | | removed code redundancy, and the query is in the switch thing now, I didn't put everything into its own separate sources (yet?). | ||||
| * | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 3 | -2/+108 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | working unified list (no actions yet) | Vincent Breitmoser | 2014-03-08 | 2 | -0/+80 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | removed useless semicolons, fixed some parameters in documenation, ↵ | uberspot | 2014-03-07 | 1 | -2/+3 |
| | | | | | | | | | | | | simplified some conditionals | ||||
| * | | 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 | 3 | -1/+34 |
|\| | |||||
| * | 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 |
| | | |||||
| * | changelog | Dominik Schürmann | 2014-02-05 | 1 | -1/+1 |
| | | |||||
| * | Hotfix for database upgrade, version 2.3.1 | Dominik Schürmann | 2014-02-05 | 1 | -0/+3 |
| | | |||||
| * | Show revoked status in key list | Dominik Schürmann | 2014-02-04 | 1 | -0/+2 |
| | | |||||
* | | 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 | 2 | -3/+4 |
| | |||||
* | Fix layout, add API notes to README, register fingerprint URIs, some ↵ | Dominik Schürmann | 2014-02-01 | 4 | -531/+489 |
| | | | | 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 | 7 | -0/+2415 |