Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 3 | -20/+37 | |
| | |/ / / | |/| | | | ||||||
| * | | | | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 3 | -46/+59 | |
| * | | | | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 6 | -50/+195 | |
| * | | | | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 3 | -99/+118 | |
| * | | | | code cleanup in ProviderHelper and UncachedKeyRing | Vincent Breitmoser | 2014-06-18 | 2 | -36/+22 | |
| * | | | | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 4 | -8/+54 | |
| * | | | | consolidate: first draft | Vincent Breitmoser | 2014-06-18 | 2 | -4/+115 | |
| * | | | | import-log: don't count self certs as unknown | Vincent Breitmoser | 2014-06-18 | 1 | -0/+1 | |
| * | | | | prepare ProviderHelper for consolidation before insert | Vincent Breitmoser | 2014-06-18 | 2 | -75/+87 | |
| * | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-18 | 6 | -99/+242 | |
| |\ \ \ \ | ||||||
| | * | | | | handle database error on secret key insert | Vincent Breitmoser | 2014-06-17 | 2 | -1/+5 | |
| | * | | | | canonicalize: support secret keys | Vincent Breitmoser | 2014-06-17 | 3 | -13/+33 | |
| | |/ / / | ||||||
| | * | | | import-log: clean up progress messages | Vincent Breitmoser | 2014-06-17 | 2 | -7/+6 | |
| | * | | | canonicalize: fix NullPointerException | Vincent Breitmoser | 2014-06-17 | 1 | -1/+2 | |
| | * | | | drop invalid user ids and add fatal case(s) | Vincent Breitmoser | 2014-06-16 | 3 | -5/+21 | |
| | * | | | add more progress info from import routine | Vincent Breitmoser | 2014-06-16 | 3 | -3/+43 | |
| | * | | | import-log: distinguish master/subkeys, distinguish redundant/bad certs, more... | Vincent Breitmoser | 2014-06-16 | 3 | -70/+133 | |
| | | |/ | | |/| | ||||||
| * / | | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 11 | -322/+236 | |
| |/ / | ||||||
| * | | 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 | |
| * | | Replaced AppMsg with notify wrapper call | Daniel Haß | 2014-06-16 | 1 | -1/+4 | |
| * | | Added notification wrapper for toast like notifys | Daniel Haß | 2014-06-16 | 1 | -0/+70 | |
| * | | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 18 | -145/+741 | |
| |\| | ||||||
| * | | canonicalize: require primary key binding certificates for signing subkeys | Vincent Breitmoser | 2014-06-12 | 2 | -3/+44 | |
| * | | canonicalize: simplify import with info from canonicalization | Vincent Breitmoser | 2014-06-12 | 2 | -39/+9 | |
| * | | canonicalize: filter out future and local certificates | Vincent Breitmoser | 2014-06-12 | 3 | -13/+85 | |
| * | | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 2 | -9/+6 | |
| * | | import: use wrapped keyring instead of uncached keyring for trust | Vincent Breitmoser | 2014-06-12 | 1 | -25/+19 | |
| * | | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 4 | -55/+74 | |
| * | | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 4 | -40/+60 | |
| * | | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 4 | -28/+317 | |
| * | | 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 | 2 | -16/+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 | 4 | -18/+102 | |
| * | | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 5 | -90/+133 | |
| * | | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 6 | -40/+71 | |
| * | | import-log: some cosmetics | Vincent Breitmoser | 2014-06-10 | 3 | -3/+7 | |
| * | | import-log: add LogDisplay activity | Vincent Breitmoser | 2014-06-10 | 3 | -4/+107 | |
| * | | 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 | 5 | -98/+251 | |
* | | | 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 output... | mar-v-in | 2014-06-08 | 5 | -176/+109 | |
| |/ |/| | ||||||
* | | Merge pull request #650 from open-keychain/v/import-log | Dominik Schürmann | 2014-06-06 | 4 | -110/+424 | |
|\| | ||||||
| * | import-log: better stripped key logging | Vincent Breitmoser | 2014-06-06 | 3 | -16/+41 | |
| * | import-log: add output to logcat (for debugging) | Vincent Breitmoser | 2014-06-06 | 3 | -8/+19 | |
| * | import-log: add log statements in import routine | Vincent Breitmoser | 2014-06-06 | 2 | -97/+225 |