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

Fixed wearable message preview

This commit is contained in:
M66B 2019-10-05 13:22:33 +02:00
parent 724bb1af23
commit 3f2d636718
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/eu/faircode/email/Core.java
View File

@ -2790,7 +2790,8 @@ class Core {
sb.append("<br>");
}
builder.setContentText(sb.toString());
// Wearable should ignore summary notification
builder.setContentText(title);
builder.setStyle(new NotificationCompat.BigTextStyle()
.bigText(HtmlHelper.fromHtml(sb.toString()))
@ -3012,27 +3013,40 @@ class Core {
mbuilder.extend(new NotificationCompat.WearableExtender()
.addActions(wactions));
if (!TextUtils.isEmpty(message.subject))
mbuilder.setContentText(message.subject);
if (message.content && notify_preview)
try {
String body = Helper.readText(message.getFile(context));
String preview = HtmlHelper.getPreview(body);
String summary =
(TextUtils.isEmpty(message.subject) ? "" : message.subject) +
" - " +
(TextUtils.isEmpty(preview) ? "" : preview);
// Wearable
mbuilder.setContentText(summary);
StringBuilder sbm = new StringBuilder();
if (!TextUtils.isEmpty(message.subject))
sbm.append(message.subject).append("<br>");
String preview = HtmlHelper.getPreview(body);
if (!TextUtils.isEmpty(preview))
sbm.append("<em>").append(preview).append("</em>");
mbuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(HtmlHelper.fromHtml(sbm.toString())));
mbuilder.setStyle(new NotificationCompat.BigTextStyle()
.bigText(HtmlHelper.fromHtml(sbm.toString()))
.setSummaryText(summary));
} catch (IOException ex) {
Log.e(ex);
mbuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(ex.toString()));
db.message().setMessageContent(message.id, false, null, null, null);
mbuilder.setStyle(new NotificationCompat.BigTextStyle()
.bigText(ex.toString())
.setSummaryText(Helper.formatThrowable(ex)));
}
else {
//mbuilder.setLocalOnly(true);
if (!TextUtils.isEmpty(message.subject))
mbuilder.setContentText(message.subject);
}
if (info.hasPhoto())
mbuilder.setLargeIcon(info.getPhotoBitmap());