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

Move constants for main endpoints from AccountUtils to OwnCloudClient

Browse Source
This commit is contained in:
David A. Velasco 2017-08-28 08:58:30 +02:00 committed by davigonz
parent 3072507972
commit 2d35b00273
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/owncloud/android/lib/common/OwnCloudClient.java
View File

@ -58,6 +58,10 @@ import com.owncloud.android.lib.resources.status.OwnCloudVersion;
public class OwnCloudClient extends HttpClient { public class OwnCloudClient extends HttpClient {
public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";
public static final String STATUS_PATH = "/status.php";
public static final String FILES_WEB_PATH = "/index.php/apps/files";
private static final String TAG = OwnCloudClient.class.getSimpleName(); private static final String TAG = OwnCloudClient.class.getSimpleName();
private static final int MAX_REDIRECTIONS_COUNT = 3; private static final int MAX_REDIRECTIONS_COUNT = 3;
private static final int MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS = 1; private static final int MAX_REPEAT_COUNT_WITH_FRESH_CREDENTIALS = 1;
@ -322,9 +326,7 @@ public class OwnCloudClient extends HttpClient {
destination = method.getRequestHeader("destination"); destination = method.getRequestHeader("destination");
} }
if (destination != null) { if (destination != null) {
int suffixIndex = locationStr.lastIndexOf( int suffixIndex = locationStr.lastIndexOf(WEBDAV_PATH_4_0);
AccountUtils.WEBDAV_PATH_4_0
);
String redirectionBase = locationStr.substring(0, suffixIndex); String redirectionBase = locationStr.substring(0, suffixIndex);
String destinationStr = destination.getValue(); String destinationStr = destination.getValue();
@ -378,7 +380,7 @@ public class OwnCloudClient extends HttpClient {
} }
public Uri getWebdavUri() { public Uri getWebdavUri() {
return Uri.parse(mBaseUri + AccountUtils.WEBDAV_PATH_4_0); return Uri.parse(mBaseUri + WEBDAV_PATH_4_0);
} }
/** /**

5
src/com/owncloud/android/lib/common/accounts/AccountUtils.java
View File

@ -51,9 +51,6 @@ public class AccountUtils {
private static final String TAG = AccountUtils.class.getSimpleName(); private static final String TAG = AccountUtils.class.getSimpleName();
public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";
public static final String STATUS_PATH = "/status.php";
/** /**
* Constructs full url to host and webdav resource basing on host version * Constructs full url to host and webdav resource basing on host version
* *
@ -65,7 +62,7 @@ public class AccountUtils {
public static String getWebDavUrlForAccount(Context context, Account account) public static String getWebDavUrlForAccount(Context context, Account account)
throws AccountNotFoundException { throws AccountNotFoundException {
return getBaseUrlForAccount(context, account) + WEBDAV_PATH_4_0; return getBaseUrlForAccount(context, account) + OwnCloudClient.WEBDAV_PATH_4_0;
} }

2
src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java
View File

@ -78,7 +78,7 @@ public class GetRemoteStatusOperation extends RemoteOperation {
GetMethod get = null; GetMethod get = null;
String baseUrlSt = client.getBaseUri().toString(); String baseUrlSt = client.getBaseUri().toString();
try { try {
get = new GetMethod(baseUrlSt + AccountUtils.STATUS_PATH); get = new GetMethod(baseUrlSt + OwnCloudClient.STATUS_PATH);
HttpParams params = get.getParams().getDefaultParams(); HttpParams params = get.getParams().getDefaultParams();
params.setParameter(HttpMethodParams.USER_AGENT, params.setParameter(HttpMethodParams.USER_AGENT,