commit 11e8e1604db779d9cbd8f9f1aba9950f05a56ef2
author alision <alexandre.lision@savoirfairelinux.com> Tue May 28 10:33:14 2013 -0400
committer alision <alexandre.lision@savoirfairelinux.com> Tue May 28 10:33:14 2013 -0400
tree bbf0ed7b245b381a35b5516103b1af0e9c9ed8b2
parent 84813a1026d9406ced54b7846d0b3c92e409d64b

* Removed custom Spinner, and added Loader instead
* Deleted unused classes

src/com/savoirfairelinux/sflphone/loaders/AccountsLoader.java

diff --git a/src/com/savoirfairelinux/sflphone/loaders/AccountsLoader.java b/src/com/savoirfairelinux/sflphone/loaders/AccountsLoader.java
new file mode 100644
index 0000000..7194096
--- /dev/null
+++ b/src/com/savoirfairelinux/sflphone/loaders/AccountsLoader.java
@@ -0,0 +1,63 @@
+package com.savoirfairelinux.sflphone.loaders;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import android.content.AsyncTaskLoader;
+import android.content.Context;
+import android.os.RemoteException;
+import android.util.Log;
+
+import com.savoirfairelinux.sflphone.account.AccountDetailAdvanced;
+import com.savoirfairelinux.sflphone.account.AccountDetailBasic;
+import com.savoirfairelinux.sflphone.model.Account;
+import com.savoirfairelinux.sflphone.service.ISipService;
+
+public class AccountsLoader extends AsyncTaskLoader<ArrayList<Account>> {
+
+    private static final String TAG = AccountsLoader.class.getSimpleName();
+
+    ISipService service;
+
+    public AccountsLoader(Context context, ISipService ref) {
+        super(context);
+        service = ref;
+    }
+
+    @Override
+    public ArrayList<Account> loadInBackground() {
+        
+        
+        ArrayList<Account> result = new ArrayList<Account>();
+        Account.AccountBuilder builder = Account.AccountBuilder.getInstance();
+
+        ArrayList<String> accountIDs;
+        HashMap<String, String> details;
+        try {
+            accountIDs = (ArrayList<String>) service.getAccountList();
+            for (String id : accountIDs) {
+                
+                if(id.contentEquals("IP2IP")){
+                    continue;
+                }
+                details = (HashMap<String, String>) service.getAccountDetails(id);
+
+                builder.setAccountID(id).setAlias(details.get(AccountDetailBasic.CONFIG_ACCOUNT_ALIAS))
+                        .setHost(details.get(AccountDetailBasic.CONFIG_ACCOUNT_HOSTNAME))
+                        .setRegisteredState(details.get(AccountDetailAdvanced.CONFIG_ACCOUNT_REGISTRATION_STATUS));
+                
+                try {
+                    result.add(builder.build());
+                } catch (Exception e) {
+                    Log.e(TAG, e.toString());
+                }
+
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, e.toString());
+        }
+
+        return result;
+    }
+
+}

src/com/savoirfairelinux/sflphone/loaders/ContactsLoader.java

diff --git a/src/com/savoirfairelinux/sflphone/loaders/ContactsLoader.java b/src/com/savoirfairelinux/sflphone/loaders/ContactsLoader.java
index 495ebc6..61ebcc3 100644
--- a/src/com/savoirfairelinux/sflphone/loaders/ContactsLoader.java
+++ b/src/com/savoirfairelinux/sflphone/loaders/ContactsLoader.java
@@ -52,7 +52,7 @@
 
             while (cPhones.moveToNext()) {
                 builder.addPhoneNumber(cPhones.getString(cPhones.getColumnIndex(Phone.NUMBER)), cPhones.getInt(cPhones.getColumnIndex(Phone.TYPE)));
-                Log.i(TAG,"Phone:"+cPhones.getString(cPhones.getColumnIndex(Phone.NUMBER)));
+//                Log.i(TAG,"Phone:"+cPhones.getString(cPhones.getColumnIndex(Phone.NUMBER)));
             }
             cPhones.close();
 
@@ -61,7 +61,7 @@
 
             while (cSip.moveToNext()) {
                 builder.addSipNumber(cSip.getString(cSip.getColumnIndex(SipAddress.SIP_ADDRESS)), cSip.getInt(cSip.getColumnIndex(SipAddress.TYPE)));
-                Log.i(TAG,"Phone:"+cSip.getString(cSip.getColumnIndex(SipAddress.SIP_ADDRESS)));
+//                Log.i(TAG,"Phone:"+cSip.getString(cSip.getColumnIndex(SipAddress.SIP_ADDRESS)));
             }
             cSip.close();