Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enable TLS option

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2011-07-20 11:52:09 +02:00
parent e45ccb765e
commit bb3dde6983
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/xml/preferences.xml
View file

@ -131,7 +131,7 @@
<CheckBoxPreference android:key="@string/pref_transport_tcp_key" <CheckBoxPreference android:key="@string/pref_transport_tcp_key"
android:title="@string/pref_transport_tcp" /> android:title="@string/pref_transport_tcp" />
<CheckBoxPreference android:key="@string/pref_transport_tls_key" <CheckBoxPreference android:key="@string/pref_transport_tls_key"
android:title="@string/pref_transport_tls" android:layout="@layout/hidden"/> android:title="@string/pref_transport_tls" />
<CheckBoxPreference android:key="@string/pref_transport_use_standard_ports_key" <CheckBoxPreference android:key="@string/pref_transport_use_standard_ports_key"
android:title="@string/pref_transport_use_standard_ports"/> android:title="@string/pref_transport_use_standard_ports"/>
</PreferenceScreen> </PreferenceScreen>

2
src/org/linphone/LinphoneManager.java
View file

@ -532,7 +532,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
if (!getBool(R.string.pref_transport_tls_key, false)) { if (!getBool(R.string.pref_transport_tls_key, false)) {
ports.tls = 0; ports.tls = 0;
} else if (useStandardPort) { } else if (useStandardPort) {
ports.tls = 5060; ports.tls = 5061;
} else if (ports.tls==0) { } else if (ports.tls==0) {
ports.tls=lPreviousPort; ports.tls=lPreviousPort;
} }

2
src/org/linphone/LinphonePreferencesActivity.java
View file

@ -123,7 +123,7 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E
final List<CheckBoxPreference> checkboxes = Arrays.asList( final List<CheckBoxPreference> checkboxes = Arrays.asList(
findCheckbox(R.string.pref_transport_udp_key) findCheckbox(R.string.pref_transport_udp_key)
,findCheckbox(R.string.pref_transport_tcp_key) ,findCheckbox(R.string.pref_transport_tcp_key)
// ,findCheckbox(R.string.pref_transport_tls_key) ,findCheckbox(R.string.pref_transport_tls_key)
); );

2
src/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -37,7 +37,7 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
loadOptionalLibrary("swscale"); loadOptionalLibrary("swscale");
loadOptionalLibrary("avcore"); loadOptionalLibrary("avcore");
loadOptionalLibrary("avcodec"); loadOptionalLibrary("avcodec");
// OPENSSL (cryptography) // OPENSSL (cryptography)
// lin prefix avoids collision with libs in /system/lib // lin prefix avoids collision with libs in /system/lib
loadOptionalLibrary("lincrypto"); loadOptionalLibrary("lincrypto");