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

Refactoring

Browse Source
pull/194/merge
M66B 4 years ago
parent 69c8a2a356
commit 68bdc75c2b
4 changed files with 54 additions and 101 deletions
Show Stats Download Patch File Download Diff File

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

@ -320,46 +320,22 @@ public class EntityMessage implements Serializable {
return MessageHelper.equalDomain(context, reply, from); return MessageHelper.equalDomain(context, reply, from);
} }
static int getReplies(Context context, String language, String subject) { static String getSubject(Context context, String language, String subject, boolean forward) {
int count = 0; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean prefix_once = prefs.getBoolean("prefix_once", true);
boolean prefix_count = prefs.getBoolean("prefix_count", false);
boolean alt = prefs.getBoolean(forward ? "alt_fwd" : "alt_re", false);
List<String> res = new ArrayList<>(); if (subject == null)
res.addAll(Arrays.asList(Helper.getStrings(context, language, R.string.title_subject_reply, ""))); subject = "";
res.addAll(Arrays.asList(Helper.getStrings(context, language, R.string.title_subject_reply_alt, "")));
subject = subject.trim(); int resid = forward
while (true) { ? (alt ? R.string.title_subject_forward_alt : R.string.title_subject_forward)
boolean found = false; : (alt ? R.string.title_subject_reply_alt : R.string.title_subject_reply);
for (String re : res) {
Matcher m = getPattern(re.trim()).matcher(subject);
if (m.matches()) {
found = true;
subject = m.group(m.groupCount()).trim();
if (re.trim().endsWith(":")) if (!prefix_once)
try { return Helper.getString(context, language, resid, subject);
String n = m.group(2);
if (n == null)
count++;
else
count += Integer.parseInt(n.substring(1, n.length() - 1));
} catch (NumberFormatException ex) {
Log.e(ex);
count++;
}
else
count++;
break;
}
}
if (!found)
break;
}
return count;
}
static String collapsePrefixes(Context context, String language, String subject, boolean forward) {
List<Pair<String, Boolean>> prefixes = new ArrayList<>(); List<Pair<String, Boolean>> prefixes = new ArrayList<>();
for (String re : Helper.getStrings(context, language, R.string.title_subject_reply, "")) for (String re : Helper.getStrings(context, language, R.string.title_subject_reply, ""))
prefixes.add(new Pair<>(re, false)); prefixes.add(new Pair<>(re, false));
@ -370,15 +346,33 @@ public class EntityMessage implements Serializable {
for (String fwd : Helper.getStrings(context, language, R.string.title_subject_forward_alt, "")) for (String fwd : Helper.getStrings(context, language, R.string.title_subject_forward_alt, ""))
prefixes.add(new Pair<>(fwd, true)); prefixes.add(new Pair<>(fwd, true));
int replies = 0;
boolean re = !forward;
List<Boolean> scanned = new ArrayList<>(); List<Boolean> scanned = new ArrayList<>();
subject = subject.trim(); String subj = subject.trim();
while (true) { while (true) {
boolean found = false; boolean found = false;
for (Pair<String, Boolean> prefix : prefixes) { for (Pair<String, Boolean> prefix : prefixes) {
Matcher m = getPattern(prefix.first.trim()).matcher(subject); Matcher m = getPattern(prefix.first.trim()).matcher(subj);
if (m.matches()) { if (m.matches()) {
found = true; found = true;
subject = m.group(m.groupCount()).trim(); subj = m.group(m.groupCount()).trim();
re = (re && !prefix.second);
if (re)
if (prefix.first.trim().endsWith(":"))
try {
String n = m.group(2);
if (n == null)
replies++;
else
replies += Integer.parseInt(n.substring(1, n.length() - 1));
} catch (NumberFormatException ex) {
Log.e(ex);
replies++;
}
else
replies++;
int count = scanned.size(); int count = scanned.size();
if (!prefix.second.equals(count == 0 ? forward : scanned.get(count - 1))) if (!prefix.second.equals(count == 0 ? forward : scanned.get(count - 1)))
@ -391,19 +385,24 @@ public class EntityMessage implements Serializable {
break; break;
} }
StringBuilder result = new StringBuilder(); String pre = Helper.getString(context, language, resid, "");
int semi = pre.lastIndexOf(':');
if (prefix_count && replies > 0 && semi > 0)
pre = pre.substring(0, semi) + "[" + (replies + 1) + "]" + pre.substring(semi);
StringBuilder result = new StringBuilder(pre);
for (int i = 0; i < scanned.size(); i++) for (int i = 0; i < scanned.size(); i++)
result.append(context.getString(scanned.get(i) ? R.string.title_subject_forward : R.string.title_subject_reply, "")); result.append(context.getString(scanned.get(i) ? R.string.title_subject_forward : R.string.title_subject_reply, ""));
result.append(subject); result.append(subj);
return result.toString(); return result.toString();
} }
private static Pattern getPattern(String prefix) { private static Pattern getPattern(String prefix) {
String pre = prefix.endsWith(":") String pat = prefix.endsWith(":")
? "(^" + Pattern.quote(prefix.substring(0, prefix.length() - 1)) + ")" + "((\\[\\d+\\])|(\\(\\d+\\)))?" + ":" ? "(^" + Pattern.quote(prefix.substring(0, prefix.length() - 1)) + ")" + "((\\[\\d+\\])|(\\(\\d+\\)))?" + ":"
: "(^" + Pattern.quote(prefix) + ")"; : "(^" + Pattern.quote(prefix) + ")";
return Pattern.compile(pre + "(\\s*)(.*)", Pattern.CASE_INSENSITIVE); return Pattern.compile(pat + "(\\s*)(.*)", Pattern.CASE_INSENSITIVE);
} }
Element getReplyHeader(Context context, Document document, boolean separate, boolean extended) { Element getReplyHeader(Context context, Document document, boolean separate, boolean extended) {

25
app/src/main/java/eu/faircode/email/EntityRule.java
Unescape View File

@ -650,14 +650,13 @@ public class EntityRule {
boolean cc = jargs.optBoolean("cc"); boolean cc = jargs.optBoolean("cc");
boolean attachments = jargs.optBoolean("attachments"); boolean attachments = jargs.optBoolean("attachments");
boolean isReply = TextUtils.isEmpty(to);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean prefix_once = prefs.getBoolean("prefix_once", true);
boolean alt_re = prefs.getBoolean("alt_re", false);
boolean alt_fwd = prefs.getBoolean("alt_fwd", false);
boolean separate_reply = prefs.getBoolean("separate_reply", false); boolean separate_reply = prefs.getBoolean("separate_reply", false);
boolean extended_reply = prefs.getBoolean("extended_reply", false); boolean extended_reply = prefs.getBoolean("extended_reply", false);
boolean quote_reply = prefs.getBoolean("quote_reply", true); boolean quote_reply = prefs.getBoolean("quote_reply", true);
boolean quote = (quote_reply && TextUtils.isEmpty(to)); boolean quote = (quote_reply && isReply);
EntityIdentity identity = db.identity().getIdentity(iid); EntityIdentity identity = db.identity().getIdentity(iid);
if (identity == null) if (identity == null)
@ -665,7 +664,7 @@ public class EntityRule {
EntityAnswer answer; EntityAnswer answer;
if (aid < 0) { if (aid < 0) {
if (TextUtils.isEmpty(to)) if (isReply)
throw new IllegalArgumentException("Rule template missing name=" + rule.name); throw new IllegalArgumentException("Rule template missing name=" + rule.name);
answer = new EntityAnswer(); answer = new EntityAnswer();
@ -703,7 +702,7 @@ public class EntityRule {
reply.identity = identity.id; reply.identity = identity.id;
reply.msgid = EntityMessage.generateMessageId(); reply.msgid = EntityMessage.generateMessageId();
if (TextUtils.isEmpty(to)) { if (isReply) {
reply.references = (message.references == null ? "" : message.references + " ") + message.msgid; reply.references = (message.references == null ? "" : message.references + " ") + message.msgid;
reply.inreplyto = message.msgid; reply.inreplyto = message.msgid;
reply.thread = message.thread; reply.thread = message.thread;
@ -719,20 +718,10 @@ public class EntityRule {
reply.cc = message.cc; reply.cc = message.cc;
reply.unsubscribe = "mailto:" + identity.email; reply.unsubscribe = "mailto:" + identity.email;
reply.auto_submitted = true; reply.auto_submitted = true;
reply.subject = EntityMessage.getSubject(context, message.language, message.subject, !isReply);
String subject = (message.subject == null ? "" : message.subject);
if (prefix_once)
subject = EntityMessage.collapsePrefixes(context, message.language, subject, !TextUtils.isEmpty(to));
reply.subject = context.getString(
TextUtils.isEmpty(to)
? (alt_re ? R.string.title_subject_reply_alt : R.string.title_subject_reply)
: (alt_fwd ? R.string.title_subject_forward_alt : R.string.title_subject_forward),
subject);
reply.received = new Date().getTime(); reply.received = new Date().getTime();
reply.sender = MessageHelper.getSortKey(reply.from); reply.sender = MessageHelper.getSortKey(reply.from);
Uri lookupUri = ContactInfo.getLookupUri(reply.from); Uri lookupUri = ContactInfo.getLookupUri(reply.from);
reply.avatar = (lookupUri == null ? null : lookupUri.toString()); reply.avatar = (lookupUri == null ? null : lookupUri.toString());

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

@ -164,7 +164,6 @@ import org.jsoup.select.Elements;
import org.jsoup.select.NodeFilter; import org.jsoup.select.NodeFilter;
import org.openintents.openpgp.OpenPgpError; import org.openintents.openpgp.OpenPgpError;
import org.openintents.openpgp.util.OpenPgpApi; import org.openintents.openpgp.util.OpenPgpApi;
import org.openintents.openpgp.util.OpenPgpServiceConnection;
import org.w3c.dom.css.CSSStyleSheet; import org.w3c.dom.css.CSSStyleSheet;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
@ -273,10 +272,6 @@ public class FragmentCompose extends FragmentBase {
private ContentResolver resolver; private ContentResolver resolver;
private AdapterAttachment adapter; private AdapterAttachment adapter;
private boolean prefix_once = false;
private boolean prefix_count = false;
private boolean alt_re = false;
private boolean alt_fwd = false;
private boolean monospaced = false; private boolean monospaced = false;
private String compose_font; private String compose_font;
private Integer encrypt = null; private Integer encrypt = null;
@ -335,10 +330,6 @@ public class FragmentCompose extends FragmentBase {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
prefix_once = prefs.getBoolean("prefix_once", true);
prefix_count = prefs.getBoolean("prefix_count", false);
alt_re = prefs.getBoolean("alt_re", false);
alt_fwd = prefs.getBoolean("alt_fwd", false);
monospaced = prefs.getBoolean("monospaced", false); monospaced = prefs.getBoolean("monospaced", false);
compose_font = prefs.getString("compose_font", monospaced ? "monospace" : "sans-serif"); compose_font = prefs.getString("compose_font", monospaced ? "monospace" : "sans-serif");
media = prefs.getBoolean("compose_media", true); media = prefs.getBoolean("compose_media", true);
@ -4580,24 +4571,8 @@ public class FragmentCompose extends FragmentBase {
// Subject // Subject
String subject = (ref.subject == null ? "" : ref.subject); String subject = (ref.subject == null ? "" : ref.subject);
if ("reply".equals(action) || "reply_all".equals(action)) { if ("reply".equals(action) || "reply_all".equals(action)) {
int replies = 0; data.draft.subject =
if (prefix_once) { EntityMessage.getSubject(context, ref.language, subject, false);
if (prefix_count)
replies = EntityMessage.getReplies(context, ref.language, subject);
subject = EntityMessage.collapsePrefixes(context, ref.language, subject, false);
}
String re = Helper.getString(context,
ref.language,
alt_re ? R.string.title_subject_reply_alt : R.string.title_subject_reply,
"").trim();
String s = Helper.getString(context,
ref.language,
alt_re ? R.string.title_subject_reply_alt : R.string.title_subject_reply,
subject);
if (replies > 0 && re.endsWith(":") && s.startsWith(re))
s = re.substring(0, re.length() - 1) + "[" + (replies + 1) + "]:" +
s.substring(re.length());
data.draft.subject = s;
if (external_text != null) { if (external_text != null) {
Element div = document.createElement("div"); Element div = document.createElement("div");
@ -4610,12 +4585,8 @@ public class FragmentCompose extends FragmentBase {
document.body().appendChild(div); document.body().appendChild(div);
} }
} else if ("forward".equals(action)) { } else if ("forward".equals(action)) {
if (prefix_once) data.draft.subject =
subject = EntityMessage.collapsePrefixes(context, ref.language, subject, true); EntityMessage.getSubject(context, ref.language, subject, true);
data.draft.subject = Helper.getString(context,
ref.language,
alt_fwd ? R.string.title_subject_forward_alt : R.string.title_subject_forward,
subject);
} else if ("resend".equals(action)) { } else if ("resend".equals(action)) {
data.draft.subject = ref.subject; data.draft.subject = ref.subject;
} else if ("editasnew".equals(action)) { } else if ("editasnew".equals(action)) {

8
app/src/main/java/eu/faircode/email/ServiceUI.java
Unescape View File

@ -303,8 +303,6 @@ public class ServiceUI extends IntentService {
private void onReplyDirect(long id, Intent intent) throws IOException { private void onReplyDirect(long id, Intent intent) throws IOException {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean prefix_once = prefs.getBoolean("prefix_once", true);
boolean alt_re = prefs.getBoolean("alt_re", false);
boolean plain_only = prefs.getBoolean("plain_only", false); boolean plain_only = prefs.getBoolean("plain_only", false);
DB db = DB.getInstance(this); DB db = DB.getInstance(this);
@ -321,10 +319,6 @@ public class ServiceUI extends IntentService {
if (outbox == null) if (outbox == null)
throw new IllegalArgumentException("outbox not found"); throw new IllegalArgumentException("outbox not found");
String subject = (ref.subject == null ? "" : ref.subject);
if (prefix_once)
subject = EntityMessage.collapsePrefixes(this, ref.language, subject, false);
Bundle results = RemoteInput.getResultsFromIntent(intent); Bundle results = RemoteInput.getResultsFromIntent(intent);
String body = results.getString("text"); String body = results.getString("text");
if (body != null) if (body != null)
@ -346,7 +340,7 @@ public class ServiceUI extends IntentService {
reply.thread = ref.thread; reply.thread = ref.thread;
reply.to = ref.from; reply.to = ref.from;
reply.from = new Address[]{new InternetAddress(identity.email, identity.name, StandardCharsets.UTF_8.name())}; reply.from = new Address[]{new InternetAddress(identity.email, identity.name, StandardCharsets.UTF_8.name())};
reply.subject = getString(alt_re ? R.string.title_subject_reply_alt : R.string.title_subject_reply, subject); reply.subject = EntityMessage.getSubject(this, ref.language, ref.subject, false);
reply.received = new Date().getTime(); reply.received = new Date().getTime();
reply.seen = true; reply.seen = true;
reply.ui_seen = true; reply.ui_seen = true;

Write Preview
Loading…
Cancel
Save