X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b7ca8521e6aeb97c95641905ad7f5b28e3436faf..e0937de63de3ec475d541a5a28fae303167b0e93:/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 a3eead94..5314e636 100644
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -153,12 +153,12 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 	protected HttpResponse fireRawRequest(HttpRequest query)
 			throws ClientProtocolException, OperationCanceledException,
 			AuthenticatorException, IOException {
-		BasicHttpContext httpContext = new BasicHttpContext();
+		/*BasicHttpContext httpContext = new BasicHttpContext();
 		BasicScheme basicAuth = new BasicScheme();
 		httpContext.setAttribute("preemptive-auth", basicAuth);
 
-		HttpResponse response = getClient().execute(mHost, query, httpContext);
-		return response;
+		HttpResponse response = getClient().execute(mHost, query, httpContext);*/
+		return null;
 	}
 
 	protected TreeNode fireRequest(HttpRequest query)
@@ -168,8 +168,8 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 
 		TreeNode root = new TreeNode();
 		root.setProperty(TreeNode.NodeProperty.NAME, "");
-		this.parseResponse(response, getUri(), getClient(), mHost,
-				root.getChildList(), false, 0);
+		//this.parseResponse(response, getUri(), getClient(), mHost,
+		//		root.getChildList(), false, 0);
 		return root;
 	}
 
@@ -178,7 +178,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 				AccountAuthenticator.KEY_OC_URL));
 	}
 
-	private DefaultHttpClient getClient() throws OperationCanceledException,
+	protected WebdavClient getClient() throws OperationCanceledException,
 			AuthenticatorException, IOException {
 		if (mClient == null) {
 			String username = getAccount().name.split("@")[0];
@@ -196,7 +196,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 			mHost = mClient.getTargetHost();
 		}
 
-		return mClient.getHttpClient();
+		return mClient;
 	}
 
 	private void parseResponse(HttpResponse resp, Uri uri,
@@ -222,6 +222,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 				Log.d(TAG, "No update for file/dir " + file.getFileName()
 						+ " is needed");
 			} else {
+			  file = new OCFile(n.getProperty(NodeProperty.PATH));
 				Log.d(TAG, "File " + n.getProperty(NodeProperty.PATH)
 						+ " will be "
 						+ (file.fileExists() ? "updated" : "created"));
@@ -231,7 +232,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 				long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0
 						: Long.parseLong(n
 								.getProperty(NodeProperty.CREATE_DATE));
-				file = new OCFile(n.getProperty(NodeProperty.PATH));
+
 				file.setFileLength(len);
 				file.setCreationTimestamp(create);
 				file.setModificationTimestamp(mod);