OC-2459: Ask for pincode, when click on an instant upload notification

[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..74d2686 100644 (file)
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -19,19 +19,17 @@
 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
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
-import com.owncloud.android.network.OwnCloudClientUtils;\r
+import com.owncloud.android.oc_framework.accounts.AccountUtils;\r
+import com.owncloud.android.oc_framework.accounts.AccountUtils.AccountNotFoundException;\r
+import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;\r
+import com.owncloud.android.oc_framework.network.webdav.WebdavClient;\r
+\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
@@ -40,7 +38,6 @@ import android.accounts.OperationCanceledException;
 import android.content.AbstractThreadedSyncAdapter;\r
 import android.content.ContentProviderClient;\r
 import android.content.Context;\r
-import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r
  * Base synchronization adapter for ownCloud designed to be subclassed for different\r
@@ -56,8 +53,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 \r
     private AccountManager accountManager;\r
     private Account account;\r
-    private ContentProviderClient contentProvider;\r
-    //private Date lastUpdated;\r
+    private ContentProviderClient mContentProviderClient;\r
     private FileDataStorageManager mStoreManager;\r
 \r
     private WebdavClient mClient = null;\r
@@ -67,6 +63,11 @@ public abstract class AbstractOwnCloudSyncAdapter extends
         this.setAccountManager(AccountManager.get(context));\r
     }\r
 \r
+    public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize, boolean allowParallelSyncs) {\r
+        super(context, autoInitialize, allowParallelSyncs);\r
+        this.setAccountManager(AccountManager.get(context));\r
+    }\r
+\r
     public AccountManager getAccountManager() {\r
         return accountManager;\r
     }\r
@@ -83,12 +84,12 @@ public abstract class AbstractOwnCloudSyncAdapter extends
         this.account = account;\r
     }\r
 \r
-    public ContentProviderClient getContentProvider() {\r
-        return contentProvider;\r
+    public ContentProviderClient getContentProviderClient() {\r
+        return mContentProviderClient;\r
     }\r
 \r
-    public void setContentProvider(ContentProviderClient contentProvider) {\r
-        this.contentProvider = contentProvider;\r
+    public void setContentProviderClient(ContentProviderClient contentProvider) {\r
+        this.mContentProviderClient = contentProvider;\r
     }\r
 \r
     public void setStorageManager(FileDataStorageManager storage_manager) {\r
@@ -101,7 +102,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 \r
     protected void initClientForCurrentAccount() throws OperationCanceledException, AuthenticatorException, IOException, AccountNotFoundException {\r
         AccountUtils.constructFullURLForAccount(getContext(), account);\r
-        mClient = OwnCloudClientUtils.createOwnCloudClient(account, getContext());\r
+        mClient = OwnCloudClientFactory.createOwnCloudClient(account, getContext());\r
     }\r
     \r
     protected WebdavClient getClient() {\r
@@ -113,49 +114,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