Refactored build of account names into the library

diff --git a/owncloud-android-library b/owncloud-android-library
index a42f6b5..e069a8c 160000 (submodule)
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit a42f6b5d6d7ffab813330870979e4a118ff9b1ad
+Subproject commit e069a8cb9f4f874ee91d7c012c083899556378e9

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 32bbcdc..b87c2dc 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -1417,11 +1417,9 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         String username = mUsernameInput.getText().toString().trim();\r
         if (isOAuth) {\r
             username = "OAuth_user" + (new java.util.Random(System.currentTimeMillis())).nextLong();\r
         String username = mUsernameInput.getText().toString().trim();\r
         if (isOAuth) {\r
             username = "OAuth_user" + (new java.util.Random(System.currentTimeMillis())).nextLong();\r

-        }            \r
-        String accountName = username + "@" + uri.getHost();\r
-        if (uri.getPort() >= 0) {\r
-            accountName += ":" + uri.getPort();\r

         }\r
         }\r

+        String accountName = com.owncloud.android.lib.common.accounts.AccountUtils.\r
+                buildAccountName(uri, username);\r

         Account newAccount = new Account(accountName, MainApp.getAccountType());\r
         if (AccountUtils.exists(newAccount, getApplicationContext())) {\r
             // fail - not a new account, but an existing one; disallow\r
         Account newAccount = new Account(accountName, MainApp.getAccountType());\r
         if (AccountUtils.exists(newAccount, getApplicationContext())) {\r
             // fail - not a new account, but an existing one; disallow\r

diff --git a/src/com/owncloud/android/authentication/OwnCloudAccount.java b/src/com/owncloud/android/authentication/OwnCloudAccount.java
deleted file mode 100644 (file)
index 4e819b9..0000000
--- a/src/com/owncloud/android/authentication/OwnCloudAccount.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ownCloud Android client application
- *   Copyright (C) 2014 ownCloud Inc.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.authentication;
-
-import com.owncloud.android.lib.common.OwnCloudCredentials;
-
-import android.accounts.Account;
-import android.content.Context;
-import android.net.Uri;
-
-/**
- * OwnCloud Account
- * 
- * @author David A. Velasco
- */
-public class OwnCloudAccount {
-
-    private Uri mBaseUri; 
-    
-    private OwnCloudCredentials mCredentials;
-    
-    public OwnCloudAccount(Account savedAccount, Context context) {
-        
-    }
-    
-    public OwnCloudAccount(Uri baseUri, OwnCloudCredentials credentials) {
-        if (baseUri == null) {
-            throw new IllegalArgumentException("Parameter 'baseUri' cannot be null");
-        }
-        mBaseUri = baseUri;
-        mCredentials = credentials;
-    }
-    
-    public boolean isAnonymous() {
-        return (mCredentials == null);
-    }
-    
-    public Uri getBaseUri() {
-        return mBaseUri;
-    }
-            
-    public OwnCloudCredentials getCredentials() {
-        return mCredentials;
-    }
-
-}