| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-11-02 | 1 | -14/+51 |
|\| | | |
|
| * | | | keylist: add "search for query" button to empty view | Vincent Breitmoser | 2015-11-02 | 1 | -14/+51 |
* | | | | Add runtime permission check for QR Code activity | Dominik Schürmann | 2015-11-02 | 1 | -14/+78 |
|/ / / |
|
* | | | update material drawer library | Dominik Schürmann | 2015-10-29 | 1 | -22/+20 |
* | | | import: make operation cancelable (again), make "update all" cancelable | Vincent Breitmoser | 2015-10-29 | 2 | -3/+8 |
* | | | encrypttext: fix mimetype check logic (#1574) | Vincent Breitmoser | 2015-10-29 | 1 | -1/+2 |
* | | | prevent crashes in EncryptKeyCompletionView (2) | Vincent Breitmoser | 2015-10-26 | 1 | -10/+19 |
* | | | Target SDK 23 and related fixes | Dominik Schürmann | 2015-10-26 | 1 | -5/+4 |
* | | | Update tokenautocomplete | Dominik Schürmann | 2015-10-26 | 1 | -15/+13 |
* | | | Update zxing-android-embedded with new custom activity | Dominik Schürmann | 2015-10-26 | 2 | -6/+75 |
* | | | import: move uri resolution into AsyncTask, prevent NetworkOnMainThreadException | Vincent Breitmoser | 2015-10-26 | 2 | -49/+44 |
* | | | decrypt: restart operation if interrupted by fragment recreation | Vincent Breitmoser | 2015-10-26 | 1 | -15/+12 |
* | | | linked: fix crash on <= lollipop | Vincent Breitmoser | 2015-10-25 | 1 | -3/+6 |
|/ / |
|
* | | import: use filesize from content provider on input uri | Vincent Breitmoser | 2015-10-23 | 1 | -3/+3 |
* | | decryptlist: use generic file icon for application/octet-stream | Vincent Breitmoser | 2015-10-23 | 1 | -0/+4 |
* | | fix argument order screwup in FileHelper | Vincent Breitmoser | 2015-10-22 | 2 | -2/+2 |
* | | decrypt: special case single encrypted text -> directly display text, if not ... | Vincent Breitmoser | 2015-10-21 | 1 | -0/+23 |
* | | encrypttext: localization, and truncate overlong input | Vincent Breitmoser | 2015-10-21 | 1 | -2/+6 |
* | | encrypttext: handle input via Intent.EXTRA_STREAM in addition to Intent.EXTRA... | Vincent Breitmoser | 2015-10-21 | 1 | -6/+34 |
* | | displaytextactivity: truncate displayed text if too long | Vincent Breitmoser | 2015-10-21 | 1 | -0/+8 |
* | | Integrate yubikey reset method | Dominik Schürmann | 2015-10-16 | 2 | -5/+32 |
* | | UI preparations for yubikey reset | Dominik Schürmann | 2015-10-16 | 2 | -31/+68 |
* | | Remove default PIN setting | Dominik Schürmann | 2015-10-16 | 3 | -34/+0 |
* | | Clear cache when PIN is too short | Dominik Schürmann | 2015-10-16 | 2 | -12/+7 |
* | | Prevent nfc dialog from closing when touching outside of it, add cancel button | Dominik Schürmann | 2015-10-16 | 3 | -6/+16 |
* | | Allow choosing of YubiKey PIN | Dominik Schürmann | 2015-10-16 | 3 | -155/+82 |
* | | Add NFC reset method | Dominik Schürmann | 2015-10-16 | 1 | -10/+46 |
* | | Remove debug log | Dominik Schürmann | 2015-10-15 | 1 | -1/+0 |
* | | Display backup code UI instead of passphrase on decrypt | Dominik Schürmann | 2015-10-15 | 2 | -2/+58 |
* | | Check if backup code in passphrase dialog | Dominik Schürmann | 2015-10-15 | 1 | -0/+21 |
* | | File ending consisitency for backups | Dominik Schürmann | 2015-10-15 | 1 | -3/+5 |
* | | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 4 | -69/+75 |
* | | Remove debug code | Dominik Schürmann | 2015-10-15 | 1 | -9/+1 |
* | | Mime type consistency | Dominik Schürmann | 2015-10-15 | 4 | -8/+8 |
* | | Use correct filename when sharing backup | Dominik Schürmann | 2015-10-15 | 1 | -8/+8 |
* | | Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for d... | Dominik Schürmann | 2015-10-15 | 5 | -12/+12 |
* | | Add restore to backup fragment, cleanup, renamings | Dominik Schürmann | 2015-10-15 | 3 | -20/+57 |
* | | Rename DrawerBackupFragment to BackupRestoreFragment | Dominik Schürmann | 2015-10-15 | 2 | -3/+3 |
* | | Cleanup in BackupCodeFragment | Dominik Schürmann | 2015-10-15 | 1 | -16/+14 |
* | | Fix drawer selection for backup | Dominik Schürmann | 2015-10-15 | 1 | -1/+1 |
* | | Unify backup filename | Dominik Schürmann | 2015-10-15 | 1 | -2/+3 |
* | | Dont force OpenKeychain in open with for pgp-keys | Dominik Schürmann | 2015-10-15 | 1 | -1/+1 |
* | | Open decrypted application/pgp-keys only in OpenKeychain | Dominik Schürmann | 2015-10-15 | 1 | -2/+7 |
* | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-09 | 1 | -26/+3 |
|\ \ |
|
| * | | Revert "viewkeyactivity: ask for passphrase for backup only if key has one" | Vincent Breitmoser | 2015-10-09 | 1 | -29/+3 |
| * | | viewkeyactivity: ask for passphrase for backup only if key has one | Vincent Breitmoser | 2015-10-09 | 1 | -3/+29 |
| * | | Revert "Check that the encrypt input uris are not linked to our own internal ... | Dominik Schürmann | 2015-10-08 | 1 | -26/+3 |
* | | | viewkeyactivity: ask for passphrase for backup only if key has one | Vincent Breitmoser | 2015-10-09 | 1 | -3/+29 |
* | | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 7 | -79/+116 |
|\| | |
|
| * | | Remove ShareHelper: Not compat with Android >= 5, reduce code complexity | Dominik Schürmann | 2015-10-08 | 3 | -55/+6 |