mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent crash

This commit is contained in:
M66B 2019-10-10 15:29:39 +02:00
parent 0f9734c7bd
commit 5dbfd2bc8f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1592,7 +1592,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
return;
boolean has_images = args.getBoolean("has_images");
boolean show_images = properties.getValue("images", message.id);
if (result instanceof Spanned) {
tvBody.setText((Spanned) result);
@ -1601,7 +1600,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvBody.setMovementMethod(new TouchHandler(message));
} else if (result instanceof String)
((WebView) wvBody).loadDataWithBaseURL(null, (String) result, "text/html", "UTF-8", null);
else
else if (result == null) {
boolean show_full = args.getBoolean("show_full");
if (show_full)
((WebView) wvBody).loadDataWithBaseURL(null, "", "text/html", "UTF-8", null);
else
tvBody.setText(null);
} else
throw new IllegalStateException("Result=" + result);
pbBody.setVisibility(View.GONE);