flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Remove legacy owncloud version from the client.

Browse Source
This commit is contained in:
Abel García de Prada 2022-09-30 10:01:25 +02:00
parent 2b27b9657c
commit b7d3cc2687
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
View File

@ -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.HttpConstants;
import com.owncloud.android.lib.common.http.methods.HttpBaseMethod; import com.owncloud.android.lib.common.http.methods.HttpBaseMethod;
import com.owncloud.android.lib.common.utils.RandomUtils; import com.owncloud.android.lib.common.utils.RandomUtils;
import com.owncloud.android.lib.resources.status.OwnCloudVersion;
import okhttp3.Cookie; import okhttp3.Cookie;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
import timber.log.Timber; import timber.log.Timber;
@ -59,7 +58,6 @@ public class OwnCloudClient extends HttpClient {
private OwnCloudCredentials mCredentials = null; private OwnCloudCredentials mCredentials = null;
private int mInstanceNumber; private int mInstanceNumber;
private Uri mBaseUri; private Uri mBaseUri;
private OwnCloudVersion mVersion = null;
private OwnCloudAccount mAccount; private OwnCloudAccount mAccount;
private final ConnectionValidator mConnectionValidator; private final ConnectionValidator mConnectionValidator;
private Object mRequestMutex = new Object(); private Object mRequestMutex = new Object();
@ -185,7 +183,7 @@ public class OwnCloudClient extends HttpClient {
return (mCredentials instanceof OwnCloudAnonymousCredentials || mAccount == null) return (mCredentials instanceof OwnCloudAnonymousCredentials || mAccount == null)
? Uri.parse(mBaseUri + WEBDAV_FILES_PATH_4_0) ? Uri.parse(mBaseUri + WEBDAV_FILES_PATH_4_0)
: Uri.parse(mBaseUri + WEBDAV_FILES_PATH_4_0 + AccountUtils.getUserId( : 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 return mCredentials instanceof OwnCloudAnonymousCredentials
? Uri.parse(mBaseUri + WEBDAV_UPLOADS_PATH_4_0) ? Uri.parse(mBaseUri + WEBDAV_UPLOADS_PATH_4_0)
: Uri.parse(mBaseUri + WEBDAV_UPLOADS_PATH_4_0 + AccountUtils.getUserId( : 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())); HttpUrl.parse(mBaseUri.toString()));
} }
public OwnCloudVersion getOwnCloudVersion() {
return mVersion;
}
public void setOwnCloudVersion(OwnCloudVersion version) {
mVersion = version;
}
public OwnCloudAccount getAccount() { public OwnCloudAccount getAccount() {
return mAccount; return mAccount;
} }
@ -260,4 +250,4 @@ public class OwnCloudClient extends HttpClient {
public void setFollowRedirects(boolean followRedirects) { public void setFollowRedirects(boolean followRedirects) {
this.mFollowRedirects = followRedirects; this.mFollowRedirects = followRedirects;
} }
} }