X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5f41bb14d370e0c9c0a8003e4ed122f466b0ce71..refs/heads/master:/src/com/owncloud/android/syncadapter/FileSyncAdapter.java diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java index b0d2f222..f04c8dac 100644 --- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java @@ -298,7 +298,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { syncChildren(children); } - } else { + } else if (result.getCode() != ResultCode.FILE_NOT_FOUND) { // in failures, the statistics for the global result are updated if ( result.getCode() == RemoteOperationResult.ResultCode.UNAUTHORIZED || result.isIdPRedirection() @@ -313,7 +313,10 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { } mFailedResultsCounter++; mLastFailedResult = result; - } + + } // else, ResultCode.FILE_NOT_FOUND is ignored, remote folder was + // removed from other thread or other client during the synchronization, + // before this thread fetched its contents } @@ -507,6 +510,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { private NotificationCompat.Builder createNotificationBuilder() { NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(getContext()); notificationBuilder.setSmallIcon(R.drawable.notification_icon).setAutoCancel(true); + notificationBuilder.setColor(getContext().getResources().getColor(R.color.primary)); return notificationBuilder; }