Locked edition of URL and password in redirection due to expired credentials; error...

[pub/Android/ownCloud.git] / src / com / owncloud / android / AccountUtils.java

diff --git a/src/com/owncloud/android/AccountUtils.java b/src/com/owncloud/android/AccountUtils.java
index 9c48793..06ab31a 100644 (file)
--- a/src/com/owncloud/android/AccountUtils.java
+++ b/src/com/owncloud/android/AccountUtils.java
@@ -31,6 +31,7 @@ public class AccountUtils {
     public static final String WEBDAV_PATH_1_2 = "/webdav/owncloud.php";\r
     public static final String WEBDAV_PATH_2_0 = "/files/webdav.php";\r
     public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";\r
+    private static final String ODAV_PATH = "/remote.php/odav";\r
     public static final String CARDDAV_PATH_2_0 = "/apps/contacts/carddav.php";\r
     public static final String CARDDAV_PATH_4_0 = "/remote/carddav.php";\r
     public static final String STATUS_PATH = "/status.php";\r
@@ -95,15 +96,43 @@ public class AccountUtils {
      * @param version version of owncloud\r
      * @return webdav path for given OC version, null if OC version unknown\r
      */\r
-    public static String getWebdavPath(OwnCloudVersion version) {\r
-        if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)\r
-            return WEBDAV_PATH_4_0;\r
-        if (version.compareTo(OwnCloudVersion.owncloud_v3) >= 0\r
-                || version.compareTo(OwnCloudVersion.owncloud_v2) >= 0)\r
-            return WEBDAV_PATH_2_0;\r
-        if (version.compareTo(OwnCloudVersion.owncloud_v1) >= 0)\r
-            return WEBDAV_PATH_1_2;\r
+    public static String getWebdavPath(OwnCloudVersion version, boolean supportsOAuth) {\r
+        if (version != null) {\r
+            if (supportsOAuth) {\r
+                return ODAV_PATH;\r
+            }\r
+            if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)\r
+                return WEBDAV_PATH_4_0;\r
+            if (version.compareTo(OwnCloudVersion.owncloud_v3) >= 0\r
+                    || version.compareTo(OwnCloudVersion.owncloud_v2) >= 0)\r
+                return WEBDAV_PATH_2_0;\r
+            if (version.compareTo(OwnCloudVersion.owncloud_v1) >= 0)\r
+                return WEBDAV_PATH_1_2;\r
+        }\r
         return null;\r
     }\r
+    \r
+    /**\r
+     * Constructs full url to host and webdav resource basing on host version\r
+     * @param context\r
+     * @param account\r
+     * @return url or null on failure\r
+     */\r
+    public static String constructFullURLForAccount(Context context, Account account) {\r
+        try {\r
+            AccountManager ama = AccountManager.get(context);\r
+            String baseurl = ama.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);\r
+            String strver  = ama.getUserData(account, AccountAuthenticator.KEY_OC_VERSION);\r
+            boolean supportsOAuth = (ama.getUserData(account, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);\r
+            OwnCloudVersion ver = new OwnCloudVersion(strver);\r
+            String webdavpath = getWebdavPath(ver, supportsOAuth);\r
+\r
+            if (webdavpath == null) return null;\r
+            return baseurl + webdavpath;\r
+        } catch (Exception e) {\r
+            e.printStackTrace();\r
+            return null;\r
+        }\r
+    }\r
 \r
 }\r