Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d54f1a0 authored by cketti's avatar cketti
Browse files

Merge pull request #2122 

Display warning on encrypted-only messages
parents 9e102a57 a77a632b

k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageCryptoPresenter.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -91,6 +91,11 @@ public class MessageCryptoPresenter implements OnCryptoClickListener { 
                        R.string.messageview_crypto_warning_error);

                        R.string.messageview_crypto_warning_error);

                break;

                break;

            }

            }

            case ENCRYPTED_UNSIGNED: {

                showMessageCryptoWarning(messageView, account, messageViewInfo,

                        R.string.messageview_crypto_warning_unsigned);

                break;

            }





            case CANCELLED: {

            case CANCELLED: {

                Drawable providerIcon = getOpenPgpApiProviderIcon(messageView.getContext(), account);

                Drawable providerIcon = getOpenPgpApiProviderIcon(messageView.getContext(), account);

k9mail/src/main/res/values/strings.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -1200,6 +1200,7 @@ Please submit bug reports, contribute new features and ask questions at 
    <string name="messageview_crypto_warning_expired">This message was signed by an <b>expired key!</b></string>

    <string name="messageview_crypto_warning_expired">This message was signed by an <b>expired key!</b></string>

    <string name="messageview_crypto_warning_insecure">This message was signed by an <b>insecure key!</b></string>

    <string name="messageview_crypto_warning_insecure">This message was signed by an <b>insecure key!</b></string>

    <string name="messageview_crypto_warning_error">There was an <b>error in this message\'s signature!</b></string>

    <string name="messageview_crypto_warning_error">There was an <b>error in this message\'s signature!</b></string>

    <string name="messageview_crypto_warning_unsigned">This message was encrypted, but not signed. It is <b>not end-to-end secure</b>!</string>

    <string name="recipient_error_non_ascii">Special characters are currently not supported!</string>

    <string name="recipient_error_non_ascii">Special characters are currently not supported!</string>

    <string name="recipient_error_parse_failed">Error parsing address!</string>

    <string name="recipient_error_parse_failed">Error parsing address!</string>

    <string name="account_settings_crypto_support_sign_only">Support signing of unencrypted messages</string>

    <string name="account_settings_crypto_support_sign_only">Support signing of unencrypted messages</string>