aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-143-30/+34
|\
| * Merge pull request #850 from da-kid/masterDominik Schürmann2014-09-143-30/+34
| |\
| | * Temporary fix for #848, fixed pull2refresh bugsDaniel Albert2014-09-133-30/+34
| |/
* / First work on decryptDominik Schürmann2014-09-146-4/+166
|/
* Hack to disable overscroll effect of swipe to updateDominik Schürmann2014-09-133-15/+486
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-133-4/+11
|\
| * add key id to trailing asym data log msgVincent Breitmoser2014-09-132-4/+7
| * just skip foreign uid certifications during import for nowVincent Breitmoser2014-09-131-0/+4
* | Custom actionbar to indicate swipe down effectDominik Schürmann2014-09-133-0/+66
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-135-6/+9
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-132-3/+8
| |\
| * | move IS_REVOKED table prefix to the right placesVincent Breitmoser2014-09-135-6/+9
* | | 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
* | 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
|\ \
| * | Removed unnecessary querying of keyservers, reimplemented the ListAwareSwipeR...Daniel Albert2014-09-133-38/+81
| * | Implemented Pull2Refresh in the KeyListFragmentDaniel Albert2014-09-125-80/+272
* | | Get certificates by raw user ids, be more liberal about accepted user id enco...Dominik Schürmann2014-09-135-39/+72
* | | 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
* nullpointer check in KeychainProviderDominik Schürmann2014-09-111-1/+1
* nullpointer check in KeychainProviderDominik Schürmann2014-09-111-0/+4