diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so index 6ce06a654..30246d373 100755 Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so index bd994d3a8..ba473f853 100755 Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ diff --git a/res/raw/linphonerc b/res/raw/linphonerc index 09d00c187..a38bdeccc 100644 --- a/res/raw/linphonerc +++ b/res/raw/linphonerc @@ -30,7 +30,6 @@ ringer_dev_id=ANDROID SND: Android Sound card capture_dev_id=ANDROID SND: Android Sound card remote_ring=/data/data/org.linphone/files/ringback.wav local_ring=/data/data/org.linphone/files/oldphone_mono.wav -ec_delay=400 ec_tail_len=200 diff --git a/src/org/linphone/BootReceiver.java b/src/org/linphone/BootReceiver.java index 36ce67def..d7fed7604 100644 --- a/src/org/linphone/BootReceiver.java +++ b/src/org/linphone/BootReceiver.java @@ -35,5 +35,4 @@ public class BootReceiver extends BroadcastReceiver { } } - } diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index e8907126c..7f924c80c 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -361,7 +361,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener { // TODO Auto-generated method stub } - public void generalState(LinphoneCore lc, GeneralState state) { + public void generalState(LinphoneCore lc, GeneralState state, String message) { if (state == GeneralState.GSTATE_POWER_ON) { mCall.setEnabled(!lc.isIncall()); @@ -413,7 +413,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener { } else if (state == GeneralState.GSTATE_CALL_ERROR) { if (mWakeLock.isHeld()) mWakeLock.release(); Toast toast = Toast.makeText(this - ,String.format(getString(R.string.call_error),lc.getRemoteAddress()) + ,String.format(getString(R.string.call_error),message) , Toast.LENGTH_LONG); toast.show(); exitCallMode(); diff --git a/src/org/linphone/LinphoneException.java b/src/org/linphone/LinphoneException.java index e24708d5e..61bcd1253 100644 --- a/src/org/linphone/LinphoneException.java +++ b/src/org/linphone/LinphoneException.java @@ -39,5 +39,4 @@ public class LinphoneException extends Exception { super(detailMessage, throwable); // TODO Auto-generated constructor stub } - } diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 33b2ae6e2..d953ff4f4 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -192,7 +192,7 @@ public class LinphoneService extends Service implements LinphoneCoreListener { // TODO Auto-generated method stub } - public void generalState(final LinphoneCore lc, final LinphoneCore.GeneralState state) { + public void generalState(final LinphoneCore lc, final LinphoneCore.GeneralState state, final String message) { Log.i(TAG, "new state ["+state+"]"); if (state == GeneralState.GSTATE_POWER_ON) { mNotification.iconLevel=IC_LEVEL_OFFLINE; @@ -226,7 +226,7 @@ public class LinphoneService extends Service implements LinphoneCoreListener { if (DialerActivity.getDialer()!=null) { mHandler.post(new Runnable() { public void run() { - DialerActivity.getDialer().generalState(lc,state); + DialerActivity.getDialer().generalState(lc,state,message); } }); } @@ -389,5 +389,5 @@ public class LinphoneService extends Service implements LinphoneCoreListener { theLinphone=null; mNotificationManager.cancel(NOTIFICATION_ID); } +} -} \ No newline at end of file diff --git a/submodules/linphone b/submodules/linphone index ab5503fca..61677ff44 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ab5503fca8ef3932bb5211396893012c9ef4ef6d +Subproject commit 61677ff44a00aa7cf4760a6faa34177e4faf4387