aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
...
* Fixes for expiry UIDominik Schürmann2014-08-185-69/+101
* Merge pull request #772 from mar-v-in/issue-729Vincent2014-08-173-97/+22
|\
| * Work-around rendering bug when switching back to asymmetric with multiple rec...mar-v-in2014-08-171-14/+2
| * Remove NoSwipeWrapContentViewPagermar-v-in2014-08-172-83/+20
* | consolidate: working implementation, lacking uiVincent Breitmoser2014-08-177-15/+281
* | parametrize FileImportCache for filenameVincent Breitmoser2014-08-173-7/+9
* | modify*Key: improve handling of passphrase modification (add tests, too)Vincent Breitmoser2014-08-162-2/+52
* | use correct algorithm for signatures (actually fix heterogeneous subkeys)Vincent Breitmoser2014-08-161-4/+4
* | fix small log format string mistake for adding subkeysVincent Breitmoser2014-08-161-1/+2
* | Fixing date picker issuesDominik Schürmann2014-08-162-22/+47
* | Fix flags UI in add subkey dialogDominik Schürmann2014-08-162-5/+44
* | Fix ElGamal key creation, SUBKEY_BINDING cert must use algo of master keyDominik Schürmann2014-08-161-1/+1
* | Fix expiry when adding subkeysDominik Schürmann2014-08-163-6/+5
* | Always return a SaveKeyringResult from savingDominik Schürmann2014-08-162-4/+7
* | Fix and simplify in OperationResultParcelDominik Schürmann2014-08-161-11/+7
* | fix travis tests (more), minor comment editsVincent Breitmoser2014-08-161-4/+3
* | tests: add test for master key revocationVincent Breitmoser2014-08-161-2/+1
* | tests: more expected error typesVincent Breitmoser2014-08-161-1/+2
* | typed expected failures and a couple minor thingsVincent Breitmoser2014-08-162-5/+6
* | support for master key modifications, among other stuffVincent Breitmoser2014-08-162-182/+310
* | modifySecretKey: err out on "use previous" expiry date for (sub)key creationVincent Breitmoser2014-08-162-1/+9
* | modifySecretKey: err out on revocation of nonexistent user idVincent Breitmoser2014-08-162-0/+13
* | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pr...Dominik Schürmann2014-08-162-68/+88
* | do not pre-select revoked or expired keysDominik Schürmann2014-08-161-6/+12
* | Fix encrypt onlyDominik Schürmann2014-08-164-37/+34
* | Remove old_apgDominik Schürmann2014-08-151-4/+4
* | Remove subkeys.pgp.net keyserver from defaultsDominik Schürmann2014-08-151-1/+1
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-153-4/+9
|\ \
| * | fix keys with no expiry in ui codeVincent Breitmoser2014-08-143-4/+9
* | | Remove subkeys.pgp.net keyserver, often down and no hkpsDominik Schürmann2014-08-152-8/+21
|/ /
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-141-1/+2
|\ \
| * | support changing expiry of subkeys to noneVincent Breitmoser2014-08-141-1/+2
* | | Pass through of master key id in SaveKeyringResultDominik Schürmann2014-08-143-25/+54
|/ /
* / fix subkey certification canonicalization (why did the test not catch this?!)Vincent Breitmoser2014-08-141-1/+1
|/
* Merge pull request #767 from mar-v-in/issue-763Dominik Schürmann2014-08-148-162/+362
|\
| * Do not allow self certifyingmar-v-in2014-08-143-4/+20
| * Fix KeySpinner on cursor changemar-v-in2014-08-141-1/+6
| * Add and use CertifyKeySpinnermar-v-in2014-08-142-18/+62
| * small bug in has_certifymar-v-in2014-08-141-1/+1
| * add OnKeyChangedListener to KeySpinnermar-v-in2014-08-142-11/+41
| * add HAS_CERTIFY (not sure why it's missing)mar-v-in2014-08-142-0/+12
| * factor KeySpinner outmar-v-in2014-08-144-136/+229
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-144-16/+38
|\ \
| * | handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-143-16/+33
| * | tests: add ProviderHelperSaveTest, with long key id collision testVincent Breitmoser2014-08-141-0/+5
* | | hacky fix to prevent key list from scrolling to top when opening nav drawerDominik Schürmann2014-08-141-7/+15
|/ /
* | dem logixVincent Breitmoser2014-08-141-1/+1
* | merge: check fingerprints on merge operation! (this needs a testcase!)Vincent Breitmoser2014-08-141-1/+3
* | Automcomplete names and emails in keyserver tabDominik Schürmann2014-08-142-2/+34
|/
* move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-143-11/+8