aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Commit message (Expand)AuthorAgeFilesLines
* merge KeychainIntentServiceDominik Schürmann2014-07-021-17/+29
|\
| * add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-291-16/+28
* | remove init methods from adapterDominik Schürmann2014-07-021-0/+1
|/
* Merge branch 'master' into improve-filemar-v-in2014-06-181-140/+30
|\
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-181-4/+3
| |\
| | * consolidate: add key import routines with consolidationVincent Breitmoser2014-06-181-1/+1
| | * prepare ProviderHelper for consolidation before insertVincent Breitmoser2014-06-181-2/+2
| * | new-edit: add logging to modifySecretKeyRing operationVincent Breitmoser2014-06-171-1/+4
| * | new-edit: remove old save keyring stuffVincent Breitmoser2014-06-171-134/+22
| |/
| * Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-131-33/+15
| |\
| * | import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-101-6/+6
* | | 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 output...mar-v-in2014-06-081-172/+105
| |/ |/|
* | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-051-6/+6
|\|
| * neatness refactoringVincent Breitmoser2014-06-041-6/+6
* | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-041-112/+61
|\|
| * make everything work againVincent Breitmoser2014-06-021-4/+5
| * wrapped-key-ring: move key data around in ParcelableKeyRing instead of Import...Vincent Breitmoser2014-06-021-43/+11
| * wrapped-key-ring: no UncachedSecretKeyRing after allVincent Breitmoser2014-06-021-5/+4
| * new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-271-20/+9
| * rename SaveKeyringParcel to OldSaveKeyringParcelVincent Breitmoser2014-05-271-1/+1
| * 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
| |\
| * | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-211-10/+14
| * | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-141-7/+59
| |\ \
| * | | wrapped-key-ring: get rid of bc objects in key editorVincent Breitmoser2014-05-041-1/+1
| * | | wrapped-key-ring: no more pgp imports in PassphraseDialogFragmentVincent Breitmoser2014-05-041-1/+3
| * | | wrapped-key-ring: more refactoring - no more pgp imports in KeychainIntentSer...Vincent Breitmoser2014-05-031-52/+27
| * | | 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
* | | | 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
| |/ |/|
* | proper null checks and closing of cursors everywhereVincent Breitmoser2014-05-081-3/+4
* | use setEncryptToSigner for asymmetric encryptionVincent Breitmoser2014-05-081-0/+1
* | 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
* Merge pull request #576 from Valodim/stripped-secretkeysDominik Schürmann2014-04-161-1/+1
|\
| * 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-151-1/+0
* Removing remaining uses of Id, closing one of the oldest bugs #9Dominik Schürmann2014-04-141-5/+4
* Handle new exceptions in KeychainIntentServiceDominik Schürmann2014-04-131-2/+23
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 02:05:44 +0000