From 1536a455a630c83f652216a32caf47d2548869ec Mon Sep 17 00:00:00 2001 From: agarcia Date: Thu, 13 Feb 2020 13:40:12 +0100 Subject: [PATCH] Move constants and utils to proper files --- .../android/lib/common/OwnCloudClient.java | 1 + .../lib/common/accounts/AccountUtils.java | 2 -- .../lib/common/network/WebdavUtils.java | 29 +++++++++++++++++++ .../lib/resources/CommonOcsResponse.kt | 2 ++ ...eration.kt => GetRemoteStatusOperation.kt} | 2 +- ...ation.kt => GetRemoteUserInfoOperation.kt} | 2 +- 6 files changed, 34 insertions(+), 4 deletions(-) rename owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/{GetStatusRemoteOperation.kt => GetRemoteStatusOperation.kt} (99%) rename owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/{GetUserInfoRemoteOperation.kt => GetRemoteUserInfoOperation.kt} (98%) 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 5c4ae8e6..1fc9ca94 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 @@ -53,6 +53,7 @@ import static com.owncloud.android.lib.common.http.HttpConstants.OC_X_REQUEST_ID public class OwnCloudClient extends HttpClient { public static final String WEBDAV_FILES_PATH_4_0 = "/remote.php/dav/files/"; + public static final String WEBDAV_PATH_4_0_AND_LATER = "/remote.php/dav"; private static final String WEBDAV_UPLOADS_PATH_4_0 = "/remote.php/dav/uploads/"; public static final String STATUS_PATH = "/status.php"; diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java index fbe4d338..b2ab1880 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java @@ -329,7 +329,5 @@ public class AccountUtils { * OAuth2 scope */ public static final String KEY_OAUTH2_SCOPE = "oc_oauth2_scope"; - - public static final String WEBDAV_PATH_4_0_AND_LATER = "/remote.php/dav"; } } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java index 45b7f35f..51f4d9b3 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java @@ -34,6 +34,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; +import static com.owncloud.android.lib.common.OwnCloudClient.WEBDAV_PATH_4_0_AND_LATER; + public class WebdavUtils { public static final SimpleDateFormat DISPLAY_DATE_FORMAT = new SimpleDateFormat( "dd.MM.yyyy hh:mm"); @@ -120,4 +122,31 @@ public class WebdavUtils { } return result; } + + public static String trimWebdavSuffix(String url) { + if (url == null) { + url = ""; + } else { + if (url.endsWith("/")) { + url = url.substring(0, url.length() - 1); + } + if (url.toLowerCase().endsWith(WEBDAV_PATH_4_0_AND_LATER)) { + url = url.substring(0, url.length() - WEBDAV_PATH_4_0_AND_LATER.length()); + } + } + return url; + } + + public static String normalizeProtocolPrefix(String url, boolean isSslConn) { + if (!url.toLowerCase().startsWith("http://") && + !url.toLowerCase().startsWith("https://")) { + if (isSslConn) { + return "https://" + url; + } else { + return "http://" + url; + } + } + return url; + } + } \ No newline at end of file diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/CommonOcsResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/CommonOcsResponse.kt index f0bb805e..2cfbe2ed 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/CommonOcsResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/CommonOcsResponse.kt @@ -25,6 +25,8 @@ package com.owncloud.android.lib.resources import com.squareup.moshi.JsonClass +// Response retrieved by OCS Rest API, used to obtain capabilities, shares and user info among others. +// More info: https://doc.owncloud.com/server/developer_manual/core/apis/ocs-capabilities.html @JsonClass(generateAdapter = true) data class CommonOcsResponse( val ocs: OCSResponse diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/GetStatusRemoteOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/GetRemoteStatusOperation.kt similarity index 99% rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/GetStatusRemoteOperation.kt rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/GetRemoteStatusOperation.kt index 76a6def9..4a92e93b 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/GetStatusRemoteOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/server/GetRemoteStatusOperation.kt @@ -46,7 +46,7 @@ import javax.net.ssl.SSLException * @author David González Verdugo * @author Abel García de Prada */ -class GetStatusRemoteOperation : RemoteOperation() { +class GetRemoteStatusOperation : RemoteOperation() { private lateinit var latestResult: RemoteOperationResult override fun run(client: OwnCloudClient): RemoteOperationResult { diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetUserInfoRemoteOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt similarity index 98% rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetUserInfoRemoteOperation.kt rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt index f670e88d..a406e6cb 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetUserInfoRemoteOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt @@ -45,7 +45,7 @@ import java.net.URL * @author David González Verdugo * @author Abel García de Prada */ -class GetUserInfoRemoteOperation : RemoteOperation() { +class GetRemoteUserInfoOperation : RemoteOperation() { override fun run(client: OwnCloudClient): RemoteOperationResult { var result: RemoteOperationResult //Get the user