X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/390949b8323633b26d56b3a837e83941cbc24b4b..a032bdeebc51a6e81d1bd5c558944f96fc55eacb:/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 3d9a766f..fa982e7e 100644
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -47,119 +47,117 @@ import eu.alefzero.webdav.WebdavClient;
  * @author sassman
  * 
  */
-public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAdapter {
-
-	private AccountManager accountManager;
-	private Account account;
-	private ContentProviderClient contentProvider;
-	private Date lastUpdated;
-	private DataStorageManager mStoreManager;
-
-	private WebdavClient mClient = null;
-
-	public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {
-		super(context, autoInitialize);
-		this.setAccountManager(AccountManager.get(context));
-	}
-
-	public AccountManager getAccountManager() {
-		return accountManager;
-	}
-
-	public void setAccountManager(AccountManager accountManager) {
-		this.accountManager = accountManager;
-	}
-
-	public Account getAccount() {
-		return account;
-	}
-
-	public void setAccount(Account account) {
-		this.account = account;
-	}
-
-	public ContentProviderClient getContentProvider() {
-		return contentProvider;
-	}
-
-	public void setContentProvider(ContentProviderClient contentProvider) {
-		this.contentProvider = contentProvider;
-	}
-
-	public Date getLastUpdated() {
-		return lastUpdated;
-	}
-
-	public void setLastUpdated(Date lastUpdated) {
-		this.lastUpdated = lastUpdated;
-	}
-
-	public void setStorageManager(DataStorageManager storage_manager) {
-	  mStoreManager = storage_manager;
-	}
-	
-	public DataStorageManager getStorageManager() {
-	  return mStoreManager;
-	}
-	
-	protected ConnectionKeepAliveStrategy getKeepAliveStrategy() {
-		return new ConnectionKeepAliveStrategy() {
-			public long getKeepAliveDuration(HttpResponse response,
-					HttpContext context) {
-				// Change keep alive straategy basing on response: ie
-				// forbidden/not found/etc
-				// should have keep alive 0
-				// 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;
-			}
-		};
-	}
-
-	protected HttpResponse fireRawRequest(HttpRequest query)
-			throws ClientProtocolException, OperationCanceledException,
-			AuthenticatorException, IOException {
-		/*BasicHttpContext httpContext = new BasicHttpContext();
-		BasicScheme basicAuth = new BasicScheme();
-		httpContext.setAttribute("preemptive-auth", basicAuth);
-
-		HttpResponse response = getClient().execute(mHost, query, httpContext);*/
-		return null;
-	}
-
-	protected Uri getUri() {
-		return Uri.parse(this.getAccountManager().getUserData(getAccount(),
-				AccountAuthenticator.KEY_OC_URL));
-	}
-
-	protected WebdavClient getClient() throws OperationCanceledException,
-			AuthenticatorException, IOException {
-		if (mClient == null) {
-			String username = getAccount().name.split("@")[0];
-			String password = this.getAccountManager().blockingGetAuthToken(
-					getAccount(), AccountAuthenticator.AUTH_TOKEN_TYPE, true);
-			if (this.getAccountManager().getUserData(getAccount(),
-					AccountAuthenticator.KEY_OC_URL) == null) {
-				throw new UnknownHostException();
-			}
-			Uri uri = getUri();
-
-			mClient = new WebdavClient(uri);
-			mClient.setCredentials(username, password);
-			mClient.allowUnsignedCertificates();
-			//mHost = mClient.getTargetHost();
-		}
-
-		return mClient;
-	}
+public abstract class AbstractOwnCloudSyncAdapter extends
+        AbstractThreadedSyncAdapter {
+
+    private AccountManager accountManager;
+    private Account account;
+    private ContentProviderClient contentProvider;
+    private Date lastUpdated;
+    private DataStorageManager mStoreManager;
+
+    private WebdavClient mClient = null;
+
+    public AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) {
+        super(context, autoInitialize);
+        this.setAccountManager(AccountManager.get(context));
+    }
+
+    public AccountManager getAccountManager() {
+        return accountManager;
+    }
+
+    public void setAccountManager(AccountManager accountManager) {
+        this.accountManager = accountManager;
+    }
+
+    public Account getAccount() {
+        return account;
+    }
+
+    public void setAccount(Account account) {
+        this.account = account;
+    }
+
+    public ContentProviderClient getContentProvider() {
+        return contentProvider;
+    }
+
+    public void setContentProvider(ContentProviderClient contentProvider) {
+        this.contentProvider = contentProvider;
+    }
+
+    public Date getLastUpdated() {
+        return lastUpdated;
+    }
+
+    public void setLastUpdated(Date lastUpdated) {
+        this.lastUpdated = lastUpdated;
+    }
+
+    public void setStorageManager(DataStorageManager storage_manager) {
+        mStoreManager = storage_manager;
+    }
+
+    public DataStorageManager getStorageManager() {
+        return mStoreManager;
+    }
+
+    protected ConnectionKeepAliveStrategy getKeepAliveStrategy() {
+        return new ConnectionKeepAliveStrategy() {
+            public long getKeepAliveDuration(HttpResponse response,
+                    HttpContext context) {
+                // Change keep alive straategy basing on response: ie
+                // forbidden/not found/etc
+                // should have keep alive 0
+                // 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;
+            }
+        };
+    }
+
+    protected HttpResponse fireRawRequest(HttpRequest query)
+            throws ClientProtocolException, OperationCanceledException,
+            AuthenticatorException, IOException {
+        /*
+         * BasicHttpContext httpContext = new BasicHttpContext(); BasicScheme
+         * basicAuth = new BasicScheme();
+         * httpContext.setAttribute("preemptive-auth", basicAuth);
+         * 
+         * HttpResponse response = getClient().execute(mHost, query,
+         * httpContext);
+         */
+        return null;
+    }
+
+    protected Uri getUri() {
+        return Uri.parse(this.getAccountManager().getUserData(getAccount(),
+                AccountAuthenticator.KEY_OC_URL));
+    }
+
+    protected WebdavClient getClient() throws OperationCanceledException,
+            AuthenticatorException, IOException {
+        if (mClient == null) {
+            if (this.getAccountManager().getUserData(getAccount(),
+                    AccountAuthenticator.KEY_OC_URL) == null) {
+                throw new UnknownHostException();
+            }
+            mClient = new WebdavClient(account, getContext());
+            mClient.allowSelfsignedCertificates();
+            // mHost = mClient.getTargetHost();
+        }
+
+        return mClient;
+    }
 }
\ No newline at end of file