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

Commit 9c375539 authored by Walter Jang's avatar Walter Jang
Browse files

Can skip mime types when checking raw contacts for changes (DN 1/2) 

Bug 21956248
Bug 25314004

Change-Id: I3b3c1a88cab6f2775b4840df31b57dfa8c3cc9c8
parent e5e2c741

src/com/android/contacts/common/model/RawContactModifier.java

+9 −2
Original line number Diff line number Diff line
@@ -402,6 +402,11 @@ public class RawContactModifier { 
    }



    public static boolean hasChanges(RawContactDeltaList set, AccountTypeManager accountTypes) {

        return hasChanges(set, accountTypes, /* excludedMimeTypes =*/ null);

    }



    public static boolean hasChanges(RawContactDeltaList set, AccountTypeManager accountTypes,

            Set<String> excludedMimeTypes) {

        if (set.isMarkedForSplitting() || set.isMarkedForJoining()) {

            return true;

        }
@@ -411,7 +416,7 @@ public class RawContactModifier { 
            final String accountType = values.getAsString(RawContacts.ACCOUNT_TYPE);

            final String dataSet = values.getAsString(RawContacts.DATA_SET);

            final AccountType type = accountTypes.getAccountType(accountType, dataSet);

            if (hasChanges(state, type)) {

            if (hasChanges(state, type, excludedMimeTypes)) {

                return true;

            }

        }
@@ -463,9 +468,11 @@ public class RawContactModifier { 
        }

    }



    private static boolean hasChanges(RawContactDelta state, AccountType accountType) {

    private static boolean hasChanges(RawContactDelta state, AccountType accountType,

            Set<String> excludedMimeTypes) {

        for (DataKind kind : accountType.getSortedDataKinds()) {

            final String mimeType = kind.mimeType;

            if (excludedMimeTypes != null && excludedMimeTypes.contains(mimeType)) continue;

            final ArrayList<ValuesDelta> entries = state.getMimeEntries(mimeType);

            if (entries == null) continue;