Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."

Browse Source 
* commit '6f67e7bf831147257e078dd72a22f2e43e009122':
  Making it possible to call SIP calls with special allowed chars.
This commit is contained in:
Brad Fitzpatrick
2011-03-29 08:45:30 -07:00
committed by Android Git Automerger
parent 8ef609abe5 6f67e7bf83
commit fae5e2894f
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/com/android/internal/telephony/sip/SipPhone.java Executable file → Normal file
View File

@@ -40,6 +40,7 @@ import com.android.internal.telephony.PhoneNotifier;
import java.text.ParseException; import java.text.ParseException;
import java.util.List; import java.util.List;
import java.util.regex.Pattern;
/** /**
* {@hide} * {@hide}
@@ -386,8 +387,8 @@ public class SipPhone extends SipPhoneBase {
Connection dial(String originalNumber) throws SipException { Connection dial(String originalNumber) throws SipException {
String calleeSipUri = originalNumber; String calleeSipUri = originalNumber;
if (!calleeSipUri.contains("@")) { if (!calleeSipUri.contains("@")) {
calleeSipUri = mProfile.getUriString().replaceFirst( String replaceStr = Pattern.quote(mProfile.getUserName() + "@");
mProfile.getUserName() + "@", calleeSipUri = mProfile.getUriString().replaceFirst(replaceStr,
calleeSipUri + "@"); calleeSipUri + "@");
} }
try { try {

8
voip/java/com/android/server/sip/SipHelper.java
View File

@@ -27,6 +27,8 @@ import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EventObject; import java.util.EventObject;
import java.util.List; import java.util.List;
import java.util.regex.Pattern;
import javax.sip.ClientTransaction; import javax.sip.ClientTransaction;
import javax.sip.Dialog; import javax.sip.Dialog;
import javax.sip.DialogTerminatedEvent; import javax.sip.DialogTerminatedEvent;
@@ -215,9 +217,11 @@ class SipHelper {
String tag) throws ParseException, SipException { String tag) throws ParseException, SipException {
FromHeader fromHeader = createFromHeader(userProfile, tag); FromHeader fromHeader = createFromHeader(userProfile, tag);
ToHeader toHeader = createToHeader(userProfile); ToHeader toHeader = createToHeader(userProfile);
String replaceStr = Pattern.quote(userProfile.getUserName() + "@");
SipURI requestURI = mAddressFactory.createSipURI( SipURI requestURI = mAddressFactory.createSipURI(
userProfile.getUriString().replaceFirst( userProfile.getUriString().replaceFirst(replaceStr, ""));
userProfile.getUserName() + "@", ""));
List<ViaHeader> viaHeaders = createViaHeaders(); List<ViaHeader> viaHeaders = createViaHeaders();
CallIdHeader callIdHeader = createCallIdHeader(); CallIdHeader callIdHeader = createCallIdHeader();
CSeqHeader cSeqHeader = createCSeqHeader(requestType); CSeqHeader cSeqHeader = createCSeqHeader(requestType);