X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b2dc291653d589178aa230ce6226106e442a8c11..f0ed8b7362e77d35d8b19c46301134566966d027:/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 524904f3..73e41d2e 100644
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -1,40 +1,58 @@
-package eu.alefzero.owncloud.syncadapter;
-
-import java.io.IOException;
-import java.net.UnknownHostException;
-import java.util.Date;
-import java.util.LinkedList;
+/* ownCloud Android client application
+ * Copyright (C) 2011 Bartek Przybylski
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
-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;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
+package eu.alefzero.owncloud.syncadapter;
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
-import android.content.AbstractThreadedSyncAdapter;
-import android.content.ContentProviderClient;
-import android.content.Context;
-import android.net.Uri;
-import android.text.TextUtils;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.webdav.HttpPropFind;
-import eu.alefzero.webdav.TreeNode;
-import eu.alefzero.webdav.TreeNode.NodeProperty;
-import eu.alefzero.webdav.WebdavUtils;
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.Date;
+import java.util.LinkedList;
+
+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.conn.ConnectionKeepAliveStrategy;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.HttpContext;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.Context;
+import android.net.Uri;
+import android.text.TextUtils;
+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..
+ * Designed to be subclassed for the concrete SyncAdapter, like ConcatsSync, CalendarSync, FileSync etc..
*
* @author sassman
*
@@ -46,8 +64,8 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
private ContentProviderClient contentProvider;
private Date lastUpdated;
- private DefaultHttpClient client = null;
- private HttpHost host;
+ private HttpHost mHost;
+ private WebdavClient mClient = null;
public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {
super(context, autoInitialize);
@@ -89,9 +107,19 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
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
+ // Change keep alive straategy basing on response: ie forbidden/not found/etc
// should have keep alive 0
- // default return: 5s
+ // 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;
}
};
@@ -109,7 +137,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
BasicScheme basicAuth = new BasicScheme();
httpContext.setAttribute("preemptive-auth", basicAuth);
- HttpResponse response = getClient().execute(this.host, query, httpContext);
+ HttpResponse response = getClient().execute(mHost, query, httpContext);
return response;
}
@@ -117,8 +145,8 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
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;
}
@@ -127,7 +155,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
}
private DefaultHttpClient getClient() throws OperationCanceledException, AuthenticatorException, IOException {
- if(this.client == null) {
+ 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) {
@@ -135,37 +163,44 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
}
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 insertList) throws IOException, OperationCanceledException, AuthenticatorException {
- boolean skipFirst = true;
- for (TreeNode n :WebdavUtils.parseResponseToNodes(resp.getEntity().getContent())) {
- String path = n.stripPathFromFilename(uri.getPath());
- if (skipFirst) {
- skipFirst = false;
- continue;
+ private void parseResponse(HttpResponse resp, Uri uri, DefaultHttpClient client, HttpHost targetHost, LinkedList 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;
+ }
+ String path = n.stripPathFromFilename(uri.getPath());
+ OCFile new_file = OCFile.createNewFile(getContentProvider(),
+ getAccount(),
+ n.getProperty(NodeProperty.PATH),
+ 0,//Long.parseLong(n.getProperty(NodeProperty.CONTENT_LENGTH)),
+ 0,//Long.parseLong(n.getProperty(NodeProperty.CREATE_DATE)),
+ 0,//Long.parseLong(n.getProperty(NodeProperty.LAST_MODIFIED_DATE)),
+ n.getProperty(NodeProperty.RESOURCE_TYPE),
+ parent_id);
+ new_file.save();
+ if (override_parent) {
+ parent_id = new_file.getFileId();
+ override_parent = false;
}
- insertList.add(n);
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") + "/");
HttpResponse response = fireRawRequest(method);
- parseResponse(response, uri, client, targetHost, n.getChildList());
+ parseResponse(response, uri, client, targetHost, n.getChildList(), true, new_file.getFileId());
}
}
}
-
}
\ No newline at end of file