X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/4f3267b3fae8c4320c93bc3f1e48ce022a716ad7..b2b6bdeadf069856bc7a67d6774985a799ab55fc:/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 ff1f8185..3d9a766f 100644
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -15,22 +15,17 @@
* along with this program. If not, see .
*
*/
-
-package eu.alefzero.owncloud.syncadapter;
-
+
+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.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;
@@ -39,163 +34,132 @@ import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
import android.content.AbstractThreadedSyncAdapter;
import android.content.ContentProviderClient;
-import android.content.ContentResolver;
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.owncloud.datamodel.DataStorageManager;
import eu.alefzero.webdav.WebdavClient;
-import eu.alefzero.webdav.WebdavUtils;
-import eu.alefzero.webdav.TreeNode.NodeProperty;
-
-/**
- * Base SyncAdapter for OwnCloud
- * Designed to be subclassed for the concreete SyncAdapter, like ConcatsSync, CalendarSync, FileSync etc..
- *
- * @author sassman
- *
- */
-public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAdapter {
-
- private AccountManager accountManager;
- private Account account;
- private ContentProviderClient contentProvider;
- private Date lastUpdated;
-
- private HttpHost mHost;
- private WebdavClient mClient = null;
-
- public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {
- super(context, autoInitialize);
- this.setAccountManager(AccountManager.get(context));
- }
-
- public AccountManager getAccountManager() {
- return accountManager;
- }
-
- public void setAccountManager(AccountManager accountManager) {
- this.accountManager = accountManager;
- }
-
- public Account getAccount() {
- return account;
- }
-
- public void setAccount(Account account) {
- this.account = account;
- }
-
- public ContentProviderClient getContentProvider() {
- return contentProvider;
- }
-
- public void setContentProvider(ContentProviderClient contentProvider) {
- this.contentProvider = contentProvider;
- }
-
- public Date getLastUpdated() {
- return lastUpdated;
- }
-
- 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
- // should have keep alive 0
- // default return: 5s
- 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(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(), mHost, root.getChildList(), false, 0);
- return root;
- }
-
- protected Uri getUri() {
- return Uri.parse(this.getAccountManager().getUserData(getAccount(), AccountAuthenticator.KEY_OC_URL));
- }
-
- 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) {
- throw new UnknownHostException();
- }
- Uri uri = getUri();
-
- mClient = new WebdavClient(uri);
- mClient.setCredentials(username, password);
- mClient.allowUnsignedCertificates();
- mHost = mClient.getTargetHost();
- }
-
- return mClient.getHttpClient();
- }
-
- 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 = true;
- 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();
- Log.e("ASD", new_file.getFileId()+"");
- Log.e("ASD", new_file.getFileName()+"");
- Log.e("ASD", new_file.getPath()+"");
- if (override_parent) {
- parent_id = new_file.getFileId();
- override_parent = false;
- }
-
- 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(), true, new_file.getFileId());
- }
- }
- }
+
+/**
+ * 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 {
+
+ private AccountManager accountManager;
+ private Account account;
+ private ContentProviderClient contentProvider;
+ private Date lastUpdated;
+ private DataStorageManager mStoreManager;
+
+ private WebdavClient mClient = null;
+
+ public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {
+ super(context, autoInitialize);
+ this.setAccountManager(AccountManager.get(context));
+ }
+
+ public AccountManager getAccountManager() {
+ return accountManager;
+ }
+
+ public void setAccountManager(AccountManager accountManager) {
+ this.accountManager = accountManager;
+ }
+
+ public Account getAccount() {
+ return account;
+ }
+
+ public void setAccount(Account account) {
+ this.account = account;
+ }
+
+ public ContentProviderClient getContentProvider() {
+ return contentProvider;
+ }
+
+ public void setContentProvider(ContentProviderClient contentProvider) {
+ this.contentProvider = contentProvider;
+ }
+
+ public Date getLastUpdated() {
+ return lastUpdated;
+ }
+
+ 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) {
+ // 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 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));
+ }
+
+ 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) {
+ throw new UnknownHostException();
+ }
+ Uri uri = getUri();
+
+ mClient = new WebdavClient(uri);
+ mClient.setCredentials(username, password);
+ mClient.allowUnsignedCertificates();
+ //mHost = mClient.getTargetHost();
+ }
+
+ return mClient;
+ }
}
\ No newline at end of file