commit 3b7148ed1875b501b1ebc71d8dca09d9f91ae443
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Wed Nov 13 17:23:06 2013 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Wed Nov 13 17:23:06 2013 -0500
tree 5e024f19934da770b4d263aaed4903fc334abeda
parent 6027f87d19f9ae3287d2cf9f05518c707809aa13

* #34699: large rewrite of account credentials access to display preferences

src/org/sflphone/loaders/AccountsLoader.java

diff --git a/src/org/sflphone/loaders/AccountsLoader.java b/src/org/sflphone/loaders/AccountsLoader.java
index e4bf4ce..e5b85e3 100644
--- a/src/org/sflphone/loaders/AccountsLoader.java
+++ b/src/org/sflphone/loaders/AccountsLoader.java
@@ -35,15 +35,17 @@
         try {
             ArrayList<String> accountIDs = (ArrayList<String>) service.getAccountList();
             HashMap<String, String> details;
+            ArrayList<HashMap<String, String>> credentials;
             for (String id : accountIDs) {
 
                 if (id.contentEquals(ACCOUNT_IP2IP)) {
                     details = (HashMap<String, String>) service.getAccountDetails(id);
-                    IP2IP = new Account(ACCOUNT_IP2IP, details);
+                    IP2IP = new Account(ACCOUNT_IP2IP, details, new ArrayList<HashMap<String, String>>()); // Empty credentials
                     continue;
                 }
                 details = (HashMap<String, String>) service.getAccountDetails(id);
-                Account tmp = new Account(id, details);
+                credentials = (ArrayList<HashMap<String, String>>) service.getCredentials(id);
+                Account tmp = new Account(id, details, credentials);
 
                 accounts.add(tmp);
 
@@ -55,7 +57,7 @@
         } catch (NullPointerException e1) {
             Log.e(TAG, e1.toString());
         }
-        
+
         Bundle result = new Bundle();
         result.putParcelableArrayList(ACCOUNTS, accounts);
         result.putParcelable(ACCOUNT_IP2IP, IP2IP);