aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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.
* | Removed unused Toast importDaniel Haß2014-05-111-1/+0
| |
* | Toast replacementDaniel Haß2014-05-111-2/+4
| |
* | proper null checks and closing of cursors everywhereVincent Breitmoser2014-05-081-3/+4
| |
* | use setEncryptToSigner for asymmetric encryptionVincent Breitmoser2014-05-081-0/+1
| | | | | | | | (tested and works, closes #569)
* | Move logic classes for import into own sub-packageDominik Schürmann2014-05-061-5/+4
| |
* | tidy up IntentServiceTim Bray2014-04-301-2/+2
| |
* | Clean up debug crudTim Bray2014-04-291-3/+0
| |
* | can search openkeychain, retrieve & install & use keys from thereTim Bray2014-04-291-0/+53
|/
* Rename setter methods for PgpDecryptVerify.BuilderThialfihar2014-04-291-3/+3
|
* Rename setter methods for PgpSignEncrypt.BuilderThialfihar2014-04-291-11/+11
|
* Rename ProgressDialogUpdater to ProgressableThialfihar2014-04-291-6/+6
| | | | | Also fix some inconsistent usages of "progress", now using "progressable" in all builders.
* Merge pull request #576 from Valodim/stripped-secretkeysDominik Schürmann2014-04-161-1/+1
|\ | | | | Support stripped secretkeys
| * stripped support: add has_secret column to keys tableVincent Breitmoser2014-04-161-1/+1
| |
* | Translations from transifex, fix some strings referencesDominik Schürmann2014-04-161-1/+1
|/
* Optimize importsDominik Schürmann2014-04-154-3/+1
|
* Removing remaining uses of Id, closing one of the oldest bugs #9Dominik Schürmann2014-04-142-8/+5
|
* key edit: fix crash when create date was after expiry date, change from ↵Dominik Schürmann2014-04-141-2/+3
| | | | gregorian calendar to calendar with creation from instance, experimental result status for decrypt activity