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

fix outbound proxy preference

Browse source
This commit is contained in:
Simon Morlat 2010-06-30 12:10:26 +02:00
parent 2ddc368898
commit ba16e38516
6 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
libs/armeabi-v7a/liblinphone.so
View file

Binary file not shown.

BIN
libs/armeabi/liblinphone.so
View file

Binary file not shown.

2
res/xml/preferences.xml
View file

@ -9,7 +9,7 @@
android:key="@string/pref_domain_key"></EditTextPreference> android:key="@string/pref_domain_key"></EditTextPreference>
<EditTextPreference android:title="@string/pref_proxy" <EditTextPreference android:title="@string/pref_proxy"
android:key="@string/pref_proxy_key"></EditTextPreference> android:key="@string/pref_proxy_key"></EditTextPreference>
<CheckBoxPreference android:enabled="true" android:selectable="false" android:key="@string/pref_enable_outbound_proxy_key" android:title="@string/pref_enable_outbound_proxy"></CheckBoxPreference> <CheckBoxPreference android:enabled="true" android:selectable="true" android:key="@string/pref_enable_outbound_proxy_key" android:title="@string/pref_enable_outbound_proxy"></CheckBoxPreference>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_advanced"> <PreferenceCategory android:title="@string/pref_advanced">
<PreferenceScreen android:title="@string/pref_codecs" android:key="@string/pref_codecs_key"> <PreferenceScreen android:title="@string/pref_codecs" android:key="@string/pref_codecs_key">

1
src/org/linphone/AboutActivity.java
View file

@ -39,4 +39,3 @@ public class AboutActivity extends Activity {
} }
} }
} }

20
src/org/linphone/DialerActivity.java
View file

@ -438,17 +438,20 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
mInCallAddressLayout.setVisibility(View.VISIBLE); mInCallAddressLayout.setVisibility(View.VISIBLE);
mCall.setEnabled(false); mCall.setEnabled(false);
mHangup.setEnabled(true); mHangup.setEnabled(true);
String DisplayName = lc.getRemoteAddress().getDisplayName(); LinphoneAddress remote=lc.getRemoteAddress();
if (DisplayName!=null) { if (remote!=null){
mDisplayNameView.setText(DisplayName); String DisplayName = remote.getDisplayName();
} else { if (DisplayName!=null) {
mDisplayNameView.setText(lc.getRemoteAddress().getUserName()); mDisplayNameView.setText(DisplayName);
} else {
mDisplayNameView.setText(lc.getRemoteAddress().getUserName());
}
} }
if (mSpeaker.isChecked()) { if (mSpeaker.isChecked()) {
routeAudioToSpeaker(); routeAudioToSpeaker();
} else { } else {
routeAudioToReceiver(); routeAudioToReceiver();
} }
setVolumeControlStream(AudioManager.STREAM_VOICE_CALL); setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
} }
private void exitCallMode() { private void exitCallMode() {
@ -524,5 +527,4 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
return; return;
} }
} }
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 4d214fbde859f93442376f0de68ffc1f1dcf1717 Subproject commit ab5503fca8ef3932bb5211396893012c9ef4ef6d