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

Commit f5c679fb authored by Alessandro Russo's avatar Alessandro Russo Committed by Jesse Vincent
Browse files

Added support for requesting read receipts

parent a779b1e2

res/menu/message_compose_option.xml

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ 
		android:title="@string/send_as"

		android:icon="@drawable/ic_menu_identity"

	/>

	<item

		android:id="@+id/read_receipt"

	android:alphabeticShortcut="r"

		android:title="@string/read_receipt"

	/>

	<item

		android:id="@+id/add_attachment_image"

		android:title="@string/add_attachment_action_image"

res/values-it/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ 
    <string name="view_hide_details_action">Mostra/nascondi dettagli</string>

    <string name="add_cc_bcc_action">Aggiungi Cc/Ccn</string>

    <string name="edit_subject_action">Modifica oggetto</string>

    <string name="read_receipt">Notifica di lettura</string>

    <string name="read_receipt_enabled">Notifica di lettura attiva</string>

    <string name="read_receipt_disabled">Notifica di lettura disattiva</string>

    <string name="add_attachment_action">Aggiungi allegato</string>

    <string name="add_attachment_action_image">Aggiungi allegato (Immagine)</string>

    <string name="add_attachment_action_video">Aggiungi allegato (Video)</string>
@@ -569,6 +572,9 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope 
    <string name="account_settings_message_format_text">Plain Text (verranno rimosse immagini e formattazione)</string>

    <string name="account_settings_message_format_html">HTML (immagini e formattazione verranno preservate)</string>



    <string name="account_settings_message_read_receipt_label">Notifica di lettura</string>

    <string name="account_settings_message_read_receipt_summary">Richiedi sempre la notifica di lettura</string>



    <string name="account_settings_quote_style_label">Aspetto testo quotato nelle risposte</string>

    <string name="account_settings_quote_style_prefix">Prefisso (come Gmail, Pine)</string>

    <string name="account_settings_quote_style_header">Intestazione (come Outlook, Yahoo!, Hotmail)</string>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ 
    <string name="view_hide_details_action">View/hide details</string>

    <string name="add_cc_bcc_action">Add Cc/Bcc</string>

    <string name="edit_subject_action">Edit subject</string>

    <string name="read_receipt">Read Receipt</string>

    <string name="read_receipt_enabled">Read receipt enabled</string>

    <string name="read_receipt_disabled">Read receipt disabled</string>

    <string name="add_attachment_action">Add attachment</string>

    <string name="add_attachment_action_image">Add attachment (Image)</string>

    <string name="add_attachment_action_video">Add attachment (Video)</string>
@@ -572,6 +575,9 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin 
    <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>

    <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>



    <string name="account_settings_message_read_receipt_label">Read receipt</string>

    <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>



    <string name="account_settings_quote_style_label">Reply quoting style</string>

    <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>

    <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>

res/xml/account_settings_preferences.xml

+6 −0
Original line number Diff line number Diff line
@@ -232,6 +232,12 @@ 
            android:entries="@array/account_settings_message_format_entries"

            android:entryValues="@array/account_settings_message_format_values" />



        <CheckBoxPreference

	    android:persistent="false"

	    android:key="message_read_receipt"

	    android:title="@string/account_settings_message_read_receipt_label"

	    android:summary="@string/account_settings_message_read_receipt_summary" />



        <ListPreference

            android:persistent="false"

            android:key="quote_style"

src/com/fsck/k9/Account.java

+13 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ public class Account implements BaseAccount { 
    private static final String[] networkTypes = { TYPE_WIFI, TYPE_MOBILE, TYPE_OTHER };



    private static final MessageFormat DEFAULT_MESSAGE_FORMAT = MessageFormat.HTML;

    private static final boolean DEFAULT_MESSAGE_READ_RECEIPT = false;

    private static final QuoteStyle DEFAULT_QUOTE_STYLE = QuoteStyle.PREFIX;

    private static final String DEFAULT_QUOTE_PREFIX = ">";

    private static final boolean DEFAULT_QUOTED_TEXT_SHOWN = true;
@@ -125,6 +126,7 @@ public class Account implements BaseAccount { 
    // current set of fetched messages

    private boolean mRingNotified;

    private MessageFormat mMessageFormat;

    private boolean mMessageReadReceipt;

    private QuoteStyle mQuoteStyle;

    private String mQuotePrefix;

    private boolean mDefaultQuotedTextShown;
@@ -203,6 +205,7 @@ public class Account implements BaseAccount { 
        maximumPolledMessageAge = -1;

        maximumAutoDownloadMessageSize = 32768;

        mMessageFormat = DEFAULT_MESSAGE_FORMAT;

        mMessageReadReceipt = DEFAULT_MESSAGE_READ_RECEIPT;

        mQuoteStyle = DEFAULT_QUOTE_STYLE;

        mQuotePrefix = DEFAULT_QUOTE_PREFIX;

        mDefaultQuotedTextShown = DEFAULT_QUOTED_TEXT_SHOWN;
@@ -277,6 +280,7 @@ public class Account implements BaseAccount { 
        maximumPolledMessageAge = prefs.getInt(mUuid + ".maximumPolledMessageAge", -1);

        maximumAutoDownloadMessageSize = prefs.getInt(mUuid + ".maximumAutoDownloadMessageSize", 32768);

        mMessageFormat = MessageFormat.valueOf(prefs.getString(mUuid + ".messageFormat", DEFAULT_MESSAGE_FORMAT.name()));

        mMessageReadReceipt = prefs.getBoolean(mUuid + ".messageReadReceipt", DEFAULT_MESSAGE_READ_RECEIPT);

        mQuoteStyle = QuoteStyle.valueOf(prefs.getString(mUuid + ".quoteStyle", DEFAULT_QUOTE_STYLE.name()));

        mQuotePrefix = prefs.getString(mUuid + ".quotePrefix", DEFAULT_QUOTE_PREFIX);

        mDefaultQuotedTextShown = prefs.getBoolean(mUuid + ".defaultQuotedTextShown", DEFAULT_QUOTED_TEXT_SHOWN);
@@ -529,6 +533,7 @@ public class Account implements BaseAccount { 
        editor.putInt(mUuid + ".maximumPolledMessageAge", maximumPolledMessageAge);

        editor.putInt(mUuid + ".maximumAutoDownloadMessageSize", maximumAutoDownloadMessageSize);

        editor.putString(mUuid + ".messageFormat", mMessageFormat.name());

        editor.putBoolean(mUuid + ".messageReadReceipt", mMessageReadReceipt);

        editor.putString(mUuid + ".quoteStyle", mQuoteStyle.name());

        editor.putString(mUuid + ".quotePrefix", mQuotePrefix);

        editor.putBoolean(mUuid + ".defaultQuotedTextShown", mDefaultQuotedTextShown);
@@ -1284,6 +1289,14 @@ public class Account implements BaseAccount { 
        this.mMessageFormat = messageFormat;

    }



    public synchronized boolean isMessageReadReceiptAlways() {

        return mMessageReadReceipt;

    }



    public synchronized void setMessageReadReceipt(boolean messageReadReceipt) {

        mMessageReadReceipt = messageReadReceipt;

    }



    public QuoteStyle getQuoteStyle() {

        return mQuoteStyle;

    }