Fixed that small todo: Set KeepAlive based on the response code

[pub/Android/ownCloud.git] / 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 ff1f818..73e41d2 100644 (file)
--- 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;\r
 import android.content.AbstractThreadedSyncAdapter;\r
 import android.content.ContentProviderClient;\r
 import android.accounts.OperationCanceledException;\r
 import android.content.AbstractThreadedSyncAdapter;\r
 import android.content.ContentProviderClient;\r

-import android.content.ContentResolver;\r

 import android.content.Context;\r
 import android.net.Uri;\r
 import android.text.TextUtils;\r
 import android.content.Context;\r
 import android.net.Uri;\r
 import android.text.TextUtils;\r

-import android.util.Log;\r

 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.webdav.HttpPropFind;\r
 import eu.alefzero.webdav.TreeNode;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.webdav.HttpPropFind;\r
 import eu.alefzero.webdav.TreeNode;\r

+import eu.alefzero.webdav.TreeNode.NodeProperty;\r

 import eu.alefzero.webdav.WebdavClient;\r
 import eu.alefzero.webdav.WebdavUtils;\r
 import eu.alefzero.webdav.WebdavClient;\r
 import eu.alefzero.webdav.WebdavUtils;\r

-import eu.alefzero.webdav.TreeNode.NodeProperty;\r

 
 /**
  * Base SyncAdapter for OwnCloud
 
 /**
  * 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
  *
  * 
  * @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) {
        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
                                // should have keep alive 0

-                               // default return: 5s
+                               // default return: 5s\r
+                               int statusCode = response.getStatusLine().getStatusCode();\r
+                               \r
+                               // HTTP 400, 500 Errors as well as HTTP 118 - Connection timed out\r
+                               if((statusCode >= 400 && statusCode <= 418) || \r
+                                               (statusCode >= 421 && statusCode <= 426) ||\r
+                                               (statusCode >= 500 && statusCode <= 510 ) ||\r
+                                               statusCode == 118) {\r
+                                       return 0;\r
+                               }\r
+                               

                                return 5 * 1000;
                        }
                };
                                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 {
        }
        
        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())) {\r
                  if (skipFirst) {\r
         skipFirst = false;\r
                for (TreeNode n :WebdavUtils.parseResponseToNodes(resp.getEntity().getContent())) {\r
                  if (skipFirst) {\r
         skipFirst = false;\r


@@ -181,9 +189,6 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
           n.getProperty(NodeProperty.RESOURCE_TYPE),\r
           parent_id);\r
                        new_file.save();\r
           n.getProperty(NodeProperty.RESOURCE_TYPE),\r
           parent_id);\r
                        new_file.save();\r

-                       Log.e("ASD", new_file.getFileId()+"");\r
-                       Log.e("ASD", new_file.getFileName()+"");\r
-                       Log.e("ASD", new_file.getPath()+"");\r

                        if (override_parent) {\r
                          parent_id = new_file.getFileId();\r
                          override_parent = false;\r
                        if (override_parent) {\r
                          parent_id = new_file.getFileId();\r
                          override_parent = false;\r