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

Delay binding conversation actions and images

Browse Source
pull/194/head
M66B 4 years ago
parent 7cf74c9094
commit 6304bd3063
2 changed files with 129 additions and 102 deletions
Show Stats Download Patch File Download Diff File

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

@ -1509,7 +1509,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
bindAddresses(message); bindAddresses(message);
bindHeaders(message, false); bindHeaders(message, false);
bindAttachments(message, properties.getAttachments(message.id)); bindAttachments(message, properties.getAttachments(message.id), false);
// Actions // Actions
vSeparator.setVisibility(View.VISIBLE); vSeparator.setVisibility(View.VISIBLE);
@ -1596,7 +1596,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
(inlineImages > lastInlineImages && (show_images || inline))) (inlineImages > lastInlineImages && (show_images || inline)))
bindBody(message, false); bindBody(message, false);
bindAttachments(message, attachments); bindAttachments(message, attachments, true);
} }
}); });
@ -2339,7 +2339,24 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean signed_data = args.getBoolean("signed_data"); boolean signed_data = args.getBoolean("signed_data");
tvSignedData.setVisibility(signed_data ? View.VISIBLE : View.GONE); tvSignedData.setVisibility(signed_data ? View.VISIBLE : View.GONE);
if (result instanceof Spanned) { if (show_full) {
((WebViewEx) wvBody).setOnPageFinished(new Runnable() {
@Override
public void run() {
try {
cowner.start(); // Show attachments
bindConversationActions(message, args.getParcelable("actions"));
} catch (Throwable ex) {
Log.e(ex);
}
}
});
if (result == null)
((WebView) wvBody).loadDataWithBaseURL(null, "", "text/html", StandardCharsets.UTF_8.name(), null);
else
((WebView) wvBody).loadDataWithBaseURL(null, (String) result, "text/html", StandardCharsets.UTF_8.name(), null);
} else {
tvBody.post(new Runnable() { tvBody.post(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -2348,112 +2365,19 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvBody.setTextIsSelectable(false); tvBody.setTextIsSelectable(false);
tvBody.setTextIsSelectable(true); tvBody.setTextIsSelectable(true);
tvBody.setMovementMethod(new TouchHandler(message)); tvBody.setMovementMethod(new TouchHandler(message));
cowner.start(); // Show attachments
bindConversationActions(message, args.getParcelable("actions"));
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
} }
} }
}); });
} else if (result instanceof String)
((WebView) wvBody).loadDataWithBaseURL(null, (String) result, "text/html", StandardCharsets.UTF_8.name(), null);
else if (result == null) {
if (show_full)
((WebView) wvBody).loadDataWithBaseURL(null, "", "text/html", StandardCharsets.UTF_8.name(), null);
else
tvBody.setText(null);
} else
throw new IllegalStateException("Result=" + result);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
boolean has = false;
ConversationActions cactions = args.getParcelable("actions");
if (cactions != null) {
List<ConversationAction> actions = cactions.getConversationActions();
for (final ConversationAction action : actions) {
final CharSequence text;
final CharSequence title;
final String type = action.getType();
final RemoteAction raction = action.getAction();
switch (type) {
case ConversationAction.TYPE_TEXT_REPLY:
text = action.getTextReply();
title = context.getString(R.string.title_conversation_action_reply, text);
break;
case "copy":
Bundle extras = action.getExtras().getParcelable("entities-extras");
if (extras == null)
continue;
text = extras.getString("text");
title = context.getString(R.string.title_conversation_action_copy, text);
break;
default:
if (raction == null) {
Log.w("Unknown action type=" + type);
continue;
}
text = null;
title = raction.getTitle();
if (TextUtils.isEmpty(title)) {
Log.e("Empty action type=" + type);
continue;
}
}
Button button = new Button(context, null, android.R.attr.buttonStyleSmall);
button.setId(View.generateViewId());
button.setText(title);
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
try {
switch (type) {
case ConversationAction.TYPE_TEXT_REPLY:
onReply();
break;
case "copy":
onCopy();
break;
default:
raction.getActionIntent().send();
}
} catch (Throwable ex) {
Log.e(ex);
}
}
private void onReply() {
Intent reply = new Intent(context, ActivityCompose.class)
.putExtra("action", "reply")
.putExtra("reference", message.id)
.putExtra("text", action.getTextReply());
context.startActivity(reply);
}
private void onCopy() {
ClipboardManager clipboard =
(ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
if (clipboard != null) {
ClipData clip = ClipData.newPlainText(title, text);
clipboard.setPrimaryClip(clip);
ToastEx.makeText(context, R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
}
}
});
((ConstraintLayout) flow.getParent()).addView(button);
flow.addView(button);
has = true;
}
grpAction.setVisibility(has ? View.VISIBLE : View.GONE);
}
} }
if (scroll) if (scroll)
properties.scrollTo(getAdapterPosition(), 0); properties.scrollTo(getAdapterPosition(), 0);
// Show attachments
cowner.start();
boolean auto_decrypt = prefs.getBoolean("auto_decrypt", false); boolean auto_decrypt = prefs.getBoolean("auto_decrypt", false);
if (auto_decrypt && if (auto_decrypt &&
(EntityMessage.PGP_SIGNENCRYPT.equals(message.encrypt) || (EntityMessage.PGP_SIGNENCRYPT.equals(message.encrypt) ||
@ -2493,7 +2417,93 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}.setCount(false).execute(context, owner, args, "message:body"); }.setCount(false).execute(context, owner, args, "message:body");
} }
private void bindAttachments(final TupleMessageEx message, @Nullable List<EntityAttachment> attachments) { private void bindConversationActions(TupleMessageEx message, ConversationActions cactions) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
boolean has = false;
if (cactions != null) {
List<ConversationAction> actions = cactions.getConversationActions();
for (final ConversationAction action : actions) {
final CharSequence text;
final CharSequence title;
final String type = action.getType();
final RemoteAction raction = action.getAction();
switch (type) {
case ConversationAction.TYPE_TEXT_REPLY:
text = action.getTextReply();
title = context.getString(R.string.title_conversation_action_reply, text);
break;
case "copy":
Bundle extras = action.getExtras().getParcelable("entities-extras");
if (extras == null)
continue;
text = extras.getString("text");
title = context.getString(R.string.title_conversation_action_copy, text);
break;
default:
if (raction == null) {
Log.w("Unknown action type=" + type);
continue;
}
text = null;
title = raction.getTitle();
if (TextUtils.isEmpty(title)) {
Log.e("Empty action type=" + type);
continue;
}
}
Button button = new Button(context, null, android.R.attr.buttonStyleSmall);
button.setId(View.generateViewId());
button.setText(title);
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
try {
switch (type) {
case ConversationAction.TYPE_TEXT_REPLY:
onReply();
break;
case "copy":
onCopy();
break;
default:
raction.getActionIntent().send();
}
} catch (Throwable ex) {
Log.e(ex);
}
}
private void onReply() {
Intent reply = new Intent(context, ActivityCompose.class)
.putExtra("action", "reply")
.putExtra("reference", message.id)
.putExtra("text", action.getTextReply());
context.startActivity(reply);
}
private void onCopy() {
ClipboardManager clipboard =
(ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
if (clipboard != null) {
ClipData clip = ClipData.newPlainText(title, text);
clipboard.setPrimaryClip(clip);
ToastEx.makeText(context, R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
}
}
});
((ConstraintLayout) flow.getParent()).addView(button);
flow.addView(button);
has = true;
}
grpAction.setVisibility(has ? View.VISIBLE : View.GONE);
}
}
}
private void bindAttachments(final TupleMessageEx message, @Nullable List<EntityAttachment> attachments, boolean bind_images) {
if (attachments == null) if (attachments == null)
attachments = new ArrayList<>(); attachments = new ArrayList<>();
properties.setAttachments(message.id, attachments); properties.setAttachments(message.id, attachments);
@ -2554,14 +2564,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
DB.getInstance(context).attachment().liveAttachments(message.id).observe(cowner, new Observer<List<EntityAttachment>>() { DB.getInstance(context).attachment().liveAttachments(message.id).observe(cowner, new Observer<List<EntityAttachment>>() {
@Override @Override
public void onChanged(@Nullable List<EntityAttachment> attachments) { public void onChanged(@Nullable List<EntityAttachment> attachments) {
bindAttachments(message, attachments); bindAttachments(message, attachments, true);
} }
}); });
} }
}); });
List<EntityAttachment> images = new ArrayList<>(); List<EntityAttachment> images = new ArrayList<>();
if (thumbnails) if (thumbnails && bind_images)
for (EntityAttachment attachment : attachments) for (EntityAttachment attachment : attachments)
if (attachment.isAttachment() && attachment.isImage()) if (attachment.isAttachment() && attachment.isImage())
images.add(attachment); images.add(attachment);

17
app/src/main/java/eu/faircode/email/WebViewEx.java
Unescape View File

@ -42,6 +42,7 @@ import static androidx.webkit.WebSettingsCompat.FORCE_DARK_ON;
public class WebViewEx extends WebView implements DownloadListener, View.OnLongClickListener { public class WebViewEx extends WebView implements DownloadListener, View.OnLongClickListener {
private int height; private int height;
private IWebView intf; private IWebView intf;
private Runnable onPageFinished;
public WebViewEx(Context context) { public WebViewEx(Context context) {
super(context); super(context);
@ -96,6 +97,18 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
this.intf = intf; this.intf = intf;
setWebViewClient(new WebViewClient() { setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
Log.i("Finished url=" + url);
}
@Override
public void onPageCommitVisible(WebView view, String url) {
Log.i("Commit url=" + url);
if (onPageFinished != null)
onPageFinished.run();
}
public boolean shouldOverrideUrlLoading(WebView view, String url) { public boolean shouldOverrideUrlLoading(WebView view, String url) {
Log.i("Open url=" + url); Log.i("Open url=" + url);
return intf.onOpenLink(url); return intf.onOpenLink(url);
@ -118,6 +131,10 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
}); });
} }
void setOnPageFinished(Runnable runnable) {
onPageFinished = runnable;
}
void setImages(boolean show_images, boolean inline) { void setImages(boolean show_images, boolean inline) {
WebSettings settings = getSettings(); WebSettings settings = getSettings();
settings.setLoadsImagesAutomatically(show_images || inline); settings.setLoadsImagesAutomatically(show_images || inline);

Write Preview
Loading…
Cancel
Save