From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 12 Jun 2014 14:45:33 +0000 (+0200)
Subject: Refactored build of account names into the library
X-Git-Tag: oc-android-1.7.0_signed~264^2~20
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6326d6f56558e96e7b50696a5a852323cde51489?ds=inline

Refactored build of account names into the library
---

diff --git a/owncloud-android-library b/owncloud-android-library
index a42f6b5d..e069a8cb 160000
--- 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 32bbcdcc..b87c2dc6 100644
--- 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();
         if (isOAuth) {
             username = "OAuth_user" + (new java.util.Random(System.currentTimeMillis())).nextLong();
-        }            
-        String accountName = username + "@" + uri.getHost();
-        if (uri.getPort() >= 0) {
-            accountName += ":" + uri.getPort();
         }
+        String accountName = com.owncloud.android.lib.common.accounts.AccountUtils.
+                buildAccountName(uri, username);
         Account newAccount = new Account(accountName, MainApp.getAccountType());
         if (AccountUtils.exists(newAccount, getApplicationContext())) {
             // fail - not a new account, but an existing one; disallow
diff --git a/src/com/owncloud/android/authentication/OwnCloudAccount.java b/src/com/owncloud/android/authentication/OwnCloudAccount.java
deleted file mode 100644
index 4e819b90..00000000
--- 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;
-    }
-
-}