From b7d3cc2687ca5829afe25f655c3be3ddbe0978d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= Date: Fri, 30 Sep 2022 10:01:25 +0200 Subject: [PATCH] Remove legacy owncloud version from the client. --- .../android/lib/common/OwnCloudClient.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java index e332b8fa..1281ec13 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java @@ -36,7 +36,6 @@ import com.owncloud.android.lib.common.http.HttpClient; import com.owncloud.android.lib.common.http.HttpConstants; import com.owncloud.android.lib.common.http.methods.HttpBaseMethod; import com.owncloud.android.lib.common.utils.RandomUtils; -import com.owncloud.android.lib.resources.status.OwnCloudVersion; import okhttp3.Cookie; import okhttp3.HttpUrl; import timber.log.Timber; @@ -59,7 +58,6 @@ public class OwnCloudClient extends HttpClient { private OwnCloudCredentials mCredentials = null; private int mInstanceNumber; private Uri mBaseUri; - private OwnCloudVersion mVersion = null; private OwnCloudAccount mAccount; private final ConnectionValidator mConnectionValidator; private Object mRequestMutex = new Object(); @@ -185,7 +183,7 @@ public class OwnCloudClient extends HttpClient { return (mCredentials instanceof OwnCloudAnonymousCredentials || mAccount == null) ? Uri.parse(mBaseUri + WEBDAV_FILES_PATH_4_0) : Uri.parse(mBaseUri + WEBDAV_FILES_PATH_4_0 + AccountUtils.getUserId( - mAccount.getSavedAccount(), getContext() + mAccount.getSavedAccount(), getContext() ) ); } @@ -194,7 +192,7 @@ public class OwnCloudClient extends HttpClient { return mCredentials instanceof OwnCloudAnonymousCredentials ? Uri.parse(mBaseUri + WEBDAV_UPLOADS_PATH_4_0) : Uri.parse(mBaseUri + WEBDAV_UPLOADS_PATH_4_0 + AccountUtils.getUserId( - mAccount.getSavedAccount(), getContext() + mAccount.getSavedAccount(), getContext() ) ); } @@ -241,14 +239,6 @@ public class OwnCloudClient extends HttpClient { HttpUrl.parse(mBaseUri.toString())); } - public OwnCloudVersion getOwnCloudVersion() { - return mVersion; - } - - public void setOwnCloudVersion(OwnCloudVersion version) { - mVersion = version; - } - public OwnCloudAccount getAccount() { return mAccount; } @@ -260,4 +250,4 @@ public class OwnCloudClient extends HttpClient { public void setFollowRedirects(boolean followRedirects) { this.mFollowRedirects = followRedirects; } -} \ No newline at end of file +}