* #30591: modified default option of dtmf
* strings: fixed warning
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 856112e..ec35667e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -95,7 +95,7 @@
<string name="account_registration_code_label">Registration Code</string>
<string name="account_registration_state_label">Registration State</string>
<string name="account_credential_count_label">Credential Count</string>
- <string name="account_config_dtmf_type_label">DTMF Type</string>
+ <string name="account_config_dtmf_type_label">overrtp</string>
<string name="account_ringtone_path_label">Ringtone</string>
<string name="account_ringtone_enabled_label">Ringtone Enabled</string>
<string name="account_keep_alive_label">Keep Alive</string>
@@ -177,7 +177,7 @@
<string name="action_call_stop_record">Stop Recording</string>
<string name="title_activity_activity_holder">ActivityHolder</string>
<string name="action_settings">Settings</string>
- <string name="copyright">Copyright \u00A9 2004-2013 Savoir-Faire Linux Inc.</string>
+ <string name="copyright">Copyright \u00A9 2004#8211;2013 Savoir-Faire Linux Inc.</string>
<string name="help_gestures"> This view will help users with different interactions during calls. Different actions will be described; Long press, fling, swype etc.</string>
diff --git a/src/com/savoirfairelinux/sflphone/account/AccountDetailAdvanced.java b/src/com/savoirfairelinux/sflphone/account/AccountDetailAdvanced.java
index ca63767..56269b5 100644
--- a/src/com/savoirfairelinux/sflphone/account/AccountDetailAdvanced.java
+++ b/src/com/savoirfairelinux/sflphone/account/AccountDetailAdvanced.java
@@ -51,11 +51,11 @@
public static final String CONFIG_PUBLISHED_PORT = "Account.publishedPort";
public static final String CONFIG_PUBLISHED_ADDRESS = "Account.publishedAddress";
- // FIXME: Why isn't this 5060?
+
public static final String CONFIG_DEFAULT_LOCAL_PORT = "5060";
public static final String CONFIG_DEFAULT_PUBLISHED_PORT = "5060";
public static final String CONFIG_DEFAULT_PUBLISHED_SAMEAS_LOCAL = "true";
- // FIXME: Why isn't this "default"?
+
public static final String CONFIG_DEFAULT_INTERFACE = "default";
public static final String CONFIG_DEFAULT_REGISTRATION_EXPIRE = "60";
@@ -64,6 +64,11 @@
public static final String CONFIG_STUN_SERVER = "STUN.server";
public static final String CONFIG_STUN_ENABLE = "STUN.enable";
+
+ public static final String CONFIG_DEFAULT_DTMF_TYPE = "overrtp";
+
+ public static final String TRUE_STR = "true";
+ public static final String FALSE_STR = "false";
private ArrayList<AccountDetail.PreferenceEntry> privateArray;
diff --git a/src/com/savoirfairelinux/sflphone/account/AccountDetailsHandler.java b/src/com/savoirfairelinux/sflphone/account/AccountDetailsHandler.java
index da01569..0596bee 100644
--- a/src/com/savoirfairelinux/sflphone/account/AccountDetailsHandler.java
+++ b/src/com/savoirfairelinux/sflphone/account/AccountDetailsHandler.java
@@ -24,6 +24,8 @@
import java.util.ArrayList;
import java.util.HashMap;
+import android.util.Log;
+
import com.savoirfairelinux.sflphone.R;
import com.savoirfairelinux.sflphone.service.StringMap;
@@ -132,6 +134,7 @@
swigmap.set(AccountDetailAdvanced.CONFIG_ACCOUNT_REGISTRATION_STATE_CODE, nativemap.get(AccountDetailAdvanced.CONFIG_ACCOUNT_REGISTRATION_STATE_CODE));
swigmap.set(AccountDetailAdvanced.CONFIG_ACCOUNT_REGISTRATION_STATE_DESC, nativemap.get(AccountDetailAdvanced.CONFIG_ACCOUNT_REGISTRATION_STATE_DESC));
swigmap.set(AccountDetailAdvanced.CONFIG_ACCOUNT_AUTOANSWER, nativemap.get(AccountDetailAdvanced.CONFIG_ACCOUNT_AUTOANSWER));
+
swigmap.set(AccountDetailAdvanced.CONFIG_ACCOUNT_DTMF_TYPE, nativemap.get(AccountDetailAdvanced.CONFIG_ACCOUNT_DTMF_TYPE));
swigmap.set(AccountDetailAdvanced.CONFIG_KEEP_ALIVE_ENABLED, nativemap.get(AccountDetailAdvanced.CONFIG_KEEP_ALIVE_ENABLED));
swigmap.set(AccountDetailAdvanced.CONFIG_LOCAL_PORT, nativemap.get(AccountDetailAdvanced.CONFIG_LOCAL_PORT));