flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 00:16:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #61 from owncloud/loging_different_servers_same_pattern

Browse Source 
Support for new name scheme for accounts.
This commit is contained in:
David A. Velasco 2015-04-22 09:29:08 +02:00
commit e73e4a56d3
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/owncloud/android/lib/common/accounts/AccountUtils.java
View File

@ -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) { if (serverBaseUrl.getScheme() == null) {
serverBaseUrl = Uri.parse("https://" + serverBaseUrl.toString()); serverBaseUrl = Uri.parse("https://" + serverBaseUrl.toString());
} }
@ -210,6 +210,20 @@ public class AccountUtils {
return accountName; 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) { public static void saveClient(OwnCloudClient client, Account savedAccount, Context context) {
@ -336,12 +350,18 @@ public class AccountUtils {
public static final String KEY_SUPPORTS_SAML_WEB_SSO = "oc_supports_saml_web_sso"; public static final String KEY_SUPPORTS_SAML_WEB_SSO = "oc_supports_saml_web_sso";
/** /**
* Flag signaling if the ownCloud server supports Share API" * Flag signaling if the ownCloud server supports Share API"
*/ * @deprecated
*/
public static final String KEY_SUPPORTS_SHARE_API = "oc_supports_share_api"; 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"; public static final String KEY_COOKIES = "oc_account_cookies";
}
/**
* OC account version
*/
public static final String KEY_OC_ACCOUNT_VERSION = "oc_account_version";
}
} }