lint: ressources clean up.

res/layout/frag_history_detail.xml

@@ -20,7 +20,7 @@
             android:layout_marginTop="30dp" />
 
         <LinearLayout
-            android:id="@+id/call_main_action"
+            android:id="@+id/contact_name_holder"
             android:layout_width="0dp"
             android:layout_height="50dp"
             android:layout_alignParentBottom="true"
@@ -34,7 +34,7 @@
                 android:id="@+id/history_call_name"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:gravity="center_vertical"
+                android:gravity="center"
                 android:singleLine="true"
                 android:textSize="18sp" />
         </LinearLayout>
@@ -45,7 +45,45 @@
     <org.sflphone.views.parallaxscrollview.AnotherView
         android:id="@+id/anotherView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:id="@+id/call_main_action"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:padding="5dp" >
+
+            <TextView
+                android:id="@+id/history_entry_number"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                android:singleLine="true"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/history_entry_number_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:singleLine="true"
+                android:textSize="18sp" />
+
+            <View
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_toLeftOf="@+id/history_entry_text_message"
+                android:background="@drawable/divider" />
+
+            <ImageButton
+                android:id="@+id/history_entry_text_message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true" />
+        </RelativeLayout>
 
         <LinearLayout
             android:id="@+id/llMainHolder"

res/values-fr/strings.xml

@@ -48,23 +48,17 @@ as that of the covered work.
     <!-- AB menus -->
     <string name="ab_account_creation">Nouveau compte</string>
     <string name="ab_account_edition_1">Supprimer</string>
-    <string name="ab_account_edition_2">Éditer</string>
     <string name="ab_action_chat">Message Texte</string>
 
     <!-- Left Drawer -->
     <!-- Accessibility -->
     <string name="drawer_open">Ouvrir le tiroir de navigation</string>
     <string name="drawer_close">Fermer le tiroir de navigation</string>
-
-    <!-- Categories -->
-    <string name="menu_category_settings">Paramètres</string>
-    <string name="menu_category_help">Aide</string>
-
-    <!-- Settings -->
+    <!-- Sections -->
     <string name="menu_item_home">Accueil</string>
     <string name="menu_item_accounts">Gérer les comptes</string>
     <string name="menu_item_settings">Paramètres</string>
-    <string name="menu_item_settings_interface">Interface</string>
+    <string name="menu_item_about">À propos de SFLphone</string>
 
     <!-- Dialing Fragment -->
     <string name="dial_action_call">Appeler</string>
@@ -74,7 +68,6 @@ as that of the covered work.
     <!-- History Fragment -->
     <string name="hist_replay_button">Écouter</string>
     <string name="hist_replay_button_stop">Stop</string>
-    <string name="hist_missed_calls">Manqué:%1$d</string>
     <string name="hist_in_calls">Entrant:%1$d</string>
     <string name="hist_out_calls">Sortant:%1$d</string>
     <string name="hist_no_history">Pas d\'historique</string>
@@ -84,6 +77,7 @@ as that of the covered work.
     <string name="home_calls_title">Appels</string>
     <string name="home_transfering">Transfert de %1$s à %1$s</string>
     <string name="home_transfer_complet">Transfert terminé</string>
+    <string name="home_conf_item">%1$s participants</string>
 
     <!-- ContactList Fragment -->
     <string name="no_contact_found">Aucun contact trouvé</string>
@@ -94,10 +88,6 @@ as that of the covered work.
     <string name="transfer_no_other_call">Aucun appel</string>
     <string name="transfer_type_number">Entrez un numéro</string>
 
-    <!-- Help -->
-    <string name="menu_item_help_gestures">Gestures</string>
-    <string name="menu_item_about">À propos de SFLphone</string>
-    
     <!-- FileExplorerDFragement -->
     <string name="file_explorer_title">Sélectionner un fichier</string>
 

res/values-fr/strings_account.xml

@@ -34,11 +34,6 @@
 
     <!-- Advanced Details -->
     <string name="account_preferences_advanced_tab">Avancé</string>
-    <string name="account_routeset_label">Route Set</string>
-    <string name="account_realm_label">Realm</string>
-    <string name="account_type_label">Account Type</string>
-    <string name="account_mailbox_label">Mailbox</string>
-    <string name="account_enabled_label">Account Enabled</string>
     <string name="account_registration_exp_label">Registration Expire</string>
     <string name="account_registration_status_label">Registration Status</string>
     <string name="account_registration_code_label">Registration Code</string>
@@ -84,6 +79,6 @@
     <string name="account_tls_require_client_certificat_label">TLS Require Client Certificate</string>
     <string name="account_tls_negotiation_timeout_sec">TLS Negotiation Timeout (sec)</string>
     <string name="account_tls_negotiation_timeout_msec">TLS Negotiation Timeout (msec)</string>
-    <string name="account_alias_field">Alias</string>
+
 
 </resources>
\ No newline at end of file

res/values-fr/strings_content_description.xml

+<resources>
+
+    <!-- Strings for xml content description of images -->
+    <string name="contact_quick_call_description">Quick Call</string>
+    <string name="contact_quick_msg_description">Quick Message</string>
+    <string name="contact_quick_starred_description">Quick Starred</string>
+    <string name="contact_quick_edit_description">Quick Edit</string>
+    <string name="contact_quick_discard_description">Quick Discard</string>
+    <string name="contact_picture_description">Contact Picture</string>
+    <string name="dial_numeric_pad">Numeric dialpad</string>
+    <string name="dial_alphabetic_pad">Alphabetic dialpad</string>
+
+</resources>
\ No newline at end of file

res/values/arrays.xml

@@ -34,33 +34,21 @@ as that of the covered work.
     <string-array name="menu_items_param">
         <item>@string/menu_item_accounts</item>
         <item>@string/menu_item_about</item>
-        <!-- <item>@string/menu_item_settings_interface</item> -->
-    </string-array>
-    <string-array name="menu_items_help">
-
-        <!-- <item>@string/menu_item_help_gestures</item> -->
-        <item>@string/menu_item_about</item>
-    </string-array>
-    <string-array name="call_actions">
-        <item>@string/action_call_attended_transfer</item>
-        <item>@string/action_call_unattended_transfer</item>
-        <item>@string/action_call_conference</item>
-        <item>@string/action_call_hold</item>
     </string-array>
     <string-array name="drop_actions">
         <item>@string/action_call_attended_transfer</item>
         <item>@string/action_call_conference</item>
     </string-array>
-    <string-array name="srtp_entry_values">
-        <item>NONE</item>
-        <item>ZRTP</item>
-        <item>SDES</item>
-    </string-array>
-    <string-array name="srtp_entry">
-        <item>@string/account_srtp_deactivated</item>
-        <item>ZRTP</item>
-        <item>SDES</item>
-    </string-array>
+    <!-- <string-array name="srtp_entry_values"> -->
+    <!-- <item>NONE</item> -->
+    <!-- <item>ZRTP</item> -->
+    <!-- <item>SDES</item> -->
+    <!-- </string-array> -->
+    <!-- <string-array name="srtp_entry"> -->
+    <!-- <item>@string/account_srtp_deactivated</item> -->
+    <!-- <item>ZRTP</item> -->
+    <!-- <item>SDES</item> -->
+    <!-- </string-array> -->
     <string-array name="dtmf_types_values">
         <item>overrtp</item>
         <item>sipinfo</item>

res/values/strings.xml

@@ -48,22 +48,17 @@ as that of the covered work.
     <!-- AB menus -->
     <string name="ab_account_creation">New account</string>
     <string name="ab_account_edition_1">Delete</string>
-    <string name="ab_account_edition_2">Edit</string>
+    <string name="ab_action_chat">Message Texte</string>
 
     <!-- Left Drawer -->
     <!-- Accessibility -->
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
-
-    <!-- Categories -->
-    <string name="menu_category_settings">Settings</string>
-    <string name="menu_category_help">Help</string>
-
-    <!-- Settings -->
+    <!-- Sections -->
     <string name="menu_item_home">Home</string>
-    <string name="menu_item_accounts">Manage Accounts</string>
+    <string name="menu_item_accounts">Manage accounts</string>
     <string name="menu_item_settings">Settings</string>
-    <string name="menu_item_settings_interface">Interface</string>
+    <string name="menu_item_about">About SFLphone</string>
 
     <!-- Dialing Fragment -->
     <string name="dial_action_call">Call</string>
@@ -74,7 +69,6 @@ as that of the covered work.
     <string name="hist_replay_button">Replay</string>
     <string name="hist_replay_button_stop">Stop</string>
     <string name="hist_no_history">No history</string>
-    <string name="hist_missed_calls">Missed:%1$d</string>
     <string name="hist_in_calls">In:%1$d</string>
     <string name="hist_out_calls">Out:%1$d</string>
 
@@ -89,10 +83,6 @@ as that of the covered work.
     <string name="no_contact_found">No contact found</string>
     <string name="starred_contacts_title">Favorites</string>
 
-    <!-- Help -->
-    <string name="menu_item_help_gestures">Gestures</string>
-    <string name="menu_item_about">About SFLphone</string>
-
     <!-- FileExplorerDFragement -->
     <string name="file_explorer_title">Select a file</string>
 
@@ -109,12 +99,8 @@ as that of the covered work.
     <string name="me">Me</string>
     <string name="action_call_attended_transfer">Attended Transfer</string>
     <string name="action_call_unattended_transfer">Unattended transfer</string>
-    <string name="action_call_general_transfer">Transfer</string>
     <string name="action_call_conference">Conference</string>
     <string name="action_call_hold">Hold</string>
-    <string name="action_call_unhold">Unhold</string>
-    <string name="action_call_record">Record</string>
-    <string name="action_call_stop_record">Stop Recording</string>
     <string name="action_settings">Settings</string>
     <string name="copyright">Copyright \u00A9 2004&#8211;2013 Savoir-Faire Linux Inc.</string>
     <string name="web_site">Website</string>

src/org/sflphone/account/AccountCredentials.java

@@ -20,9 +20,9 @@ public class AccountCredentials implements AccountDetail {
     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;
     }
@@ -38,7 +38,6 @@ public class AccountCredentials implements AccountDetail {
             p.mValue = pref.get(p.mKey);
         }
 
-        
     }
 
     public AccountCredentials(ArrayList<String> pref) {
@@ -104,9 +103,12 @@ public class AccountCredentials implements AccountDetail {
     @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));
+            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;
     }

src/org/sflphone/account/AccountDetail.java

@@ -31,28 +31,24 @@ public interface AccountDetail {
 
     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;
         }

src/org/sflphone/account/AccountDetailAdvanced.java

@@ -58,23 +58,23 @@ public class AccountDetailAdvanced implements AccountDetail {
     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;
     }

src/org/sflphone/account/AccountDetailBasic.java

@@ -45,23 +45,21 @@ public class AccountDetailBasic implements AccountDetail {
     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;
     }

src/org/sflphone/account/AccountDetailSrtp.java

@@ -46,14 +46,14 @@ public class AccountDetailSrtp implements AccountDetail {
     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;
     }

src/org/sflphone/account/AccountDetailTls.java

@@ -53,20 +53,20 @@ public class AccountDetailTls implements AccountDetail {
     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;
     }

src/org/sflphone/adapters/AccountSelectionAdapter.java

@@ -65,6 +65,9 @@ public class AccountSelectionAdapter extends BaseAdapter {
         }
 
         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);
         if (pos == selectedAccount) {

src/org/sflphone/adapters/MenuAdapter.java

-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

src/org/sflphone/fragments/DetailsHistoryEntryFragment.java

@@ -140,7 +140,13 @@ public class DetailsHistoryEntryFragment extends Fragment {
         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 @@ public class DetailsHistoryEntryFragment extends Fragment {
             }
         });
 
-        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

src/org/sflphone/fragments/MenuFragment.java

@@ -35,10 +35,6 @@ import java.util.ArrayList;
 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 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
     @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 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
         } catch (Exception e1) {
 
         }
-        getLoaderManager().initLoader(LoaderConstants.ACCOUNTS_LOADER, null, this);
+        
 
     }
 
@@ -130,8 +125,6 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        mAdapter = new MenuAdapter(getActivity());
         accountReceiver = new AccountsReceiver(this);
     }
 
@@ -142,6 +135,7 @@ public class MenuFragment extends Fragment implements LoaderCallbacks<Bundle>, A
         intentFilter2.addAction(ConfigurationManagerCallback.ACCOUNT_STATE_CHANGED);
         intentFilter2.addAction(ConfigurationManagerCallback.ACCOUNTS_CHANGED);
         getActivity().registerReceiver(accountReceiver, intentFilter2);
+        getLoaderManager().initLoader(LoaderConstants.ACCOUNTS_LOADER, null, this);
 
     }