flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2026-08-15 02:13:00 +00:00
Code Issues Releases Wiki Activity

Move constants and utils to proper files

Browse Source
This commit is contained in:
agarcia
2020-02-13 13:40:12 +01:00
committed by davigonz
parent 4f07187fa2
commit 1536a455a6
6 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java
+1
View File
@@ -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";
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java
-2
View File
@@ -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";
}
}
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java
+29
View File
@@ -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;
}
}