aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | import-log: distinguish master/subkeys, distinguish redundant/bad certs, more...Vincent Breitmoser2014-06-164-79/+150
| | |_|/ | |/| |
* / | | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-1834-460/+1204
|/ / /
* | | Merge pull request #656 from danielhass/supertoast-devDominik Schürmann2014-06-164-1/+87
|\ \ \
| * | | Changed license headerDaniel Haß2014-06-161-11/+11
| * | | Moved Notify class to utilsDaniel Haß2014-06-162-2/+2
| * | | Removed unused importDaniel Haß2014-06-161-1/+0
| * | | Added notification area to decrypt contentDaniel Haß2014-06-161-0/+2
| * | | Replaced AppMsg with notify wrapper callDaniel Haß2014-06-161-1/+4
| * | | Added notification area as reusable layoutDaniel Haß2014-06-161-0/+12
| * | | Added notification wrapper for toast like notifysDaniel Haß2014-06-161-0/+70
|/ / /
* | | Merge pull request #654 from artbristol/masterDominik Schürmann2014-06-141-1/+1
|\ \ \
| * | | Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Desc...Art O Cathain2014-06-141-1/+1
|/ / /
* | | Merge branch 'canonicalize'Vincent Breitmoser2014-06-1372-483/+2583
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-1343-163/+823
| |\ \ \
| | * | | Update example code instructionsDominik Schürmann2014-06-091-2/+2
| | * | | Update README for build toolsDominik Schürmann2014-06-091-1/+1
| | * | | Really fix travisDominik Schürmann2014-06-091-3/+3
| | * | | Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12Dominik Schürmann2014-06-093-9/+9
| | * | | Fix travis for buildTools 19.1Dominik Schürmann2014-06-091-1/+1
| | * | | Update buildTools to 19.1Dominik Schürmann2014-06-098-0/+0
| | * | | Update buildTools to 19.1Dominik Schürmann2014-06-091-1/+1
| | |/ /
| * | | canonicalize: require primary key binding certificates for signing subkeysVincent Breitmoser2014-06-123-5/+49
| * | | canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-123-43/+9
| * | | canonicalize: filter out future and local certificatesVincent Breitmoser2014-06-124-19/+98
| * | | import-log: more minor improvementsVincent Breitmoser2014-06-123-17/+12
| * | | import: use wrapped keyring instead of uncached keyring for trustVincent Breitmoser2014-06-122-26/+20
| * | | import-log: minor improvementsVincent Breitmoser2014-06-125-56/+77
| * | | canonicalize: more stuffVincent Breitmoser2014-06-125-47/+70
| * | | canonicalize: implementation, first draftVincent Breitmoser2014-06-125-29/+337
| * | | import-log: properly distinguish return statesVincent Breitmoser2014-06-125-26/+25
| * | | import-log: better way to check self trust, and fix log level filteringVincent Breitmoser2014-06-123-17/+6
| * | | import-log: use holder pattern in log fragmentVincent Breitmoser2014-06-111-16/+24
| * | | import-log: work on log fragment uiVincent Breitmoser2014-06-106-21/+113
| * | | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-1016-160/+205
| * | | import-log: more interface workVincent Breitmoser2014-06-107-50/+94
| * | | import-log: some cosmeticsVincent Breitmoser2014-06-108-26/+33
| * | | import-log: add LogDisplay activityVincent Breitmoser2014-06-108-21/+204
| * | | import-log: use supertoast in ImportKeyActivityVincent Breitmoser2014-06-101-26/+87
| * | | canonicalize: first step(s)Vincent Breitmoser2014-06-103-3/+66
| * | | import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-106-101/+260
| * | | import-log: add SuperToast external libraryVincent Breitmoser2014-06-104-0/+7
| | | * Delete using Document API (unsafe)mar-v-in2014-06-103-5/+43
| | | * Use Document API on KitKat for file encrypt/decryptmar-v-in2014-06-106-54/+200
| | | * Modify KeychainIntentService to support I/O with URIs, allow input and output...mar-v-in2014-06-085-176/+109
| | |/
| | * Merge pull request #650 from open-keychain/v/import-logDominik Schürmann2014-06-065-110/+463
| | |\ | | |/ | |/|
| * | import-log: better stripped key loggingVincent Breitmoser2014-06-064-17/+43
| * | import-log: add output to logcat (for debugging)Vincent Breitmoser2014-06-063-8/+19
| * | import-log: add import log string resourcesVincent Breitmoser2014-06-061-0/+38
| * | import-log: add log statements in import routineVincent Breitmoser2014-06-062-97/+225
| * | import-log: improve operationresultparcel, add indentationVincent Breitmoser2014-06-062-10/+37