lint: ressources clean up.
diff --git a/src/org/sflphone/account/AccountCredentials.java b/src/org/sflphone/account/AccountCredentials.java
index 0f13e50..90c3f8c 100644
--- a/src/org/sflphone/account/AccountCredentials.java
+++ b/src/org/sflphone/account/AccountCredentials.java
@@ -20,9 +20,9 @@
public static ArrayList<AccountDetail.PreferenceEntry> getPreferenceEntries() {
ArrayList<AccountDetail.PreferenceEntry> preference = new ArrayList<AccountDetail.PreferenceEntry>();
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_USERNAME, R.string.account_username_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_PASSWORD, R.string.account_password_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REALM, R.string.account_realm_label));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_USERNAME));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_PASSWORD));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REALM));
return preference;
}
@@ -37,8 +37,7 @@
for (AccountDetail.PreferenceEntry p : privateArray) {
p.mValue = pref.get(p.mKey);
}
-
-
+
}
public AccountCredentials(ArrayList<String> pref) {
@@ -100,14 +99,17 @@
}
}
-
+
@Override
- public boolean equals(Object other){
- if(other instanceof AccountCredentials)
- return ((AccountCredentials)other).getDetailsHashMap().get(CONFIG_ACCOUNT_USERNAME).contentEquals(getDetailString(CONFIG_ACCOUNT_USERNAME)) &&
- ((AccountCredentials)other).getDetailsHashMap().get(CONFIG_ACCOUNT_PASSWORD).contentEquals(getDetailString(CONFIG_ACCOUNT_PASSWORD)) &&
- ((AccountCredentials)other).getDetailsHashMap().get(CONFIG_ACCOUNT_REALM).contentEquals(getDetailString(CONFIG_ACCOUNT_REALM));
-
+ public boolean equals(Object other) {
+ if (other instanceof AccountCredentials)
+ return ((AccountCredentials) other).getDetailsHashMap().get(CONFIG_ACCOUNT_USERNAME)
+ .contentEquals(getDetailString(CONFIG_ACCOUNT_USERNAME))
+ && ((AccountCredentials) other).getDetailsHashMap().get(CONFIG_ACCOUNT_PASSWORD)
+ .contentEquals(getDetailString(CONFIG_ACCOUNT_PASSWORD))
+ && ((AccountCredentials) other).getDetailsHashMap().get(CONFIG_ACCOUNT_REALM)
+ .contentEquals(getDetailString(CONFIG_ACCOUNT_REALM));
+
return false;
}
diff --git a/src/org/sflphone/account/AccountDetail.java b/src/org/sflphone/account/AccountDetail.java
index 194bc3d..18cce9c 100644
--- a/src/org/sflphone/account/AccountDetail.java
+++ b/src/org/sflphone/account/AccountDetail.java
@@ -31,28 +31,24 @@
public static class PreferenceEntry {
public String mKey;
- public int mLabelId;
public boolean isTwoState;
public String mValue;
- public PreferenceEntry(String key, int labelId) {
+ public PreferenceEntry(String key) {
mKey = key;
- mLabelId = labelId;
isTwoState = false;
mValue = "";
}
- public PreferenceEntry(String key, int labelId, boolean twoState) {
+ public PreferenceEntry(String key, boolean twoState) {
mKey = key;
- mLabelId = labelId;
isTwoState = twoState;
mValue = "";
}
- public PreferenceEntry(String key, int labelId, boolean twoState, String value) {
+ public PreferenceEntry(String key, boolean twoState, String value) {
mKey = key;
- mLabelId = labelId;
isTwoState = twoState;
mValue = value;
}
diff --git a/src/org/sflphone/account/AccountDetailAdvanced.java b/src/org/sflphone/account/AccountDetailAdvanced.java
index e2a08e2..1ae4a10 100644
--- a/src/org/sflphone/account/AccountDetailAdvanced.java
+++ b/src/org/sflphone/account/AccountDetailAdvanced.java
@@ -58,23 +58,23 @@
public static ArrayList<AccountDetail.PreferenceEntry> getPreferenceEntries() {
ArrayList<AccountDetail.PreferenceEntry> preference = new ArrayList<AccountDetail.PreferenceEntry>();
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REGISTRATION_EXPIRE, R.string.account_registration_exp_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REGISTRATION_STATUS, R.string.account_registration_status_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REGISTRATION_STATE_CODE, R.string.account_registration_code_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REGISTRATION_STATE_DESC, R.string.account_registration_state_label));
- preference.add(new PreferenceEntry(CONFIG_CREDENTIAL_NUMBER, R.string.account_credential_count_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_DTMF_TYPE, R.string.account_config_dtmf_type_label));
- preference.add(new PreferenceEntry(CONFIG_RINGTONE_PATH, R.string.account_ringtone_path_label));
- preference.add(new PreferenceEntry(CONFIG_RINGTONE_ENABLED, R.string.account_ringtone_enabled_label, true));
- preference.add(new PreferenceEntry(CONFIG_KEEP_ALIVE_ENABLED, R.string.account_keep_alive_label, true));
- preference.add(new PreferenceEntry(CONFIG_LOCAL_INTERFACE, R.string.account_local_interface_label));
- preference.add(new PreferenceEntry(CONFIG_PUBLISHED_SAMEAS_LOCAL, R.string.account_published_same_as_local_label, true));
- preference.add(new PreferenceEntry(CONFIG_LOCAL_PORT, R.string.account_local_port_label));
- preference.add(new PreferenceEntry(CONFIG_PUBLISHED_PORT, R.string.account_published_port_label));
- preference.add(new PreferenceEntry(CONFIG_PUBLISHED_ADDRESS, R.string.account_published_address_label));
- preference.add(new PreferenceEntry(CONFIG_DISPLAY_NAME, R.string.account_displayname_label));
- preference.add(new PreferenceEntry(CONFIG_STUN_SERVER, R.string.account_stun_server_label));
- preference.add(new PreferenceEntry(CONFIG_STUN_ENABLE, R.string.account_stun_enable_label, true));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REGISTRATION_EXPIRE));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REGISTRATION_STATUS));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REGISTRATION_STATE_CODE));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REGISTRATION_STATE_DESC));
+ preference.add(new PreferenceEntry(CONFIG_CREDENTIAL_NUMBER));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_DTMF_TYPE));
+ preference.add(new PreferenceEntry(CONFIG_RINGTONE_PATH));
+ preference.add(new PreferenceEntry(CONFIG_RINGTONE_ENABLED, true));
+ preference.add(new PreferenceEntry(CONFIG_KEEP_ALIVE_ENABLED, true));
+ preference.add(new PreferenceEntry(CONFIG_LOCAL_INTERFACE));
+ preference.add(new PreferenceEntry(CONFIG_PUBLISHED_SAMEAS_LOCAL, true));
+ preference.add(new PreferenceEntry(CONFIG_LOCAL_PORT));
+ preference.add(new PreferenceEntry(CONFIG_PUBLISHED_PORT));
+ preference.add(new PreferenceEntry(CONFIG_PUBLISHED_ADDRESS));
+ preference.add(new PreferenceEntry(CONFIG_DISPLAY_NAME));
+ preference.add(new PreferenceEntry(CONFIG_STUN_SERVER));
+ preference.add(new PreferenceEntry(CONFIG_STUN_ENABLE, true));
return preference;
}
diff --git a/src/org/sflphone/account/AccountDetailBasic.java b/src/org/sflphone/account/AccountDetailBasic.java
index 66ea886..330a959 100644
--- a/src/org/sflphone/account/AccountDetailBasic.java
+++ b/src/org/sflphone/account/AccountDetailBasic.java
@@ -45,23 +45,21 @@
public static final String CONFIG_ACCOUNT_TYPE = "Account.type";
public static final String CONFIG_ACCOUNT_ENABLE = "Account.enable";
-
-
private ArrayList<AccountDetail.PreferenceEntry> privateArray;
public static ArrayList<AccountDetail.PreferenceEntry> getPreferenceEntries() {
ArrayList<AccountDetail.PreferenceEntry> preference = new ArrayList<AccountDetail.PreferenceEntry>();
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_ENABLE, R.string.account_enabled_label, true));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_TYPE, R.string.account_type_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_ALIAS, R.string.account_alias_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_HOSTNAME, R.string.account_hostname_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_USERNAME, R.string.account_username_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_ROUTESET, R.string.account_routeset_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_PASSWORD, R.string.account_password_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_AUTOANSWER, R.string.account_autoanswer_label, true));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REALM, R.string.account_realm_label));
- preference.add(new PreferenceEntry(CONFIG_ACCOUNT_USERAGENT, R.string.account_autoanswer_label));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_ENABLE, true));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_TYPE));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_ALIAS));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_HOSTNAME));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_USERNAME));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_ROUTESET));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_PASSWORD));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_AUTOANSWER, true));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_REALM));
+ preference.add(new PreferenceEntry(CONFIG_ACCOUNT_USERAGENT));
return preference;
}
diff --git a/src/org/sflphone/account/AccountDetailSrtp.java b/src/org/sflphone/account/AccountDetailSrtp.java
index 7f0cc75..009fc3d 100644
--- a/src/org/sflphone/account/AccountDetailSrtp.java
+++ b/src/org/sflphone/account/AccountDetailSrtp.java
@@ -46,14 +46,14 @@
public static ArrayList<AccountDetail.PreferenceEntry> getPreferenceEntries() {
ArrayList<AccountDetail.PreferenceEntry> preference = new ArrayList<AccountDetail.PreferenceEntry>();
- preference.add(new PreferenceEntry(CONFIG_SRTP_ENABLE, R.string.account_srtp_enabled_label, true));
- preference.add(new PreferenceEntry(CONFIG_SRTP_KEY_EXCHANGE, R.string.account_srtp_exchange_label, false));
- preference.add(new PreferenceEntry(CONFIG_SRTP_ENCRYPTION_ALGO, R.string.account_encryption_algo_label, true));
- preference.add(new PreferenceEntry(CONFIG_SRTP_RTP_FALLBACK, R.string.account_srtp_fallback_label, true));
- preference.add(new PreferenceEntry(CONFIG_ZRTP_HELLO_HASH, R.string.account_hello_hash_enable_label, true));
- preference.add(new PreferenceEntry(CONFIG_ZRTP_DISPLAY_SAS, R.string.account_display_sas_label, true));
- preference.add(new PreferenceEntry(CONFIG_ZRTP_NOT_SUPP_WARNING, R.string.account_not_supported_warning_label, true));
- preference.add(new PreferenceEntry(CONFIG_ZRTP_DISPLAY_SAS_ONCE, R.string.account_display_sas_once_label, true));
+ preference.add(new PreferenceEntry(CONFIG_SRTP_ENABLE, true));
+ preference.add(new PreferenceEntry(CONFIG_SRTP_KEY_EXCHANGE, false));
+ preference.add(new PreferenceEntry(CONFIG_SRTP_ENCRYPTION_ALGO, true));
+ preference.add(new PreferenceEntry(CONFIG_SRTP_RTP_FALLBACK, true));
+ preference.add(new PreferenceEntry(CONFIG_ZRTP_HELLO_HASH, true));
+ preference.add(new PreferenceEntry(CONFIG_ZRTP_DISPLAY_SAS, true));
+ preference.add(new PreferenceEntry(CONFIG_ZRTP_NOT_SUPP_WARNING, true));
+ preference.add(new PreferenceEntry(CONFIG_ZRTP_DISPLAY_SAS_ONCE, true));
return preference;
}
diff --git a/src/org/sflphone/account/AccountDetailTls.java b/src/org/sflphone/account/AccountDetailTls.java
index 3c45b9e..582a0fd 100644
--- a/src/org/sflphone/account/AccountDetailTls.java
+++ b/src/org/sflphone/account/AccountDetailTls.java
@@ -53,20 +53,20 @@
public static ArrayList<AccountDetail.PreferenceEntry> getPreferenceEntries() {
ArrayList<AccountDetail.PreferenceEntry> preference = new ArrayList<AccountDetail.PreferenceEntry>();
- preference.add(new PreferenceEntry(CONFIG_TLS_LISTENER_PORT, R.string.account_listener_port_label));
- preference.add(new PreferenceEntry(CONFIG_TLS_ENABLE, R.string.account_tls_enabled_label, true));
- preference.add(new PreferenceEntry(CONFIG_TLS_CA_LIST_FILE, R.string.account_tls_certificate_list_label));
- preference.add(new PreferenceEntry(CONFIG_TLS_CERTIFICATE_FILE, R.string.account_tls_certificate_file_label));
- preference.add(new PreferenceEntry(CONFIG_TLS_PRIVATE_KEY_FILE, R.string.account_tls_private_key_file_label));
- preference.add(new PreferenceEntry(CONFIG_TLS_PASSWORD, R.string.account_tls_password_label));
- preference.add(new PreferenceEntry(CONFIG_TLS_METHOD, R.string.account_tls_method_label));
- preference.add(new PreferenceEntry(CONFIG_TLS_CIPHERS, R.string.account_tls_ciphers_label));
- preference.add(new PreferenceEntry(CONFIG_TLS_SERVER_NAME, R.string.account_tls_server_name_label));
- preference.add(new PreferenceEntry(CONFIG_TLS_VERIFY_SERVER, R.string.account_tls_verify_label, true));
- preference.add(new PreferenceEntry(CONFIG_TLS_VERIFY_CLIENT, R.string.account_tls_verify_client_label, true));
- preference.add(new PreferenceEntry(CONFIG_TLS_REQUIRE_CLIENT_CERTIFICATE, R.string.account_tls_require_client_certificat_label, true));
- preference.add(new PreferenceEntry(CONFIG_TLS_NEGOTIATION_TIMEOUT_SEC, R.string.account_tls_negotiation_timeout_sec));
- preference.add(new PreferenceEntry(CONFIG_TLS_NEGOTIATION_TIMEOUT_MSEC, R.string.account_tls_negotiation_timeout_msec));
+ preference.add(new PreferenceEntry(CONFIG_TLS_LISTENER_PORT));
+ preference.add(new PreferenceEntry(CONFIG_TLS_ENABLE, true));
+ preference.add(new PreferenceEntry(CONFIG_TLS_CA_LIST_FILE));
+ preference.add(new PreferenceEntry(CONFIG_TLS_CERTIFICATE_FILE));
+ preference.add(new PreferenceEntry(CONFIG_TLS_PRIVATE_KEY_FILE));
+ preference.add(new PreferenceEntry(CONFIG_TLS_PASSWORD));
+ preference.add(new PreferenceEntry(CONFIG_TLS_METHOD));
+ preference.add(new PreferenceEntry(CONFIG_TLS_CIPHERS));
+ preference.add(new PreferenceEntry(CONFIG_TLS_SERVER_NAME));
+ preference.add(new PreferenceEntry(CONFIG_TLS_VERIFY_SERVER));
+ preference.add(new PreferenceEntry(CONFIG_TLS_VERIFY_CLIENT, true));
+ preference.add(new PreferenceEntry(CONFIG_TLS_REQUIRE_CLIENT_CERTIFICATE, true));
+ preference.add(new PreferenceEntry(CONFIG_TLS_NEGOTIATION_TIMEOUT_SEC));
+ preference.add(new PreferenceEntry(CONFIG_TLS_NEGOTIATION_TIMEOUT_MSEC));
return preference;
}
diff --git a/src/org/sflphone/adapters/AccountSelectionAdapter.java b/src/org/sflphone/adapters/AccountSelectionAdapter.java
index 961f39e..cb34f16 100644
--- a/src/org/sflphone/adapters/AccountSelectionAdapter.java
+++ b/src/org/sflphone/adapters/AccountSelectionAdapter.java
@@ -65,8 +65,11 @@
}
entryView.alias.setText(accounts.get(pos).getAlias());
+
+ Log.i(TAG, "getView:" + accounts.get(pos).getRegistered_state());
+
entryView.host.setText(accounts.get(pos).getHost() + " - " + accounts.get(pos).getRegistered_state());
-// accManager.displayAccountDetails(accounts.get(pos), entryView);
+ // accManager.displayAccountDetails(accounts.get(pos), entryView);
if (pos == selectedAccount) {
entryView.select.setVisibility(View.VISIBLE);
} else {
@@ -132,14 +135,14 @@
String result = DEFAULT_ACCOUNT_ID + File.separator;
String selectedID = accounts.get(selectedAccount).getAccountID();
result += selectedID + File.separator;
-
+
for (Account a : accounts) {
if (a.getAccountID().contentEquals(selectedID)) {
continue;
}
result += a.getAccountID() + File.separator;
}
-
+
return result;
}
diff --git a/src/org/sflphone/adapters/MenuAdapter.java b/src/org/sflphone/adapters/MenuAdapter.java
deleted file mode 100644
index 700d9e0..0000000
--- a/src/org/sflphone/adapters/MenuAdapter.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.sflphone.adapters;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.sflphone.R;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Adapter;
-import android.widget.ArrayAdapter;
-import android.widget.BaseAdapter;
-
-public class MenuAdapter extends BaseAdapter {
- public final Map<String, Adapter> sections = new LinkedHashMap<String, Adapter>();
- public final ArrayAdapter<String> headers;
- public final static int TYPE_SECTION_HEADER = 0;
-
- public MenuAdapter(Context context) {
- headers = new ArrayAdapter<String>(context, R.layout.item_menu_header);
- }
-
- public Object getItem(int position) {
- for (Object section : this.sections.keySet()) {
- Adapter adapter = sections.get(section);
- int size = adapter.getCount() + 1;
-
- // check if position inside this section
- if (position == 0)
- return section;
- if (position < size)
- return adapter.getItem(position - 1);
-
- // otherwise jump into next section
- position -= size;
- }
- return null;
- }
-
- public int getCount() {
- // total together all sections, plus one for each section header
- int total = 0;
- for (Adapter adapter : this.sections.values())
- total += adapter.getCount() + 1;
- return total;
- }
-
- @Override
- public int getViewTypeCount() {
- // assume that headers count as one, then total all sections
- int total = 1;
- for (Adapter adapter : this.sections.values())
- total += adapter.getViewTypeCount();
- return total;
- }
-
- @Override
- public int getItemViewType(int position) {
- int type = 1;
- for (Object section : this.sections.keySet()) {
- Adapter adapter = sections.get(section);
- int size = adapter.getCount() + 1;
-
- // check if position inside this section
- if (position == 0)
- return TYPE_SECTION_HEADER;
- if (position < size)
- return type + adapter.getItemViewType(position - 1);
-
- // otherwise jump into next section
- position -= size;
- type += adapter.getViewTypeCount();
- }
- return -1;
- }
-
- public boolean areAllItemsSelectable() {
- return false;
- }
-
- @Override
- public boolean isEnabled(int position) {
- return (getItemViewType(position) != TYPE_SECTION_HEADER);
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- int sectionnum = 0;
- for (Object section : this.sections.keySet()) {
- Adapter adapter = sections.get(section);
- int size = adapter.getCount() + 1;
-
- // check if position inside this section
- if (position == 0)
- return headers.getView(sectionnum, convertView, parent);
- if (position < size)
- return adapter.getView(position - 1, convertView, parent);
-
- // otherwise jump into next section
- position -= size;
- sectionnum++;
- }
- return null;
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
-}
\ No newline at end of file
diff --git a/src/org/sflphone/fragments/DetailsHistoryEntryFragment.java b/src/org/sflphone/fragments/DetailsHistoryEntryFragment.java
index 4affba3..7f03e3f 100644
--- a/src/org/sflphone/fragments/DetailsHistoryEntryFragment.java
+++ b/src/org/sflphone/fragments/DetailsHistoryEntryFragment.java
@@ -140,7 +140,13 @@
iv = (RelativeLayout) inflatedView.findViewById(R.id.iv);
((TextView) iv.findViewById(R.id.history_call_name)).setText(toDisplay.getContact().getmDisplayName());
- ((LinearLayout) iv.findViewById(R.id.call_main_action)).setOnClickListener(new OnClickListener() {
+
+ tasker = new ContactPictureTask(getActivity(), (ImageView) iv.findViewById(R.id.contact_photo), toDisplay.getContact());
+ tasker.run();
+ anotherView = (AnotherView) inflatedView.findViewById(R.id.anotherView);
+
+ ((TextView) anotherView.findViewById(R.id.history_entry_number)).setText(toDisplay.getNumber());
+ ((RelativeLayout) anotherView.findViewById(R.id.call_main_action)).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
@@ -149,10 +155,6 @@
}
});
- tasker = new ContactPictureTask(getActivity(), (ImageView) iv.findViewById(R.id.contact_photo), toDisplay.getContact());
- tasker.run();
- anotherView = (AnotherView) inflatedView.findViewById(R.id.anotherView);
-
lvMain.post(new Runnable() {
@Override
diff --git a/src/org/sflphone/fragments/MenuFragment.java b/src/org/sflphone/fragments/MenuFragment.java
index c59c4db..24693fe 100644
--- a/src/org/sflphone/fragments/MenuFragment.java
+++ b/src/org/sflphone/fragments/MenuFragment.java
@@ -35,10 +35,6 @@
import org.sflphone.R;
import org.sflphone.adapters.AccountSelectionAdapter;
import org.sflphone.adapters.ContactPictureTask;
-import org.sflphone.adapters.MenuAdapter;
-import org.sflphone.client.ActivityHolder;
-import org.sflphone.client.HomeActivity;
-import org.sflphone.client.AccountsManagementActivity;
import org.sflphone.interfaces.AccountsInterface;
import org.sflphone.loaders.AccountsLoader;
import org.sflphone.loaders.LoaderConstants;
@@ -74,7 +70,6 @@
@SuppressWarnings("unused")
private static final String TAG = MenuFragment.class.getSimpleName();
- MenuAdapter mAdapter;
String[] mProjection = new String[] { Profile._ID, Profile.DISPLAY_NAME_PRIMARY, Profile.LOOKUP_KEY, Profile.PHOTO_URI };
AccountSelectionAdapter mAccountAdapter;
private Spinner spinnerAccounts;
@@ -117,7 +112,7 @@
} catch (Exception e1) {
}
- getLoaderManager().initLoader(LoaderConstants.ACCOUNTS_LOADER, null, this);
+
}
@@ -130,8 +125,6 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
- mAdapter = new MenuAdapter(getActivity());
accountReceiver = new AccountsReceiver(this);
}
@@ -142,6 +135,7 @@
intentFilter2.addAction(ConfigurationManagerCallback.ACCOUNT_STATE_CHANGED);
intentFilter2.addAction(ConfigurationManagerCallback.ACCOUNTS_CHANGED);
getActivity().registerReceiver(accountReceiver, intentFilter2);
+ getLoaderManager().initLoader(LoaderConstants.ACCOUNTS_LOADER, null, this);
}