X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/dc8c32fb3f7033d6fdfa7e1b64eaa77884da678a..32b09ab78ffd18a5a07752982883813ccecfb80d:/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java?ds=inline
diff --git a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
index 3c1caf95..3d9a766f 100644
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -15,23 +15,17 @@
* along with this program. If not, see .
*
*/
+
package eu.alefzero.owncloud.syncadapter;
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.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;
import android.accounts.Account;
@@ -42,19 +36,16 @@ 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 eu.alefzero.owncloud.datamodel.DataStorageManager;
+import eu.alefzero.webdav.WebdavClient;
/**
- * 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 {
@@ -62,9 +53,9 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
private Account account;
private ContentProviderClient contentProvider;
private Date lastUpdated;
-
- private DefaultHttpClient client = null;
- private HttpHost host;
+ private DataStorageManager mStoreManager;
+
+ private WebdavClient mClient = null;
public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {
super(context, autoInitialize);
@@ -102,87 +93,73 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
public void setLastUpdated(Date lastUpdated) {
this.lastUpdated = lastUpdated;
}
+
+ public void setStorageManager(DataStorageManager storage_manager) {
+ mStoreManager = storage_manager;
+ }
+
+ public DataStorageManager getStorageManager() {
+ return mStoreManager;
+ }
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 {
- 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 {
- HttpResponse response = fireRawRequest(query);
-
- TreeNode root = new TreeNode();
- root.setProperty(TreeNode.NodeProperty.NAME, "/");
- this.parseResponse(response, getUri(), getClient(), this.host, root.getChildList());
- return root;
+
+ 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 null;
}
-
+
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) {
+
+ protected WebdavClient 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");
- }
-
- return this.client;
- }
-
- 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;
- }
- 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());
- }
+
+ mClient = new WebdavClient(uri);
+ mClient.setCredentials(username, password);
+ mClient.allowUnsignedCertificates();
+ //mHost = mClient.getTargetHost();
}
+
+ return mClient;
}
-
}
\ No newline at end of file