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

Fix partial sip uri displaying.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-10-17 10:51:13 +02:00
parent 7db742d55a
commit ad73edbe00
4 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
res/values/custom.xml
View file

@ -3,27 +3,9 @@
<string name="app_name">Linphone</string>
<string name="default_domain">test.linphone.org</string>
<bool name="use_android_contact_picker">true</bool>
<bool name="useFirstLoginActivity">false</bool>
<bool name="useMenuSettings">true</bool>
<bool name="useMenuAbout">true</bool>
<bool name="use_incall_activity">false</bool>
<bool name="use_conference_activity">true</bool>
<bool name="use_video_activity">true</bool>
<bool name="use_incoming_call_dialog">false</bool>
<bool name="use_incoming_call_activity">true</bool>
<bool name="show_full_remote_address_on_incoming_call">true</bool>
<string name="notification_title">Linphone</string>
<bool name="allow_edit_in_dialer">true</bool>
<string name="notification_registered">Registered to %s </string>
<string name="notification_register_failure">Fails to register to %s</string>
<color name="conf_active_bg_color">#191970</color>
<string name="about_text">Linphone %s SIP (rfc 3261) compatible phone under GNU Public License V2\n http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/m/help\n\n© 2011 Belledonne Communications</string>
<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
</resources>

24
res/values/non_localizable_custom.xml Normal file
View file

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="default_domain">test.linphone.org</string>
<bool name="use_android_contact_picker">true</bool>
<bool name="useFirstLoginActivity">false</bool>
<bool name="useMenuSettings">true</bool>
<bool name="useMenuAbout">true</bool>
<bool name="use_incall_activity">false</bool>
<bool name="use_conference_activity">true</bool>
<bool name="use_video_activity">true</bool>
<bool name="use_incoming_call_dialog">false</bool>
<bool name="use_incoming_call_activity">true</bool>
<bool name="show_full_remote_address_on_incoming_call">true</bool>
<bool name="allow_edit_in_dialer">true</bool>
<color name="conf_active_bg_color">#191970</color>
<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
</resources>

6
src/org/linphone/ConferenceActivity.java
View file

@ -497,11 +497,9 @@ public class ConferenceActivity extends ListActivity implements
LinphoneAddress address = call.getRemoteAddress();
String mainText = address.getDisplayName();
String complText;
String complText = address.getUserName();
if ((getResources().getBoolean(R.bool.show_full_remote_address_on_incoming_call))) {
complText = address.getUserName() + "@" + address.getDomain();
} else {
complText = address.getUserName();
complText += "@" + address.getDomain();
}
TextView mainTextView = (TextView) v.findViewById(R.id.name);
TextView complTextView = (TextView) v.findViewById(R.id.address);

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

@ -112,7 +112,7 @@ public class IncomingCallActivity extends Activity implements LinphoneManagerRea
if (getResources().getBoolean(R.bool.show_full_remote_address_on_incoming_call)) {
mNumberView.setText(address.asStringUriOnly());
} else {
mNumberView.setText("");
mNumberView.setText(address.getUserName());
}
}