Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0993d914 authored by Vincent Breitmoser's avatar Vincent Breitmoser Committed by cketti
Browse files

only care for our own MessageReference in MessageLoaderHelper

parent a58ca462
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -399,6 +399,9 @@ public class MessageLoaderHelper {
    MessagingListener downloadMessageListener = new MessagingListener() {
        @Override
        public void loadMessageRemoteFinished(Account account, String folder, String uid) {
            if (messageReference.equals(account.getUuid(), folder, uid)) {
                return;
            }
            onMessageDownloadFinished();
        }

+9 −7
Original line number Diff line number Diff line
@@ -109,16 +109,18 @@ public class MessageReference implements Parcelable {

    @Override
    public boolean equals(Object o) {
        if (o instanceof MessageReference == false) {
        if (!(o instanceof MessageReference)) {
            return false;
        }
        MessageReference other = (MessageReference) o;
        if ((accountUuid == other.accountUuid || (accountUuid != null && accountUuid.equals(other.accountUuid)))
                && (folderName == other.folderName || (folderName != null && folderName.equals(other.folderName)))
                && (uid == other.uid || (uid != null && uid.equals(other.uid)))) {
            return true;
        return equals(other.accountUuid, other.folderName, other.uid);
    }
        return false;

    public boolean equals(String accountUuid, String folderName, String uid) {
        // noinspection StringEquality, we check for null values here
        return ((accountUuid == this.accountUuid || (accountUuid != null && accountUuid.equals(this.accountUuid)))
                && (folderName == this.folderName || (folderName != null && folderName.equals(this.folderName)))
                && (uid == this.uid || (uid != null && uid.equals(this.uid))));
    }

    @Override