arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-05-28 19:58:49 +00:00
Code Issues Releases Wiki Activity

Android 7 workaround: update hash after group membership operations

Browse Source
This commit is contained in:
Ricki Hirner 2017-02-10 16:52:25 +01:00 committed by Tom Hacohen
parent c50ccf9b7a
commit 97aefad0a2
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/etesync/syncadapter/resource/LocalContact.java
View File

@ -164,34 +164,11 @@ public class LocalContact extends AndroidContact implements LocalResource {
} }
@Override
public int update(Contact contact) throws ContactsStorageException {
int result = super.update(contact);
if (!saveAsDirty && (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N))
// workaround for Android 7 which sets DIRTY flag when only meta-data is changed
updateHashCode();
return result;
}
public int updateAsDirty(Contact contact) throws ContactsStorageException { public int updateAsDirty(Contact contact) throws ContactsStorageException {
saveAsDirty = true; saveAsDirty = true;
return this.update(contact); return this.update(contact);
} }
@Override
public Uri create() throws ContactsStorageException {
Uri uri = super.create();
if (!saveAsDirty && (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N))
// workaround for Android 7 which sets DIRTY flag when only meta-data is changed
updateHashCode();
return uri;
}
public Uri createAsDirty() throws ContactsStorageException { public Uri createAsDirty() throws ContactsStorageException {
saveAsDirty = true; saveAsDirty = true;
return this.create(); return this.create();
@ -207,7 +184,7 @@ public class LocalContact extends AndroidContact implements LocalResource {
* Calculates a hash code from the contact's data (VCard) and group memberships. * Calculates a hash code from the contact's data (VCard) and group memberships.
* @return hash code of contact data (including group memberships) * @return hash code of contact data (including group memberships)
*/ */
public int dataHashCode() throws FileNotFoundException, ContactsStorageException { protected int dataHashCode() throws FileNotFoundException, ContactsStorageException {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
App.log.severe("dataHashCode() should not be called on Android <7"); App.log.severe("dataHashCode() should not be called on Android <7");
@ -215,7 +192,7 @@ public class LocalContact extends AndroidContact implements LocalResource {
return getContact().hashCode() ^ groupMemberships.hashCode(); return getContact().hashCode() ^ groupMemberships.hashCode();
} }
protected void updateHashCode() throws ContactsStorageException { public void updateHashCode() throws ContactsStorageException {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
App.log.severe("updateHashCode() should not be called on Android <7"); App.log.severe("updateHashCode() should not be called on Android <7");
@ -234,7 +211,7 @@ public class LocalContact extends AndroidContact implements LocalResource {
} }
} }
int getLastHashCode() throws ContactsStorageException { public int getLastHashCode() throws ContactsStorageException {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
App.log.severe("getLastHashCode() should not be called on Android <7"); App.log.severe("getLastHashCode() should not be called on Android <7");

4
app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.java
View File

@ -206,6 +206,10 @@ public class ContactsSyncManager extends SyncManager {
syncResult.stats.numInserts++; syncResult.stats.numInserts++;
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && local instanceof LocalContact)
// workaround for Android 7 which sets DIRTY flag when only meta-data is changed
((LocalContact)local).updateHashCode();
return local; return local;
} }