X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/0aeb425885ceccb28b31c9822d52b90656bf9257..2b00ff1c7eb24dffcd70ced6c33db8ecf90e3f57:/src/eu/alefzero/owncloud/AccountUtils.java

diff --git a/src/eu/alefzero/owncloud/AccountUtils.java b/src/eu/alefzero/owncloud/AccountUtils.java
index 9e1b1248..090dec38 100644
--- a/src/eu/alefzero/owncloud/AccountUtils.java
+++ b/src/eu/alefzero/owncloud/AccountUtils.java
@@ -28,61 +28,67 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
 public class AccountUtils {
-  public static final String WEBDAV_PATH_1_2 = "/webdav/owncloud.php";
-  public static final String WEBDAV_PATH_2_0 = "/files/webdav.php";
-  public static final String WEBDAV_PATH_4_0 = "/remote/webdav.php";
-  public static final String CARDDAV_PATH_2_0 = "/apps/contacts/carddav.php";
-  public static final String CARDDAV_PATH_4_0 = "/remote/carddav.php";
-  public static final String STATUS_PATH = "/status.php";
+    public static final String WEBDAV_PATH_1_2 = "/webdav/owncloud.php";
+    public static final String WEBDAV_PATH_2_0 = "/files/webdav.php";
+    public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";
+    public static final String CARDDAV_PATH_2_0 = "/apps/contacts/carddav.php";
+    public static final String CARDDAV_PATH_4_0 = "/remote/carddav.php";
+    public static final String STATUS_PATH = "/status.php";
 
-  /**
-   * Can be used to get the currently selected ownCloud account in the preferences
-   * 
-   * @param context The current appContext
-   * @return The current account or first available, if none is available, then null.
-   */
-  public static Account getCurrentOwnCloudAccount(Context context) {
-	  Account[] ocAccounts = AccountManager.get(context).getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
-	  Account defaultAccount = null;
-	  
-	  SharedPreferences appPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-	  String accountName = appPreferences.getString("select_oc_account", null);
-	  
-	  if(accountName != null){
-		  for(Account account : ocAccounts){
-			  if(account.name.equals(accountName)){
-				  defaultAccount = account;
-				  break;
-			  }
-		  }
-	  } else if (ocAccounts.length != 0) {
-	    // we at least need to take first account as fallback
-	    defaultAccount = ocAccounts[0];
-	  }
-	  
-	return defaultAccount;
-  }
-  
-  public static void setCurrentOwnCloudAccount(Context context, String name) {
-    SharedPreferences.Editor appPrefs = PreferenceManager.getDefaultSharedPreferences(context).edit();
-    appPrefs.putString("select_oc_account", name);
-    appPrefs.commit();
-  }
-  
-  /**
-   * 
-   * @param version version of owncloud
-   * @return webdav path for given OC version, null if OC version unknown
-   */
-  public static String getWebdavPath(OwnCloudVersion version) {
-    if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)
-      return WEBDAV_PATH_4_0;
-    if (version.compareTo(OwnCloudVersion.owncloud_v3) >= 0 ||
-        version.compareTo(OwnCloudVersion.owncloud_v2) >= 0)
-      return WEBDAV_PATH_2_0;
-    if (version.compareTo(OwnCloudVersion.owncloud_v1) >= 0)
-      return WEBDAV_PATH_1_2;
-    return null;
-  }
+    /**
+     * Can be used to get the currently selected ownCloud account in the
+     * preferences
+     * 
+     * @param context The current appContext
+     * @return The current account or first available, if none is available,
+     *         then null.
+     */
+    public static Account getCurrentOwnCloudAccount(Context context) {
+        Account[] ocAccounts = AccountManager.get(context).getAccountsByType(
+                AccountAuthenticator.ACCOUNT_TYPE);
+        Account defaultAccount = null;
+
+        SharedPreferences appPreferences = PreferenceManager
+                .getDefaultSharedPreferences(context);
+        String accountName = appPreferences
+                .getString("select_oc_account", null);
+
+        if (accountName != null) {
+            for (Account account : ocAccounts) {
+                if (account.name.equals(accountName)) {
+                    defaultAccount = account;
+                    break;
+                }
+            }
+        } else if (ocAccounts.length != 0) {
+            // we at least need to take first account as fallback
+            defaultAccount = ocAccounts[0];
+        }
+
+        return defaultAccount;
+    }
+
+    public static void setCurrentOwnCloudAccount(Context context, String name) {
+        SharedPreferences.Editor appPrefs = PreferenceManager
+                .getDefaultSharedPreferences(context).edit();
+        appPrefs.putString("select_oc_account", name);
+        appPrefs.commit();
+    }
+
+    /**
+     * 
+     * @param version version of owncloud
+     * @return webdav path for given OC version, null if OC version unknown
+     */
+    public static String getWebdavPath(OwnCloudVersion version) {
+        if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)
+            return WEBDAV_PATH_4_0;
+        if (version.compareTo(OwnCloudVersion.owncloud_v3) >= 0
+                || version.compareTo(OwnCloudVersion.owncloud_v2) >= 0)
+            return WEBDAV_PATH_2_0;
+        if (version.compareTo(OwnCloudVersion.owncloud_v1) >= 0)
+            return WEBDAV_PATH_1_2;
+        return null;
+    }
 
 }