diff --git a/src/fr/unix_experience/owncloud_sms/activities/restore_sms/AccountListActivity.java b/src/fr/unix_experience/owncloud_sms/activities/restore_sms/AccountListActivity.java index 9f0c63c..24d9791 100644 --- a/src/fr/unix_experience/owncloud_sms/activities/restore_sms/AccountListActivity.java +++ b/src/fr/unix_experience/owncloud_sms/activities/restore_sms/AccountListActivity.java @@ -13,15 +13,11 @@ public class AccountListActivity extends ListActivity { ArrayList listItems = new ArrayList(); AndroidAccountAdapter adapter; - private static String _accountType; - private static AccountManager _accountMgr; - @Override public void onCreate(final Bundle icicle) { super.onCreate(icicle); - _accountType = getString(R.string.account_type); - _accountMgr = AccountManager.get(getBaseContext()); + final AccountManager _accountMgr = AccountManager.get(getBaseContext()); setContentView(R.layout.restore_activity_accountlist); adapter = new AndroidAccountAdapter(this, @@ -31,8 +27,9 @@ public class AccountListActivity extends ListActivity { R.id.accountname, ContactListActivity.class); setListAdapter(adapter); - final Account[] myAccountList = _accountMgr.getAccountsByType(_accountType); - for (final Account element : myAccountList) { + final Account[] accountList = + _accountMgr.getAccountsByType(getString(R.string.account_type)); + for (final Account element : accountList) { listItems.add(element); } diff --git a/src/fr/unix_experience/owncloud_sms/activities/restore_sms/ContactListActivity.java b/src/fr/unix_experience/owncloud_sms/activities/restore_sms/ContactListActivity.java index 2b9b335..7dcd9c7 100644 --- a/src/fr/unix_experience/owncloud_sms/activities/restore_sms/ContactListActivity.java +++ b/src/fr/unix_experience/owncloud_sms/activities/restore_sms/ContactListActivity.java @@ -1,7 +1,10 @@ package fr.unix_experience.owncloud_sms.activities.restore_sms; +import android.accounts.Account; +import android.accounts.AccountManager; import android.app.ListActivity; import android.os.Bundle; +import fr.unix_experience.owncloud_sms.R; public class ContactListActivity extends ListActivity { @@ -9,5 +12,25 @@ public class ContactListActivity extends ListActivity { protected void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); + final String accountName = savedInstanceState.getString("account"); + // Impossible... need to handle this later, in case of + if (accountName == null) { + return; + } + + final AccountManager _accountMgr = AccountManager.get(getBaseContext()); + final Account[] myAccountList = + _accountMgr.getAccountsByType(getString(R.string.account_type)); + for (final Account element : myAccountList) { + if (element.name.equals(accountName)) { + loadContacts(element); + return; + } + } + } + + // This function fetch contacts from the ownCloud instance and generate the list activity + private void loadContacts(final Account account) { + } }