From: jabarros <jabarros@solidgear.es>
Date: Fri, 21 Nov 2014 09:57:38 +0000 (+0100)
Subject: Merge branch 'develop' into release-1.6.2
X-Git-Tag: oc-android-1.7.0_signed~15^2~5^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/803ed3487449d4b07ab8e38dc15e76ea96446c3e?hp=094fa09e9e9598e852e4719199c5990e470c4c16

Merge branch 'develop' into release-1.6.2
---

diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index 66359f3d..6c8a1320 100644
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@ -170,7 +170,7 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene
         case DIALOG_MULTIPLE_ACCOUNT:
             CharSequence ac[] = new CharSequence[mAccountManager.getAccountsByType(MainApp.getAccountType()).length];
             for (int i = 0; i < ac.length; ++i) {
-                ac[i] = mAccountManager.getAccountsByType(MainApp.getAccountType())[i].name;
+                ac[i] = DisplayUtils.convertIdn(mAccountManager.getAccountsByType(MainApp.getAccountType())[i].name, false);
             }
             builder.setTitle(R.string.common_choose_account);
             builder.setItems(ac, new OnClickListener() {