Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | 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 | 18 | -57/+632 |
| |\ \ | | | | | | | | | 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 | ||||
| | * | | | 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 | 145 | -2380/+4013 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix url building to support certificate check on hkps servers | mar-v-in | 2014-05-28 | 1 | -8/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert. | ||||
| | | * | | | | Add hkps support | mar-v-in | 2014-05-27 | 1 | -9/+37 |
| | | | | | | | |||||
| | * | | | | | Store nice origin with keybase keys (that can't be interpreted as HKP server) | mar-v-in | 2014-05-29 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Make abstract methods in Keyserver public (implementations make them public ↵ | mar-v-in | 2014-05-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | anyway) | ||||
| | * | | | | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS | mar-v-in | 2014-05-29 | 1 | -3/+4 |
| | |/ / / / | |||||
| | * | | | | Store origin with ImportKeysListEntry | mar-v-in | 2014-05-27 | 3 | -0/+13 |
| | | | | | | |||||
| | * | | | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV record | mar-v-in | 2014-05-27 | 1 | -0/+38 |
| | | | | | | |||||
| | * | | | | ContactHelper can read email addresses from contact list | mar-v-in | 2014-05-26 | 2 | -0/+22 |
| | | | | | | |||||
| * | | | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage | Dominik Schürmann | 2014-06-06 | 6 | -6/+6 |
| | | | | | | |||||
| * | | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide them | Dominik Schürmann | 2014-06-06 | 4 | -10/+94 |
| | |_|/ / | |/| | | | |||||
| * | | | | Clean up keyimport.ImportKeysListEntry | Tim Bray | 2014-06-05 | 2 | -67/+66 |
| | | | | | |||||
| * | | | | Merge pull request #645 from timbray/master | Dominik Schürmann | 2014-06-05 | 2 | -7/+4 |
| |\ \ \ \ | | | | | | | | | | | | | Don't show full fingerprint in key search result lists | ||||
| | * | | | | Don't show full fingerprint in key search results | Tim Bray | 2014-06-05 | 1 | -6/+2 |
| | | | | | | |||||
| | * | | | | fixed error message | Tim Bray | 2014-06-04 | 2 | -4/+3 |
| | | |/ / | | |/| | | |||||
* | | | | | 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 |
| | | | | |