Browse Source

Made previewing messages in notification a pro feature

main
M66B 6 years ago
parent
commit
f9c9f2d2f5
2 changed files with 14 additions and 11 deletions
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. +14
    -11
      app/src/main/java/eu/faircode/email/ServiceSynchronize.java

BIN
.idea/caches/build_file_checksums.ser View File


+ 14
- 11
app/src/main/java/eu/faircode/email/ServiceSynchronize.java View File

@ -281,16 +281,6 @@ public class ServiceSynchronize extends LifecycleService {
Uri uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.SHORT, SimpleDateFormat.SHORT);
StringBuilder sb = new StringBuilder();
for (EntityMessage message : messages) {
sb.append(MessageHelper.getFormattedAddresses(message.from, false));
if (!TextUtils.isEmpty(message.subject))
sb.append(": ").append(message.subject);
sb.append(" ").append(df.format(new Date(message.sent)));
sb.append("\n");
}
// Build notification
Notification.Builder builder;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
@ -302,7 +292,6 @@ public class ServiceSynchronize extends LifecycleService {
.setSmallIcon(R.drawable.baseline_mail_24)
.setContentTitle(getResources().getQuantityString(R.plurals.title_notification_unseen, messages.size(), messages.size()))
.setContentIntent(pi)
.setStyle(new Notification.BigTextStyle().bigText(sb.toString()))
.setSound(uri)
.setShowWhen(false)
.setPriority(Notification.PRIORITY_DEFAULT)
@ -310,6 +299,20 @@ public class ServiceSynchronize extends LifecycleService {
.setVisibility(Notification.VISIBILITY_PUBLIC)
.setDeleteIntent(pid);
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("pro", false)) {
DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.SHORT, SimpleDateFormat.SHORT);
StringBuilder sb = new StringBuilder();
for (EntityMessage message : messages) {
sb.append(MessageHelper.getFormattedAddresses(message.from, false));
if (!TextUtils.isEmpty(message.subject))
sb.append(": ").append(message.subject);
sb.append(" ").append(df.format(new Date(message.sent)));
sb.append("\n");
}
builder.setStyle(new Notification.BigTextStyle().bigText(sb.toString()));
}
return builder;
}


Loading…
Cancel
Save