aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-11-041-38/+84
|\
| * changed KeyserverSyncAdapterService to work with START_REDELIVER_INTENTAdithya Abraham Philip2015-10-311-38/+84
* | bench: add benchmark operation for testingVincent Breitmoser2015-11-042-0/+57
|/
* uploadop: clean up, add loggingVincent Breitmoser2015-10-291-0/+1
* Integrate yubikey reset methodDominik Schürmann2015-10-161-1/+6
* Remove default PIN settingDominik Schürmann2015-10-161-8/+0
* Support backupVersion ASCII Armor headerDominik Schürmann2015-10-151-2/+7
* Cleanup, fix advanced sharingDominik Schürmann2015-10-152-13/+12
* upload: re-add upload by bytesVincent Breitmoser2015-09-281-3/+19
* export: support encrypted export, first versionVincent Breitmoser2015-09-281-13/+8
* upload: identify key by masterKeyId onlyVincent Breitmoser2015-09-261-6/+5
* export: externalize upload into its own operationVincent Breitmoser2015-09-263-19/+67
* remove "export to file" code path from export operationVincent Breitmoser2015-09-261-8/+0
* preliminary working mime parsing in DecryptListFragment! (beware WIP, here be...Vincent Breitmoser2015-09-161-0/+1
* mime: create more general InputDataOperation, which for now and does basic mi...Vincent Breitmoser2015-09-152-36/+34
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-145-18/+528
|\
| * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-032-3/+3
| * Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-10/+6
| |\
| | * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-111-11/+8
| | |\
| | * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-247-88/+475
| | |\ \
| | * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-094-23/+416
| | |\ \ \
| | * \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-244-31/+36
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-152-48/+80
| | |\ \ \ \ \
| | * | | | | | return key ids from PassphraseDialogActivity, accept null useridsVincent Breitmoser2015-03-081-2/+2
| | * | | | | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-081-10/+5
| | * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-081-3/+11
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-026-306/+384
| | |\ \ \ \ \ \ \
| | * | | | | | | | affirmation -> linked identityVincent Breitmoser2015-01-152-2/+0
| | * | | | | | | | support addition of user attributesVincent Breitmoser2015-01-121-5/+6
| | * | | | | | | | work on affirmations (begin rename to LinkedIdentityVincent Breitmoser2015-01-121-1/+6
| | * | | | | | | | even more intermediate resultVincent Breitmoser2015-01-121-0/+2
| * | | | | | | | | Remove dead codeDominik Schürmann2015-08-271-2/+2
| * | | | | | | | | introduced constants for keyserver sync, fixed sync issueAdithya Abraham Philip2015-08-202-30/+54
| * | | | | | | | | added sync preferencesAdithya Abraham Philip2015-08-201-1/+9
| * | | | | | | | | changed orbot notification iconsAdithya Abraham Philip2015-08-201-6/+8
| * | | | | | | | | reworked keyserversyncadapterservice flowAdithya Abraham Philip2015-08-201-96/+272
| * | | | | | | | | improved orbot notify, added periodic syncAdithya Abraham Philip2015-08-201-8/+80
| * | | | | | | | | introduced keyserver sync adapterAdithya Abraham Philip2015-08-202-3/+235
* | | | | | | | | | WIP mime parsingDominik Schürmann2015-08-172-0/+77
|/ / / / / / / / /
* | | | | | | | | Add privacy information to account screenDominik Schürmann2015-08-031-1/+1
* | | | | | | | | made mSignatureTime optional in CryptoOperationHelperAdithya Abraham Philip2015-07-151-7/+25
* | | | | | | | | added licenses, cleaned up code, fixed warningsAdithya Abraham Philip2015-07-135-2/+21
* | | | | | | | | added retry on upload failureAdithya Abraham Philip2015-07-132-0/+7
* | | | | | | | | prevented passphrase caching on revocationAdithya Abraham Philip2015-07-131-1/+16
* | | | | | | | | implemented revocation on deletionAdithya Abraham Philip2015-07-136-8/+100
* | | | | | | | | fix symmetric passphrase caching (fixes #1401)Vincent Breitmoser2015-07-081-8/+8
* | | | | | | | | reformatted codeAdithya Abraham Philip2015-07-031-6/+5
* | | | | | | | | added proxy support to OperationHelperAdithya Abraham Philip2015-07-033-4/+28
* | | | | | | | | ensuring code style is preservedAdithya Abraham Philip2015-07-031-5/+1
* | | | | | | | | added keyserver/proxy support to certify operationAdithya Abraham Philip2015-07-031-0/+6