Add privatelink property support to webdav reponses

src/com/owncloud/android/lib/common/network/WebdavEntry.java

@@ -45,13 +45,14 @@ public class WebdavEntry {
     public static final String EXTENDED_PROPERTY_NAME_PERMISSIONS = "permissions";
     public static final String EXTENDED_PROPERTY_NAME_REMOTE_ID = "id";
     public static final String EXTENDED_PROPERTY_NAME_SIZE = "size";
+    public static final String EXTENDED_PROPERTY_NAME_PRIVATE_LINK = "privatelink";
 
     public static final String PROPERTY_QUOTA_USED_BYTES = "quota-used-bytes";
     public static final String PROPERTY_QUOTA_AVAILABLE_BYTES = "quota-available-bytes";
 
     private static final int CODE_PROP_NOT_FOUND = 404;
 
-	private String mName, mPath, mUri, mContentType, mEtag, mPermissions, mRemoteId;
+    private String mName, mPath, mUri, mContentType, mEtag, mPermissions, mRemoteId, mPrivateLink;
     private long mContentLength, mCreateTimestamp, mModifiedTimestamp, mSize;
     private BigDecimal mQuotaUsedBytes, mQuotaAvailableBytes;
 
@@ -72,8 +73,7 @@ public class WebdavEntry {
             if (prop != null) {
                 mName = (String) prop.getName().toString();
                 mName = mName.substring(1, mName.length() - 1);
-            }
+            } else {
-            else {
                 String[] tmp = mPath.split("/");
                 if (tmp.length > 0)
                     mName = tmp[tmp.length - 1];
@@ -176,7 +176,6 @@ public class WebdavEntry {
                 mRemoteId = prop.getValue().toString();
             }
 
-            // TODO: is it necessary?
             // OC size property <oc:size>
             prop = propSet.get(
                 EXTENDED_PROPERTY_NAME_SIZE, Namespace.getNamespace(NAMESPACE_OC)
@@ -185,6 +184,14 @@ public class WebdavEntry {
                 mSize = Long.parseLong((String) prop.getValue());
             }
 
+            // OC privatelink property <oc:privatelink>
+            prop = propSet.get(
+                EXTENDED_PROPERTY_NAME_PRIVATE_LINK, Namespace.getNamespace(NAMESPACE_OC)
+            );
+            if (prop != null) {
+                mPrivateLink = prop.getValue().toString();
+            }
+
         } else {
             Log_OC.e("WebdavEntry",
                 "General fuckup, no status for webdav response");
@@ -251,11 +258,17 @@ public class WebdavEntry {
         return mQuotaAvailableBytes;
     }
 
+    public String privateLink() {
+        return mPrivateLink;
+    }
+
     private void resetData() {
-        mName = mUri = mContentType = mPermissions = null; mRemoteId = null;
+        mName = mUri = mContentType = mPermissions = null;
+        mRemoteId = null;
         mContentLength = mCreateTimestamp = mModifiedTimestamp = 0;
         mSize = 0;
         mQuotaUsedBytes = null;
         mQuotaAvailableBytes = null;
+        mPrivateLink = null;
     }
 }

src/com/owncloud/android/lib/common/network/WebdavUtils.java

@@ -107,6 +107,8 @@ public class WebdavUtils {
                 Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
         propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_SIZE,
                 Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
+        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_PRIVATE_LINK,
+            Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
 
         return propSet;
     }
@@ -130,6 +132,10 @@ public class WebdavUtils {
                 Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
         propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_SIZE,
                 Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
+        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_SIZE,
+            Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
+        propSet.add(WebdavEntry.EXTENDED_PROPERTY_NAME_PRIVATE_LINK,
+            Namespace.getNamespace(WebdavEntry.NAMESPACE_OC));
 
         return propSet;
     }

src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java

@@ -171,6 +171,7 @@ public class ReadRemoteFolderOperation extends RemoteOperation {
         file.setSize(we.size());
         file.setQuotaUsedBytes(we.quotaUsedBytes());
         file.setQuotaAvailableBytes(we.quotaAvailableBytes());
+        file.setPrivateLink(we.privateLink());
         return file;
     }
 }

src/com/owncloud/android/lib/resources/files/RemoteFile.java

@@ -40,7 +40,9 @@ import com.owncloud.android.lib.common.network.WebdavEntry;
 
 public class RemoteFile implements Parcelable, Serializable {
 
-    /** Generated - should be refreshed every time the class changes!! */
+    /**
+     * Generated - should be refreshed every time the class changes!!
+     */
     private static final long serialVersionUID = 3130865437811248451L;
 
     private String mRemotePath;
@@ -54,6 +56,7 @@ public class RemoteFile implements Parcelable, Serializable {
     private long mSize;
     private BigDecimal mQuotaUsedBytes;
     private BigDecimal mQuotaAvailableBytes;
+    private String mPrivateLink;
 
     /**
      * Getters and Setters
@@ -139,13 +142,21 @@ public class RemoteFile implements Parcelable, Serializable {
         mQuotaAvailableBytes = quotaAvailableBytes;
     }
 
+    public String getPrivateLink() {
+        return mPrivateLink;
+    }
+
+    public void setPrivateLink(String privateLink) {
+        mPrivateLink = privateLink;
+    }
+
     public RemoteFile() {
         resetData();
     }
 
     /**
      * Create new {@link RemoteFile} with given path.
-     * 
+     * <p>
      * The path received must be URL-decoded. Path separator must be OCFile.PATH_SEPARATOR, and it must be the first character in 'path'.
      *
      * @param path The remote path of the file.
@@ -170,6 +181,7 @@ public class RemoteFile implements Parcelable, Serializable {
         this.setSize(we.size());
         this.setQuotaUsedBytes(we.quotaUsedBytes());
         this.setQuotaAvailableBytes(we.quotaAvailableBytes());
+        this.setPrivateLink(we.privateLink());
     }
 
     /**
@@ -187,6 +199,7 @@ public class RemoteFile implements Parcelable, Serializable {
         mSize = 0;
         mQuotaUsedBytes = null;
         mQuotaAvailableBytes = null;
+        mPrivateLink = null;
     }
 
     /**
@@ -226,6 +239,7 @@ public class RemoteFile implements Parcelable, Serializable {
         mSize = source.readLong();
         mQuotaUsedBytes = (BigDecimal) source.readSerializable();
         mQuotaAvailableBytes = (BigDecimal) source.readSerializable();
+        mPrivateLink = source.readString();
     }
 
     @Override
@@ -246,6 +260,7 @@ public class RemoteFile implements Parcelable, Serializable {
         dest.writeLong(mSize);
         dest.writeSerializable(mQuotaUsedBytes);
         dest.writeSerializable(mQuotaAvailableBytes);
+        dest.writeString(mPrivateLink);
     }
 
 }