arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-16 04:49:06 +00:00
Code Issues Releases Wiki Activity

Sync manager: Fix log messages to be the state strings and not int ids.

Browse Source
This commit is contained in:
Tom Hacohen 2017-03-12 17:08:01 +00:00
parent 4603cc960e
commit e9428c6ec7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ abstract public class SyncManager {
public void performSync() {
int syncPhase = R.string.sync_phase_prepare;
try {
App.log.info("Sync phase: " + syncPhase);
App.log.info("Sync phase: " + context.getString(syncPhase));
if (!prepare()) {
App.log.info("No reason to synchronize, aborting");
return;
@ -129,51 +129,51 @@ abstract public class SyncManager {
if (Thread.interrupted())
return;
syncPhase = R.string.sync_phase_query_capabilities;
App.log.info("Sync phase: " + syncPhase);
App.log.info("Sync phase: " + context.getString(syncPhase));
queryCapabilities();
if (Thread.interrupted())
return;
syncPhase = R.string.sync_phase_prepare_local;
App.log.info("Sync phase: " + syncPhase);
App.log.info("Sync phase: " + context.getString(syncPhase));
prepareLocal();
if (Thread.interrupted())
return;
syncPhase = R.string.sync_phase_fetch_entries;
App.log.info("Sync phase: " + syncPhase);
App.log.info("Sync phase: " + context.getString(syncPhase));
fetchEntries();
if (Thread.interrupted())
return;
syncPhase = R.string.sync_phase_apply_remote_entries;
App.log.info("Sync phase: " + syncPhase);
App.log.info("Sync phase: " + context.getString(syncPhase));
applyRemoteEntries();
/* Create journal entries out of local changes. */
if (Thread.interrupted())
return;
syncPhase = R.string.sync_phase_create_local_entries;
App.log.info("Sync phase: " + syncPhase);
App.log.info("Sync phase: " + context.getString(syncPhase));
createLocalEntries();
if (Thread.interrupted())
return;
syncPhase = R.string.sync_phase_apply_local_entries;
App.log.info("Sync phase: " + syncPhase);
App.log.info("Sync phase: " + context.getString(syncPhase));
applyLocalEntries();
if (Thread.interrupted())
return;
syncPhase = R.string.sync_phase_push_entries;
App.log.info("Sync phase: " + syncPhase);
App.log.info("Sync phase: " + context.getString(syncPhase));
pushEntries();
/* Cleanup and finalize changes */
if (Thread.interrupted())
return;
syncPhase = R.string.sync_phase_post_processing;
App.log.info("Sync phase: " + syncPhase);
App.log.info("Sync phase: " + context.getString(syncPhase));
postProcess();
} catch (IOException e) {
App.log.log(Level.WARNING, "I/O exception during sync, trying again later", e);