From: masensio <masensio@solidgear.es>
Date: Mon, 24 Aug 2015 11:01:12 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Tag: oc-android-1.8~35
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/83442c8ded183be69e5433d3f4238da20b75be40?hp=9849205124c3c6f7cc44afcf5ba777a0895435bf

Merge branch '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);