* #30591: dtmf tones sent during call
diff --git a/src/com/savoirfairelinux/sflphone/fragments/AccountCreationFragment.java b/src/com/savoirfairelinux/sflphone/fragments/AccountCreationFragment.java
index 5103e4b..6a864d5 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/AccountCreationFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/AccountCreationFragment.java
@@ -173,18 +173,18 @@
accountDetails.put(AccountDetailAdvanced.CONFIG_ACCOUNT_REGISTRATION_STATUS, "");
accountDetails.put(AccountDetailAdvanced.CONFIG_ACCOUNT_REGISTRATION_STATE_CODE, "");
accountDetails.put(AccountDetailAdvanced.CONFIG_ACCOUNT_REGISTRATION_STATE_DESC, "");
- accountDetails.put(AccountDetailAdvanced.CONFIG_ACCOUNT_AUTOANSWER, "");
- accountDetails.put(AccountDetailAdvanced.CONFIG_ACCOUNT_DTMF_TYPE, "");
- accountDetails.put(AccountDetailAdvanced.CONFIG_KEEP_ALIVE_ENABLED, "");
+ accountDetails.put(AccountDetailAdvanced.CONFIG_ACCOUNT_AUTOANSWER, AccountDetailAdvanced.FALSE_STR);
+ accountDetails.put(AccountDetailAdvanced.CONFIG_ACCOUNT_DTMF_TYPE, AccountDetailAdvanced.CONFIG_DEFAULT_DTMF_TYPE);
+ accountDetails.put(AccountDetailAdvanced.CONFIG_KEEP_ALIVE_ENABLED, AccountDetailAdvanced.FALSE_STR);
accountDetails.put(AccountDetailAdvanced.CONFIG_STUN_SERVER, "");
accountDetails.put(AccountDetailAdvanced.CONFIG_PUBLISHED_SAMEAS_LOCAL, AccountDetailAdvanced.CONFIG_DEFAULT_PUBLISHED_SAMEAS_LOCAL);
- accountDetails.put(AccountDetailAdvanced.CONFIG_RINGTONE_ENABLED, "false");
+ accountDetails.put(AccountDetailAdvanced.CONFIG_RINGTONE_ENABLED, AccountDetailAdvanced.FALSE_STR);
accountDetails.put(AccountDetailAdvanced.CONFIG_RINGTONE_PATH, "");
- accountDetails.put(AccountDetailAdvanced.CONFIG_STUN_ENABLE, "false");
+ accountDetails.put(AccountDetailAdvanced.CONFIG_STUN_ENABLE, AccountDetailAdvanced.FALSE_STR);
accountDetails.put(AccountDetailSrtp.CONFIG_SRTP_KEY_EXCHANGE, "");
accountDetails.put(AccountDetailSrtp.CONFIG_SRTP_RTP_FALLBACK, "");
- accountDetails.put(AccountDetailSrtp.CONFIG_SRTP_ENABLE, "");
+ accountDetails.put(AccountDetailSrtp.CONFIG_SRTP_ENABLE, AccountDetailAdvanced.FALSE_STR);
accountDetails.put(AccountDetailSrtp.CONFIG_SRTP_KEY_EXCHANGE, "");
accountDetails.put(AccountDetailSrtp.CONFIG_ZRTP_DISPLAY_SAS, "");
accountDetails.put(AccountDetailSrtp.CONFIG_ZRTP_DISPLAY_SAS_ONCE, "");
@@ -195,12 +195,12 @@
accountDetails.put(AccountDetailTls.CONFIG_TLS_CIPHERS, "");
accountDetails.put(AccountDetailTls.CONFIG_TLS_LISTENER_PORT, "");
accountDetails.put(AccountDetailTls.CONFIG_TLS_METHOD, "");
- accountDetails.put(AccountDetailTls.CONFIG_TLS_ENABLE, "");
+ accountDetails.put(AccountDetailTls.CONFIG_TLS_ENABLE, AccountDetailAdvanced.FALSE_STR);
accountDetails.put(AccountDetailTls.CONFIG_TLS_PASSWORD, "");
accountDetails.put(AccountDetailTls.CONFIG_TLS_PRIVATE_KEY_FILE, "");
accountDetails.put(AccountDetailTls.CONFIG_TLS_SERVER_NAME, "");
- accountDetails.put(AccountDetailTls.CONFIG_TLS_REQUIRE_CLIENT_CERTIFICATE, "false");
+ accountDetails.put(AccountDetailTls.CONFIG_TLS_REQUIRE_CLIENT_CERTIFICATE, AccountDetailAdvanced.FALSE_STR);
accountDetails.put(AccountDetailTls.CONFIG_TLS_LISTENER_PORT, "");
accountDetails.put(AccountDetailTls.CONFIG_TLS_VERIFY_CLIENT, "");
accountDetails.put(AccountDetailTls.CONFIG_TLS_CERTIFICATE_FILE, "");
diff --git a/src/com/savoirfairelinux/sflphone/fragments/CallFragment.java b/src/com/savoirfairelinux/sflphone/fragments/CallFragment.java
index b8d031b..269b3da 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/CallFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/CallFragment.java
@@ -534,9 +534,9 @@
public void onKeyUp(int keyCode, KeyEvent event) {
try {
- String toSend = "" + event.getDisplayLabel();
- Log.d(TAG,"toSend "+toSend);
+ String toSend = Character.toString(event.getDisplayLabel());
toSend.toUpperCase(Locale.getDefault());
+ Log.d(TAG,"toSend "+toSend);
mCallbacks.getService().playDtmf(toSend);
} catch (RemoteException e) {
e.printStackTrace();
diff --git a/src/com/savoirfairelinux/sflphone/receivers/IncomingReceiver.java b/src/com/savoirfairelinux/sflphone/receivers/IncomingReceiver.java
index 60b91f3..362ddb8 100644
--- a/src/com/savoirfairelinux/sflphone/receivers/IncomingReceiver.java
+++ b/src/com/savoirfairelinux/sflphone/receivers/IncomingReceiver.java
@@ -33,7 +33,8 @@
mBinder = bind;
}
- @SuppressWarnings("unchecked") // Hashmap runtime cast
+ @SuppressWarnings("unchecked")
+ // Hashmap runtime cast
@Override
public void onReceive(Context context, Intent intent) {
@@ -88,7 +89,19 @@
if (newState.equals("INCOMING")) {
callback.getCurrent_calls().get(b.getString("CallID")).setCallState(SipCall.state.CALL_STATE_INCOMING);
} else if (newState.equals("RINGING")) {
- callback.getCurrent_calls().get(b.getString("CallID")).setCallState(SipCall.state.CALL_STATE_RINGING);
+ try {
+ callback.getCurrent_calls().get(b.getString("CallID")).setCallState(SipCall.state.CALL_STATE_RINGING);
+ } catch (NullPointerException e) {
+ if (callback.getCurrent_calls() == null) {
+ Log.e(TAG, "Current calls null");
+ return;
+ }
+ if (callback.getCurrent_calls().get(b.getString("CallID")) == null) {
+ Log.e(TAG, "get(b.getString(callID)) null");
+ return;
+ }
+ }
+
} else if (newState.equals("CURRENT")) {
if (callback.getCurrent_calls().get(b.getString("CallID")) != null) {
callback.getCurrent_calls().get(b.getString("CallID")).setCallState(SipCall.state.CALL_STATE_CURRENT);