Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-01 | 13 | -116/+143 | |
|\| | ||||||
| * | spongy: use version which doesn't skip bad signatures | Vincent Breitmoser | 2015-10-01 | 2 | -0/+3 | |
| | | ||||||
| * | spongy: treat eddsa signatures as non-verifiable signatures | Vincent Breitmoser | 2015-10-01 | 1 | -0/+0 | |
| | | ||||||
| * | 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 | 7 | -59/+68 | |
| | | ||||||
| * | 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 | |
| | | ||||||
* | | decrypt: revise card layout margins | Vincent Breitmoser | 2015-09-30 | 1 | -16/+18 | |
| | | ||||||
* | | import: special treatment for application/pgp-keys | Vincent Breitmoser | 2015-09-30 | 2 | -4/+11 | |
| | | ||||||
* | | import: simplify ImportKeysActivity, don't display search bar for fixed input | Vincent Breitmoser | 2015-09-30 | 2 | -168/+109 | |
| | | ||||||
* | | enc-export: use BackupActivity for backup from ViewKeyActivity | Vincent Breitmoser | 2015-09-30 | 4 | -11/+17 | |
| | | ||||||
* | | 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 | 2 | -2/+36 | |
| | | ||||||
* | | enc-export: handle onSaveInstanceState, add nicer layout for landscape | Vincent Breitmoser | 2015-09-29 | 4 | -45/+93 | |
| | | ||||||
* | | enc-export: add "back" button to fail state | Vincent Breitmoser | 2015-09-29 | 5 | -20/+439 | |
| | | ||||||
* | | 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 | 3 | -7/+11 | |
| | | ||||||
* | | enc-export: transifex compat | Vincent Breitmoser | 2015-09-29 | 1 | -7/+7 | |
| | | ||||||
* | | enc-export: localization, and layout compatibility | Vincent Breitmoser | 2015-09-29 | 4 | -72/+394 | |
| | | ||||||
* | | enc-export: rename fragment to match class | Vincent Breitmoser | 2015-09-29 | 2 | -1/+1 | |
| | | ||||||
* | | enc-export: implement save file as CREATE_DOCUMENT, with static fallback for ↵ | Vincent Breitmoser | 2015-09-29 | 3 | -16/+76 | |
| | | | | | | | | 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 | 71 | -745/+2100 | |
|\| | ||||||
| * | 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 | 3 | -2/+8 | |
| | | ||||||
| * | 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 | 10 | -319/+54 | |
| | | ||||||
| * | Fix some illegal state exceptions | Dominik Schürmann | 2015-09-24 | 2 | -5/+28 | |
| | | ||||||
| * | Fix genitiv in strings | Dominik Schürmann | 2015-09-24 | 1 | -2/+2 | |
| | | ||||||
| * | Confirm design | Dominik Schürmann | 2015-09-24 | 10 | -146/+106 | |
| | | ||||||
| * | phrase confirmation | Dominik Schürmann | 2015-09-24 | 13 | -11/+1352 | |
| | | ||||||
| * | 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 | 9 | -33/+184 | |
| | |\ | ||||||
| | * \ | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-21 | 22 | -142/+200 | |
| | |\ \ | ||||||
| | * | | | 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 | 4 | -31/+39 | |
| | |_|/ | |/| | | ||||||
| * | | | Fix deps verification | Dominik Schürmann | 2015-09-21 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Pin keybase certificate | Dominik Schürmann | 2015-09-21 | 4 | -20/+56 | |
| | | | | ||||||
| * | | | Use more modular Keybase lib with OkHttp wrapper | Dominik Schürmann | 2015-09-21 | 7 | -33/+148 | |
| | |/ | |/| | ||||||
| * | | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ↵ | Dominik Schürmann | 2015-09-20 | 22 | -142/+200 | |
| |/ | | | | | | | 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 | 3 | -21/+24 | |
| | |