Loading src/com/owncloud/android/lib/common/network/WebdavEntry.java +22 −6 Original line number Diff line number Diff line Loading @@ -24,8 +24,9 @@ package com.owncloud.android.lib.common.network; import java.math.BigDecimal; import java.util.Date; import android.net.Uri; import com.owncloud.android.lib.common.utils.Log_OC; import org.apache.jackrabbit.webdav.MultiStatusResponse; import org.apache.jackrabbit.webdav.property.DavProperty; Loading @@ -33,9 +34,8 @@ import org.apache.jackrabbit.webdav.property.DavPropertyName; import org.apache.jackrabbit.webdav.property.DavPropertySet; import org.apache.jackrabbit.webdav.xml.Namespace; import android.net.Uri; import com.owncloud.android.lib.common.utils.Log_OC; import java.math.BigDecimal; import java.util.Date; public class WebdavEntry { Loading @@ -45,13 +45,21 @@ 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_FAVORITE = "favorite"; 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; private String mPath; private String mUri; private String mContentType; private String mEtag; private String mPermissions; private String mRemoteId; private boolean mIsFavorite; private long mContentLength, mCreateTimestamp, mModifiedTimestamp, mSize; private BigDecimal mQuotaUsedBytes, mQuotaAvailableBytes; Loading Loading @@ -185,6 +193,14 @@ public class WebdavEntry { mSize = Long.parseLong((String) prop.getValue()); } // OC favorite property <oc:favorite> prop = propSet.get(EXTENDED_PROPERTY_FAVORITE, Namespace.getNamespace(NAMESPACE_OC)); if (prop != null) { mIsFavorite = Boolean.parseBoolean((String) prop.getValue()); } else { mIsFavorite = false; } } else { Log_OC.e("WebdavEntry", "General fuckup, no status for webdav response"); Loading src/com/owncloud/android/lib/common/network/WebdavUtils.java +9 −5 Original line number Diff line number Diff line Loading @@ -25,11 +25,6 @@ package com.owncloud.android.lib.common.network; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; import android.net.Uri; import org.apache.commons.httpclient.Header; Loading @@ -38,6 +33,11 @@ import org.apache.jackrabbit.webdav.property.DavPropertyName; import org.apache.jackrabbit.webdav.property.DavPropertyNameSet; import org.apache.jackrabbit.webdav.xml.Namespace; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; public class WebdavUtils { public static final SimpleDateFormat DISPLAY_DATE_FORMAT = new SimpleDateFormat( "dd.MM.yyyy hh:mm"); Loading Loading @@ -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_FAVORITE, Namespace.getNamespace(WebdavEntry.NAMESPACE_OC)); return propSet; } Loading @@ -130,6 +132,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_FAVORITE, Namespace.getNamespace(WebdavEntry.NAMESPACE_OC)); return propSet; } Loading Loading
src/com/owncloud/android/lib/common/network/WebdavEntry.java +22 −6 Original line number Diff line number Diff line Loading @@ -24,8 +24,9 @@ package com.owncloud.android.lib.common.network; import java.math.BigDecimal; import java.util.Date; import android.net.Uri; import com.owncloud.android.lib.common.utils.Log_OC; import org.apache.jackrabbit.webdav.MultiStatusResponse; import org.apache.jackrabbit.webdav.property.DavProperty; Loading @@ -33,9 +34,8 @@ import org.apache.jackrabbit.webdav.property.DavPropertyName; import org.apache.jackrabbit.webdav.property.DavPropertySet; import org.apache.jackrabbit.webdav.xml.Namespace; import android.net.Uri; import com.owncloud.android.lib.common.utils.Log_OC; import java.math.BigDecimal; import java.util.Date; public class WebdavEntry { Loading @@ -45,13 +45,21 @@ 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_FAVORITE = "favorite"; 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; private String mPath; private String mUri; private String mContentType; private String mEtag; private String mPermissions; private String mRemoteId; private boolean mIsFavorite; private long mContentLength, mCreateTimestamp, mModifiedTimestamp, mSize; private BigDecimal mQuotaUsedBytes, mQuotaAvailableBytes; Loading Loading @@ -185,6 +193,14 @@ public class WebdavEntry { mSize = Long.parseLong((String) prop.getValue()); } // OC favorite property <oc:favorite> prop = propSet.get(EXTENDED_PROPERTY_FAVORITE, Namespace.getNamespace(NAMESPACE_OC)); if (prop != null) { mIsFavorite = Boolean.parseBoolean((String) prop.getValue()); } else { mIsFavorite = false; } } else { Log_OC.e("WebdavEntry", "General fuckup, no status for webdav response"); Loading
src/com/owncloud/android/lib/common/network/WebdavUtils.java +9 −5 Original line number Diff line number Diff line Loading @@ -25,11 +25,6 @@ package com.owncloud.android.lib.common.network; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; import android.net.Uri; import org.apache.commons.httpclient.Header; Loading @@ -38,6 +33,11 @@ import org.apache.jackrabbit.webdav.property.DavPropertyName; import org.apache.jackrabbit.webdav.property.DavPropertyNameSet; import org.apache.jackrabbit.webdav.xml.Namespace; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; public class WebdavUtils { public static final SimpleDateFormat DISPLAY_DATE_FORMAT = new SimpleDateFormat( "dd.MM.yyyy hh:mm"); Loading Loading @@ -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_FAVORITE, Namespace.getNamespace(WebdavEntry.NAMESPACE_OC)); return propSet; } Loading @@ -130,6 +132,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_FAVORITE, Namespace.getNamespace(WebdavEntry.NAMESPACE_OC)); return propSet; } Loading