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

Account color is a pro feature

This commit is contained in:
M66B 2018-11-07 12:51:43 +00:00
parent 15163fb1b0
commit 73d704d688
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -38,10 +38,10 @@ See also [this FAQ](https://github.com/M66B/open-source-email/blob/master/FAQ.md
* Dark/black theme
* Account colors
* Multiple select
* Standard replies
* Reply templates
* Sort on time, unread or starred
* Search on server
* Preview sender/subject in new messages status bar notification
* Preview sender/subject/photo in new message notifications
* Encryption/decryption ([OpenPGP](https://www.openpgp.org/))
* Export settings

51
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@ -508,39 +508,40 @@ public class ServiceSynchronize extends LifecycleService {
.addAction(actionArchive.build())
.addAction(actionTrash.build());
if (pro)
if (pro) {
if (!TextUtils.isEmpty(message.subject))
mbuilder.setContentText(message.subject);
if (!TextUtils.isEmpty(message.avatar)) {
Cursor cursor = null;
try {
cursor = getContentResolver().query(
Uri.parse(message.avatar),
new String[]{ContactsContract.Contacts._ID},
null, null, null);
if (cursor.moveToNext()) {
Uri photo = Uri.withAppendedPath(
ContactsContract.Contacts.CONTENT_URI,
cursor.getLong(0) + "/photo");
mbuilder.setLargeIcon(Icon.createWithContentUri(photo));
if (!TextUtils.isEmpty(message.avatar)) {
Cursor cursor = null;
try {
cursor = getContentResolver().query(
Uri.parse(message.avatar),
new String[]{ContactsContract.Contacts._ID},
null, null, null);
if (cursor.moveToNext()) {
Uri photo = Uri.withAppendedPath(
ContactsContract.Contacts.CONTENT_URI,
cursor.getLong(0) + "/photo");
mbuilder.setLargeIcon(Icon.createWithContentUri(photo));
}
} finally {
if (cursor != null)
cursor.close();
}
} finally {
if (cursor != null)
cursor.close();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
mbuilder.addPerson(new Person.Builder()
.setUri(message.avatar)
.build());
else
mbuilder.addPerson(message.avatar);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
mbuilder.addPerson(new Person.Builder()
.setUri(message.avatar)
.build());
else
mbuilder.addPerson(message.avatar);
if (message.accountColor != null)
mbuilder.setColor(message.accountColor);
}
if (message.accountColor != null)
mbuilder.setColor(message.accountColor);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
mbuilder.setGroupAlertBehavior(Notification.GROUP_ALERT_CHILDREN);