aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'certify' into certsVincent Breitmoser2014-03-151-0/+36
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/values/strings.xml
| * | | | certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha)Vincent Breitmoser2014-03-151-0/+36
| | | | |
* | | | | Merge branch 'master' into certsVincent Breitmoser2014-03-157-170/+136
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
| * | | | final code style changesuberspot2014-03-137-86/+101
| | | | |
| * | | | final ui code style changesuberspot2014-03-131-1/+1
| | | | |
| * | | | Cleanup and simplificationDominik Schürmann2014-03-131-1/+1
| | | | |
| * | | | drop unified uri in favor of generic /key_ringsVincent Breitmoser2014-03-132-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 queryVincent Breitmoser2014-03-131-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, kindasortaVincent Breitmoser2014-03-131-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 'master' into certsVincent Breitmoser2014-03-122-17/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
| * | | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-123-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
| * | | | | 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
| | | | | |
| * | | | | removed useless semicolons, fixed some parameters in documenation, ↵uberspot2014-03-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | simplified some conditionals
| * | | | | remove unused imports and unthrown exceptionsuberspot2014-03-071-2/+0
| | |_|_|/ | |/| | |
| * | | | corrected commitAnkush2014-03-071-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | mCurrentPassPhrase, mChangePassPhrase Minor variable naming Issue #338
* | | | add view cert activityVincent Breitmoser2014-03-121-4/+15
| | | |
* | | | add "show unknown signatures" buttonVincent Breitmoser2014-03-111-4/+9
| | | |
* | | | add keys we don't know about, just for funVincent Breitmoser2014-03-111-0/+2
| | | |
* | | | experimental cert list, properVincent Breitmoser2014-03-111-2/+43
| | | |
* | | | join cert info into query routinesVincent Breitmoser2014-03-111-3/+22
| | | |
* | | | experimental cert importVincent Breitmoser2014-03-111-7/+42
| | | |
* | | | certs: close in from both sides :)Vincent Breitmoser2014-03-111-7/+38
| | | |
* | | | (preliminary) certs tableVincent Breitmoser2014-03-113-1/+87
| |/ / |/| |
* | | 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.
* | | working unified list (no actions yet)Vincent Breitmoser2014-03-082-0/+80
|/ /
* | 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
| |
* | changelogDominik Schürmann2014-02-051-1/+1
| |
* | Hotfix for database upgrade, version 2.3.1Dominik Schürmann2014-02-051-0/+3
| |
* | Show revoked status in key listDominik Schürmann2014-02-041-0/+2
|/
* save fingerprint on saveDominik Schürmann2014-02-011-0/+2
|
* No bouncy castle objects in key viewDominik Schürmann2014-02-012-3/+4
|
* Fix layout, add API notes to README, register fingerprint URIs, some ↵Dominik Schürmann2014-02-014-531/+489
| | | | reformatting (sry)
* save keyring in-place, fixes #228, #203Dominik Schürmann2014-01-291-42/+70
|
* New Gradle project structureDominik Schürmann2014-01-277-0/+2415
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 11:43:20 +0000