flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Use WebdavUtils.parseResponseDate for parsing expiration date in ShareXMLParser

Browse Source
This commit is contained in:
masensio 2014-03-20 09:25:14 +01:00
parent ebe9c9fe92
commit ff4dd08dd5
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/owncloud/android/lib/common/network/WebdavUtils.java
View File

@ -42,7 +42,8 @@ public class WebdavUtils {
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US), new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US),
new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US), new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US),
new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US), new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US) }; new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US) ,
new SimpleDateFormat("yyyy-MM-dd hh:mm:ss") };
public static String prepareXmlForPropFind() { public static String prepareXmlForPropFind() {
String ret = "<?xml version=\"1.0\" ?><D:propfind xmlns:D=\"DAV:\"><D:allprop/></D:propfind>"; String ret = "<?xml version=\"1.0\" ?><D:propfind xmlns:D=\"DAV:\"><D:allprop/></D:propfind>";

25
src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java
View File

@ -26,10 +26,7 @@ package com.owncloud.android.lib.resources.shares;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
@ -38,6 +35,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
import android.util.Log; import android.util.Log;
import android.util.Xml; import android.util.Xml;
import com.owncloud.android.lib.common.network.WebdavUtils;
import com.owncloud.android.lib.resources.files.FileUtils; import com.owncloud.android.lib.resources.files.FileUtils;
/** /**
@ -83,8 +81,6 @@ public class ShareXMLParser {
private static final String TYPE_FOLDER = "folder"; private static final String TYPE_FOLDER = "folder";
private static final String DATE_FORMAT = "yyyy-MM-dd hh:mm:ss";
private static final int SUCCESS = 100; private static final int SUCCESS = 100;
private static final int FAILURE = 403; private static final int FAILURE = 403;
private static final int FILE_NOT_FOUND = 404; private static final int FILE_NOT_FOUND = 404;
@ -317,7 +313,7 @@ public class ShareXMLParser {
} else if (name.equalsIgnoreCase(NODE_EXPIRATION)) { } else if (name.equalsIgnoreCase(NODE_EXPIRATION)) {
String value = readNode(parser, NODE_EXPIRATION); String value = readNode(parser, NODE_EXPIRATION);
if (!(value.length() == 0)) { if (!(value.length() == 0)) {
share.setExpirationDate(convertToDate(value).getTime()); //Long.parseLong(readNode(parser, NODE_EXPIRATION))); // check if expiration is in long format or date format share.setExpirationDate(WebdavUtils.parseResponseDate(value).getTime());
} }
} else if (name.equalsIgnoreCase(NODE_TOKEN)) { } else if (name.equalsIgnoreCase(NODE_TOKEN)) {
@ -407,20 +403,5 @@ public class ShareXMLParser {
} }
} }
} }
/**
* Convert String to Date
* @param dateString
* @return
*/
private Date convertToDate(String dateString){
SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
Date convertedDate = new Date();
try {
convertedDate = dateFormat.parse(dateString);
} catch (ParseException e) {
e.printStackTrace();
}
return convertedDate;
}
} }