msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Refactoring

Browse Source
pull/194/head
M66B 4 years ago
parent 6221a918d3
commit d707235eec
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/eu/faircode/email/EntityMessage.java
Unescape View File

@ -104,7 +104,7 @@ public class EntityMessage implements Serializable {
static final Integer DSN_NONE = 0;
static final Integer DSN_RECEIPT = 1;
static final Integer DSN_USER_UNKNOWN = 2;
static final Integer DSN_ADDRESS_UNKNOWN = 2;
static final Long SWIPE_ACTION_ASK = -1L;
static final Long SWIPE_ACTION_SEEN = -2L;

10
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

@ -3622,7 +3622,7 @@ public class FragmentCompose extends FragmentBase {
else if ("dsn".equals(action)) {
if (EntityMessage.DSN_RECEIPT.equals(dsn) && ref.receipt_to != null)
data.draft.to = ref.receipt_to;
else if (EntityMessage.DSN_USER_UNKNOWN.equals(dsn) && ref.return_path != null)
else if (EntityMessage.DSN_ADDRESS_UNKNOWN.equals(dsn) && ref.return_path != null)
data.draft.to = ref.return_path;
} else {
// Prevent replying to self
@ -3733,14 +3733,14 @@ public class FragmentCompose extends FragmentBase {
} else if ("list".equals(action)) {
data.draft.subject = ref.subject;
} else if ("dsn".equals(action)) {
if (EntityMessage.DSN_USER_UNKNOWN.equals(dsn))
data.draft.subject = context.getString(R.string.title_user_unknown_subject);
if (EntityMessage.DSN_ADDRESS_UNKNOWN.equals(dsn))
data.draft.subject = context.getString(R.string.title_address_unknown_subject);
else
data.draft.subject = context.getString(R.string.title_receipt_subject, subject);
String[] texts;
if (EntityMessage.DSN_USER_UNKNOWN.equals(dsn))
texts = new String[]{context.getString(R.string.title_user_unknown_text)};
if (EntityMessage.DSN_ADDRESS_UNKNOWN.equals(dsn))
texts = new String[]{context.getString(R.string.title_address_unknown_text)};
else
texts = Helper.getStrings(context, ref.language, R.string.title_receipt_text);
for (int i = 0; i < texts.length; i++) {

6
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -2431,7 +2431,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
popupMenu.getMenu().findItem(R.id.menu_reply_to_all).setVisible(recipients.length > 0);
popupMenu.getMenu().findItem(R.id.menu_reply_list).setVisible(message.list_post != null);
popupMenu.getMenu().findItem(R.id.menu_reply_receipt).setVisible(message.receipt_to != null);
popupMenu.getMenu().findItem(R.id.menu_reply_user_unknown)
popupMenu.getMenu().findItem(R.id.menu_reply_address_unknown)
.setVisible(experiments && message.return_path != null && message.return_path.length > 0);
popupMenu.getMenu().findItem(R.id.menu_new_message).setVisible(to != null && to.length > 0);
popupMenu.getMenu().findItem(R.id.menu_reply_answer).setVisible(answers != 0 || !ActivityBilling.isPro(context));
@ -2476,8 +2476,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
case R.id.menu_reply_receipt:
onMenuDsn(message, EntityMessage.DSN_RECEIPT);
return true;
case R.id.menu_reply_user_unknown:
onMenuDsn(message, EntityMessage.DSN_USER_UNKNOWN);
case R.id.menu_reply_address_unknown:
onMenuDsn(message, EntityMessage.DSN_ADDRESS_UNKNOWN);
return true;
case R.id.menu_forward:
onMenuReply(message, "forward");

2
app/src/main/java/eu/faircode/email/MessageHelper.java
Unescape View File

@ -575,7 +575,7 @@ public class MessageHelper {
imessage.setContent(report);
return;
} else if (EntityMessage.DSN_USER_UNKNOWN.equals(message.dsn)) {
} else if (EntityMessage.DSN_ADDRESS_UNKNOWN.equals(message.dsn)) {
// https://tools.ietf.org/html/rfc3464
Multipart report = new MimeMultipart("report; report-type=delivery-status");

4
app/src/main/res/menu/popup_reply.xml
Unescape View File

@ -17,8 +17,8 @@
android:title="@string/title_reply_receipt" />
<item
android:id="@+id/menu_reply_user_unknown"
android:title="@string/title_reply_user_unknown" />
android:id="@+id/menu_reply_address_unknown"
android:title="@string/title_reply_address_unknown" />
<item
android:id="@+id/menu_forward"

8
app/src/main/res/values/strings.xml
Unescape View File

@ -887,18 +887,18 @@
<string name="title_reply_to_all">Reply to all</string>
<string name="title_reply_list">Reply to list</string>
<string name="title_reply_receipt">Send read receipt</string>
<string name="title_reply_user_unknown" translatable="false">Send user unknown</string>
<string name="title_reply_address_unknown">Report \'address unknown\'</string>
<string name="title_reply_template">Reply with template</string>
<string name="title_move_undo">Moving to %1$s (%2$d)</string>
<string name="title_open_with">Open with</string>
<string name="title_authentication_failed">%1$s authentication failed</string>
<string name="title_user_unknown_subject" translatable="false">Delivery Status Notification (Failure)</string>
<string name="title_user_unknown_text" translatable="false">Your message wasn\'t delivered because the address couldn\'t be found.</string>
<string name="title_receipt_subject">Read receipt: %1$s</string>
<string name="title_receipt_text">This read receipt only acknowledges that the message was displayed. There is no guarantee that the recipient has read the message contents.</string>
<string name="title_address_unknown_subject" translatable="false">Delivery Status Notification (Failure)</string>
<string name="title_address_unknown_text" translatable="false">Your message wasn\'t delivered because the address couldn\'t be found.</string>
<string name="title_no_answers">No reply templates defined</string>
<string name="title_no_viewer">No viewer app available for %1$s</string>
<string name="title_no_recorder">No suitable audio recorder app available</string>

Write Preview
Loading…
Cancel
Save