Cleaning-up AuthenticatorActivty code

[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 997633a..06ab31a 100644 (file)
--- a/src/com/owncloud/android/AccountUtils.java
+++ b/src/com/owncloud/android/AccountUtils.java
@@ -97,10 +97,10 @@ public class AccountUtils {
      * @return webdav path for given OC version, null if OC version unknown\r
      */\r
     public static String getWebdavPath(OwnCloudVersion version, boolean supportsOAuth) {\r
      * @return webdav path for given OC version, null if OC version unknown\r
      */\r
     public static String getWebdavPath(OwnCloudVersion version, boolean supportsOAuth) {\r

-        if (supportsOAuth) {\r
-            return ODAV_PATH;\r
-        }\r

         if (version != null) {\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
             if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)\r
                 return WEBDAV_PATH_4_0;\r
             if (version.compareTo(OwnCloudVersion.owncloud_v3) >= 0\r