minor bug fixes
This commit is contained in:
parent
90c7cae818
commit
29f34f621d
9 changed files with 39 additions and 6 deletions
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="org.linphone"
|
package="org.linphone"
|
||||||
android:versionName="1.0.13" android:versionCode="1013">
|
android:versionCode="1014" android:versionName="1.0.14">
|
||||||
<uses-sdk android:minSdkVersion="3" />
|
<uses-sdk android:minSdkVersion="3" />
|
||||||
<application android:label="@string/app_name" android:debuggable = "true" android:icon="@drawable/logo_linphone_57x57">
|
<application android:label="@string/app_name" android:debuggable = "true" android:icon="@drawable/logo_linphone_57x57">
|
||||||
|
|
||||||
|
|
13
README
Normal file
13
README
Normal file
|
@ -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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -3,7 +3,7 @@
|
||||||
<string name="pref_ilbc_summary">iLBC might be unavailable depending on ARM processor and Android OS version.</string>
|
<string name="pref_ilbc_summary">iLBC might be unavailable depending on ARM processor and Android OS version.</string>
|
||||||
<string name="pref_echo_cancellation">Echo cancellation</string>
|
<string name="pref_echo_cancellation">Echo cancellation</string>
|
||||||
<string name="pref_echo_cancellation_key">pref_echo_cancellation_key</string>
|
<string name="pref_echo_cancellation_key">pref_echo_cancellation_key</string>
|
||||||
<string name="pref_handle_outcall_summarry">If set cellular call are redirected to voip when possible</string>
|
<string name="pref_handle_outcall_summarry">If set cellular calls are redirected to voip when possible</string>
|
||||||
<string name="pref_handle_outcall">Redirect cellular calls</string>
|
<string name="pref_handle_outcall">Redirect cellular calls</string>
|
||||||
<string name="pref_handle_outcall_key">pref_handle_outcall_key</string>
|
<string name="pref_handle_outcall_key">pref_handle_outcall_key</string>
|
||||||
<string name="pref_autostart">Start at boot time</string>
|
<string name="pref_autostart">Start at boot time</string>
|
||||||
|
|
|
@ -87,8 +87,9 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
|
||||||
private PowerManager.WakeLock mWakeLock;
|
private PowerManager.WakeLock mWakeLock;
|
||||||
private SharedPreferences mPref;
|
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
|
@Override
|
||||||
protected void onDestroy() {
|
protected void onDestroy() {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
|
|
|
@ -59,6 +59,7 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
protected void onSaveInstanceState (Bundle outState) {
|
protected void onSaveInstanceState (Bundle outState) {
|
||||||
|
super.onSaveInstanceState(outState);
|
||||||
if (mMainFrame.getVisibility() == View.INVISIBLE) {
|
if (mMainFrame.getVisibility() == View.INVISIBLE) {
|
||||||
outState.putBoolean(SCREEN_IS_HIDDEN, true);
|
outState.putBoolean(SCREEN_IS_HIDDEN, true);
|
||||||
} else {
|
} else {
|
||||||
|
@ -233,7 +234,7 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onSensorChanged(SensorEvent event) {
|
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.isready() == false) return; //nop nothing to do
|
||||||
|
|
||||||
if (LinphoneService.instance().getLinphoneCore().isIncall()
|
if (LinphoneService.instance().getLinphoneCore().isIncall()
|
||||||
|
|
|
@ -325,6 +325,9 @@ public class LinphoneService extends Service implements LinphoneCoreListener {
|
||||||
if (lProxy == null || lProxy.length() == 0) {
|
if (lProxy == null || lProxy.length() == 0) {
|
||||||
lProxy = "sip:"+lDomain;
|
lProxy = "sip:"+lDomain;
|
||||||
}
|
}
|
||||||
|
if (!lProxy.startsWith("sip:")) {
|
||||||
|
lProxy = "sip:"+lProxy;
|
||||||
|
}
|
||||||
//get Default proxy if any
|
//get Default proxy if any
|
||||||
LinphoneProxyConfig lDefaultProxyConfig = mLinphoneCore.getDefaultProxyConfig();
|
LinphoneProxyConfig lDefaultProxyConfig = mLinphoneCore.getDefaultProxyConfig();
|
||||||
String lIdentity = "sip:"+lUserName+"@"+lDomain;
|
String lIdentity = "sip:"+lUserName+"@"+lDomain;
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 61677ff44a00aa7cf4760a6faa34177e4faf4387
|
Subproject commit 2b7bd0b0e4c01ae08cb8064d2c70528b9770a807
|
Loading…
Reference in a new issue