Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 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 |
| | | | |||||
| | * | 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 | ||||
| | * \ | Merge pull request #649 from mar-v-in/automatic-contact-discovery | Dominik Schürmann | 2014-06-06 | 22 | -57/+637 |
| | |\ \ | | | | | | | | | | | Automatic contact discovery and more | ||||
| | | * | | Fix TAG in account service as well | mar-v-in | 2014-06-06 | 1 | -7/+8 |
| | | | | | |||||
| | | * | | Fixing TAG and string resource | mar-v-in | 2014-06-06 | 2 | -4/+4 |
| | | | | | |||||
| | | * | | Fix compile error introduced during merge | mar-v-in | 2014-06-06 | 1 | -1/+2 |
| | | | | | |||||
| | | * | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 37 | -340/+214 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | | * | | | Add dnsjava as submodule | mar-v-in | 2014-06-05 | 4 | -1/+5 |
| | | | | | | |||||
| | | * | | | Show keys with android contacts | mar-v-in | 2014-06-05 | 8 | -11/+119 |
| | | | | | | | | | | | | | | | | | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | ||||
| | | * | | | Make keylist case insensitive | mar-v-in | 2014-06-05 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | You want "michael" to be next to "Michael", don't you? | ||||
| | | * | | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 149 | -2417/+4042 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | | * | | | | Fix regex for hkp parsing to support multiple uids | mar-v-in | 2014-06-04 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | First version of automatic contact discovery. | mar-v-in | 2014-06-04 | 9 | -0/+358 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: - Configuration (much of it) - Enabled by default? - Which keys to import? Current state: All non-revoked and non-expired with matching userid - Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?) - Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes) | ||||
| | | * | | | | Store expired state within ImportKeysListEntry | mar-v-in | 2014-06-04 | 2 | -0/+12 |
| | | | | | | | |||||
| | | * | | | | Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYS | mar-v-in | 2014-05-29 | 1 | -54/+15 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'hkps-support' into automatic-contact-discovery | mar-v-in | 2014-05-29 | 1 | -15/+54 |
| | | |\ \ \ \ |