mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-15 08:29:24 +00:00
Code Issues Releases Wiki Activity

Small improvements

Browse source
This commit is contained in:
M66B 2018-12-14 20:15:07 +01:00
parent e0dc8ffb96
commit 627ce9e7a0
3 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/EntityOperation.java
View file

@ -129,10 +129,12 @@ public class EntityOperation {
for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid))
db.message().setMessageUiAnswered(similar.id, jargs.getBoolean(0));
else if (MOVE.equals(name))
db.message().setMessageUiHide(message.id, true);
else if (MOVE.equals(name)) {
EntityFolder source = db.folder().getFolder(message.folder);
if (!EntityFolder.ARCHIVE.equals(source.type))
db.message().setMessageUiHide(message.id, true);
else if (DELETE.equals(name))
} else if (DELETE.equals(name))
db.message().setMessageUiHide(message.id, true);
} catch (JSONException ex) {
Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));

28
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -1798,10 +1798,8 @@ public class FragmentMessages extends FragmentEx {
}
private void moveAsk(final MessageTarget result) {
if (result.target == null) {
// TODO: unhide messages
if (result.target == null)
return;
}
String title = getResources().getQuantityString(
R.plurals.title_moving_messages, result.ids.size(),
@ -1850,7 +1848,25 @@ public class FragmentMessages extends FragmentEx {
}
private void moveUndo(final MessageTarget result) {
final Bundle args = new Bundle();
args.putSerializable("result", result);
if (result.target == null) {
new SimpleTask<Void>() {
@Override
protected Void onLoad(Context context, Bundle args) {
DB db = DB.getInstance(context);
MessageTarget result = (MessageTarget) args.getSerializable("result");
for (long id : result.ids)
db.message().setMessageUiHide(id, false);
return null;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
}
}.load(FragmentMessages.this, args);
// TODO: unhide messages
return;
}
@ -1865,17 +1881,15 @@ public class FragmentMessages extends FragmentEx {
public void onClick(View v) {
snackbar.dismiss();
Bundle args = new Bundle();
args.putSerializable("result", result);
// Show message again
new SimpleTask<Void>() {
@Override
protected Void onLoad(Context context, Bundle args) {
DB db = DB.getInstance(context);
MessageTarget result = (MessageTarget) args.getSerializable("result");
for (long id : result.ids) {
Log.i(Helper.TAG, "Move undo id=" + id);
DB.getInstance(context).message().setMessageUiHide(id, false);
db.message().setMessageUiHide(id, false);
}
return null;
}

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

@ -51,6 +51,10 @@ import java.util.regex.Pattern;
public class HtmlHelper {
private static Pattern pattern = Pattern.compile("([http|https]+://[\\w\\S(\\.|:|/)]+)");
static String getBody(String html) {
return Jsoup.parse(html).body().html();
}
static String sanitize(String html) {
Document document = Jsoup.parse(Jsoup.clean(html, Whitelist
.relaxed()
@ -97,6 +101,7 @@ public class HtmlHelper {
public void tail(Node node, int depth) {
}
}, document.body());
return document.body().html();
}