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

Allow removing avatars

This commit is contained in:
M66B 2018-11-29 10:45:58 +01:00
parent 5677c283e3
commit d71bddf958
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/EntityMessage.java
View File

@ -202,6 +202,8 @@ public class EntityMessage implements Serializable {
void getAvatar(Context context) { void getAvatar(Context context) {
if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS)
== PackageManager.PERMISSION_GRANTED) { == PackageManager.PERMISSION_GRANTED) {
this.avatar = null;
try { try {
if (this.from != null) if (this.from != null)
for (int i = 0; i < this.from.length; i++) { for (int i = 0; i < this.from.length; i++) {

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

@ -2167,11 +2167,10 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(Helper.TAG, folder.name + " updated id=" + message.id + " uid=" + message.uid + " unhide"); Log.i(Helper.TAG, folder.name + " updated id=" + message.id + " uid=" + message.uid + " unhide");
} }
if (TextUtils.isEmpty(message.avatar)) { boolean noavatar = TextUtils.isEmpty(message.avatar);
message.getAvatar(context); message.getAvatar(context);
if (!TextUtils.isEmpty(message.avatar)) if (noavatar != TextUtils.isEmpty(message.avatar))
update = true; update = true;
}
if (update) if (update)
db.message().updateMessage(message); db.message().updateMessage(message);