From: gstraube <georg.straube@googlemail.com>
Date: Fri, 21 Aug 2015 18:45:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Tag: oc-android-1.8~35^2^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1a8a6557474d510bf0b49bc7f7d94bb4c96755a2?hp=0c7a9c3e3a0bba9344db08c8c2acf2718b968e92

Merge remote-tracking branch 'upstream/develop' into develop
---

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);