Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | PgpSignEncryptOperation refactoring | Andrea Torlaschi | 2016-05-10 | 5 | -84/+49 |
| | |||||
* | Merge branch 'master' into backup-api | Dominik Schürmann | 2016-05-07 | 6 | -10/+121 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java extern/openpgp-api-lib | ||||
| * | Added license to ChangeUnlockOperation | Alex Fong | 2016-05-05 | 1 | -0/+17 |
| | | |||||
| * | Refactoring: Removed PassphraseChangeParcel and placed its functionality ↵ | Alex Fong | 2016-05-05 | 1 | -9/+8 |
| | | | | | | | | into ChangeUnlockParcel. | ||||
| * | Removed unrequired code, standardized terms used. | Alex Fong | 2016-05-05 | 1 | -24/+3 |
| | | |||||
| * | Refactored code to use functions already present in code, reduced liberties ↵ | Alex Fong | 2016-05-05 | 1 | -28/+0 |
| | | | | | | | | | | | | | | taken when modifying functions. Todo: Fix indentation for error messages | ||||
| * | (WIP) Change password when key is stripped #1692 | Alex Fong | 2016-05-04 | 2 | -0/+143 |
| | | | | | | | | | | | | | | | | | | | | | | Approach: Find the first unstripped secret key and use it for passphrase verification All unstripped keys will have their passphrase changed to new passphrase, if possible. Current Progress: Changing the passphrase of keys works fine. Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword" may be possible if given the go-ahead. | ||||
| * | Merge pull request #1819 from 007durgesh219/Issue#1817 | Dominik Schürmann | 2016-04-29 | 1 | -0/+1 |
| |\ | | | | | | | Fix Crash when no encryption subkey is available, Issue #1817 | ||||
| | * | Fix Crash when no encryption subkey is available, Issue #1817 | Durgesh | 2016-04-14 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com> | ||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2016-04-18 | 2 | -5/+5 |
| |\ \ | |||||
| | * | | Update obsolete Nfc class prefixes | Nikita Mikhailov | 2016-04-16 | 2 | -5/+5 |
| | |/ | |||||
| * / | Fix delete_fail | Dominik Schürmann | 2016-04-18 | 1 | -1/+2 |
| |/ | |||||
| * | get rid of code path for pin and notation data handling | Vincent Breitmoser | 2016-03-23 | 1 | -2/+0 |
| | | |||||
| * | Set filename after decryption | Andrea Torlaschi | 2016-03-05 | 1 | -2/+3 |
| | | |||||
* | | Add backup API | Dominik Schürmann | 2016-03-01 | 1 | -10/+27 |
|/ | |||||
* | ditch isLikelyText flag, set mimeType to text/plain in that case | Vincent Breitmoser | 2016-02-23 | 1 | -2/+2 |
| | |||||
* | move CharsetVerifier to utils package | Vincent Breitmoser | 2016-02-23 | 2 | -142/+1 |
| | |||||
* | documentation and cleanup | Vincent Breitmoser | 2016-02-22 | 2 | -3/+23 |
| | |||||
* | externalize CharsetVerifier, add looksLikeText to OpenPgpMetadata object | Vincent Breitmoser | 2016-02-22 | 2 | -76/+140 |
| | |||||
* | mime: try to decode with given charset or utf-8 while file is read | Vincent Breitmoser | 2016-02-22 | 2 | -6/+84 |
| | |||||
* | Merge branch 'master' into performance | Vincent Breitmoser | 2016-02-10 | 4 | -11/+11 |
|\ | |||||
| * | Replace spongycastle with bouncycastle | Dominik Schürmann | 2016-02-09 | 4 | -11/+11 |
| | | |||||
* | | performance: avoid expensive getSecretKeyType call, use cached where possible | Vincent Breitmoser | 2016-02-05 | 1 | -13/+15 |
|/ | |||||
* | import: handle FileNotFoundException (fixes #1688) | Vincent Breitmoser | 2016-02-01 | 2 | -13/+14 |
| | |||||
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵ | Dominik Schürmann | 2016-01-10 | 1 | -3/+3 |
| | | | | what tokens are supported | ||||
* | passphraseactivity: add inline spinner to password dialog | Vincent Breitmoser | 2016-01-06 | 1 | -21/+0 |
| | |||||
* | api: add micalg result extra to detached signature api call | Vincent Breitmoser | 2015-12-17 | 1 | -0/+10 |
| | |||||
* | some work on benchmark operation (affects only debug build) | Vincent Breitmoser | 2015-12-13 | 1 | -1/+4 |
| | |||||
* | Merge pull request #1610 from open-keychain/facebook | Dominik Schürmann | 2015-12-10 | 2 | -0/+59 |
|\ | | | | | Basic Facebook Support | ||||
| * | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 2 | -0/+59 |
| | | |||||
* | | Issue#1605 solved | TedaLIEz | 2015-12-09 | 1 | -1/+6 |
|/ | |||||
* | Show notification when READ_CONTACTS permission is denied in sync service, ↵ | Dominik Schürmann | 2015-11-23 | 4 | -10/+6 |
| | | | | hide linked contact card if permission is denied | ||||
* | decrypt: skip all encountered marker packets (fix #1582) | Vincent Breitmoser | 2015-11-15 | 2 | -4/+2 |
| | |||||
* | inputdataop: leave content as-is if no header found (fixes #1592) | Vincent Breitmoser | 2015-11-14 | 1 | -0/+9 |
| | |||||
* | decrypt: skip unavailable and unsuitable keys | Vincent Breitmoser | 2015-11-13 | 1 | -0/+2 |
| | |||||
* | bench: add simple s2k benchmark (iterations for 100ms) | Vincent Breitmoser | 2015-11-04 | 2 | -3/+50 |
| | |||||
* | bench: run ops multiple times and for an average time | Vincent Breitmoser | 2015-11-04 | 2 | -16/+29 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-11-04 | 1 | -1/+3 |
|\ | |||||
| * | changed KeyserverSyncAdapterService to work with START_REDELIVER_INTENT | Adithya Abraham Philip | 2015-10-31 | 1 | -1/+3 |
| | | |||||
* | | bench: simple working benchmark | Vincent Breitmoser | 2015-11-04 | 5 | -4/+23 |
| | | |||||
* | | bench: add benchmark operation for testing | Vincent Breitmoser | 2015-11-04 | 3 | -0/+142 |
|/ | |||||
* | import: make operation cancelable (again), make "update all" cancelable | Vincent Breitmoser | 2015-10-29 | 1 | -16/+28 |
| | | | | (also, use unbounded blocking queue to fix update of more than 10 keys) | ||||
* | import: reduce number of threads a little, and code cleanup | Vincent Breitmoser | 2015-10-29 | 1 | -39/+37 |
| | |||||
* | make use of proxies a Keyserver property | Vincent Breitmoser | 2015-10-29 | 2 | -9/+9 |
| | |||||
* | editkey: always return EditKeyResult | Vincent Breitmoser | 2015-10-29 | 3 | -14/+16 |
| | |||||
* | use Proxy.NO_PROXY instead of null value for no proxy | Vincent Breitmoser | 2015-10-29 | 2 | -10/+7 |
| | |||||
* | uploadop: clean up, add logging | Vincent Breitmoser | 2015-10-29 | 7 | -65/+109 |
| | |||||
* | inputdataoperation: guess filetype from filename for generic application/ ↵ | Vincent Breitmoser | 2015-10-23 | 2 | -3/+18 |
| | | | | mime types | ||||
* | re-add accidentally deleted string | Vincent Breitmoser | 2015-10-21 | 1 | -1/+2 |
| | |||||
* | Renaming export strings to backup | Dominik Schürmann | 2015-10-15 | 3 | -45/+45 |
| |