commit d2e9e06c150812608331388d98cbbb56ae19c7fa
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Oct 21 16:27:33 2013 -0400
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Oct 21 16:27:33 2013 -0400
tree 1c0a97f20251c493de6ab669169adcc63b3f9ecc
parent 4fb226212fdd1a78854b5f85a0f2c17649bdcb81

* #31603: display account IP2IP (was hidden until now)

src/org/sflphone/fragments/AccountManagementFragment.java

diff --git a/src/org/sflphone/fragments/AccountManagementFragment.java b/src/org/sflphone/fragments/AccountManagementFragment.java
index 8602a75..a458397 100644
--- a/src/org/sflphone/fragments/AccountManagementFragment.java
+++ b/src/org/sflphone/fragments/AccountManagementFragment.java
@@ -75,7 +75,7 @@
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.TextView;
 
-public class AccountManagementFragment extends ListFragment implements LoaderCallbacks<ArrayList<Account>>, AccountsInterface {
+public class AccountManagementFragment extends ListFragment implements LoaderCallbacks<Bundle>, AccountsInterface {
     static final String TAG = "AccountManagementFragment";
     static final String DEFAULT_ACCOUNT_ID = "IP2IP";
     static final int ACCOUNT_CREATE_REQUEST = 1;
@@ -98,7 +98,6 @@
             }
         }
 
-       
     };
 
     private Callbacks mCallbacks = sDummyCallbacks;
@@ -171,7 +170,7 @@
             }
         });
 
-         list.setEmptyView(view.findViewById(android.R.id.empty));
+        list.setEmptyView(view.findViewById(android.R.id.empty));
     }
 
     @Override
@@ -191,22 +190,22 @@
     }
 
     @Override
-    public Loader<ArrayList<Account>> onCreateLoader(int id, Bundle args) {
+    public Loader<Bundle> onCreateLoader(int id, Bundle args) {
         AccountsLoader l = new AccountsLoader(getActivity(), mCallbacks.getService());
 
         l.forceLoad();
-
         return l;
     }
 
     @Override
-    public void onLoadFinished(Loader<ArrayList<Account>> loader, ArrayList<Account> results) {
+    public void onLoadFinished(Loader<Bundle> loader, Bundle bun) {
         mAdapter.removeAll();
-        mAdapter.addAll(results);
+        ArrayList<Account> accounts = bun.getParcelableArrayList(AccountsLoader.ACCOUNTS);
+        mAdapter.addAll(accounts);
     }
 
     @Override
-    public void onLoaderReset(Loader<ArrayList<Account>> arg0) {
+    public void onLoaderReset(Loader<Bundle> arg0) {
         // TODO Auto-generated method stub
 
     }
@@ -235,12 +234,7 @@
 
         Intent intent = new Intent().setClass(getActivity(), AccountEditionActivity.class);
         Bundle bundle = new Bundle();
-        bundle.putString("AccountID", acc.getAccountID());
-        bundle.putSerializable(AccountDetailBasic.BUNDLE_TAG, acc.getBasicDetails().getDetailsHashMap());
-        bundle.putSerializable(AccountDetailAdvanced.BUNDLE_TAG, acc.getAdvancedDetails().getDetailsHashMap());
-        bundle.putSerializable(AccountDetailSrtp.BUNDLE_TAG, acc.getSrtpDetails().getDetailsHashMap());
-        bundle.putSerializable(AccountDetailTls.BUNDLE_TAG, acc.getTlsDetails().getDetailsHashMap());
-
+        bundle.putParcelable("account", acc);
         intent.putExtras(bundle);
 
         startActivityForResult(intent, ACCOUNT_EDIT_REQUEST);
@@ -286,9 +280,9 @@
             accounts.remove(item);
             notifyDataSetChanged();
         }
-        
+
         @Override
-        public boolean hasStableIds(){
+        public boolean hasStableIds() {
             return true;
         }
 
@@ -386,7 +380,7 @@
             }
 
         }
-        
+
         private String generateAccountOrder() {
             String result = DEFAULT_ACCOUNT_ID + File.separator;
             for (Account a : accounts) {