Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge pull request #1782 from fiaxh/share_key_mime | Dominik Schürmann | 2016-03-24 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Set MIME application/pgp-keys when sending a key | |||||
| | * | | | Set MIME application/pgp-keys when sending a key | fiaxh | 2016-03-14 | 1 | -1/+1 | |
| | |/ / | ||||||
| * | | | use new TokenAutoComplete 2.0.7, fixes #1636 | Vincent Breitmoser | 2016-03-23 | 2 | -11/+0 | |
| | | | | ||||||
| * | | | get rid of code path for pin and notation data handling | Vincent Breitmoser | 2016-03-23 | 3 | -6/+4 | |
| | | | | ||||||
| * | | | Fix CertifyKeyActivity back button on action bar not working #1758 | Durgesh | 2016-03-22 | 1 | -0/+11 | |
| |/ / | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | |||||
| * | | Merge pull request #1780 from AlexFJW/backup-code-selection | Dominik Schürmann | 2016-03-12 | 1 | -0/+25 | |
| |\ \ | | | | | | | | | Provisional backup-code text selection fix | |||||
| | * | | Provisional backup-code text selection fix | Alex Fong | 2016-03-12 | 1 | -0/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | For issue #1779, a provisional fix where selection is still possible, but more difficult. Preventing selection altogether is not possible due to the implementation in the Masked-Edittext dependency. To be updated when Masked-Edittext fixes this bug. | |||||
* | | | | okhttp3 | Michal Kepkowski | 2016-03-14 | 1 | -10/+5 | |
|/ / / | ||||||
* / / | Fix display of keyserver item in dark theme | fiaxh | 2016-03-10 | 1 | -3/+4 | |
|/ / | ||||||
* | | Fix NullPointerException in ↵ | Durgesh | 2016-03-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | ImportKeysListFragment.checkAndRequestReadPermission, #1766 Signed-off-by: Durgesh <007durgesh219@gmail.com> | |||||
* | | 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 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> | |||||
* / / | Always check read permission | Andrea Torlaschi | 2016-03-02 | 1 | -1/+8 | |
|/ / | ||||||
* | | handle openpgp4fpr intent filter as import rather than certify (see #1661) | Vincent Breitmoser | 2016-03-02 | 1 | -1/+4 | |
| | | ||||||
* | | 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 | |
|/ | ||||||
* | Merge pull request #1727 from open-keychain/mime-fallback | Vincent | 2016-02-23 | 3 | -1/+28 | |
|\ | | | | | 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 | 1 | -1/+1 | |
| | | ||||||
| * | 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 | |||||
* | | 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 | 3 | -1/+13 | |
| | ||||||
* | Split remote methods from activities for better seperation | Dominik Schürmann | 2016-02-22 | 3 | -38/+15 | |
| | ||||||
* | Extract service parts from SecurityTokenOperationActivity | Dominik Schürmann | 2016-02-22 | 2 | -19/+9 | |
| | ||||||
* | Split RemoteServiceActivity into multiple activities | Dominik Schürmann | 2016-02-15 | 2 | -3/+9 | |
| | ||||||
* | Use non-breaking spaces for backup code MaskedEditText | Dominik Schürmann | 2016-02-10 | 1 | -2/+7 | |
| | ||||||
* | Backup format v2: redesign restore dialog | Dominik Schürmann | 2016-02-10 | 1 | -45/+23 | |
| | ||||||
* | Backup format v2: redesigned backup code fragment with masked edit text | Dominik Schürmann | 2016-02-10 | 1 | -123/+80 | |
| | ||||||
* | Merge pull request #1708 from open-keychain/performance | Vincent | 2016-02-10 | 1 | -35/+45 | |
|\ | | | | | performance improvements | |||||
| * | Merge branch 'master' into performance | Vincent Breitmoser | 2016-02-10 | 12 | -23/+99 | |
| |\ | ||||||
| * | | performance: avoid expensive getSecretKeyType call, use cached where possible | Vincent Breitmoser | 2016-02-05 | 1 | -35/+45 | |
| | | | ||||||
* | | | Better transaction animation | Theo Franzén | 2016-02-10 | 1 | -0/+16 | |
| |/ |/| | ||||||
* | | Fix SecurityException on Android 6 due to remove contacts on disabled sync | Dominik Schürmann | 2016-02-09 | 1 | -1/+1 | |
| | | ||||||
* | | Add donation fragment | Dominik Schürmann | 2016-02-09 | 2 | -7/+70 | |
| | | ||||||
* | | Remove leftovers from spongycastle | Dominik Schürmann | 2016-02-09 | 1 | -1/+1 | |
| | | ||||||
* | | Replace spongycastle with bouncycastle | Dominik Schürmann | 2016-02-09 | 8 | -14/+14 | |
| | | ||||||
* | | delete linked contacts on turning off contact sync | Adithya Abraham Philip | 2016-02-06 | 2 | -1/+14 | |
|/ | ||||||
* | import: handle FileNotFoundException (fixes #1688) | Vincent Breitmoser | 2016-02-01 | 1 | -17/+26 | |
| | ||||||
* | Merge pull request #1683 from eighthave/master | Dominik Schürmann | 2016-01-26 | 2 | -0/+101 | |
|\ | | | | | allow "panic button" apps to clear all passphrases | |||||
| * | after receiving panic trigger and locking app, remove from history | Hans-Christoph Steiner | 2016-01-13 | 2 | -0/+53 | |
| | | | | | | | | This makes the app fully exit, and removes it from the Recent Apps listing. | |||||
| * | respond to generic panic trigger Intent by clearing passphrases | Hans-Christoph Steiner | 2016-01-13 | 1 | -0/+48 | |
| | | | | | | | | | | | | PanicKit provides a common framework for creating "panic button" apps that can trigger actions in "panic responder" apps. In this case, the response is to clear all the cached passphrases. | |||||
* | | Handle not installed PGP applet | Theo Franzén | 2016-01-15 | 3 | -1/+193 | |
|/ |