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 2018-12-24 20:09:47 +00:00
parent 4df54faed6
commit d515f1aafa
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -816,7 +816,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
@Override
protected SpannableStringBuilder onLoad(final Context context, final Bundle args) {
protected SpannableStringBuilder onLoad(Context context, final Bundle args) {
DB db = DB.getInstance(context);
TupleMessageEx message = (TupleMessageEx) args.getSerializable("message");
if (body == null)
try {
@ -824,7 +825,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} catch (IOException ex) {
Log.e(ex);
body = ex.toString();
DB.getInstance(context).message().setMessageContent(message.id, false, null);
db.message().setMessageContent(message.id, false, null);
}
Spanned html = decodeHtml(message, body);

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

@ -1241,9 +1241,8 @@ public class FragmentCompose extends FragmentEx {
result.draft.id = db.message().insertMessage(result.draft);
result.draft.write(context, body == null ? "" : body);
String text = (body == null ? null : Jsoup.parse(body).text());
String preview = (text == null ? null : text.substring(0, Math.min(text.length(), 250)));
db.message().setMessageContent(result.draft.id, true, preview);
db.message().setMessageContent(
result.draft.id, true, HtmlHelper.getPreview(body));
if ("new".equals(action)) {
ArrayList<Uri> uris = args.getParcelableArrayList("attachments");
@ -1657,9 +1656,8 @@ public class FragmentCompose extends FragmentEx {
if (dirty) {
db.message().updateMessage(draft);
draft.write(context, body);
String text = (body == null ? null : Jsoup.parse(body).text());
String preview = (text == null ? null : text.substring(0, Math.min(text.length(), 250)));
db.message().setMessageContent(draft.id, true, preview);
db.message().setMessageContent(
draft.id, true, HtmlHelper.getPreview(body));
}
// Execute action

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

@ -41,8 +41,6 @@ import android.widget.Button;
import android.widget.CompoundButton;
import android.widget.Spinner;
import org.jsoup.Jsoup;
import java.io.IOException;
import androidx.annotation.NonNull;
@ -229,10 +227,9 @@ public class FragmentOptions extends FragmentEx implements SharedPreferences.OnS
EntityMessage message = db.message().getMessage(id);
try {
Log.i("Building preview id=" + id);
String html = message.read(context);
String text = (html == null ? null : Jsoup.parse(html).text());
String preview = (text == null ? null : text.substring(0, Math.min(text.length(), 250)));
db.message().setMessageContent(message.id, true, preview);
String body = message.read(context);
db.message().setMessageContent(
message.id, true, HtmlHelper.getPreview(body));
} catch (IOException ex) {
Log.e(ex);
db.message().setMessageContent(message.id, false, null);

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

@ -247,4 +247,9 @@ public class HtmlHelper {
Html.escapeHtml(MessageHelper.getFormattedAddresses(message.from, true)),
sanitize ? sanitize(html, true) : getBody(html));
}
static String getPreview(String body) {
String text = (body == null ? null : Jsoup.parse(body).text());
return (text == null ? null : text.substring(0, Math.min(text.length(), 250)));
}
}

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

@ -2475,11 +2475,10 @@ public class ServiceSynchronize extends LifecycleService {
if (!message.content)
if (!metered || (message.size != null && message.size < download)) {
String html = helper.getHtml();
String text = (html == null ? null : Jsoup.parse(html).text());
String preview = (text == null ? null : text.substring(0, Math.min(text.length(), PREVIEW_SIZE)));
message.write(context, html);
db.message().setMessageContent(message.id, true, preview);
String body = helper.getHtml();
message.write(context, body);
db.message().setMessageContent(
message.id, true, HtmlHelper.getPreview(body));
Log.i(folder.name + " downloaded message id=" + message.id + " size=" + message.size);
}