X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/4f3267b3fae8c4320c93bc3f1e48ce022a716ad7..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 ff1f8185..73e41d2e 100644
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -39,22 +39,20 @@ 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.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
  *
@@ -109,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;
 			}
 		};
@@ -165,7 +173,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
 	}
 	
 	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 = true;
+		boolean skipFirst = sf, override_parent = !sf;
 		for (TreeNode n :WebdavUtils.parseResponseToNodes(resp.getEntity().getContent())) {
 		  if (skipFirst) {
         skipFirst = false;
@@ -181,9 +189,6 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
           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;