arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-08 21:52:47 +00:00
Code Issues Releases Wiki Activity

Improve integrity error, error message.

Browse Source
This commit is contained in:
Tom Hacohen 2017-02-07 22:15:12 +00:00
parent 1730241e5d
commit f2febfeb8c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
View File

@ -209,8 +209,7 @@ abstract public class SyncManager {
syncResult.databaseError = true; syncResult.databaseError = true;
} else if (e instanceof Exceptions.IntegrityException) { } else if (e instanceof Exceptions.IntegrityException) {
App.log.log(Level.SEVERE, "Integrity error", e); App.log.log(Level.SEVERE, "Integrity error", e);
// FIXME: Make a proper error message messageString = R.string.sync_error_integrity;
messageString = R.string.sync_error;
syncResult.stats.numParseExceptions++; syncResult.stats.numParseExceptions++;
} else { } else {
App.log.log(Level.SEVERE, "Unknown sync error", e); App.log.log(Level.SEVERE, "Unknown sync error", e);

1
app/src/main/res/values/strings.xml
View File

@ -262,6 +262,7 @@
<string name="sync_error_contacts">Address book synchronization failed (%s)</string> <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_tasks">Task synchronization failed (%s)</string>
<string name="sync_error">Error while %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_http_dav">Server error while %s</string>
<string name="sync_error_local_storage">Database error while %s</string> <string name="sync_error_local_storage">Database error while %s</string>
<string-array name="sync_error_phases"> <string-array name="sync_error_phases">