Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | api: allow caching of sessionKey in OpenPgpDecryptResult | Vincent Breitmoser | 2016-04-29 | 1 | -6/+6 |
| | |||||
* | Update obsolete Nfc class prefixes | Nikita Mikhailov | 2016-04-16 | 1 | -7/+7 |
| | |||||
* | OTG: Rename smartcard -> security token | Nikita Mikhailov | 2016-04-15 | 1 | -9/+9 |
| | |||||
* | OTG: refactor, change nfc prefix to smartcard | Nikita Mikhailov | 2016-04-14 | 1 | -9/+9 |
| | |||||
* | change sync interval on change in code | Adithya Abraham Philip | 2016-03-24 | 1 | -6/+25 |
| | |||||
* | Merge pull request #1785 from advaita13/wifi-only-fix | Vincent | 2016-03-24 | 2 | -6/+27 |
|\ | | | | | Sync only when unmetered internet is available #1670 | ||||
| * | Final commit | Advaita | 2016-03-23 | 2 | -6/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All changes included Improvements -Reformatted code wherever required -Only active wifi connections trigger events -Improve sync reliability -Removed extra permission Minor Changes -Refactored 2 variables for easier readbility -Wifi-Only-Sync is now enabled by default | ||||
* | | get rid of code path for pin and notation data handling | Vincent Breitmoser | 2016-03-23 | 1 | -13/+3 |
|/ | |||||
* | Update ContactSyncAdapterService.java | Advaita | 2016-03-03 | 1 | -0/+7 |
| | |||||
* | Fix SecurityException on Android 6 due to remove contacts on disabled sync | Dominik Schürmann | 2016-02-09 | 1 | -3/+10 |
| | |||||
* | delete linked contacts on turning off contact sync | Adithya Abraham Philip | 2016-02-06 | 1 | -3/+18 |
| | |||||
* | prevent rare KeyserverSyncAdapterService crash | Adithya Abraham Philip | 2016-01-27 | 1 | -6/+11 |
| | |||||
* | passphrasecache: update defaults, add "forever" setting | Vincent Breitmoser | 2016-01-11 | 1 | -1/+6 |
| | |||||
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵ | Dominik Schürmann | 2016-01-10 | 1 | -22/+23 |
| | | | | what tokens are supported | ||||
* | add method to skip caching | Vincent Breitmoser | 2016-01-06 | 1 | -0/+4 |
| | |||||
* | inline-ttl: support "screen off" in preference | Vincent Breitmoser | 2016-01-06 | 1 | -7/+6 |
| | |||||
* | passcache: add support for clear on screen lock (ttl == 0) | Vincent Breitmoser | 2016-01-06 | 1 | -36/+70 |
| | |||||
* | inline-ttl: use ttl preference in ttl spinner | Vincent Breitmoser | 2016-01-06 | 1 | -5/+3 |
| | |||||
* | inline-ttl: create ttl choice customization setting activity | Vincent Breitmoser | 2016-01-06 | 1 | -2/+1 |
| | |||||
* | passphraseactivity: add inline spinner to password dialog | Vincent Breitmoser | 2016-01-06 | 1 | -6/+5 |
| | |||||
* | Follow notification style guidelines, dismiss permission notification on click | Dominik Schürmann | 2015-12-22 | 2 | -14/+9 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-12-21 | 2 | -43/+30 |
|\ | |||||
| * | fixed key update preference not turning off | Adithya Abraham Philip | 2015-12-21 | 2 | -43/+30 |
| | | |||||
* | | Make ContactHelper less static | Dominik Schürmann | 2015-12-21 | 1 | -1/+1 |
|/ | |||||
* | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 1 | -1/+1 |
| | |||||
* | Fix strings, thanks to Alain-Olivier | Dominik Schürmann | 2015-11-23 | 2 | -31/+5 |
| | |||||
* | re-enable contact sync by default | Dominik Schürmann | 2015-11-23 | 1 | -6/+2 |
| | |||||
* | Disable contact sync by default on Android >= 6 | Dominik Schürmann | 2015-11-23 | 2 | -4/+32 |
| | |||||
* | Show notification when READ_CONTACTS permission is denied in sync service, ↵ | Dominik Schürmann | 2015-11-23 | 1 | -6/+51 |
| | | | | hide linked contact card if permission is denied | ||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-04 | 1 | -38/+84 |
|\ | |||||
| * | changed KeyserverSyncAdapterService to work with START_REDELIVER_INTENT | Adithya Abraham Philip | 2015-10-31 | 1 | -38/+84 |
| | | |||||
* | | bench: add benchmark operation for testing | Vincent Breitmoser | 2015-11-04 | 2 | -0/+57 |
|/ | |||||
* | uploadop: clean up, add logging | Vincent Breitmoser | 2015-10-29 | 1 | -0/+1 |
| | |||||
* | Integrate yubikey reset method | Dominik Schürmann | 2015-10-16 | 1 | -1/+6 |
| | |||||
* | Remove default PIN setting | Dominik Schürmann | 2015-10-16 | 1 | -8/+0 |
| | |||||
* | Support backupVersion ASCII Armor header | Dominik Schürmann | 2015-10-15 | 1 | -2/+7 |
| | |||||
* | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 2 | -13/+12 |
| | |||||
* | upload: re-add upload by bytes | Vincent Breitmoser | 2015-09-28 | 1 | -3/+19 |
| | |||||
* | export: support encrypted export, first version | Vincent Breitmoser | 2015-09-28 | 1 | -13/+8 |
| | |||||
* | upload: identify key by masterKeyId only | Vincent Breitmoser | 2015-09-26 | 1 | -6/+5 |
| | |||||
* | export: externalize upload into its own operation | Vincent Breitmoser | 2015-09-26 | 3 | -19/+67 |
| | |||||
* | remove "export to file" code path from export operation | Vincent Breitmoser | 2015-09-26 | 1 | -8/+0 |
| | |||||
* | preliminary working mime parsing in DecryptListFragment! (beware WIP, here ↵ | Vincent Breitmoser | 2015-09-16 | 1 | -0/+1 |
| | | | | be dragons!) | ||||
* | mime: create more general InputDataOperation, which for now and does basic ↵ | Vincent Breitmoser | 2015-09-15 | 2 | -36/+34 |
| | | | | mime parsing | ||||
* | Merge branch 'master' into mime4j | Vincent Breitmoser | 2015-09-14 | 5 | -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#1515 | Kaladin Light | 2015-09-03 | 2 | -3/+3 |
| | | | | | | | | Move launcher icons to mipmap | ||||
| * | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -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-identities | Vincent Breitmoser | 2015-05-11 | 1 | -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-identities | Vincent Breitmoser | 2015-04-24 | 7 | -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-identities | Vincent Breitmoser | 2015-04-09 | 4 | -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 |