aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
...
| * Pull from transifexDominik Schürmann2014-09-151-1/+1
| * Fix buildDominik Schürmann2014-09-151-1/+0
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-1545-587/+571
| |\
| | * update for new plural origins on ImportKeyListEntryTim Bray2014-09-131-1/+1
| | * Keys found on multiple servers are now imported from all of themTim Bray2014-09-135-27/+40
| | * Change shuffle to rotate, and when merging ImportKeysList entries, if either ...Tim Bray2014-09-133-5/+15
| | * Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefsTim Bray2014-09-1316-438/+407
| * | New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodab...Dominik Schürmann2014-09-159-139/+366
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-147-213/+379
| |\ \
| * \ \ Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-143-30/+34
| |\ \ \
| * | | | First work on decryptDominik Schürmann2014-09-142-2/+3
* | | | | move LogLevel info into LogType enumVincent Breitmoser2014-09-1510-471/+461
| |_|_|/ |/| | |
* | | | work on OperationResultParcelVincent Breitmoser2014-09-1426-111/+101
* | | | pending results are a type of non-successVincent Breitmoser2014-09-146-10/+12
| |_|/ |/| |
* | | (forgot a file for previous commit)Vincent Breitmoser2014-09-141-0/+103
* | | add SignEncryptResult parcel (probably break stuff)Vincent Breitmoser2014-09-146-213/+276
| |/ |/|
* | Temporary fix for #848, fixed pull2refresh bugsDaniel Albert2014-09-133-30/+34
|/
* Hack to disable overscroll effect of swipe to updateDominik Schürmann2014-09-132-15/+13
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-132-3/+10
|\
| * add key id to trailing asym data log msgVincent Breitmoser2014-09-131-3/+6
| * just skip foreign uid certifications during import for nowVincent Breitmoser2014-09-131-0/+4
* | Custom actionbar to indicate swipe down effectDominik Schürmann2014-09-131-0/+51
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-131-1/+7
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-132-0/+5
| |\
| * | Set literal data format tag to UTF8 when encrypting textDominik Schürmann2014-09-131-1/+7
* | | move IS_REVOKED table prefix to the right placesVincent Breitmoser2014-09-135-6/+9
| |/ |/|
* | very small fix, don't show name on encoding warningVincent Breitmoser2014-09-131-2/+1
* | log warning on bad uid encodingVincent Breitmoser2014-09-132-0/+6
|/
* Merge branch 'result-parcels'Vincent Breitmoser2014-09-138-214/+344
|\
| * some DecryptVerify log refinementsVincent Breitmoser2014-09-131-5/+13
| * add a ton of logging to DecryptVerifyVincent Breitmoser2014-09-133-26/+128
| * working version of DecryptVerifyResultVincent Breitmoser2014-09-136-64/+113
| * introduce OperationResultParcel for PgpDecryptVerify operations (WIP)Vincent Breitmoser2014-09-137-231/+202
* | deactivate screenshots in new PassphraseDialogActivityDominik Schürmann2014-09-131-0/+10
* | More smaller UI fixesDominik Schürmann2014-09-132-0/+6
* | If expired/revoked, disable both encrypt buttonsDominik Schürmann2014-09-131-0/+3
* | Test for badly encoded user idsDominik Schürmann2014-09-131-0/+1
* | Add new PassphraseDialogActivity, a transparent activity that only holds the ...Dominik Schürmann2014-09-131-0/+357
* | 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
* | Remove unused method in KeyUpdateHelperDominik Schürmann2014-09-131-17/+0
* | Merge pull request #843 from da-kid/masterDominik Schürmann2014-09-134-5/+244
|\ \
| * | Removed unnecessary querying of keyservers, reimplemented the ListAwareSwipeR...Daniel Albert2014-09-133-38/+81
| * | Implemented Pull2Refresh in the KeyListFragmentDaniel Albert2014-09-124-5/+201
* | | 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-1323-402/+483
|\ \ \ | | |/ | |/|
| * | promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-1323-402/+483
| |/
* / 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-113-16/+35