Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ditch isLikelyText flag, set mimeType to text/plain in that case | Vincent Breitmoser | 2016-02-23 | 1 | -5/+17 |
| | |||||
* | move CharsetVerifier to utils package | Vincent Breitmoser | 2016-02-23 | 1 | -0/+142 |
| | |||||
* | Merge branch 'master' into performance | Vincent Breitmoser | 2016-02-10 | 2 | -3/+3 |
|\ | |||||
| * | delete linked contacts on turning off contact sync | Adithya Abraham Philip | 2016-02-06 | 1 | -2/+2 |
| | | |||||
* | | performance: add license headers and some documentation | Vincent Breitmoser | 2016-02-10 | 1 | -5/+17 |
| | | |||||
* | | performance: cache session keys per compatible S2K configuration | Vincent Breitmoser | 2016-02-05 | 1 | -2/+43 |
|/ | |||||
* | passphrasecache: update defaults, add "forever" setting | Vincent Breitmoser | 2016-01-11 | 1 | -2/+4 |
| | |||||
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵ | Dominik Schürmann | 2016-01-10 | 1 | -2/+2 |
| | | | | what tokens are supported | ||||
* | inline-ttl: remove "default" setting | Vincent Breitmoser | 2016-01-06 | 1 | -8/+3 |
| | |||||
* | some code cleanup in Preferences | Vincent Breitmoser | 2016-01-06 | 1 | -10/+16 |
| | |||||
* | inline-ttl: support "screen off" in preference | Vincent Breitmoser | 2016-01-06 | 1 | -1/+3 |
| | |||||
* | inline-ttl: save changes in ttl settings | Vincent Breitmoser | 2016-01-06 | 1 | -16/+24 |
| | |||||
* | inline-ttl: create ttl choice customization setting activity | Vincent Breitmoser | 2016-01-06 | 1 | -15/+60 |
| | |||||
* | Check for ACTION_OPEN_DOCUMENT before starting activity | Dominik Schürmann | 2016-01-04 | 1 | -10/+28 |
| | |||||
* | Fallback for ACTION_OPEN_DOCUMENT, hopefully fixes #1625 | Dominik Schürmann | 2016-01-04 | 1 | -3/+12 |
| | |||||
* | Make ContactHelper less static | Dominik Schürmann | 2015-12-21 | 2 | -152/+137 |
| | |||||
* | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 2 | -54/+48 |
| | |||||
* | No need to delete by raw contact id | Dominik Schürmann | 2015-11-23 | 1 | -30/+8 |
| | |||||
* | Fix potential NPE | Dominik Schürmann | 2015-11-23 | 1 | -2/+2 |
| | |||||
* | Show notification when READ_CONTACTS permission is denied in sync service, ↵ | Dominik Schürmann | 2015-11-23 | 1 | -8/+47 |
| | | | | hide linked contact card if permission is denied | ||||
* | FileHelperLollipop: Check by comparing UID instead of checking files read ↵ | Dominik Schürmann | 2015-11-19 | 1 | -14/+4 |
| | | | | permissions. This fixes sharing of file uris from sdcard | ||||
* | Handle denied storage permission, use ContentResolver.SCHEME_FILE constant | Dominik Schürmann | 2015-11-19 | 2 | -2/+19 |
| | |||||
* | fix delete file securely method and use for delete original file | Vincent Breitmoser | 2015-11-15 | 1 | -8/+48 |
| | |||||
* | make use of proxies a Keyserver property | Vincent Breitmoser | 2015-10-29 | 1 | -7/+6 |
| | |||||
* | use Proxy.NO_PROXY instead of null value for no proxy | Vincent Breitmoser | 2015-10-29 | 2 | -5/+8 |
| | |||||
* | uploadop: clean up, add logging | Vincent Breitmoser | 2015-10-29 | 2 | -0/+9 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-10-26 | 1 | -3/+6 |
|\ | |||||
* | | fix FileHelper class for pre-lollipop devices | Vincent Breitmoser | 2015-10-26 | 2 | -43/+86 |
|/ | |||||
* | fix argument order screwup in FileHelper | Vincent Breitmoser | 2015-10-22 | 1 | -1/+1 |
| | |||||
* | Fix keybase verification | Dominik Schürmann | 2015-10-21 | 1 | -20/+17 |
| | |||||
* | Remove default PIN setting | Dominik Schürmann | 2015-10-16 | 1 | -10/+0 |
| | |||||
* | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 1 | -125/+0 |
| | |||||
* | Mime type consistency | Dominik Schürmann | 2015-10-15 | 1 | -1/+1 |
| | |||||
* | Show the Internal Storage menu item on openFile | Dominik Schürmann | 2015-10-15 | 1 | -4/+4 |
| | |||||
* | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-09 | 1 | -0/+64 |
|\ | |||||
| * | make openInputStreamSafe static and move to FileHelper | Vincent Breitmoser | 2015-10-09 | 1 | -9/+74 |
| | | |||||
* | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 1 | -104/+0 |
|\| | |||||
| * | Remove ShareHelper: Not compat with Android >= 5, reduce code complexity | Dominik Schürmann | 2015-10-08 | 1 | -104/+0 |
| | | |||||
* | | use annotations for android sdk constraints | Vincent Breitmoser | 2015-09-28 | 1 | -33/+25 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into encrypted-export | Vincent Breitmoser | 2015-09-28 | 7 | -138/+146 |
|\| | |||||
| * | Harden parsing of keyserver results (OKC-01-003) | Dominik Schürmann | 2015-09-25 | 1 | -2/+1 |
| | | |||||
| * | Cleanup FileHelper | Dominik Schürmann | 2015-09-24 | 1 | -11/+10 |
| | | |||||
| * | Remove save support for Android < 4.4 (OKC-01-014) | Dominik Schürmann | 2015-09-24 | 2 | -71/+9 |
| | | |||||
| * | Fix some illegal state exceptions | Dominik Schürmann | 2015-09-24 | 1 | -0/+4 |
| | | |||||
| * | Pin keybase certificate | Dominik Schürmann | 2015-09-21 | 1 | -20/+25 |
| | | |||||
| * | Use more modular Keybase lib with OkHttp wrapper | Dominik Schürmann | 2015-09-21 | 2 | -0/+91 |
| | | |||||
| * | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ↵ | Dominik Schürmann | 2015-09-20 | 1 | -55/+27 |
| | | | | | | | | add (OKC-01-018) | ||||
* | | export: support encrypted export, first version | Vincent Breitmoser | 2015-09-28 | 1 | -1/+1 |
| | | |||||
* | | remove "export to file" code path from export operation | Vincent Breitmoser | 2015-09-26 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -0/+76 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |