From: gstraube Date: Tue, 28 Jul 2015 20:05:54 +0000 (+0200) Subject: Check if ETag for remote folder is null, i.e. it was not received from the server X-Git-Tag: oc-android-1.8~35^2^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/aec910ff838026ebcca673f3e7e3dc3161a249a2?ds=inline;hp=--cc Check if ETag for remote folder is null, i.e. it was not received from the server --- aec910ff838026ebcca673f3e7e3dc3161a249a2 diff --git a/src/com/owncloud/android/operations/RefreshFolderOperation.java b/src/com/owncloud/android/operations/RefreshFolderOperation.java index ddbffb8c..977f72a8 100644 --- a/src/com/owncloud/android/operations/RefreshFolderOperation.java +++ b/src/com/owncloud/android/operations/RefreshFolderOperation.java @@ -252,8 +252,14 @@ public class RefreshFolderOperation extends RemoteOperation { if (!mIgnoreETag) { // check if remote and local folder are different - mRemoteFolderChanged = - !(remoteFolder.getEtag().equalsIgnoreCase(mLocalFolder.getEtag())); + String remoteFolderETag = remoteFolder.getEtag(); + if (remoteFolderETag != null) { + mRemoteFolderChanged = + !(remoteFolderETag.equalsIgnoreCase(mLocalFolder.getEtag())); + } else { + Log_OC.e(TAG, "Checked " + mAccount.name + remotePath + " : " + + "No ETag received from server"); + } } result = new RemoteOperationResult(ResultCode.OK);