From ff4dd08dd5ac79ef2ce200d033182773f9dc36b1 Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Thu, 20 Mar 2014 09:25:14 +0100
Subject: [PATCH] Use WebdavUtils.parseResponseDate for parsing expiration date
 in ShareXMLParser

---
 .../lib/common/network/WebdavUtils.java       |  3 ++-
 .../lib/resources/shares/ShareXMLParser.java  | 25 +++----------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/network/WebdavUtils.java b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
index 33ebf5c0..d64042bf 100644
--- a/src/com/owncloud/android/lib/common/network/WebdavUtils.java
+++ b/src/com/owncloud/android/lib/common/network/WebdavUtils.java
@@ -42,7 +42,8 @@ public class WebdavUtils {
             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("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() {
         String ret = "<?xml version=\"1.0\" ?><D:propfind xmlns:D=\"DAV:\"><D:allprop/></D:propfind>";
diff --git a/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java b/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java
index 58cc8246..c48cf9ba 100644
--- a/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java
+++ b/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java
@@ -26,10 +26,7 @@ package com.owncloud.android.lib.resources.shares;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -38,6 +35,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
 import android.util.Log;
 import android.util.Xml;
 
+import com.owncloud.android.lib.common.network.WebdavUtils;
 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 DATE_FORMAT = "yyyy-MM-dd hh:mm:ss";
-	
 	private static final int SUCCESS = 100;
 	private static final int FAILURE = 403;
 	private static final int FILE_NOT_FOUND = 404;
@@ -317,7 +313,7 @@ public class ShareXMLParser {
 			} else if (name.equalsIgnoreCase(NODE_EXPIRATION)) {
 				String value = readNode(parser, NODE_EXPIRATION);
 				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)) {
@@ -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;
-	}
+
 }