aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
* Add backup APIDominik Schürmann2016-03-011-6/+1
* Fix SecurityException on Android 6 due to remove contacts on disabled syncDominik Schürmann2016-02-091-3/+10
* delete linked contacts on turning off contact syncAdithya Abraham Philip2016-02-061-3/+18
* prevent rare KeyserverSyncAdapterService crashAdithya Abraham Philip2016-01-271-6/+11
* passphrasecache: update defaults, add "forever" settingVincent Breitmoser2016-01-111-1/+6
* Use more generic 'Security Token' where possible, add sutitle to create key w...Dominik Schürmann2016-01-101-22/+23
* add method to skip cachingVincent Breitmoser2016-01-061-0/+4
* inline-ttl: support "screen off" in preferenceVincent Breitmoser2016-01-061-7/+6
* passcache: add support for clear on screen lock (ttl == 0)Vincent Breitmoser2016-01-061-36/+70
* inline-ttl: use ttl preference in ttl spinnerVincent Breitmoser2016-01-061-5/+3
* inline-ttl: create ttl choice customization setting activityVincent Breitmoser2016-01-061-2/+1
* passphraseactivity: add inline spinner to password dialogVincent Breitmoser2016-01-061-6/+5
* Follow notification style guidelines, dismiss permission notification on clickDominik Schürmann2015-12-222-14/+9
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-12-212-43/+30
|\
| * fixed key update preference not turning offAdithya Abraham Philip2015-12-212-43/+30
* | Make ContactHelper less staticDominik Schürmann2015-12-211-1/+1
|/
* added Facebook links support, reworked PreferencesAdithya Abraham Philip2015-12-061-1/+1
* Fix strings, thanks to Alain-OlivierDominik Schürmann2015-11-232-31/+5
* re-enable contact sync by defaultDominik Schürmann2015-11-231-6/+2
* Disable contact sync by default on Android >= 6Dominik Schürmann2015-11-232-4/+32
* Show notification when READ_CONTACTS permission is denied in sync service, hi...Dominik Schürmann2015-11-231-6/+51
* 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