Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 34 | -460/+1204 | |
|/ / / | ||||||
* | | | Merge pull request #656 from danielhass/supertoast-dev | Dominik Schürmann | 2014-06-16 | 4 | -1/+87 | |
|\ \ \ | | | | | | | | | Added SuperToasts with new notify-wrapper | |||||
| * | | | Changed license header | Daniel Haß | 2014-06-16 | 1 | -11/+11 | |
| | | | | ||||||
| * | | | Moved Notify class to utils | Daniel Haß | 2014-06-16 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | Removed unused import | Daniel Haß | 2014-06-16 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Added notification area to decrypt content | Daniel Haß | 2014-06-16 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Replaced AppMsg with notify wrapper call | Daniel Haß | 2014-06-16 | 1 | -1/+4 | |
| | | | | ||||||
| * | | | Added notification area as reusable layout | Daniel Haß | 2014-06-16 | 1 | -0/+12 | |
| | | | | ||||||
| * | | | Added notification wrapper for toast like notifys | Daniel Haß | 2014-06-16 | 1 | -0/+70 | |
|/ / / | ||||||
* | | | Merge pull request #654 from artbristol/master | Dominik Schürmann | 2014-06-14 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Update JUnit version | |||||
| * | | | Later version of Junit prevents 'Multiple dex files define ↵ | Art O Cathain | 2014-06-14 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | Lorg/hamcrest/Description' error | |||||
* | | | Merge branch 'canonicalize' | Vincent Breitmoser | 2014-06-13 | 72 | -483/+2583 | |
|\ \ \ | ||||||
| * \ \ | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 43 | -163/+823 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle | |||||
| | * | | | Update example code instructions | Dominik Schürmann | 2014-06-09 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | Update README for build tools | Dominik Schürmann | 2014-06-09 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Really fix travis | Dominik Schürmann | 2014-06-09 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12 | Dominik Schürmann | 2014-06-09 | 3 | -9/+9 | |
| | | | | | ||||||
| | * | | | Fix travis for buildTools 19.1 | Dominik Schürmann | 2014-06-09 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Update buildTools to 19.1 | Dominik Schürmann | 2014-06-09 | 8 | -0/+0 | |
| | | | | | ||||||
| | * | | | Update buildTools to 19.1 | Dominik Schürmann | 2014-06-09 | 1 | -1/+1 | |
| | |/ / | ||||||
| * | | | canonicalize: require primary key binding certificates for signing subkeys | Vincent Breitmoser | 2014-06-12 | 3 | -5/+49 | |
| | | | | ||||||
| * | | | canonicalize: simplify import with info from canonicalization | Vincent Breitmoser | 2014-06-12 | 3 | -43/+9 | |
| | | | | ||||||
| * | | | canonicalize: filter out future and local certificates | Vincent Breitmoser | 2014-06-12 | 4 | -19/+98 | |
| | | | | ||||||
| * | | | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 3 | -17/+12 | |
| | | | | ||||||
| * | | | import: use wrapped keyring instead of uncached keyring for trust | Vincent Breitmoser | 2014-06-12 | 2 | -26/+20 | |
| | | | | ||||||
| * | | | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 5 | -56/+77 | |
| | | | | ||||||
| * | | | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 5 | -47/+70 | |
| | | | | ||||||
| * | | | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 5 | -29/+337 | |
| | | | | ||||||
| * | | | import-log: properly distinguish return states | Vincent Breitmoser | 2014-06-12 | 5 | -26/+25 | |
| | | | | ||||||
| * | | | import-log: better way to check self trust, and fix log level filtering | Vincent Breitmoser | 2014-06-12 | 3 | -17/+6 | |
| | | | | ||||||
| * | | | import-log: use holder pattern in log fragment | Vincent Breitmoser | 2014-06-11 | 1 | -16/+24 | |
| | | | | ||||||
| * | | | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 6 | -21/+113 | |
| | | | | ||||||
| * | | | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 16 | -160/+205 | |
| | | | | ||||||
| * | | | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 7 | -50/+94 | |
| | | | | ||||||
| * | | | import-log: some cosmetics | Vincent Breitmoser | 2014-06-10 | 8 | -26/+33 | |
| | | | | ||||||
| * | | | import-log: add LogDisplay activity | Vincent Breitmoser | 2014-06-10 | 8 | -21/+204 | |
| | | | | ||||||
| * | | | import-log: use supertoast in ImportKeyActivity | Vincent Breitmoser | 2014-06-10 | 1 | -26/+87 | |
| | | | | ||||||
| * | | | canonicalize: first step(s) | Vincent Breitmoser | 2014-06-10 | 3 | -3/+66 | |
| | | | | ||||||
| * | | | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 6 | -101/+260 | |
| | | | | ||||||
| * | | | import-log: add SuperToast external library | Vincent Breitmoser | 2014-06-10 | 4 | -0/+7 | |
| | | | | ||||||
| | | * | Delete using Document API (unsafe) | mar-v-in | 2014-06-10 | 3 | -5/+43 | |
| | | | | ||||||
| | | * | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 6 | -54/+200 | |
| | | | | ||||||
| | | * | Modify KeychainIntentService to support I/O with URIs, allow input and ↵ | mar-v-in | 2014-06-08 | 5 | -176/+109 | |
| | |/ | | | | | | | | | | output to/from different types (eg. encrypt file and return byte array) | |||||
| | * | Merge pull request #650 from open-keychain/v/import-log | Dominik Schürmann | 2014-06-06 | 5 | -110/+463 | |
| | |\ | | |/ | |/| | Parcelable operation result with logging capabilities + import logging | |||||
| * | | import-log: better stripped key logging | Vincent Breitmoser | 2014-06-06 | 4 | -17/+43 | |
| | | | ||||||
| * | | import-log: add output to logcat (for debugging) | Vincent Breitmoser | 2014-06-06 | 3 | -8/+19 | |
| | | | ||||||
| * | | import-log: add import log string resources | Vincent Breitmoser | 2014-06-06 | 1 | -0/+38 | |
| | | | ||||||
| * | | import-log: add log statements in import routine | Vincent Breitmoser | 2014-06-06 | 2 | -97/+225 | |
| | | | ||||||
| * | | import-log: improve operationresultparcel, add indentation | Vincent Breitmoser | 2014-06-06 | 2 | -10/+37 | |
| | | | ||||||
| * | | import-log: add parcelable prototype | Vincent Breitmoser | 2014-06-05 | 1 | -0/+123 | |
|/ / |