Migration to ActionBarSherlock 4.0.1 / Custom Adapter to override text

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / Preferences.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/Preferences.java b/src/eu/alefzero/owncloud/ui/activity/Preferences.java
index 1e35896..3677f8a 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/Preferences.java
+++ b/src/eu/alefzero/owncloud/ui/activity/Preferences.java
@@ -24,6 +24,7 @@ import java.util.Vector;
 import eu.alefzero.owncloud.OwnCloudSession;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.OwnCloudSession;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r

+import eu.alefzero.owncloud.authenticator.AuthUtils;\r

 import eu.alefzero.owncloud.db.DbHandler;\r
 \r
 import android.accounts.Account;\r
 import eu.alefzero.owncloud.db.DbHandler;\r
 \r
 import android.accounts.Account;\r


@@ -98,6 +99,12 @@ public class Preferences extends PreferenceActivity {
          mAccounts = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
          ListPreference accountList = (ListPreference) findPreference("select_oc_account");\r
          \r
          mAccounts = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
          ListPreference accountList = (ListPreference) findPreference("select_oc_account");\r
          \r

+         // Display the name of the current account if there is any\r
+         Account defaultAccount = AuthUtils.getCurrentOwnCloudAccount(this);\r
+         if(defaultAccount != null){\r
+                 accountList.setSummary(defaultAccount.name);\r
+         }\r
+         \r

          // Transform accounts into array of string for preferences to use\r
          String[] accNames = new String[mAccounts.length];\r
          for(int i = 0; i < mAccounts.length; i++){\r
          // Transform accounts into array of string for preferences to use\r
          String[] accNames = new String[mAccounts.length];\r
          for(int i = 0; i < mAccounts.length; i++){\r