From f2febfeb8c490e3d630e21ef9e16cb1b06019aa8 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 7 Feb 2017 22:15:12 +0000
Subject: [PATCH] Improve integrity error, error message.

---
 .../main/java/at/bitfire/davdroid/syncadapter/SyncManager.java | 3 +--
 app/src/main/res/values/strings.xml                            | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
index 94519b42..ebf39f87 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
@@ -209,8 +209,7 @@ abstract public class SyncManager {
                 syncResult.databaseError = true;
             } else if (e instanceof Exceptions.IntegrityException) {
                 App.log.log(Level.SEVERE, "Integrity error", e);
-                // FIXME: Make a proper error message
-                messageString = R.string.sync_error;
+                messageString = R.string.sync_error_integrity;
                 syncResult.stats.numParseExceptions++;
             } else {
                 App.log.log(Level.SEVERE, "Unknown sync error", e);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c25457b4..20805d76 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -262,6 +262,7 @@
     <string name="sync_error_contacts">Address book synchronization failed (%s)</string>
     <string name="sync_error_tasks">Task synchronization failed (%s)</string>
     <string name="sync_error">Error while %s</string>
+    <string name="sync_error_integrity">Integrity error while %s</string>
     <string name="sync_error_http_dav">Server error while %s</string>
     <string name="sync_error_local_storage">Database error while %s</string>
     <string-array name="sync_error_phases">