Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19e30a62 authored by David A. Velasco's avatar David A. Velasco
Browse files

Added util method to extract username from saved Account

parent 740f0deb

src/com/owncloud/android/lib/common/OwnCloudClientFactory.java

+3 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class OwnCloudClientFactory { 
                am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;

        OwnCloudClient client = createOwnCloudClient(baseUri, appContext, !isSamlSso);



        String username = account.name.substring(0, account.name.lastIndexOf('@'));

        String username = AccountUtils.getUsernameForAccount(account);

        if (isOauth2) {

            String accessToken = am.blockingGetAuthToken(

            		account,
@@ -137,7 +137,7 @@ public class OwnCloudClientFactory { 
                am.getUserData(account, AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;

        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

            AccountManagerFuture<Bundle> future =  am.getAuthToken(

            		account,

src/com/owncloud/android/lib/common/accounts/AccountUtils.java

+18 −2
Original line number Diff line number Diff line
@@ -147,6 +147,22 @@ public class AccountUtils { 
    }





    /**

     * 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;

    }



    /**

     * 

     * @return
@@ -168,7 +184,7 @@ public class AccountUtils { 
        		account, 

        		AccountUtils.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null;



        String username = account.name.substring(0, account.name.lastIndexOf('@'));

        String username = AccountUtils.getUsernameForAccount(account);



        if (isOauth2) {    

            String accessToken = am.blockingGetAuthToken(