aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix testsDominik Schürmann2014-09-131-1/+1
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-133-0/+6
|\
| * very small fix, don't show name on encoding warningVincent Breitmoser2014-09-131-2/+1
| |
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-131-8/+3
| |\
| | * Cleanup testDominik Schürmann2014-09-131-8/+3
| | |
| * | log warning on bad uid encodingVincent Breitmoser2014-09-133-0/+7
| |/
* | Cleanup testsDominik Schürmann2014-09-132-10/+4
| |
* | Set literal data format tag to UTF8 when encrypting textDominik Schürmann2014-09-131-1/+7
|/
* Merge branch 'result-parcels'Vincent Breitmoser2014-09-1310-216/+384
|\
| * some DecryptVerify log refinementsVincent Breitmoser2014-09-132-7/+15
| |
| * add a ton of logging to DecryptVerifyVincent Breitmoser2014-09-134-26/+166
| |
| * working version of DecryptVerifyResultVincent Breitmoser2014-09-136-64/+113
| |
| * introduce OperationResultParcel for PgpDecryptVerify operations (WIP)Vincent Breitmoser2014-09-138-233/+204
| |
* | deactivate screenshots in new PassphraseDialogActivityDominik Schürmann2014-09-132-0/+11
| |
* | More smaller UI fixesDominik Schürmann2014-09-133-0/+7
| |
* | If expired/revoked, disable both encrypt buttonsDominik Schürmann2014-09-131-0/+3
| |
* | Test for badly encoded user idsDominik Schürmann2014-09-132-1/+31
| |
* | Add new PassphraseDialogActivity, a transparent activity that only holds the ↵Dominik Schürmann2014-09-132-2/+361
| | | | | | | | passphrase dialog
* | Fix share to encrypt textDominik Schürmann2014-09-132-25/+22
| |
* | Use spannable directly instead of html conversion in SubkeysAdapterDominik Schürmann2014-09-132-12/+20
| |
* | Fix testsDominik Schürmann2014-09-132-2/+4
| |
* | Add key with bad user id encodingDominik Schürmann2014-09-131-0/+60
| |
* | Remove unused method in KeyUpdateHelperDominik Schürmann2014-09-131-17/+0
| |
* | Merge pull request #843 from da-kid/masterDominik Schürmann2014-09-135-80/+315
|\ \ | | | | | | Implemented Pull2Refresh
| * | Removed unnecessary querying of keyservers, reimplemented the ↵Daniel Albert2014-09-133-38/+81
| | | | | | | | | | | | ListAwareSwipeRefreshLayout and implemented a pull-lock in case there are no keyservers
| * | Implemented Pull2Refresh in the KeyListFragmentDaniel Albert2014-09-125-80/+272
| | | | | | | | | | | | | | | | | | Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs Added Pull2Refresh to the KeyListFragment
* | | Get certificates by raw user ids, be more liberal about accepted user id ↵Dominik Schürmann2014-09-135-39/+72
| | | | | | | | | | | | encodings
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-1329-426/+494
|\ \ \ | | |/ | |/|
| * | promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-1329-426/+494
| |/
* / getSignaturesForID can return null, check thisDominik Schürmann2014-09-132-119/+138
|/
* fix key upload after certification (hopefully?)Vincent Breitmoser2014-09-121-4/+1
|
* add ui support for stripping subkeysVincent Breitmoser2014-09-114-16/+38
|
* editKey: add test case for previous commitVincent Breitmoser2014-09-111-0/+54
|
* editKey: add support for sripping keysVincent Breitmoser2014-09-113-2/+32
|
* merge: adapt testcase to previous commitVincent Breitmoser2014-09-111-9/+41
|
* merge: add support for s2k dummy generationVincent Breitmoser2014-09-112-23/+3
| | | | | | if a public key gets merged into a secret one, and there are new subkeys, the merge() routine now adds a newly generated, stripped secret subkey instead.
* nullpointer check in KeychainProviderDominik Schürmann2014-09-111-1/+1
|
* nullpointer check in KeychainProviderDominik Schürmann2014-09-111-0/+4
|
* Add newly discussed design decisions for passphrase cache serviceDominik Schürmann2014-09-101-0/+9
|
* add some comments to previous commitVincent Breitmoser2014-09-103-1/+12
|
* jury-rig broken sign mechanismVincent Breitmoser2014-09-094-30/+61
| | | | Should improve situation on #811
* Version 2.9.2Dominik Schürmann2014-09-091-2/+2
|
* Fix testDominik Schürmann2014-09-092-5/+2
|
* Changelog 2.9.2Dominik Schürmann2014-09-092-0/+10
|
* Increase s2k count to 0x90Dominik Schürmann2014-09-091-4/+6
|
* Consolidate on database upgradeDominik Schürmann2014-09-097-27/+52
|
* Yubikey decryption works nowDominik Schürmann2014-09-091-0/+0
|
* Unify package nameDominik Schürmann2014-09-082-1/+1
|
* Update nfc libDominik Schürmann2014-09-081-0/+0
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-085-10/+107
|\