aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #772 from mar-v-in/issue-729Vincent2014-08-174-102/+25
|\ | | | | Remove NoSwipeWrapContentViewPager
| * Work-around rendering bug when switching back to asymmetric with multiple ↵mar-v-in2014-08-171-14/+2
| | | | | | | | recipients selected
| * Remove NoSwipeWrapContentViewPagermar-v-in2014-08-173-88/+23
| |
* | consolidate: working implementation, lacking uiVincent Breitmoser2014-08-179-15/+302
| |
* | parametrize FileImportCache for filenameVincent Breitmoser2014-08-174-8/+10
| |
* | modify*Key: improve handling of passphrase modification (add tests, too)Vincent Breitmoser2014-08-164-17/+143
| |
* | use correct algorithm for signatures (actually fix heterogeneous subkeys)Vincent Breitmoser2014-08-162-6/+6
| |
* | fix small log format string mistake for adding subkeysVincent Breitmoser2014-08-161-1/+2
| | | | | | | | closes #768
* | 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-164-6/+11
| |
* | tests: add test for master key revocationVincent Breitmoser2014-08-162-2/+26
| |
* | tests: more expected error typesVincent Breitmoser2014-08-162-8/+37
| |
* | typed expected failures and a couple minor thingsVincent Breitmoser2014-08-1615-40/+47
| |
* | support for master key modifications, among other stuffVincent Breitmoser2014-08-1612-204/+446
| |
* | modifySecretKey: err out on "use previous" expiry date for (sub)key creationVincent Breitmoser2014-08-164-11/+21
| |
* | modifySecretKey: err out on revocation of nonexistent user idVincent Breitmoser2014-08-164-0/+21
| |
* | test: even nicer codeVincent Breitmoser2014-08-161-29/+16
| |
* | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix ↵Dominik Schürmann2014-08-164-75/+96
| | | | | | | | pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables
* | 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
|/ /
* | Fix sticky list headers lib, fix travisDominik Schürmann2014-08-141-0/+0
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-142-1/+24
|\ \
| * | explicitly add BouncyCastleProvider (fixes travis?)Vincent Breitmoser2014-08-141-0/+4
| | |
| * | support changing expiry of subkeys to noneVincent Breitmoser2014-08-142-1/+20
| | |
* | | 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-1411-171/+367
|\ | | | | Use dropdown in CertifyActivity
| * 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-143-26/+66
| |
| * 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-146-137/+230
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-148-16/+154
|\ \
| * | handle modify and save errors in KeychainIntentResultVincent Breitmoser2014-08-143-16/+33
| | |
| * | tests: add ProviderHelperSaveTest, with long key id collision testVincent Breitmoser2014-08-145-0/+121
| | |
* | | hacky fix to prevent key list from scrolling to top when opening nav drawerDominik Schürmann2014-08-141-7/+15
|/ /
* | Update sticky list headersDominik Schürmann2014-08-141-0/+0
| |
* | dem logixVincent Breitmoser2014-08-141-1/+1
| |