flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2026-08-19 20:32:57 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into add_cookie_based_session_support

Browse Source
This commit is contained in:
David A. Velasco
2014-07-01 12:44:19 +02:00
parent 8080e4904d f323dda044
commit 0071a97e8b
5 changed files with 69 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/owncloud/android/lib/common/network/WebdavEntry.java
+33 -7
View File
@@ -30,18 +30,20 @@ import org.apache.jackrabbit.webdav.MultiStatusResponse;
import org.apache.jackrabbit.webdav.property.DavProperty;
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 android.util.Log;
public class WebdavEntry {
private String mName, mPath, mUri, mContentType, mEtag;
private long mContentLength, mCreateTimestamp, mModifiedTimestamp;
private static final String NAMESPACE_OC = "http://owncloud.org/ns";
private static final String EXTENDED_PROPERTY_NAME_PERMISSIONS = "permissions";
private static final String EXTENDED_PROPERTY_NAME_REMOTE_ID = "id";
public WebdavEntry(MultiStatusResponse ms, String splitElement) {
private String mName, mPath, mUri, mContentType, mEtag, mPermissions, mRemoteId;
private long mContentLength, mCreateTimestamp, mModifiedTimestamp;
public WebdavEntry(MultiStatusResponse ms, String splitElement) {
resetData();
if (ms.getStatus().length != 0) {
mUri = ms.getHref();
@@ -106,6 +108,22 @@ public class WebdavEntry {
mEtag = mEtag.substring(1, mEtag.length()-1);
}
// OC permissions property <oc:permissions>
prop = propSet.get(
EXTENDED_PROPERTY_NAME_PERMISSIONS, Namespace.getNamespace(NAMESPACE_OC)
);
if (prop != null) {
mPermissions = prop.getValue().toString();
}
// OC remote id property <oc:id>
prop = propSet.get(
EXTENDED_PROPERTY_NAME_REMOTE_ID, Namespace.getNamespace(NAMESPACE_OC)
);
if (prop != null) {
mRemoteId = prop.getValue().toString();
}
} else {
Log.e("WebdavEntry",
"General fuckup, no status for webdav response");
@@ -152,8 +170,16 @@ public class WebdavEntry {
return mEtag;
}
public String permissions() {
return mPermissions;
}
public String remoteId() {
return mRemoteId;
}
private void resetData() {
mName = mUri = mContentType = null;
mName = mUri = mContentType = mPermissions = null; mRemoteId = null;
mContentLength = mCreateTimestamp = mModifiedTimestamp = 0;
}
}
src/com/owncloud/android/lib/common/network/WebdavUtils.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class WebdavUtils {
Date returnDate = null;
for (int i = 0; i < DATETIME_FORMATS.length; ++i) {
try {
returnDate = new SimpleDateFormat (DATETIME_FORMATS[i]).parse(date);
returnDate = new SimpleDateFormat (DATETIME_FORMATS[i], Locale.US).parse(date);
return returnDate;
} catch (ParseException e) {
}