aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-0112-116/+143
|\|
| * spongy: use version which doesn't skip bad signaturesVincent Breitmoser2015-10-011-0/+3
| * No show key button for RESULT_INVALID_SIGNATURE, CleanupDominik Schürmann2015-09-304-10/+20
| * Cleanup in BaseNfcActivityDominik Schürmann2015-09-301-10/+2
| * Improve NFC exception handling, fixes RuntimeExceptionsDominik Schürmann2015-09-307-59/+68
| * Fix crashes with Fluffys PGP appletDominik Schürmann2015-09-304-20/+32
| * Enable YubiKey creationDominik Schürmann2015-09-301-14/+5
| * Full 160 bit for phrase confirm, stuffed with onesDominik Schürmann2015-09-293-15/+25
* | decrypt: revise card layout marginsVincent Breitmoser2015-09-301-16/+18
* | import: special treatment for application/pgp-keysVincent Breitmoser2015-09-302-4/+11
* | import: simplify ImportKeysActivity, don't display search bar for fixed inputVincent Breitmoser2015-09-302-168/+109
* | enc-export: use BackupActivity for backup from ViewKeyActivityVincent Breitmoser2015-09-304-11/+17
* | inputdata: don't attempt mime decode on application/* except octet-streamVincent Breitmoser2015-09-301-1/+1
* | decryptverify: add trivial detection of pgp ascii-armored dataVincent Breitmoser2015-09-302-2/+36
* | enc-export: handle onSaveInstanceState, add nicer layout for landscapeVincent Breitmoser2015-09-294-45/+93
* | enc-export: add "back" button to fail stateVincent Breitmoser2015-09-295-20/+439
* | enc-export: add comments about debug mechanismsVincent Breitmoser2015-09-291-0/+3
* | enc-export: localize snackbar stringsVincent Breitmoser2015-09-293-7/+11
* | enc-export: transifex compatVincent Breitmoser2015-09-291-7/+7
* | enc-export: localization, and layout compatibilityVincent Breitmoser2015-09-294-72/+394
* | enc-export: rename fragment to match classVincent Breitmoser2015-09-292-1/+1
* | enc-export: implement save file as CREATE_DOCUMENT, with static fallback for ...Vincent Breitmoser2015-09-293-16/+76
* | enc-export: mv BackupCodeEntryFragment BackupCodeFragmentVincent Breitmoser2015-09-292-4/+4
* | use annotations for android sdk constraintsVincent Breitmoser2015-09-284-41/+35
* | Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-2868-744/+2098
|\|
| * Harden parsing of keyserver results (OKC-01-003)Dominik Schürmann2015-09-254-30/+48
| * Dont import more than 100 User IDs (OKC-01-002)Dominik Schürmann2015-09-253-2/+8
| * Check that the encrypt input uris are not linked to our own internal storage ...Dominik Schürmann2015-09-251-3/+26
| * Prevent database downgrade (OKC-01-012)Dominik Schürmann2015-09-251-1/+10
| * Reject filenames with slashes completlyDominik Schürmann2015-09-241-4/+5
| * Cleanup FileHelperDominik Schürmann2015-09-244-20/+16
| * Remove save support for Android < 4.4 (OKC-01-014)Dominik Schürmann2015-09-2410-319/+54
| * Fix some illegal state exceptionsDominik Schürmann2015-09-242-5/+28
| * Fix genitiv in stringsDominik Schürmann2015-09-241-2/+2
| * Confirm designDominik Schürmann2015-09-249-146/+105
| * phrase confirmationDominik Schürmann2015-09-2413-11/+1352
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-09-211-6/+10
| |\
| | * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-218-33/+184
| | |\
| | * \ Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-2122-142/+200
| | |\ \
| | * | | mime: don't do mime parsing if the encrypted data has a filenameVincent Breitmoser2015-09-211-6/+10
| * | | | Use api.keybase.ioDominik Schürmann2015-09-213-31/+39
| | |_|/ | |/| |
| * | | Fix deps verificationDominik Schürmann2015-09-211-1/+1
| * | | Pin keybase certificateDominik Schürmann2015-09-213-20/+56
| * | | Use more modular Keybase lib with OkHttp wrapperDominik Schürmann2015-09-216-33/+148
| | |/ | |/|
| * | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ...Dominik Schürmann2015-09-2022-142/+200
| |/
| * use intent icon as fallback if we get no thumbnailVincent Breitmoser2015-09-191-2/+4
| * inform storage provider of uri content-type for decrypted outputVincent Breitmoser2015-09-191-0/+6
| * skip mime parsing if we already know the content type isn't suitableVincent Breitmoser2015-09-191-5/+18
| * fix fallback for non-mime dataVincent Breitmoser2015-09-193-21/+24
| * Fix DECRYPT_DATA intentDominik Schürmann2015-09-182-4/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 02:54:55 +0000