mirror of https://github.com/M66B/FairEmail.git
Refactoring
This commit is contained in:
parent
4df54faed6
commit
d515f1aafa
|
@ -816,7 +816,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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");
|
TupleMessageEx message = (TupleMessageEx) args.getSerializable("message");
|
||||||
if (body == null)
|
if (body == null)
|
||||||
try {
|
try {
|
||||||
|
@ -824,7 +825,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
Log.e(ex);
|
Log.e(ex);
|
||||||
body = ex.toString();
|
body = ex.toString();
|
||||||
DB.getInstance(context).message().setMessageContent(message.id, false, null);
|
db.message().setMessageContent(message.id, false, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
Spanned html = decodeHtml(message, body);
|
Spanned html = decodeHtml(message, body);
|
||||||
|
|
|
@ -1241,9 +1241,8 @@ public class FragmentCompose extends FragmentEx {
|
||||||
result.draft.id = db.message().insertMessage(result.draft);
|
result.draft.id = db.message().insertMessage(result.draft);
|
||||||
result.draft.write(context, body == null ? "" : body);
|
result.draft.write(context, body == null ? "" : body);
|
||||||
|
|
||||||
String text = (body == null ? null : Jsoup.parse(body).text());
|
db.message().setMessageContent(
|
||||||
String preview = (text == null ? null : text.substring(0, Math.min(text.length(), 250)));
|
result.draft.id, true, HtmlHelper.getPreview(body));
|
||||||
db.message().setMessageContent(result.draft.id, true, preview);
|
|
||||||
|
|
||||||
if ("new".equals(action)) {
|
if ("new".equals(action)) {
|
||||||
ArrayList<Uri> uris = args.getParcelableArrayList("attachments");
|
ArrayList<Uri> uris = args.getParcelableArrayList("attachments");
|
||||||
|
@ -1657,9 +1656,8 @@ public class FragmentCompose extends FragmentEx {
|
||||||
if (dirty) {
|
if (dirty) {
|
||||||
db.message().updateMessage(draft);
|
db.message().updateMessage(draft);
|
||||||
draft.write(context, body);
|
draft.write(context, body);
|
||||||
String text = (body == null ? null : Jsoup.parse(body).text());
|
db.message().setMessageContent(
|
||||||
String preview = (text == null ? null : text.substring(0, Math.min(text.length(), 250)));
|
draft.id, true, HtmlHelper.getPreview(body));
|
||||||
db.message().setMessageContent(draft.id, true, preview);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Execute action
|
// Execute action
|
||||||
|
|
|
@ -41,8 +41,6 @@ import android.widget.Button;
|
||||||
import android.widget.CompoundButton;
|
import android.widget.CompoundButton;
|
||||||
import android.widget.Spinner;
|
import android.widget.Spinner;
|
||||||
|
|
||||||
import org.jsoup.Jsoup;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
@ -229,10 +227,9 @@ public class FragmentOptions extends FragmentEx implements SharedPreferences.OnS
|
||||||
EntityMessage message = db.message().getMessage(id);
|
EntityMessage message = db.message().getMessage(id);
|
||||||
try {
|
try {
|
||||||
Log.i("Building preview id=" + id);
|
Log.i("Building preview id=" + id);
|
||||||
String html = message.read(context);
|
String body = message.read(context);
|
||||||
String text = (html == null ? null : Jsoup.parse(html).text());
|
db.message().setMessageContent(
|
||||||
String preview = (text == null ? null : text.substring(0, Math.min(text.length(), 250)));
|
message.id, true, HtmlHelper.getPreview(body));
|
||||||
db.message().setMessageContent(message.id, true, preview);
|
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
Log.e(ex);
|
Log.e(ex);
|
||||||
db.message().setMessageContent(message.id, false, null);
|
db.message().setMessageContent(message.id, false, null);
|
||||||
|
|
|
@ -247,4 +247,9 @@ public class HtmlHelper {
|
||||||
Html.escapeHtml(MessageHelper.getFormattedAddresses(message.from, true)),
|
Html.escapeHtml(MessageHelper.getFormattedAddresses(message.from, true)),
|
||||||
sanitize ? sanitize(html, true) : getBody(html));
|
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)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2475,11 +2475,10 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
|
|
||||||
if (!message.content)
|
if (!message.content)
|
||||||
if (!metered || (message.size != null && message.size < download)) {
|
if (!metered || (message.size != null && message.size < download)) {
|
||||||
String html = helper.getHtml();
|
String body = helper.getHtml();
|
||||||
String text = (html == null ? null : Jsoup.parse(html).text());
|
message.write(context, body);
|
||||||
String preview = (text == null ? null : text.substring(0, Math.min(text.length(), PREVIEW_SIZE)));
|
db.message().setMessageContent(
|
||||||
message.write(context, html);
|
message.id, true, HtmlHelper.getPreview(body));
|
||||||
db.message().setMessageContent(message.id, true, preview);
|
|
||||||
Log.i(folder.name + " downloaded message id=" + message.id + " size=" + message.size);
|
Log.i(folder.name + " downloaded message id=" + message.id + " size=" + message.size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue