X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/8ec6915a58779eb43f1446100cb6fa477c206529..f0ed8b7362e77d35d8b19c46301134566966d027:/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java?ds=sidebyside

diff --git a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
index e4bacf29..73e41d2e 100644
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -43,15 +43,16 @@ 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;
-import eu.alefzero.webdav.TreeNode.NodeProperty;
 
 /**
  * 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
  *
@@ -106,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;
 			}
 		};
@@ -134,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(), mHost, root.getChildList());
+		root.setProperty(TreeNode.NodeProperty.NAME, "");
+		this.parseResponse(response, getUri(), getClient(), mHost, root.getChildList(), false, 0);
 		return root;
 	}
 	
@@ -161,22 +172,34 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
 		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());
-			if (skipFirst) {
-				skipFirst = false;
-				continue;
+	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;
+      }
+			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());
 			}
 		}
 	}