Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | canonicalize: simplify import with info from canonicalization | Vincent Breitmoser | 2014-06-12 | 1 | -4/+0 | |
| | | | ||||||
| * | | canonicalize: filter out future and local certificates | Vincent Breitmoser | 2014-06-12 | 1 | -2/+9 | |
| | | | ||||||
| * | | import-log: more minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -3/+1 | |
| | | | ||||||
| * | | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -0/+2 | |
| | | | ||||||
| * | | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 1 | -7/+10 | |
| | | | ||||||
| * | | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 1 | -2/+21 | |
| | | | ||||||
| * | | import-log: properly distinguish return states | Vincent Breitmoser | 2014-06-12 | 2 | -5/+5 | |
| | | | ||||||
| * | | import-log: better way to check self trust, and fix log level filtering | Vincent Breitmoser | 2014-06-12 | 1 | -3/+1 | |
| | | | ||||||
| * | | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 1 | -3/+3 | |
| | | | ||||||
| * | | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 2 | -16/+48 | |
| | | | ||||||
| * | | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 2 | -7/+21 | |
| | | | ||||||
| * | | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 3 | -6/+276 | |
| | | | ||||||
* | | | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | Modify KeychainIntentService to support I/O with URIs, allow input and ↵ | mar-v-in | 2014-06-08 | 1 | -172/+105 | |
| |/ |/| | | | | | output to/from different types (eg. encrypt file and return byte array) | |||||
* | | 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 | 1 | -2/+3 | |
| | | ||||||
* | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 1 | -6/+6 | |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| * | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -6/+6 | |
| | | ||||||
* | | Show keys with android contacts | mar-v-in | 2014-06-05 | 1 | -0/+4 | |
| | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | |||||
* | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 4 | -254/+301 | |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| * | make everything work again | Vincent Breitmoser | 2014-06-02 | 1 | -4/+5 | |
| | | ||||||
| * | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵ | Vincent Breitmoser | 2014-06-02 | 1 | -43/+11 | |
| | | | | | | | | ImportKeysListEntry | |||||
| * | wrapped-key-ring: no UncachedSecretKeyRing after all | Vincent Breitmoser | 2014-06-02 | 1 | -5/+4 | |
| | | ||||||
| * | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 3 | -69/+17 | |
| | | ||||||
| * | introduce new SaveKeyringParcel | Vincent Breitmoser | 2014-05-27 | 1 | -0/+113 | |
| | | ||||||
| * | rename SaveKeyringParcel to OldSaveKeyringParcel | Vincent Breitmoser | 2014-05-27 | 2 | -9/+14 | |
| | | ||||||
| * | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 1 | -6/+8 | |
| | | ||||||
| * | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 1 | -11/+11 | |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| * | | use long rather than String to build uris by key | Vincent Breitmoser | 2014-05-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 2 | -13/+17 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 2 | -10/+63 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | | | wrapped-key-ring: get rid of bc objects in key editor | Vincent Breitmoser | 2014-05-04 | 2 | -10/+27 | |
| | | | | ||||||
| * | | | wrapped-key-ring: more work on passphrase caching and certification | Vincent Breitmoser | 2014-05-04 | 1 | -32/+34 | |
| | | | | ||||||
| * | | | wrapped-key-ring: no more pgp imports in PassphraseDialogFragment | Vincent Breitmoser | 2014-05-04 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | wrapped-key-ring: more refactoring - no more pgp imports in ↵ | Vincent Breitmoser | 2014-05-03 | 1 | -52/+27 | |
| | | | | | | | | | | | | | | | | KeychainIntentService! | |||||
| * | | | wrapped-key-ring: move more helper methods into keys | Vincent Breitmoser | 2014-05-03 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | wrapped-key-ring: move certification logic into secretkey | Vincent Breitmoser | 2014-05-03 | 1 | -29/+17 | |
| | | | | ||||||
| * | | | certification is always done with the master key | Vincent Breitmoser | 2014-05-03 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | First version of automatic contact discovery. | mar-v-in | 2014-06-04 | 2 | -0/+201 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | |||||
* | | | | Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYS | mar-v-in | 2014-05-29 | 1 | -54/+15 | |
| | | | | ||||||
* | | | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS | mar-v-in | 2014-05-29 | 1 | -3/+4 | |
| |_|/ |/| | | ||||||
* | | | Rename KeyServer to Keyserver | Dominik Schürmann | 2014-05-18 | 1 | -5/+5 | |
| | | | ||||||
* | | | Rename fingerPrint to fingerprint | Thialfihar | 2014-05-14 | 1 | -4/+4 | |
| | | | ||||||
* | | | Add extraData property in ImportKeyListEntry | Thialfihar | 2014-05-14 | 1 | -2/+2 | |
| |/ |/| | | | | | | | | | This allows any KeyServer to store some extra data it might need. In the case of KeybaseKeyServer it is the username, which then can be grabbed directly, without the hack of storing it as userId. | |||||
* | | Removed unused Toast import | Daniel Haß | 2014-05-11 | 1 | -1/+0 | |
| | | ||||||
* | | Toast replacement | Daniel Haß | 2014-05-11 | 1 | -2/+4 | |
| | | ||||||
* | | proper null checks and closing of cursors everywhere | Vincent Breitmoser | 2014-05-08 | 1 | -3/+4 | |
| | | ||||||
* | | use setEncryptToSigner for asymmetric encryption | Vincent Breitmoser | 2014-05-08 | 1 | -0/+1 | |
| | | | | | | | | (tested and works, closes #569) | |||||
* | | Move logic classes for import into own sub-package | Dominik Schürmann | 2014-05-06 | 1 | -5/+4 | |
| | | ||||||
* | | tidy up IntentService | Tim Bray | 2014-04-30 | 1 | -2/+2 | |
| | |