flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-30 18:07:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #118 from owncloud/stable

Browse Source 
Release 0.9.11
This commit is contained in:
David A. Velasco 2016-04-21 12:53:16 +02:00
commit f53ebc09b2
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/owncloud/android/lib/common/OwnCloudClientFactory.java
View File

@ -53,7 +53,7 @@ public class OwnCloudClientFactory {
/** Default timeout for establishing a connection */ /** Default timeout for establishing a connection */
public static final int DEFAULT_CONNECTION_TIMEOUT = 60000; public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
/** /**
* Creates a OwnCloudClient setup for an ownCloud account * Creates a OwnCloudClient setup for an ownCloud account
* *
@ -83,7 +83,7 @@ public class OwnCloudClientFactory {
am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null; am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;
OwnCloudClient client = createOwnCloudClient(baseUri, appContext, !isSamlSso); OwnCloudClient client = createOwnCloudClient(baseUri, appContext, !isSamlSso);
String username = account.name.substring(0, account.name.lastIndexOf('@')); String username = AccountUtils.getUsernameForAccount(account);
if (isOauth2) { if (isOauth2) {
String accessToken = am.blockingGetAuthToken( String accessToken = am.blockingGetAuthToken(
account, account,
@ -137,7 +137,7 @@ public class OwnCloudClientFactory {
am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null; am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;
OwnCloudClient client = createOwnCloudClient(baseUri, appContext, !isSamlSso); OwnCloudClient client = createOwnCloudClient(baseUri, appContext, !isSamlSso);
String username = account.name.substring(0, account.name.lastIndexOf('@')); String username = AccountUtils.getUsernameForAccount(account);
if (isOauth2) { // TODO avoid a call to getUserData here if (isOauth2) { // TODO avoid a call to getUserData here
AccountManagerFuture<Bundle> future = am.getAuthToken( AccountManagerFuture<Bundle> future = am.getAuthToken(
account, account,

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

@ -145,7 +145,23 @@ public class AccountUtils {
return baseurl; return baseurl;
} }
/**
* Get the username corresponding to an OC account.
*
* @param account An OC account
* @return Username for the given account, extracted from the account.name
*/
public static String getUsernameForAccount(Account account) {
String username = null;
try {
username = account.name.substring(0, account.name.lastIndexOf('@'));
} catch (Exception e) {
Log_OC.e(TAG, "Couldn't get a username for the given account", e);
}
return username;
}
/** /**
* *
@ -168,7 +184,7 @@ public class AccountUtils {
account, account,
AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null; AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;
String username = account.name.substring(0, account.name.lastIndexOf('@')); String username = AccountUtils.getUsernameForAccount(account);
if (isOauth2) { if (isOauth2) {
String accessToken = am.blockingGetAuthToken( String accessToken = am.blockingGetAuthToken(

3
src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
View File

@ -217,6 +217,9 @@ public class UpdateRemoteShareOperation extends RemoteOperation {
} else { } else {
result = new RemoteOperationResult(false, status, put.getResponseHeaders()); result = new RemoteOperationResult(false, status, put.getResponseHeaders());
} }
if (!result.isSuccess()) {
break;
}
} }
} catch (Exception e) { } catch (Exception e) {