mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactoring

This commit is contained in:
M66B 2021-01-19 12:18:03 +01:00
parent 91e9eae07a
commit 8e946e9863
6 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/eu/faircode/email/Core.java
View File

@ -1500,12 +1500,13 @@ class Core {
File file = message.getFile(context);
Helper.writeText(file, body);
String text = HtmlHelper.getFullText(body);
String preview = HtmlHelper.getPreviewText(text);
message.preview = HtmlHelper.getPreview(text);
message.language = HtmlHelper.getLanguage(context, text);
db.message().setMessageContent(message.id,
true,
HtmlHelper.getLanguage(context, text),
message.language,
parts.isPlainOnly(),
preview,
message.preview,
parts.getWarnings(message.warning));
MessageClassifier.classify(message, folder, null, context);
@ -2211,12 +2212,13 @@ class Core {
File file = message.getFile(context);
Helper.writeText(file, body);
String text = HtmlHelper.getFullText(body);
String preview = HtmlHelper.getPreviewText(text);
message.preview = HtmlHelper.getPreview(text);
message.language = HtmlHelper.getLanguage(context, text);
db.message().setMessageContent(message.id,
true,
HtmlHelper.getLanguage(context, text),
message.language,
parts.isPlainOnly(),
preview,
message.preview,
parts.getWarnings(message.warning));
for (EntityAttachment attachment : parts.getAttachments())
@ -3016,12 +3018,13 @@ class Core {
File file = message.getFile(context);
Helper.writeText(file, body);
String text = HtmlHelper.getFullText(body);
String preview = HtmlHelper.getPreviewText(text);
message.preview = HtmlHelper.getPreview(text);
message.language = HtmlHelper.getLanguage(context, text);
db.message().setMessageContent(message.id,
true,
HtmlHelper.getLanguage(context, text),
message.language,
parts.isPlainOnly(),
preview,
message.preview,
parts.getWarnings(message.warning));
MessageClassifier.classify(message, folder, null, context);
@ -3454,12 +3457,13 @@ class Core {
File file = message.getFile(context);
Helper.writeText(file, body);
String text = HtmlHelper.getFullText(body);
String preview = HtmlHelper.getPreviewText(text);
message.preview = HtmlHelper.getPreview(text);
message.language = HtmlHelper.getLanguage(context, text);
db.message().setMessageContent(message.id,
true,
HtmlHelper.getLanguage(context, text),
message.language,
parts.isPlainOnly(),
preview,
message.preview,
parts.getWarnings(message.warning));
MessageClassifier.classify(message, folder, null, context);

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

@ -612,12 +612,13 @@ public class EntityRule {
File file = reply.getFile(context);
Helper.writeText(file, body);
String text = HtmlHelper.getFullText(body);
String preview = HtmlHelper.getPreviewText(text);
reply.preview = HtmlHelper.getPreview(text);
reply.language = HtmlHelper.getLanguage(context, text);
db.message().setMessageContent(reply.id,
true,
HtmlHelper.getLanguage(context, text),
reply.language,
false,
preview,
reply.preview,
null);
if (attachments)
@ -703,7 +704,7 @@ public class EntityRule {
String body = Helper.readText(message.getFile(context));
String text = HtmlHelper.getFullText(body);
String preview = HtmlHelper.getPreviewText(text);
String preview = HtmlHelper.getPreview(text);
if (!TextUtils.isEmpty(preview))
sb.append(res.getString(R.string.title_rule_tts_content))

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

@ -3925,12 +3925,13 @@ public class FragmentCompose extends FragmentBase {
Helper.writeText(data.draft.getFile(context, data.draft.revision), html);
String text = HtmlHelper.getFullText(html);
String preview = HtmlHelper.getPreviewText(text);
data.draft.preview = HtmlHelper.getPreview(text);
data.draft.language = HtmlHelper.getLanguage(context, text);
db.message().setMessageContent(data.draft.id,
true,
HtmlHelper.getLanguage(context, text),
data.draft.language,
data.draft.plain_only,
preview,
data.draft.preview,
null);
if ("participation".equals(action)) {
@ -4080,12 +4081,13 @@ public class FragmentCompose extends FragmentBase {
Helper.writeText(data.draft.getFile(context, data.draft.revision), html);
String text = HtmlHelper.getFullText(html);
String preview = HtmlHelper.getPreviewText(text);
data.draft.preview = HtmlHelper.getPreview(text);
data.draft.language = HtmlHelper.getLanguage(context, text);
db.message().setMessageContent(data.draft.id,
true,
HtmlHelper.getLanguage(context, text),
data.draft.language,
data.draft.plain_only,
preview,
data.draft.preview,
null);
} else
EntityOperation.queue(context, data.draft, EntityOperation.BODY);
@ -4598,12 +4600,13 @@ public class FragmentCompose extends FragmentBase {
Helper.writeText(draft.getFile(context), body);
String full = HtmlHelper.getFullText(body);
String preview = HtmlHelper.getPreviewText(full);
draft.preview = HtmlHelper.getPreview(full);
draft.language = HtmlHelper.getLanguage(context, full);
db.message().setMessageContent(draft.id,
true,
HtmlHelper.getLanguage(context, full),
draft.language,
draft.plain_only, // unchanged
preview,
draft.preview,
null);
db.message().setMessageRevision(draft.id, draft.revision);

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

@ -1724,7 +1724,7 @@ public class HtmlHelper {
}
}
static String getPreviewText(String text) {
static String getPreview(String text) {
if (text == null)
return null;

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

@ -540,7 +540,7 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
String text = HtmlHelper.getFullText(body);
String language = HtmlHelper.getLanguage(this, text);
String preview = HtmlHelper.getPreviewText(text);
String preview = HtmlHelper.getPreview(text);
try {
db.beginTransaction();

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

@ -290,7 +290,7 @@ public class ServiceUI extends IntentService {
String text = HtmlHelper.getFullText(body);
String language = HtmlHelper.getLanguage(this, text);
String preview = HtmlHelper.getPreviewText(text);
String preview = HtmlHelper.getPreview(text);
DB db = DB.getInstance(this);
try {