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

128
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);
bindHeaders(message, false);
bindAttachments(message, properties.getAttachments(message.id));
bindAttachments(message, properties.getAttachments(message.id), false);
// Actions
vSeparator.setVisibility(View.VISIBLE);
@ -1596,7 +1596,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
(inlineImages > lastInlineImages && (show_images || inline)))
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");
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() {
@Override
public void run() {
@ -2348,24 +2365,61 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvBody.setTextIsSelectable(false);
tvBody.setTextIsSelectable(true);
tvBody.setMovementMethod(new TouchHandler(message));
cowner.start(); // Show attachments
bindConversationActions(message, args.getParcelable("actions"));
} catch (Throwable 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);
}
if (scroll)
properties.scrollTo(getAdapterPosition(), 0);
boolean auto_decrypt = prefs.getBoolean("auto_decrypt", false);
if (auto_decrypt &&
(EntityMessage.PGP_SIGNENCRYPT.equals(message.encrypt) ||
EntityMessage.SMIME_SIGNENCRYPT.equals(message.encrypt)))
onActionDecrypt(message, true);
}
@Override
protected void onException(Bundle args, Throwable ex) {
if (ex instanceof OutOfMemoryError)
Snackbar.make(parentFragment.getView(), ex.getMessage(), Snackbar.LENGTH_LONG)
.setGestureInsetBottomIgnored(true).show();
else
tvBody.setText(null);
} else
throw new IllegalStateException("Result=" + result);
Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
}
@RequiresApi(api = Build.VERSION_CODES.Q)
private ConversationActions getConversationActions(TupleMessageEx message, Document document, Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean conversation_actions = prefs.getBoolean("conversation_actions", true);
boolean conversation_actions_replies = prefs.getBoolean("conversation_actions_replies", true);
if (!conversation_actions)
return null;
List<String> texts = new ArrayList<>();
if (!TextUtils.isEmpty(message.subject))
texts.add(message.subject);
texts.add(document.text());
return TextHelper.getConversationActions(
context,
texts.toArray(new String[0]),
conversation_actions_replies,
isOutgoing(message),
message.received);
}
}.setCount(false).execute(context, owner, args, "message:body");
}
private void bindConversationActions(TupleMessageEx message, ConversationActions cactions) {
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) {
@ -2447,53 +2501,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
grpAction.setVisibility(has ? View.VISIBLE : View.GONE);
}
}
if (scroll)
properties.scrollTo(getAdapterPosition(), 0);
// Show attachments
cowner.start();
boolean auto_decrypt = prefs.getBoolean("auto_decrypt", false);
if (auto_decrypt &&
(EntityMessage.PGP_SIGNENCRYPT.equals(message.encrypt) ||
EntityMessage.SMIME_SIGNENCRYPT.equals(message.encrypt)))
onActionDecrypt(message, true);
}
@Override
protected void onException(Bundle args, Throwable ex) {
if (ex instanceof OutOfMemoryError)
Snackbar.make(parentFragment.getView(), ex.getMessage(), Snackbar.LENGTH_LONG)
.setGestureInsetBottomIgnored(true).show();
else
Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
}
@RequiresApi(api = Build.VERSION_CODES.Q)
private ConversationActions getConversationActions(TupleMessageEx message, Document document, Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean conversation_actions = prefs.getBoolean("conversation_actions", true);
boolean conversation_actions_replies = prefs.getBoolean("conversation_actions_replies", true);
if (!conversation_actions)
return null;
List<String> texts = new ArrayList<>();
if (!TextUtils.isEmpty(message.subject))
texts.add(message.subject);
texts.add(document.text());
return TextHelper.getConversationActions(
context,
texts.toArray(new String[0]),
conversation_actions_replies,
isOutgoing(message),
message.received);
}
}.setCount(false).execute(context, owner, args, "message:body");
}
private void bindAttachments(final TupleMessageEx message, @Nullable List<EntityAttachment> attachments) {
private void bindAttachments(final TupleMessageEx message, @Nullable List<EntityAttachment> attachments, boolean bind_images) {
if (attachments == null)
attachments = new ArrayList<>();
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>>() {
@Override
public void onChanged(@Nullable List<EntityAttachment> attachments) {
bindAttachments(message, attachments);
bindAttachments(message, attachments, true);
}
});
}
});
List<EntityAttachment> images = new ArrayList<>();
if (thumbnails)
if (thumbnails && bind_images)
for (EntityAttachment attachment : attachments)
if (attachment.isAttachment() && attachment.isImage())
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 {
private int height;
private IWebView intf;
private Runnable onPageFinished;
public WebViewEx(Context context) {
super(context);
@ -96,6 +97,18 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
this.intf = intf;
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) {
Log.i("Open url=" + 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) {
WebSettings settings = getSettings();
settings.setLoadsImagesAutomatically(show_images || inline);

Write Preview
Loading…
Cancel
Save