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 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 | |
| |/ | ||||||
* / | Add backup API | Dominik Schürmann | 2016-03-01 | 2 | -9/+49 | |
|/ | ||||||
* | 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 | |
|/ | ||||||
* | add debug option to use dummy backup code (fixes #1675) | Vincent Breitmoser | 2016-01-13 | 1 | -1/+51 | |
| | ||||||
* | Merge pull request #1614 from fidesmo/feature-introduce-nfc-handling-via-nordpol | Dominik Schürmann | 2016-01-13 | 2 | -61/+28 | |
|\ | | | | | Use Nordpol for BaseNfcActivity | |||||
| * | Use new version of Nordpol from jcenter | Petter Arvidsson | 2016-01-12 | 1 | -1/+1 | |
| | | | | | | | | | | - Use version 0.1.13 that is now available on jcenter - Add a "gradle witness" for this version | |||||
| * | Use Nordpol for BaseNfcActivity | Petter Arvidsson | 2016-01-12 | 2 | -61/+28 | |
| | | | | | | | | | | | | | | | | - Replace handling of intents with Nordpol tag dispatcher - Update CreateKeyActivity to pass it's intent to the tag dispatcher when invoked by the system (onCreate) - Add Fidesmo marmeladburk repository - Add dependency on nordpol-android and nordpol-core | |||||
* | | fix symmetric decryption with backup code (fixes #1677) | Vincent Breitmoser | 2016-01-13 | 1 | -5/+6 | |
|/ | ||||||
* | fix symmetric decryption (fixes #1672) | Vincent Breitmoser | 2016-01-12 | 1 | -2/+2 | |
| | ||||||
* | Fix singleTop definitions | Dominik Schürmann | 2016-01-11 | 1 | -16/+2 | |
| | ||||||
* | Merge pull request #1666 from open-keychain/file-import-fix | Dominik Schürmann | 2016-01-11 | 1 | -2/+15 | |
|\ | | | | | Fixed File Import issue due to onResumeFragments | |||||
| * | fixed file import issue due to onResumeFragments | Adithya Abraham Philip | 2016-01-09 | 1 | -2/+15 | |
| | |