Merge branch 'develop' into refresh_folder_contents_when_browsed_into

[pub/Android/ownCloud.git] / src / com / owncloud / android / syncadapter / AbstractOwnCloudSyncAdapter.java

diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
index 43c0f2f..34ef452 100644 (file)
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -19,14 +19,10 @@
 package com.owncloud.android.syncadapter;\r
 \r
 import java.io.IOException;\r
-//import java.net.UnknownHostException;\r
-//import java.util.Date;\r
 \r
 import org.apache.http.HttpRequest;\r
 import org.apache.http.HttpResponse;\r
 import org.apache.http.client.ClientProtocolException;\r
-//import org.apache.http.conn.ConnectionKeepAliveStrategy;\r
-//import org.apache.http.protocol.HttpContext;\r
 \r
 import com.owncloud.android.authentication.AccountUtils;\r
 import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;\r
@@ -57,7 +53,6 @@ public abstract class AbstractOwnCloudSyncAdapter extends
     private AccountManager accountManager;\r
     private Account account;\r
     private ContentProviderClient contentProvider;\r
-    //private Date lastUpdated;\r
     private FileDataStorageManager mStoreManager;\r
 \r
     private WebdavClient mClient = null;\r
@@ -113,49 +108,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
     protected HttpResponse fireRawRequest(HttpRequest query)\r
             throws ClientProtocolException, OperationCanceledException,\r
             AuthenticatorException, IOException {\r
-        /*\r
-         * BasicHttpContext httpContext = new BasicHttpContext(); BasicScheme\r
-         * basicAuth = new BasicScheme();\r
-         * httpContext.setAttribute("preemptive-auth", basicAuth);\r
-         * \r
-         * HttpResponse response = getClient().execute(mHost, query,\r
-         * httpContext);\r
-         */\r
         return null;\r
     }\r
 \r
-    /* methods never used  below */\r
-    /*\r
-    public Date getLastUpdated() {\r
-        return lastUpdated;\r
-    }\r
-\r
-    public void setLastUpdated(Date lastUpdated) {\r
-        this.lastUpdated = lastUpdated;\r
-    }\r
-\r
-    protected ConnectionKeepAliveStrategy getKeepAliveStrategy() {\r
-        return new ConnectionKeepAliveStrategy() {\r
-            public long getKeepAliveDuration(HttpResponse response,\r
-                    HttpContext context) {\r
-                // Change keep alive straategy basing on response: ie\r
-                // forbidden/not found/etc\r
-                // should have keep alive 0\r
-                // default return: 5s\r
-                int statusCode = response.getStatusLine().getStatusCode();\r
-\r
-                // HTTP 400, 500 Errors as well as HTTP 118 - Connection timed\r
-                // 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
-\r
-                return 5 * 1000;\r
-            }\r
-        };\r
-    }\r
-     */\r
 }
\ No newline at end of file