Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Open keyboard for backup code | Dominik Schürmann | 2016-03-08 | 1 | -22/+31 |
| | |||||
* | Revert "Use non-breaking spaces for backup code MaskedEditText" | Dominik Schürmann | 2016-03-08 | 1 | -7/+2 |
| | | | | | | | This reverts commit 0feb4d074ce284bfed17e82a3cbc218209aff14a. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java | ||||
* | Fix code style and documentation in BaseSecurityTokenNfcActivity | Dominik Schürmann | 2016-03-08 | 2 | -40/+45 |
| | |||||
* | Fix documentation of nfcGenerateOnCardKey | Dominik Schürmann | 2016-03-08 | 1 | -3/+1 |
| | |||||
* | Fix comment in nfcGenerateOnCardKey | Dominik Schürmann | 2016-03-08 | 1 | -1/+1 |
| | |||||
* | Add nfcGenerateOnCardKey by Joey Castillo before it gets lost | Dominik Schürmann | 2016-03-08 | 1 | -0/+42 |
| | |||||
* | Merge branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain ↵ | Dominik Schürmann | 2016-03-07 | 4 | -82/+81 |
|\ | | | | | | | into kepuss-okHttpLinkedToken | ||||
| * | okHttp | Michal Kepkowski | 2016-03-04 | 4 | -82/+81 |
| | | |||||
* | | fix get key ids by removing another leftover | Dominik Schürmann | 2016-03-07 | 1 | -1/+0 |
| | | |||||
* | | fix bug from leftover line in openpgpservice | Vincent Breitmoser | 2016-03-07 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #1757 from 007durgesh219/Issue#1752 | Dominik Schürmann | 2016-03-06 | 1 | -1/+7 |
|\ \ | | | | | | | Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752 | ||||
| * | | Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752 | Durgesh | 2016-03-06 | 1 | -1/+7 |
| | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | ||||
* | | | Merge pull request #1747 from runnerway/fix-alreadyadded | Dominik Schürmann | 2016-03-06 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Fix duplicate file insertion while encrypting | ||||
| * | | Remove uri from pending even when already added | Andrea Torlaschi | 2016-03-04 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #1750 from 007durgesh219/Issue#1746 | Dominik Schürmann | 2016-03-05 | 1 | -1/+1 |
|\ \ | | | | | | | Fix Dark theme no longer works in main screen on android 5, Issue#1746 | ||||
| * | | Fix Dark theme no longer works in main screen on android 5, Issue#1746 | Durgesh | 2016-03-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | ||||
* | | | Merge pull request #1738 from runnerway/storage-permission-fix | Dominik Schürmann | 2016-03-05 | 1 | -1/+8 |
|\ \ \ | | | | | | | | | Always check read permission | ||||
| * | | | Always check read permission | Andrea Torlaschi | 2016-03-02 | 1 | -1/+8 |
| | | | | |||||
* | | | | Merge pull request #1751 from runnerway/decrypt-filename | Dominik Schürmann | 2016-03-05 | 2 | -4/+14 |
|\ \ \ \ | |_|/ / |/| | | | Fix wrong behavior of third-party apps while opening files after decryption | ||||
| * | | | Set filename after decryption | Andrea Torlaschi | 2016-03-05 | 1 | -2/+3 |
| | | | | |||||
| * | | | Extend FileProvider to support name update | Andrea Torlaschi | 2016-03-05 | 1 | -2/+11 |
| | |/ | |/| | |||||
* / | | Update ContactSyncAdapterService.java | Advaita | 2016-03-03 | 1 | -0/+7 |
|/ / | |||||
* / | add v11 to supported api versions | Vincent Breitmoser | 2016-03-02 | 1 | -3/+6 |
|/ | |||||
* | handle openpgp4fpr intent filter as import rather than certify (see #1661) | Vincent Breitmoser | 2016-03-02 | 1 | -1/+4 |
| | |||||
* | small nullpointer fix | Vincent Breitmoser | 2016-03-02 | 1 | -3/+6 |
| | |||||
* | nfc: disable broadcomWorkaround for TagDispatcher to reduce delay (see #1734) | Vincent Breitmoser | 2016-03-02 | 1 | -1/+1 |
| | |||||
* | Fix backup code comparison | Andrea Torlaschi | 2016-03-02 | 1 | -5/+6 |
| | |||||
* | add some license headers | Vincent Breitmoser | 2016-02-24 | 3 | -0/+52 |
| | |||||
* | wip | Vincent Breitmoser | 2016-02-24 | 1 | -42/+88 |
| | |||||
* | add ACTION_CHECK_PERMISSION for a simple permission check | Vincent Breitmoser | 2016-02-24 | 1 | -0/+13 |
| | |||||
* | external-provider: add permission check for status query | Vincent Breitmoser | 2016-02-24 | 4 | -7/+54 |
| | |||||
* | external-provider: add (experimental) external provider | Vincent Breitmoser | 2016-02-24 | 2 | -0/+266 |
| | |||||
* | split off ApiDataAccessObject from ProviderHelper | Vincent Breitmoser | 2016-02-24 | 11 | -247/+324 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-02-23 | 7 | -25/+229 |
|\ | |||||
| * | Merge pull request #1727 from open-keychain/mime-fallback | Vincent | 2016-02-23 | 7 | -25/+229 |
| |\ | | | | | | | try to guess if data is text or not | ||||
| | * | ditch isLikelyText flag, set mimeType to text/plain in that case | Vincent Breitmoser | 2016-02-23 | 4 | -19/+27 |
| | | | |||||
| | * | move CharsetVerifier to utils package | Vincent Breitmoser | 2016-02-23 | 3 | -2/+3 |
| | | | |||||
| | * | documentation and cleanup | Vincent Breitmoser | 2016-02-22 | 3 | -4/+24 |
| | | | |||||
| | * | displaytext: add "View Log" option, move "Copy to clipboard" into overflow menu | Vincent Breitmoser | 2016-02-22 | 2 | -1/+16 |
| | | | |||||
| | * | decrypt: always show "View in OpenKeychain" as intent chooser option iff ↵ | Vincent Breitmoser | 2016-02-22 | 1 | -0/+12 |
| | | | | | | | | | | | | isLikelyText | ||||
| | * | decryptVerify: use CharsetVerifier to guess whether data is binary or not | Vincent Breitmoser | 2016-02-22 | 1 | -10/+19 |
| | | | |||||
| | * | externalize CharsetVerifier, add looksLikeText to OpenPgpMetadata object | Vincent Breitmoser | 2016-02-22 | 3 | -87/+148 |
| | | | |||||
| | * | mime: try to decode with given charset or utf-8 while file is read | Vincent Breitmoser | 2016-02-22 | 2 | -6/+84 |
| | | | |||||
* | | | Passthrough of data Intent in methods of ApiPendingIntentFactory instead of ↵ | Dominik Schürmann | 2016-02-23 | 3 | -50/+58 |
|/ / | | | | | | | constructor | ||||
* / | Remove AspectRatioImageView | unyoungwax | 2016-02-23 | 1 | -138/+0 |
|/ | |||||
* | Extend documentation, proper method naming, use of deprecated method annotation | Dominik Schürmann | 2016-02-22 | 6 | -44/+51 |
| | |||||
* | Use FLAG_IMMUTABLE | Dominik Schürmann | 2016-02-22 | 1 | -6/+22 |
| | |||||
* | Move PendingIntent creation into factory | Dominik Schürmann | 2016-02-22 | 3 | -140/+201 |
| | |||||
* | Split remote methods from activities for better seperation | Dominik Schürmann | 2016-02-22 | 7 | -57/+127 |
| | |||||
* | Extract service parts from SecurityTokenOperationActivity | Dominik Schürmann | 2016-02-22 | 4 | -23/+62 |
| |