I2P_Developers/i2p.i2p-bote
3
0
Fork 0
Code Issues 4 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Quote subject and content when replying to emails

Browse Source
This commit is contained in:
str4d
2014-06-12 04:23:09 +00:00
parent b2439f73d1
commit 879c5cc5a5
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@ -71,6 +71,11 @@
<string name="add_one_recipient">Add at least one recipient.</string>
<string name="email_queued_for_sending">Email queued for sending</string>
<string name="response_prefix_re">Re:</string>
<string name="response_prefix_re_hide" translatable="false">Re:</string>
<string name="response_quote_wrote">%s wrote:</string>
<string name="response_quote_wrote_hide" translatable="false">%s wrote:</string>
<string name="address_book_empty">Address book is empty</string>
<string name="action_new_contact">New contact</string>

27
src/i2p/bote/android/NewEmailFragment.java
View File

@ -108,6 +108,9 @@ public class NewEmailFragment extends Fragment {
String quoteMsgId = getArguments().getString(QUOTE_MSG_ID);
Email origEmail = null;
String recipientAddr = null;
String origSubject = null;
String origContent = null;
String origFrom = null;
try {
origEmail = BoteHelper.getEmail(quoteMsgFolder, quoteMsgId);
if (origEmail != null) {
@ -115,6 +118,9 @@ public class NewEmailFragment extends Fragment {
BoteHelper.getOneLocalRecipient(origEmail).toString());
recipientAddr = BoteHelper.getNameAndDestination(
origEmail.getReplyAddress(I2PBote.getInstance().getIdentities()));
origSubject = origEmail.getSubject();
origContent = origEmail.getText();
origFrom = BoteHelper.getShortSenderName(origEmail.getOneFromAddress(), 50);
}
} catch (PasswordException e) {
// TODO Auto-generated catch block
@ -168,6 +174,27 @@ public class NewEmailFragment extends Fragment {
mSubject = (EditText) view.findViewById(R.id.subject);
mContent = (EditText) view.findViewById(R.id.message);
boolean hide = I2PBote.getInstance().getConfiguration().getHideLocale();
if (origSubject != null) {
String responsePrefix = getResources().getString(
hide ? R.string.response_prefix_re_hide
: R.string.response_prefix_re);
if (!origSubject.startsWith(responsePrefix))
origSubject = responsePrefix + " " + origSubject;
mSubject.setText(origSubject);
}
if (origContent != null) {
StringBuilder quotation = new StringBuilder();
quotation.append("\n\n");
quotation.append(getResources().getString(
hide ? R.string.response_quote_wrote
: R.string.response_quote_wrote_hide,
origFrom));
String[] lines = origContent.split("\r?\n|\r");
for (String line: lines)
quotation = quotation.append("\n> ").append(line);
mContent.setText(quotation);
}
if (savedInstanceState == null) {
mRecipients.setPrefix(getResources().getString(R.string.email_to) + " ");