X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/dc8c32fb3f7033d6fdfa7e1b64eaa77884da678a..a66be3bc47376f9cedcd594bf5a39dafcf1650c2:/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java

diff --git a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
index 3c1caf95..41a0503e 100644
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -15,6 +15,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 package eu.alefzero.owncloud.syncadapter;
 
 import java.io.IOException;
@@ -25,8 +26,6 @@ import java.util.LinkedList;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.impl.auth.BasicScheme;
@@ -43,28 +42,33 @@ import android.content.ContentProviderClient;
 import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
+import android.util.Log;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
+import eu.alefzero.owncloud.datamodel.OCFile;
 import eu.alefzero.webdav.HttpPropFind;
 import eu.alefzero.webdav.TreeNode;
 import eu.alefzero.webdav.TreeNode.NodeProperty;
+import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
 
 /**
- * Base SyncAdapter for OwnCloud
- * Designed to be subclassed for the concreete SyncAdapter, like ConcatsSync, CalendarSync, FileSync etc..
+ * Base SyncAdapter for OwnCloud Designed to be subclassed for the concrete
+ * SyncAdapter, like ConcatsSync, CalendarSync, FileSync etc..
  * 
  * @author sassman
- *
+ * 
  */
-public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAdapter {
+public abstract class AbstractOwnCloudSyncAdapter extends
+		AbstractThreadedSyncAdapter {
 
 	private AccountManager accountManager;
 	private Account account;
 	private ContentProviderClient contentProvider;
 	private Date lastUpdated;
-	
-	private DefaultHttpClient client = null;
-	private HttpHost host;
+
+	private HttpHost mHost;
+	private WebdavClient mClient = null;
+	private static String TAG = "AbstractOwnCloudSyncAdapter";
 
 	public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {
 		super(context, autoInitialize);
@@ -102,87 +106,141 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
 	public void setLastUpdated(Date lastUpdated) {
 		this.lastUpdated = lastUpdated;
 	}
-	
+
 	protected ConnectionKeepAliveStrategy getKeepAliveStrategy() {
 		return new ConnectionKeepAliveStrategy() {
-			public long getKeepAliveDuration(HttpResponse response, HttpContext context) {
-				// TODO: change keep alive straategy basing on response: ie forbidden/not found/etc
+			public long getKeepAliveDuration(HttpResponse response,
+					HttpContext context) {
+				// Change keep alive straategy basing on response: ie
+				// forbidden/not found/etc
 				// should have keep alive 0
 				// default return: 5s
+				int statusCode = response.getStatusLine().getStatusCode();
+
+				// HTTP 400, 500 Errors as well as HTTP 118 - Connection timed
+				// out
+				if ((statusCode >= 400 && statusCode <= 418)
+						|| (statusCode >= 421 && statusCode <= 426)
+						|| (statusCode >= 500 && statusCode <= 510)
+						|| statusCode == 118) {
+					return 0;
+				}
+
 				return 5 * 1000;
 			}
 		};
 	}
-	
-	protected HttpPropFind getPropFindQuery() throws OperationCanceledException, AuthenticatorException, IOException {
+
+	protected HttpPropFind getPropFindQuery()
+			throws OperationCanceledException, AuthenticatorException,
+			IOException {
 		HttpPropFind query = new HttpPropFind(getUri().toString());
 		query.setHeader("Content-type", "text/xml");
 		query.setHeader("User-Agent", "Android-ownCloud");
 		return query;
 	}
-	
-	protected HttpResponse fireRawRequest(HttpRequest query) throws ClientProtocolException, OperationCanceledException, AuthenticatorException, IOException {
-	    BasicHttpContext httpContext = new BasicHttpContext();
-        BasicScheme basicAuth = new BasicScheme();
-        httpContext.setAttribute("preemptive-auth", basicAuth);
-        
-        HttpResponse response = getClient().execute(this.host, query, httpContext);
-        return response;
-	}
-	
-	protected TreeNode fireRequest(HttpRequest query) throws ClientProtocolException, OperationCanceledException, AuthenticatorException, IOException {
+
+	protected HttpResponse fireRawRequest(HttpRequest query)
+			throws ClientProtocolException, OperationCanceledException,
+			AuthenticatorException, IOException {
+		BasicHttpContext httpContext = new BasicHttpContext();
+		BasicScheme basicAuth = new BasicScheme();
+		httpContext.setAttribute("preemptive-auth", basicAuth);
+
+		HttpResponse response = getClient().execute(mHost, query, httpContext);
+		return response;
+	}
+
+	protected TreeNode fireRequest(HttpRequest query)
+			throws ClientProtocolException, OperationCanceledException,
+			AuthenticatorException, IOException {
 		HttpResponse response = fireRawRequest(query);
-		
+
 		TreeNode root = new TreeNode();
-		root.setProperty(TreeNode.NodeProperty.NAME, "/");
-		this.parseResponse(response, getUri(), getClient(), this.host, root.getChildList());
+		root.setProperty(TreeNode.NodeProperty.NAME, "");
+		this.parseResponse(response, getUri(), getClient(), mHost,
+				root.getChildList(), false, 0);
 		return root;
 	}
-	
+
 	protected Uri getUri() {
-		return Uri.parse(this.getAccountManager().getUserData(getAccount(), AccountAuthenticator.KEY_OC_URL));
+		return Uri.parse(this.getAccountManager().getUserData(getAccount(),
+				AccountAuthenticator.KEY_OC_URL));
 	}
-	
-	private DefaultHttpClient getClient() throws OperationCanceledException, AuthenticatorException, IOException {
-		if(this.client == null) {
+
+	private DefaultHttpClient getClient() throws OperationCanceledException,
+			AuthenticatorException, IOException {
+		if (mClient == null) {
 			String username = getAccount().name.split("@")[0];
-			String password = this.getAccountManager().blockingGetAuthToken(getAccount(), AccountAuthenticator.AUTH_TOKEN_TYPE, true);
-			if (this.getAccountManager().getUserData(getAccount(), AccountAuthenticator.KEY_OC_URL) == null) {
+			String password = this.getAccountManager().blockingGetAuthToken(
+					getAccount(), AccountAuthenticator.AUTH_TOKEN_TYPE, true);
+			if (this.getAccountManager().getUserData(getAccount(),
+					AccountAuthenticator.KEY_OC_URL) == null) {
 				throw new UnknownHostException();
 			}
 			Uri uri = getUri();
-	
-			int port = (uri.getPort() == -1) ? 80 : uri.getPort();
-			this.client = new DefaultHttpClient();
-			this.client.getCredentialsProvider().setCredentials(
-				new AuthScope(uri.getHost(), port),
-				new UsernamePasswordCredentials(username, password)
-			);
-			this.client.setKeepAliveStrategy(this.getKeepAliveStrategy());
-			this.host = new HttpHost(uri.getHost(), port, (uri.getScheme() == "https") ? "https" : "http");
+
+			mClient = new WebdavClient(uri);
+			mClient.setCredentials(username, password);
+			mClient.allowUnsignedCertificates();
+			mHost = mClient.getTargetHost();
 		}
-		
-		return this.client;
+
+		return mClient.getHttpClient();
 	}
-	
-	private void parseResponse(HttpResponse resp, Uri uri, DefaultHttpClient client, HttpHost targetHost, LinkedList<TreeNode> insertList) throws IOException, OperationCanceledException, AuthenticatorException {
-		boolean skipFirst = true;
-		for (TreeNode n :WebdavUtils.parseResponseToNodes(resp.getEntity().getContent())) {
-			String path = n.stripPathFromFilename(uri.getPath());
+
+	private void parseResponse(HttpResponse resp, Uri uri,
+			DefaultHttpClient client, HttpHost targetHost,
+			LinkedList<TreeNode> insertList, boolean sf, long parent_id)
+			throws IOException, OperationCanceledException,
+			AuthenticatorException {
+		boolean skipFirst = sf, override_parent = !sf;
+		for (TreeNode n : WebdavUtils.parseResponseToNodes(resp.getEntity()
+				.getContent())) {
 			if (skipFirst) {
 				skipFirst = false;
 				continue;
 			}
-			insertList.add(n);
+			String path = n.stripPathFromFilename(uri.getPath());
+
+			long mod = n.getProperty(NodeProperty.LAST_MODIFIED_DATE) == null ? 0
+					: Long.parseLong(n
+							.getProperty(NodeProperty.LAST_MODIFIED_DATE));
+			OCFile file = new OCFile(getContentProvider(), getAccount(),
+					n.getProperty(NodeProperty.PATH));
+			if (file.fileExists() && file.getModificationTimestamp() >= mod) {
+				Log.d(TAG, "No update for file/dir " + file.getFileName()
+						+ " is needed");
+			} else {
+				Log.d(TAG, "File " + n.getProperty(NodeProperty.PATH)
+						+ " will be "
+						+ (file.fileExists() ? "updated" : "created"));
+				long len = n.getProperty(NodeProperty.CONTENT_LENGTH) == null ? 0
+						: Long.parseLong(n
+								.getProperty(NodeProperty.CONTENT_LENGTH));
+				long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0
+						: Long.parseLong(n
+								.getProperty(NodeProperty.CREATE_DATE));
+				file = OCFile.createNewFile(getContentProvider(), getAccount(),
+						n.getProperty(NodeProperty.PATH), len, create, mod,
+						n.getProperty(NodeProperty.RESOURCE_TYPE), parent_id);
+				file.save();
+				if (override_parent) {
+					parent_id = file.getFileId();
+					override_parent = false;
+				}
+			}
+
+			if (!TextUtils.isEmpty(n.getProperty(NodeProperty.NAME))
+					&& n.getProperty(NodeProperty.RESOURCE_TYPE).equals("DIR")) {
 
-			if (!TextUtils.isEmpty(n.getProperty(NodeProperty.NAME)) &&
-					n.getProperty(NodeProperty.RESOURCE_TYPE).equals("DIR")) {
-			    
-			    HttpPropFind method = new HttpPropFind(uri.getPath() + path + n.getProperty(NodeProperty.NAME).replace(" ", "%20") + "/");
+				HttpPropFind method = new HttpPropFind(uri.getPath() + path
+						+ n.getProperty(NodeProperty.NAME).replace(" ", "%20")
+						+ "/");
 				HttpResponse response = fireRawRequest(method);
-				parseResponse(response, uri, client, targetHost, n.getChildList());
+				parseResponse(response, uri, client, targetHost,
+						n.getChildList(), true, file.getFileId());
 			}
 		}
 	}
-	
 }
\ No newline at end of file