From 0a2a3b2d996ad919939fa200612875681eceaf1c Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Thu, 21 Mar 2019 14:50:49 +0000 Subject: [PATCH] Rename queryCapabilites to prepareFetch --- .../com/etesync/syncadapter/syncadapter/SyncManager.kt | 7 +++---- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt index 8f23e5e9..f2565947 100644 --- a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt +++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt @@ -124,9 +124,9 @@ constructor(protected val context: Context, protected val account: Account, prot if (Thread.interrupted()) throw InterruptedException() - syncPhase = R.string.sync_phase_query_capabilities + syncPhase = R.string.sync_phase_prepare_fetch Logger.log.info("Sync phase: " + context.getString(syncPhase)) - queryCapabilities() + prepareFetch() do { if (Thread.interrupted()) @@ -315,8 +315,7 @@ constructor(protected val context: Context, protected val account: Account, prot } @Throws(IOException::class, CalendarStorageException::class, ContactsStorageException::class) - protected fun queryCapabilities() { - // FIXME: Needs to rename this function + protected fun prepareFetch() { remoteCTag = journalEntity.getLastUid(data) } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b4e72da0..ac2bcf2b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -189,7 +189,7 @@ Datenbankfehler beim %s Synchronisation wird vorbereitet Synchronisiere Journale - Frage Ressourcen ab + Frage Ressourcen ab Bereite lokale Einträge vorbereitet Erstelle lokale Einträge Rufe ferne Einträge ab diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 4bda075e..0973828d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -286,7 +286,7 @@ Błąd bazy danych podczas %s przygotowywanie synchronizacji synchronizacja dzienników - odpytywanie możliwości + odpytywanie możliwości przygotowywanie lokalnych wejść tworzenie lokalnych wejść otrzymywanie zdalnych wejść diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e7227b49..e058ed28 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -339,7 +339,7 @@ Journal is read only preparing synchronization syncronizing journals - querying capabilities + preparing for fetch preparing local entries creating local entries fetching remote entries