From 21c329aa126833119f4bc6ed06a3f3881964246f Mon Sep 17 00:00:00 2001 From: masensio Date: Mon, 13 Apr 2015 13:30:31 +0200 Subject: [PATCH 1/2] Set new pattern for account name --- .../lib/common/accounts/AccountUtils.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java index 586fd3f8..be7bafab 100644 --- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java +++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java @@ -199,7 +199,7 @@ public class AccountUtils { } - public static String buildAccountName(Uri serverBaseUrl, String username) { + public static String buildAccountNameOld(Uri serverBaseUrl, String username) { if (serverBaseUrl.getScheme() == null) { serverBaseUrl = Uri.parse("https://" + serverBaseUrl.toString()); } @@ -209,7 +209,21 @@ public class AccountUtils { } return accountName; } - + + public static String buildAccountName(Uri serverBaseUrl, String username) { + if (serverBaseUrl.getScheme() == null) { + serverBaseUrl = Uri.parse("https://" + serverBaseUrl.toString()); + } + + // Remove http:// or https:// + String url = serverBaseUrl.toString(); + if (url.contains("://")) { + url = url.substring(serverBaseUrl.toString().indexOf("://") + 3); + } + String accountName = username + "@" + url; + + return accountName; + } public static void saveClient(OwnCloudClient client, Account savedAccount, Context context) { From ddb8648809b7e5c91ec6d081ccdb0597dbebd520 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 15 Apr 2015 12:49:45 +0200 Subject: [PATCH 2/2] Added version for OC accounts --- .../android/lib/common/accounts/AccountUtils.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java index be7bafab..02a12bd8 100644 --- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java +++ b/src/com/owncloud/android/lib/common/accounts/AccountUtils.java @@ -350,12 +350,18 @@ public class AccountUtils { public static final String KEY_SUPPORTS_SAML_WEB_SSO = "oc_supports_saml_web_sso"; /** * Flag signaling if the ownCloud server supports Share API" - */ + * @deprecated + */ public static final String KEY_SUPPORTS_SHARE_API = "oc_supports_share_api"; /** - * OC accout cookies + * OC account cookies */ public static final String KEY_COOKIES = "oc_account_cookies"; - } + + /** + * OC account version + */ + public static final String KEY_OC_ACCOUNT_VERSION = "oc_account_version"; + } }