arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-22 07:58:09 +00:00
Code Issues Releases Wiki Activity

Version bump to 1.1.1.1

Browse Source 
* add yield points to allow processing of groups with many contacts
* new script to generate contacts for testing
This commit is contained in:
Ricki Hirner 2016-06-23 11:40:39 +02:00
parent 4542da7d89
commit 54e6426dc4
6 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -17,8 +17,8 @@ android {
minSdkVersion 14
targetSdkVersion 23
versionCode 104
versionName "1.1.1"
versionCode 105
versionName "1.1.1.1"
buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
}

2
app/src/main/java/at/bitfire/davdroid/resource/LocalContact.java
View File

@ -126,6 +126,7 @@ public class LocalContact extends AndroidContact implements LocalResource {
.withValue(CachedGroupMembership.MIMETYPE, CachedGroupMembership.CONTENT_ITEM_TYPE)
.withValue(CachedGroupMembership.RAW_CONTACT_ID, id)
.withValue(CachedGroupMembership.GROUP_ID, groupID)
.withYieldAllowed(true)
.build()
);
}
@ -138,6 +139,7 @@ public class LocalContact extends AndroidContact implements LocalResource {
Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + " IN (?,?)",
new String[] { String.valueOf(id), GroupMembership.CONTENT_ITEM_TYPE, CachedGroupMembership.CONTENT_ITEM_TYPE }
)
.withYieldAllowed(true)
.build()
);
}

4
app/src/main/java/at/bitfire/davdroid/resource/LocalGroup.java
View File

@ -81,6 +81,7 @@ public class LocalGroup extends AndroidGroup implements LocalResource {
.withValue(CachedGroupMembership.MIMETYPE, CachedGroupMembership.CONTENT_ITEM_TYPE)
.withValue(CachedGroupMembership.RAW_CONTACT_ID, member)
.withValue(CachedGroupMembership.GROUP_ID, id)
.withYieldAllowed(true)
.build()
);
@ -122,6 +123,7 @@ public class LocalGroup extends AndroidGroup implements LocalResource {
batch.enqueue(ContentProviderOperation
.newUpdate(addressBook.syncAdapterURI(ContentUris.withAppendedId(RawContacts.CONTENT_URI, member)))
.withValue(RawContacts.DIRTY, 1)
.withYieldAllowed(true)
.build()
);
@ -155,6 +157,7 @@ public class LocalGroup extends AndroidGroup implements LocalResource {
"(" + GroupMembership.MIMETYPE + "=? AND " + GroupMembership.GROUP_ROW_ID + "=?) OR (" +
CachedGroupMembership.MIMETYPE + "=? AND " + CachedGroupMembership.GROUP_ID + "=?)",
new String[] { GroupMembership.CONTENT_ITEM_TYPE, String.valueOf(id), CachedGroupMembership.CONTENT_ITEM_TYPE, String.valueOf(id) })
.withYieldAllowed(true)
.build()
);
@ -181,6 +184,7 @@ public class LocalGroup extends AndroidGroup implements LocalResource {
batch.enqueue(ContentProviderOperation
.newUpdate(addressBook.syncAdapterURI(ContentUris.withAppendedId(Groups.CONTENT_URI, id)))
.withValue(COLUMN_PENDING_MEMBERS, null)
.withYieldAllowed(true)
.build()
);

1
app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.java
View File

@ -214,6 +214,7 @@ public class ContactsSyncManager extends SyncManager {
batch.enqueue(ContentProviderOperation
.newUpdate(addressBook.syncAdapterURI(ContentUris.withAppendedId(Groups.CONTENT_URI, groupID)))
.withValue(Groups.DIRTY, 1)
.withYieldAllowed(true)
.build()
);
}

1
gradle.properties Normal file
View File

@ -0,0 +1 @@
org.gradle.jvmargs=-Xmx2048M

13
scripts/gen-contacts.rb Executable file
View File

@ -0,0 +1,13 @@
#!/usr/bin/ruby
File.open("contacts.vcf", "w") do |f|
for i in 1..600 do
f.puts "BEGIN:VCARD"
f.puts "VERSION:3.0"
f.puts "FN:Kontakt Nr. #{i}"
f.puts "N:Kontakt Nr. #{i}"
f.puts "EMAIL:#{i}@google-god.com"
f.puts "PHONE:#{i}#{i}#{i}"
f.puts "END:VCARD"
end
end