aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | handle database error on secret key insertVincent Breitmoser2014-06-171-0/+1
| | | |
| * | | canonicalize: support secret keysVincent Breitmoser2014-06-171-1/+3
| |/ /
| * | drop invalid user ids and add fatal case(s)Vincent Breitmoser2014-06-161-0/+2
| | |
| * | import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵Vincent Breitmoser2014-06-161-7/+33
| | | | | | | | | | | | more docs
| * | Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-133-33/+222
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 subkeysVincent Breitmoser2014-06-121-0/+3
| | |
| * | canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-121-4/+0
| | |
| * | canonicalize: filter out future and local certificatesVincent Breitmoser2014-06-121-2/+9
| | |
| * | import-log: more minor improvementsVincent Breitmoser2014-06-121-3/+1
| | |
| * | import-log: minor improvementsVincent Breitmoser2014-06-121-0/+2
| | |
| * | canonicalize: more stuffVincent Breitmoser2014-06-121-7/+10
| | |
| * | canonicalize: implementation, first draftVincent Breitmoser2014-06-121-2/+21
| | |
| * | import-log: properly distinguish return statesVincent Breitmoser2014-06-122-5/+5
| | |
| * | import-log: better way to check self trust, and fix log level filteringVincent Breitmoser2014-06-121-3/+1
| | |
| * | import-log: work on log fragment uiVincent Breitmoser2014-06-101-3/+3
| | |
| * | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-102-16/+48
| | |
| * | import-log: more interface workVincent Breitmoser2014-06-102-7/+21
| | |
| * | import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-103-6/+276
| | |
* | | Use Document API on KitKat for file encrypt/decryptmar-v-in2014-06-101-1/+1
| | |
* | | Modify KeychainIntentService to support I/O with URIs, allow input and ↵mar-v-in2014-06-081-172/+105
| |/ |/| | | | | output to/from different types (eg. encrypt file and return byte array)
* | Fix TAG in account service as wellmar-v-in2014-06-061-7/+8
| |
* | Fixing TAG and string resourcemar-v-in2014-06-061-2/+3
| |
* | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-051-6/+6
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * neatness refactoringVincent Breitmoser2014-06-041-6/+6
| |
* | Show keys with android contactsmar-v-in2014-06-051-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-discoverymar-v-in2014-06-044-254/+301
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * make everything work againVincent Breitmoser2014-06-021-4/+5
| |
| * wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵Vincent Breitmoser2014-06-021-43/+11
| | | | | | | | ImportKeysListEntry
| * wrapped-key-ring: no UncachedSecretKeyRing after allVincent Breitmoser2014-06-021-5/+4
| |
| * new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-273-69/+17
| |
| * introduce new SaveKeyringParcelVincent Breitmoser2014-05-271-0/+113
| |
| * rename SaveKeyringParcel to OldSaveKeyringParcelVincent Breitmoser2014-05-272-9/+14
| |
| * wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic typeVincent Breitmoser2014-05-231-6/+8
| |
| * Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-211-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 keyVincent Breitmoser2014-05-211-1/+1
| | |
| * | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-212-13/+17
| | |
| * | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-142-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 editorVincent Breitmoser2014-05-042-10/+27
| | | |
| * | | wrapped-key-ring: more work on passphrase caching and certificationVincent Breitmoser2014-05-041-32/+34
| | | |
| * | | wrapped-key-ring: no more pgp imports in PassphraseDialogFragmentVincent Breitmoser2014-05-041-1/+3
| | | |
| * | | wrapped-key-ring: more refactoring - no more pgp imports in ↵Vincent Breitmoser2014-05-031-52/+27
| | | | | | | | | | | | | | | | KeychainIntentService!
| * | | wrapped-key-ring: move more helper methods into keysVincent Breitmoser2014-05-031-0/+2
| | | |
| * | | wrapped-key-ring: move certification logic into secretkeyVincent Breitmoser2014-05-031-29/+17
| | | |
| * | | certification is always done with the master keyVincent Breitmoser2014-05-031-1/+1
| | | |
* | | | First version of automatic contact discovery.mar-v-in2014-06-042-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_KEYSmar-v-in2014-05-291-54/+15
| | | |
* | | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYSmar-v-in2014-05-291-3/+4
| |_|/ |/| |
* | | Rename KeyServer to KeyserverDominik Schürmann2014-05-181-5/+5
| | |
* | | Rename fingerPrint to fingerprintThialfihar2014-05-141-4/+4
| | |
* | | Add extraData property in ImportKeyListEntryThialfihar2014-05-141-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.