aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Collapse)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 ↵Dominik Schürmann2016-01-101-22/+23
| | | | what tokens are supported
* 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, ↵Dominik Schürmann2015-11-231-6/+51
| | | | hide linked contact card if permission is denied
* 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 ↵Vincent Breitmoser2015-09-161-0/+1
| | | | be dragons!)
* mime: create more general InputDataOperation, which for now and does basic ↵Vincent Breitmoser2015-09-152-36/+34
| | | | mime parsing
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-145-18/+528
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java OpenKeychain/src/main/res/values/strings.xml
| * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-032-3/+3
| | | | | | | | Move launcher icons to mipmap
| * Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-10/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| | * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-111-11/+8
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| | * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-247-88/+475
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| | * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-094-23/+416
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-244-31/+36
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-152-48/+80
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| | * | | | | | 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
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * \ \ \ \ \ \ NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-026-306/+384
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java 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/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| | * | | | | | | | affirmation -> linked identityVincent Breitmoser2015-01-152-2/+0
| | | | | | | | | |
| | * | | | | | | | support addition of user attributesVincent Breitmoser2015-01-121-5/+6
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 13:45:40 +0000