arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-07-27 00:48:06 +00:00
Code Issues Releases Wiki Activity

ServiceEntity: rename fetch to fetchOrCreate.

Browse Source 
This is what it was doing anyway.
This commit is contained in:
Tom Hacohen 2019-10-16 10:35:53 +03:00
parent 9600cd3f1f
commit 990ab81c2b
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/etesync/syncadapter/model/JournalModel.java
View File

@ -144,7 +144,7 @@ public class JournalModel {
@Index(value = "service_unique_together") @Index(value = "service_unique_together")
CollectionInfo.Type type; CollectionInfo.Type type;
public static ServiceEntity fetch(EntityDataStore<Persistable> data, String account, CollectionInfo.Type type) { public static ServiceEntity fetchOrCreate(EntityDataStore<Persistable> data, String account, CollectionInfo.Type type) {
ServiceEntity service = data.select(ServiceEntity.class).where(ServiceEntity.ACCOUNT.eq(account).and(ServiceEntity.TYPE.eq(type))).limit(1).get().firstOrNull(); ServiceEntity service = data.select(ServiceEntity.class).where(ServiceEntity.ACCOUNT.eq(account).and(ServiceEntity.TYPE.eq(type))).limit(1).get().firstOrNull();
if (service == null) { if (service == null) {
// If our first time, create service and a journal // If our first time, create service and a journal

2
app/src/main/java/com/etesync/syncadapter/syncadapter/AddressBooksSyncAdapterService.kt
View File

@ -74,7 +74,7 @@ class AddressBooksSyncAdapterService : SyncAdapterService() {
private fun updateLocalAddressBooks(provider: ContentProviderClient, account: Account) { private fun updateLocalAddressBooks(provider: ContentProviderClient, account: Account) {
val context = context val context = context
val data = (getContext().applicationContext as App).data val data = (getContext().applicationContext as App).data
val service = JournalModel.Service.fetch(data, account.name, CollectionInfo.Type.ADDRESS_BOOK) val service = JournalModel.Service.fetchOrCreate(data, account.name, CollectionInfo.Type.ADDRESS_BOOK)
val remote = HashMap<String, JournalEntity>() val remote = HashMap<String, JournalEntity>()
val remoteJournals = JournalEntity.getJournals(data, service) val remoteJournals = JournalEntity.getJournals(data, service)

2
app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.kt
View File

@ -59,7 +59,7 @@ class CalendarsSyncAdapterService : SyncAdapterService() {
@Throws(CalendarStorageException::class) @Throws(CalendarStorageException::class)
private fun updateLocalCalendars(provider: ContentProviderClient, account: Account, settings: AccountSettings) { private fun updateLocalCalendars(provider: ContentProviderClient, account: Account, settings: AccountSettings) {
val data = (context.applicationContext as App).data val data = (context.applicationContext as App).data
val service = JournalModel.Service.fetch(data, account.name, CollectionInfo.Type.CALENDAR) val service = JournalModel.Service.fetchOrCreate(data, account.name, CollectionInfo.Type.CALENDAR)
val remote = HashMap<String, JournalEntity>() val remote = HashMap<String, JournalEntity>()
val remoteJournals = JournalEntity.getJournals(data, service) val remoteJournals = JournalEntity.getJournals(data, service)

2
app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt
View File

@ -229,7 +229,7 @@ abstract class SyncAdapterService : Service() {
private fun saveCollections(journals: Iterable<Pair<JournalManager.Journal, CollectionInfo>>) { private fun saveCollections(journals: Iterable<Pair<JournalManager.Journal, CollectionInfo>>) {
val data = (context.applicationContext as App).data val data = (context.applicationContext as App).data
val service = JournalModel.Service.fetch(data, account.name, serviceType) val service = JournalModel.Service.fetchOrCreate(data, account.name, serviceType)
val existing = HashMap<String, JournalEntity>() val existing = HashMap<String, JournalEntity>()
for (journalEntity in JournalEntity.getJournals(data, service)) { for (journalEntity in JournalEntity.getJournals(data, service)) {

2
app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt
View File

@ -89,7 +89,7 @@ constructor(protected val context: Context, protected val account: Account, prot
httpClient = HttpClient.Builder(context, settings).setForeground(false).build() httpClient = HttpClient.Builder(context, settings).setForeground(false).build()
data = (context.applicationContext as App).data data = (context.applicationContext as App).data
val serviceEntity = JournalModel.Service.fetch(data, accountName, serviceType) val serviceEntity = JournalModel.Service.fetchOrCreate(data, accountName, serviceType)
info = JournalEntity.fetch(data, serviceEntity, journalUid)!!.info info = JournalEntity.fetch(data, serviceEntity, journalUid)!!.info
// dismiss previous error notifications // dismiss previous error notifications

2
app/src/main/java/com/etesync/syncadapter/syncadapter/TasksSyncAdapterService.kt
View File

@ -78,7 +78,7 @@ class TasksSyncAdapterService: SyncAdapterService() {
private fun updateLocalTaskLists(provider: TaskProvider, account: Account, settings: AccountSettings) { private fun updateLocalTaskLists(provider: TaskProvider, account: Account, settings: AccountSettings) {
val data = (context.applicationContext as App).data val data = (context.applicationContext as App).data
var service = JournalModel.Service.fetch(data, account.name, CollectionInfo.Type.TASKS) var service = JournalModel.Service.fetchOrCreate(data, account.name, CollectionInfo.Type.TASKS)
val remote = HashMap<String, JournalEntity>() val remote = HashMap<String, JournalEntity>()
val remoteJournals = JournalEntity.getJournals(data, service) val remoteJournals = JournalEntity.getJournals(data, service)

2
app/src/main/java/com/etesync/syncadapter/ui/CreateCollectionFragment.kt
View File

@ -95,7 +95,7 @@ class CreateCollectionFragment : DialogFragment(), LoaderManager.LoaderCallbacks
CollectionInfo.Type.TASKS -> authority = TaskProvider.ProviderName.OpenTasks.authority CollectionInfo.Type.TASKS -> authority = TaskProvider.ProviderName.OpenTasks.authority
} }
val serviceEntity = JournalModel.Service.fetch(data, account.name, info.type) val serviceEntity = JournalModel.Service.fetchOrCreate(data, account.name, info.type)
info.serviceID = serviceEntity.id info.serviceID = serviceEntity.id
val settings = AccountSettings(context, account) val settings = AccountSettings(context, account)