Recovered full port and path in accounts naming to distinguish instances in the same host

src/com/owncloud/android/ui/activity/Preferences.java

@@ -752,7 +752,8 @@ public class Preferences extends PreferenceActivity
                 try {
                     oca = new OwnCloudAccount(a, this);
                     accountPreference.setTitle(
-                        oca.getDisplayName() + " @ " + DisplayUtils.convertIdn(oca.getBaseUri().getHost(), false)
+                        oca.getDisplayName() + " @ " +
+                        DisplayUtils.convertIdn(a.name.substring(a.name.lastIndexOf("@") + 1), false)
                     );
                 } catch (Exception e) {
                     Log_OC.w(

src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -273,7 +273,12 @@ public class ReceiveExternalFilesActivity extends FileActivity
                 try {
                     oca = new OwnCloudAccount(accounts[i], this);
                     dialogItems[i] =
-                        oca.getDisplayName() + " @ " + DisplayUtils.convertIdn(oca.getBaseUri().getHost(), false);
+                        oca.getDisplayName() + " @ " +
+                        DisplayUtils.convertIdn(
+                            accounts[i].name.substring(accounts[i].name.lastIndexOf("@") + 1),
+                            false
+                        );
+
                 } catch (Exception e) {
                     Log_OC.w(TAG, "Couldn't read display name of account; using account name instead");
                     dialogItems[i] = DisplayUtils.convertIdn(accounts[i].name, false);

src/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java

@@ -242,12 +242,11 @@ public class ExpandableUploadListAdapter extends BaseExpandableListAdapter imple
 
             TextView accountNameTextView = (TextView) view.findViewById(R.id.upload_account);
             try {
-                OwnCloudAccount oca = new OwnCloudAccount(
-                    AccountUtils.getOwnCloudAccountByName(mParentActivity, upload.getAccountName()),
-                    mParentActivity
-                );
+                Account account = AccountUtils.getOwnCloudAccountByName(mParentActivity, upload.getAccountName());
+                OwnCloudAccount oca = new OwnCloudAccount(account, mParentActivity);
                 accountNameTextView.setText(
-                    oca.getDisplayName() + " @ " + DisplayUtils.convertIdn(oca.getBaseUri().getHost(), false)
+                    oca.getDisplayName() + " @ " +
+                    DisplayUtils.convertIdn(account.name.substring(account.name.lastIndexOf("@") + 1), false)
                 );
             } catch (Exception e) {
                 Log_OC.w(TAG, "Couldn't get display name for account, using old style");