Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-01 | 10 | -116/+138 | |
|\| | | ||||||
| * | | No show key button for RESULT_INVALID_SIGNATURE, Cleanup | Dominik Schürmann | 2015-09-30 | 4 | -10/+20 | |
| | | | ||||||
| * | | Cleanup in BaseNfcActivity | Dominik Schürmann | 2015-09-30 | 1 | -10/+2 | |
| | | | ||||||
| * | | Improve NFC exception handling, fixes RuntimeExceptions | Dominik Schürmann | 2015-09-30 | 6 | -59/+66 | |
| | | | ||||||
| * | | Fix crashes with Fluffys PGP applet | Dominik Schürmann | 2015-09-30 | 4 | -20/+32 | |
| | | | ||||||
| * | | Enable YubiKey creation | Dominik Schürmann | 2015-09-30 | 1 | -14/+5 | |
| | | | ||||||
| * | | Full 160 bit for phrase confirm, stuffed with ones | Dominik Schürmann | 2015-09-29 | 3 | -15/+25 | |
| | | | ||||||
* | | | import: special treatment for application/pgp-keys | Vincent Breitmoser | 2015-09-30 | 1 | -4/+10 | |
| | | | ||||||
* | | | import: simplify ImportKeysActivity, don't display search bar for fixed input | Vincent Breitmoser | 2015-09-30 | 1 | -159/+89 | |
| | | | ||||||
* | | | enc-export: use BackupActivity for backup from ViewKeyActivity | Vincent Breitmoser | 2015-09-30 | 2 | -9/+15 | |
| | | | ||||||
* | | | inputdata: don't attempt mime decode on application/* except octet-stream | Vincent Breitmoser | 2015-09-30 | 1 | -1/+1 | |
| | | | ||||||
* | | | decryptverify: add trivial detection of pgp ascii-armored data | Vincent Breitmoser | 2015-09-30 | 1 | -2/+33 | |
| | | | ||||||
* | | | enc-export: handle onSaveInstanceState, add nicer layout for landscape | Vincent Breitmoser | 2015-09-29 | 2 | -38/+86 | |
| | | | ||||||
* | | | enc-export: add "back" button to fail state | Vincent Breitmoser | 2015-09-29 | 1 | -6/+16 | |
| | | | ||||||
* | | | enc-export: add comments about debug mechanisms | Vincent Breitmoser | 2015-09-29 | 1 | -0/+3 | |
| | | | ||||||
* | | | enc-export: localize snackbar strings | Vincent Breitmoser | 2015-09-29 | 2 | -7/+7 | |
| | | | ||||||
* | | | enc-export: rename fragment to match class | Vincent Breitmoser | 2015-09-29 | 1 | -1/+1 | |
| | | | ||||||
* | | | enc-export: implement save file as CREATE_DOCUMENT, with static fallback for ↵ | Vincent Breitmoser | 2015-09-29 | 2 | -16/+75 | |
| | | | | | | | | | | | | pre-kitkat | |||||
* | | | enc-export: mv BackupCodeEntryFragment BackupCodeFragment | Vincent Breitmoser | 2015-09-29 | 2 | -4/+4 | |
| | | | ||||||
* | | | use annotations for android sdk constraints | Vincent Breitmoser | 2015-09-28 | 4 | -41/+35 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/master' into encrypted-export | Vincent Breitmoser | 2015-09-28 | 31 | -529/+818 | |
|\| | | ||||||
| * | | Harden parsing of keyserver results (OKC-01-003) | Dominik Schürmann | 2015-09-25 | 4 | -30/+48 | |
| | | | ||||||
| * | | Dont import more than 100 User IDs (OKC-01-002) | Dominik Schürmann | 2015-09-25 | 2 | -2/+7 | |
| | | | ||||||
| * | | Check that the encrypt input uris are not linked to our own internal storage ↵ | Dominik Schürmann | 2015-09-25 | 1 | -3/+26 | |
| | | | | | | | | | | | | (OKC-01-010) | |||||
| * | | Prevent database downgrade (OKC-01-012) | Dominik Schürmann | 2015-09-25 | 1 | -1/+10 | |
| | | | ||||||
| * | | Reject filenames with slashes completly | Dominik Schürmann | 2015-09-24 | 1 | -4/+5 | |
| | | | ||||||
| * | | Cleanup FileHelper | Dominik Schürmann | 2015-09-24 | 4 | -20/+16 | |
| | | | ||||||
| * | | Remove save support for Android < 4.4 (OKC-01-014) | Dominik Schürmann | 2015-09-24 | 7 | -309/+29 | |
| | | | ||||||
| * | | Fix some illegal state exceptions | Dominik Schürmann | 2015-09-24 | 2 | -5/+28 | |
| | | | ||||||
| * | | Confirm design | Dominik Schürmann | 2015-09-24 | 1 | -11/+16 | |
| | | | ||||||
| * | | phrase confirmation | Dominik Schürmann | 2015-09-24 | 4 | -6/+347 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-09-21 | 1 | -6/+10 | |
| |\ \ | ||||||
| | * \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-21 | 6 | -18/+136 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-21 | 5 | -94/+101 | |
| | |\ \ \ | ||||||
| | * | | | | mime: don't do mime parsing if the encrypted data has a filename | Vincent Breitmoser | 2015-09-21 | 1 | -6/+10 | |
| | | | | | | ||||||
| * | | | | | Use api.keybase.io | Dominik Schürmann | 2015-09-21 | 1 | -6/+1 | |
| | |_|/ / | |/| | | | ||||||
| * | | | | Pin keybase certificate | Dominik Schürmann | 2015-09-21 | 2 | -20/+31 | |
| | | | | | ||||||
| * | | | | Use more modular Keybase lib with OkHttp wrapper | Dominik Schürmann | 2015-09-21 | 5 | -18/+125 | |
| | |/ / | |/| | | ||||||
| * | | | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ↵ | Dominik Schürmann | 2015-09-20 | 5 | -94/+101 | |
| |/ / | | | | | | | | | | add (OKC-01-018) | |||||
| * | | use intent icon as fallback if we get no thumbnail | Vincent Breitmoser | 2015-09-19 | 1 | -2/+4 | |
| | | | ||||||
| * | | inform storage provider of uri content-type for decrypted output | Vincent Breitmoser | 2015-09-19 | 1 | -0/+6 | |
| |/ | ||||||
| * | skip mime parsing if we already know the content type isn't suitable | Vincent Breitmoser | 2015-09-19 | 1 | -5/+18 | |
| | | ||||||
| * | fix fallback for non-mime data | Vincent Breitmoser | 2015-09-19 | 2 | -20/+23 | |
| | | ||||||
| * | Fix DECRYPT_DATA intent | Dominik Schürmann | 2015-09-18 | 1 | -1/+1 | |
| | | ||||||
* | | enc-export: easier mechanism to get backup code from edittexts | Vincent Breitmoser | 2015-09-28 | 1 | -7/+8 | |
| | | ||||||
* | | upload: re-add upload by bytes | Vincent Breitmoser | 2015-09-28 | 6 | -59/+83 | |
| | | ||||||
* | | enc-backup: working "save to file" | Vincent Breitmoser | 2015-09-28 | 1 | -8/+21 | |
| | | ||||||
* | | enc-backup: working first version | Vincent Breitmoser | 2015-09-28 | 2 | -50/+82 | |
| | | ||||||
* | | signencrypt: make sure we buffer the InputStream | Vincent Breitmoser | 2015-09-28 | 1 | -4/+5 | |
| | | ||||||
* | | export: improve stream handling, performance | Vincent Breitmoser | 2015-09-28 | 1 | -3/+12 | |
| | |