Merge branch 'develop' into review_build_process

[pub/Android/ownCloud.git] / src / eu / alefzero / webdav / WebdavEntry.java

diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java
index 46923c6..665a850 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavEntry.java
+++ b/src/eu/alefzero/webdav/WebdavEntry.java
@@ -28,7 +28,7 @@ import com.owncloud.android.Log_OC;
 import android.net.Uri;
 
 public class WebdavEntry {
 import android.net.Uri;
 
 public class WebdavEntry {

-    private String mName, mPath, mUri, mContentType;
+    private String mName, mPath, mUri, mContentType, mEtag;

     private long mContentLength, mCreateTimestamp, mModifiedTimestamp;
 
     public WebdavEntry(MultiStatusResponse ms, String splitElement) {
     private long mContentLength, mCreateTimestamp, mModifiedTimestamp;
 
     public WebdavEntry(MultiStatusResponse ms, String splitElement) {


@@ -42,8 +42,10 @@ public class WebdavEntry {
             DavPropertySet propSet = ms.getProperties(status);
             @SuppressWarnings("rawtypes")
             DavProperty prop = propSet.get(DavPropertyName.DISPLAYNAME);
             DavPropertySet propSet = ms.getProperties(status);
             @SuppressWarnings("rawtypes")
             DavProperty prop = propSet.get(DavPropertyName.DISPLAYNAME);

-            if (prop != null)
+            if (prop != null) {

                 mName = (String) prop.getName().toString();
                 mName = (String) prop.getName().toString();

+                mName = mName.substring(1, mName.length()-1);
+            }

             else {
                 String[] tmp = mPath.split("/");
                 if (tmp.length > 0)
             else {
                 String[] tmp = mPath.split("/");
                 if (tmp.length > 0)


@@ -87,6 +89,12 @@ public class WebdavEntry {
                         .parseResponseDate((String) prop.getValue());
                 mCreateTimestamp = (d != null) ? d.getTime() : 0;
             }
                         .parseResponseDate((String) prop.getValue());
                 mCreateTimestamp = (d != null) ? d.getTime() : 0;
             }

+            
+            prop = propSet.get(DavPropertyName.GETETAG);
+            if (prop != null) {
+                mEtag = (String) prop.getValue();
+                mEtag = mEtag.substring(1, mEtag.length()-1);
+            }

 
         } else {
             Log_OC.e("WebdavEntry",
 
         } else {
             Log_OC.e("WebdavEntry",


@@ -129,6 +137,10 @@ public class WebdavEntry {
     public long modifiedTimestamp() {
         return mModifiedTimestamp;
     }
     public long modifiedTimestamp() {
         return mModifiedTimestamp;
     }

+    
+    public String etag() {
+        return mEtag;
+    }

 
     private void resetData() {
         mName = mUri = mContentType = null;
 
     private void resetData() {
         mName = mUri = mContentType = null;