From 310a8da6229b3c37cb4b9e804932740d8b056d5c Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 10 Jun 2014 12:52:03 +0200 Subject: [PATCH] Removed last direct dependency on OwnCloudClientFactory to get all the OwnCloudClient instances through OwnCloudClientMap --- owncloud-android-library | 2 +- src/com/owncloud/android/services/OperationsService.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/owncloud-android-library b/owncloud-android-library index b18dffe1..b5ff057e 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit b18dffe100942a4e7df8ce1615ba5a254cac8dbc +Subproject commit b5ff057e95858f1b8a0559a4598053702adcbf0e diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java index 6fea5084..a5ff56d7 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -26,7 +26,6 @@ import java.util.concurrent.ConcurrentMap; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.lib.common.OwnCloudClient; -import com.owncloud.android.lib.common.OwnCloudClientFactory; import com.owncloud.android.lib.common.OwnCloudClientMap; import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; import com.owncloud.android.lib.common.operations.RemoteOperation; @@ -461,8 +460,11 @@ public class OperationsService extends Service { mLastTarget.mAccount, getContentResolver()); } else { - mOwnCloudClient = OwnCloudClientFactory.createOwnCloudClient(mLastTarget.mServerUrl, getApplicationContext(), - mLastTarget.mFollowRedirects); // this is not good enough + mOwnCloudClient = OwnCloudClientMap.getAnonymousClientFor( + mLastTarget.mServerUrl, + this, + mLastTarget.mFollowRedirects); + if (mLastTarget.mWebDavUrl != null) { mOwnCloudClient.setWebdavUri(Uri.parse(mLastTarget.mWebDavUrl)); } -- 2.11.0