aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-0823-46/+45
|\
| * pgpsignencrypt: unsupported parameter combinations are a bugVincent Breitmoser2015-10-081-1/+0
| * pgpdecryptverify: refactor signature verification state into SignatureChecker...Vincent Breitmoser2015-10-081-1/+0
| * pgpdecryptverify: fix one pass signature check, actually use bracketed structureVincent Breitmoser2015-10-071-2/+4
| * center wizard buttons for other languagesDominik Schürmann2015-10-0410-21/+21
| * Raise min asymmetric key length for all ciphers to 2048 bitDominik Schürmann2015-10-0413-21/+15
| * Show dialog before sharing logDominik Schürmann2015-10-041-0/+5
* | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-011-0/+2
|\|
| * Improve NFC exception handling, fixes RuntimeExceptionsDominik Schürmann2015-09-301-0/+2
* | decrypt: revise card layout marginsVincent Breitmoser2015-09-301-16/+18
* | import: special treatment for application/pgp-keysVincent Breitmoser2015-09-301-0/+1
* | import: simplify ImportKeysActivity, don't display search bar for fixed inputVincent Breitmoser2015-09-301-9/+20
* | enc-export: use BackupActivity for backup from ViewKeyActivityVincent Breitmoser2015-09-302-2/+2
* | enc-export: handle onSaveInstanceState, add nicer layout for landscapeVincent Breitmoser2015-09-291-6/+6
* | enc-export: add "back" button to fail stateVincent Breitmoser2015-09-294-14/+423
* | enc-export: localize snackbar stringsVincent Breitmoser2015-09-291-0/+4
* | 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-291-0/+0
* | enc-export: implement save file as CREATE_DOCUMENT, with static fallback for ...Vincent Breitmoser2015-09-291-0/+1
* | Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-2832-197/+13217
|\|
| * Dont import more than 100 User IDs (OKC-01-002)Dominik Schürmann2015-09-251-0/+1
| * Remove save support for Android < 4.4 (OKC-01-014)Dominik Schürmann2015-09-243-10/+25
| * Fix genitiv in stringsDominik Schürmann2015-09-241-2/+2
| * Confirm designDominik Schürmann2015-09-248-135/+89
| * phrase confirmationDominik Schürmann2015-09-249-5/+13037
| * Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ...Dominik Schürmann2015-09-2015-48/+66
| * fix fallback for non-mime dataVincent Breitmoser2015-09-191-1/+1
* | export: more cleanup and splitting into subroutinesVincent Breitmoser2015-09-261-5/+0
* | enc-backup: didn't like the check mark icon after allVincent Breitmoser2015-09-256-2/+0
* | enc-backup: use black check icon for button, and some cleanupVincent Breitmoser2015-09-256-1/+1
* | enc-backup: use only one fragment after allVincent Breitmoser2015-09-252-126/+217
* | enc-backup: handle bad code more nicelyVincent Breitmoser2015-09-253-2/+17
* | enc-backup: ask for backup code againVincent Breitmoser2015-09-253-16/+213
* | encrypted export WIPVincent Breitmoser2015-09-194-0/+71
|/
* mime: skip trailing unsigned parts, and ignore nested signed dataVincent Breitmoser2015-09-171-0/+1
* mime: support for signed-then-encrypted formatVincent Breitmoser2015-09-171-0/+6
* multidcrypt: display k9 download only after decryption failureVincent Breitmoser2015-09-171-1/+1
* Use material overflow icon in decrypt listDominik Schürmann2015-09-179-3/+4
* white share icon in log display activityVincent Breitmoser2015-09-176-1/+1
* multidecrypt: black share icon in bottom sheetVincent Breitmoser2015-09-176-1/+1
* Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4jVincent Breitmoser2015-09-171-1/+2
|\
| * Add K-9 Mail warning toastDominik Schürmann2015-09-171-1/+2
* | multidecrypt: use chooser intent on click for everything but text/plain ACTIO...Vincent Breitmoser2015-09-171-0/+1
|/
* fail with warning if we get data from the AOSP mail client (see #290)Vincent Breitmoser2015-09-161-0/+1
* mime: add failure case if openpgp processing fails!Vincent Breitmoser2015-09-161-0/+1
* mime: add logging messagesVincent Breitmoser2015-09-161-13/+13
* mime: handle non-mime data, just pass it throughVincent Breitmoser2015-09-161-0/+1
* multidecrypt: use bottom sheet for longclick optionsVincent Breitmoser2015-09-162-1/+22
* multidecrypt: context menu per card, not per fileVincent Breitmoser2015-09-163-22/+12