Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge branch 'new-edit' | Vincent Breitmoser | 2014-06-18 | 9 | -991/+315 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml | |||||
| | * | | | | new-edit: add logging to modifySecretKeyRing operation | Vincent Breitmoser | 2014-06-17 | 4 | -72/+158 | |
| | | | | | | ||||||
| | * | | | | new-edit: add new save keyring stuff | Vincent Breitmoser | 2014-06-17 | 3 | -151/+124 | |
| | | | | | | ||||||
| | * | | | | new-edit: remove old save keyring stuff | Vincent Breitmoser | 2014-06-17 | 6 | -819/+83 | |
| | | | | | | ||||||
| * | | | | | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 4 | -21/+39 | |
| | |/ / / | |/| | | | ||||||
| * | | | | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 4 | -49/+63 | |
| | | | | | ||||||
| * | | | | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 7 | -53/+198 | |
| | | | | | ||||||
| * | | | | consolidate: make it work | Vincent Breitmoser | 2014-06-18 | 4 | -105/+126 | |
| | | | | | ||||||
| * | | | | code cleanup in ProviderHelper and UncachedKeyRing | Vincent Breitmoser | 2014-06-18 | 2 | -36/+22 | |
| | | | | | ||||||
| * | | | | consolidate: add logging | Vincent Breitmoser | 2014-06-18 | 5 | -8/+61 | |
| | | | | | ||||||
| * | | | | 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 | 7 | -109/+265 | |
| |\ \ \ \ | ||||||
| | * | | | | handle database error on secret key insert | Vincent Breitmoser | 2014-06-17 | 3 | -1/+6 | |
| | | | | | | ||||||
| | * | | | | canonicalize: support secret keys | Vincent Breitmoser | 2014-06-17 | 4 | -14/+36 | |
| | |/ / / | ||||||
| | * | | | 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 | 4 | -5/+23 | |
| | | | | | ||||||
| | * | | | add more progress info from import routine | Vincent Breitmoser | 2014-06-16 | 3 | -3/+43 | |
| | | | | | ||||||
| | * | | | import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵ | Vincent Breitmoser | 2014-06-16 | 4 | -79/+150 | |
| | | |/ | | |/| | | | | | | | | | more docs | |||||
| * / | | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 30 | -458/+446 | |
| |/ / | ||||||
| * | | 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 remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 26 | -147/+802 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | 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 | |
| | | | ||||||
* | | | Delete using Document API (unsafe) | mar-v-in | 2014-06-10 | 3 | -5/+43 | |
| | | |