diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1afb900f5..51eaab8e8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="1014" android:versionName="1.0.14"> diff --git a/README b/README new file mode 100644 index 000000000..1b4823403 --- /dev/null +++ b/README @@ -0,0 +1,13 @@ + LINPHONE for ANDROID + **************************** + +To build liblinphone for Android, you must first download the Android ndk R4 from google. +Next step is to download libilbc code: + cd submodules/libilbc-rfc3951 && ./configure && make + +Finnaly from directory linphone-android, just execute command: + ndk-build + + + + diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so index dd089667e..a6112c0aa 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 610d1cc31..f66f8b473 100755 Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ diff --git a/res/values/strings.xml b/res/values/strings.xml index 51f041649..373c90855 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3,7 +3,7 @@ iLBC might be unavailable depending on ARM processor and Android OS version. Echo cancellation pref_echo_cancellation_key - If set cellular call are redirected to voip when possible + If set cellular calls are redirected to voip when possible Redirect cellular calls pref_handle_outcall_key Start at boot time diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index 7f924c80c..89374a77c 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -87,8 +87,9 @@ public class DialerActivity extends Activity implements LinphoneCoreListener { private PowerManager.WakeLock mWakeLock; private SharedPreferences mPref; - String PREF_CHECK_CONFIG = "pref_check_config"; - + static String PREF_CHECK_CONFIG = "pref_check_config"; + private static String CURRENT_ADDRESS = "org.linphone.current-address"; + private static String CURRENT_DISPLAYNAME = "org.linphone.current-displayname"; /** * @@ -331,7 +332,22 @@ public class DialerActivity extends Activity implements LinphoneCoreListener { } } + @Override + public void onSaveInstanceState(Bundle savedInstanceState) { + super.onSaveInstanceState(savedInstanceState); + savedInstanceState.putString(CURRENT_ADDRESS, mAddress.getText().toString()); + if (mDisplayName != null) savedInstanceState.putString(CURRENT_DISPLAYNAME,mDisplayName); + } + @Override + protected void onRestoreInstanceState(Bundle savedInstanceState) { + super.onRestoreInstanceState(savedInstanceState); + String lAddress = savedInstanceState.getString(CURRENT_ADDRESS); + if (lAddress != null && mAddress != null) { + mAddress.setText(lAddress); + } + mDisplayName = savedInstanceState.getString(CURRENT_DISPLAYNAME); + } @Override protected void onDestroy() { // TODO Auto-generated method stub diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 5bdaaf512..9571226e6 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -59,6 +59,7 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener } } protected void onSaveInstanceState (Bundle outState) { + super.onSaveInstanceState(outState); if (mMainFrame.getVisibility() == View.INVISIBLE) { outState.putBoolean(SCREEN_IS_HIDDEN, true); } else { @@ -233,7 +234,7 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener } public void onSensorChanged(SensorEvent event) { - Log.d(LinphoneService.TAG, "Proximity sensor report ["+event.values[0]+"] , for max range ["+event.sensor.getMaximumRange()+"]"); + //Log.d(LinphoneService.TAG, "Proximity sensor report ["+event.values[0]+"] , for max range ["+event.sensor.getMaximumRange()+"]"); if (LinphoneService.isready() == false) return; //nop nothing to do if (LinphoneService.instance().getLinphoneCore().isIncall() diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 7c7144243..cecc1ed08 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -325,6 +325,9 @@ public class LinphoneService extends Service implements LinphoneCoreListener { if (lProxy == null || lProxy.length() == 0) { lProxy = "sip:"+lDomain; } + if (!lProxy.startsWith("sip:")) { + lProxy = "sip:"+lProxy; + } //get Default proxy if any LinphoneProxyConfig lDefaultProxyConfig = mLinphoneCore.getDefaultProxyConfig(); String lIdentity = "sip:"+lUserName+"@"+lDomain; diff --git a/submodules/linphone b/submodules/linphone index 61677ff44..2b7bd0b0e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 61677ff44a00aa7cf4760a6faa34177e4faf4387 +Subproject commit 2b7bd0b0e4c01ae08cb8064d2c70528b9770a807