Use Constants class appropriately for sip/tel Uris.
Change-Id: I822634c6e0dc4ae6bd407639730763b658170f3b
diff --git a/src/com/android/contacts/CallDetailActivity.java b/src/com/android/contacts/CallDetailActivity.java
index ac26494..428e2e8 100644
--- a/src/com/android/contacts/CallDetailActivity.java
+++ b/src/com/android/contacts/CallDetailActivity.java
@@ -25,6 +25,7 @@
import com.android.contacts.format.FormatUtils;
import com.android.contacts.util.AsyncTaskExecutor;
import com.android.contacts.util.AsyncTaskExecutors;
+import com.android.contacts.util.Constants;
import com.android.contacts.voicemail.VoicemailPlaybackFragment;
import com.android.contacts.voicemail.VoicemailStatusHelper;
import com.android.contacts.voicemail.VoicemailStatusHelper.StatusMessage;
@@ -333,7 +334,7 @@
getSystemService(Context.TELEPHONY_SERVICE);
if (tm.getCallState() == TelephonyManager.CALL_STATE_IDLE) {
startActivity(ContactsUtils.getCallIntent(
- Uri.fromParts("tel", mNumber, null)));
+ Uri.fromParts(Constants.SCHEME_TEL, mNumber, null)));
return true;
}
}
diff --git a/src/com/android/contacts/ContactsUtils.java b/src/com/android/contacts/ContactsUtils.java
index f7afd22..687bd0d 100644
--- a/src/com/android/contacts/ContactsUtils.java
+++ b/src/com/android/contacts/ContactsUtils.java
@@ -22,6 +22,7 @@
import com.android.contacts.model.AccountTypeManager;
import com.android.contacts.model.AccountWithDataSet;
import com.android.contacts.test.NeededForTesting;
+import com.android.contacts.util.Constants;
import com.android.i18n.phonenumbers.PhoneNumberUtil;
import android.content.Context;
@@ -224,9 +225,9 @@
return Uri.parse("voicemail:");
}
if (PhoneNumberUtils.isUriNumber(number)) {
- return Uri.fromParts("sip", number, null);
+ return Uri.fromParts(Constants.SCHEME_SIP, number, null);
}
- return Uri.fromParts("tel", number, null);
+ return Uri.fromParts(Constants.SCHEME_TEL, number, null);
}
/**
diff --git a/src/com/android/contacts/activities/DialtactsActivity.java b/src/com/android/contacts/activities/DialtactsActivity.java
index d81e1ee..9872ad4 100644
--- a/src/com/android/contacts/activities/DialtactsActivity.java
+++ b/src/com/android/contacts/activities/DialtactsActivity.java
@@ -29,6 +29,7 @@
import com.android.contacts.list.PhoneNumberPickerFragment;
import com.android.contacts.activities.TransactionSafeActivity;
import com.android.contacts.util.AccountFilterUtil;
+import com.android.contacts.util.Constants;
import com.android.internal.telephony.ITelephony;
import android.app.ActionBar;
@@ -721,7 +722,7 @@
}
if (Intent.ACTION_VIEW.equals(action)) {
final Uri data = intent.getData();
- if (data != null && "tel".equals(data.getScheme())) {
+ if (data != null && Constants.SCHEME_TEL.equals(data.getScheme())) {
return true;
}
}
diff --git a/src/com/android/contacts/activities/NonPhoneActivity.java b/src/com/android/contacts/activities/NonPhoneActivity.java
index 3a54292..47ae020 100644
--- a/src/com/android/contacts/activities/NonPhoneActivity.java
+++ b/src/com/android/contacts/activities/NonPhoneActivity.java
@@ -18,6 +18,7 @@
import com.android.contacts.ContactsActivity;
import com.android.contacts.R;
+import com.android.contacts.util.Constants;
import android.app.Activity;
import android.app.AlertDialog;
@@ -56,7 +57,7 @@
final Uri data = getIntent().getData();
if (data == null) return null;
final String scheme = data.getScheme();
- if (!"tel".equals(scheme)) return null;
+ if (!Constants.SCHEME_TEL.equals(scheme)) return null;
return getIntent().getData().getSchemeSpecificPart();
}
diff --git a/src/com/android/contacts/calllog/CallLogFragment.java b/src/com/android/contacts/calllog/CallLogFragment.java
index 9e52b4f..059436b 100644
--- a/src/com/android/contacts/calllog/CallLogFragment.java
+++ b/src/com/android/contacts/calllog/CallLogFragment.java
@@ -19,6 +19,7 @@
import com.android.common.io.MoreCloseables;
import com.android.contacts.ContactsUtils;
import com.android.contacts.R;
+import com.android.contacts.util.Constants;
import com.android.contacts.util.EmptyLoader;
import com.android.contacts.voicemail.VoicemailStatusHelper;
import com.android.contacts.voicemail.VoicemailStatusHelper.StatusMessage;
@@ -323,7 +324,8 @@
Intent intent;
// If "number" is really a SIP address, construct a sip: URI.
if (PhoneNumberUtils.isUriNumber(number)) {
- intent = ContactsUtils.getCallIntent(Uri.fromParts("sip", number, null));
+ intent = ContactsUtils.getCallIntent(
+ Uri.fromParts(Constants.SCHEME_SIP, number, null));
} else {
// We're calling a regular PSTN phone number.
// Construct a tel: URI, but do some other possible cleanup first.
@@ -335,7 +337,8 @@
String countryIso = cursor.getString(CallLogQuery.COUNTRY_ISO);
number = mAdapter.getBetterNumberFromContacts(number, countryIso);
}
- intent = ContactsUtils.getCallIntent(Uri.fromParts("tel", number, null));
+ intent = ContactsUtils.getCallIntent(
+ Uri.fromParts(Constants.SCHEME_TEL, number, null));
}
intent.setFlags(
Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
diff --git a/src/com/android/contacts/dialpad/DialpadFragment.java b/src/com/android/contacts/dialpad/DialpadFragment.java
index 47d4f9f..1087ecc 100644
--- a/src/com/android/contacts/dialpad/DialpadFragment.java
+++ b/src/com/android/contacts/dialpad/DialpadFragment.java
@@ -20,6 +20,7 @@
import com.android.contacts.R;
import com.android.contacts.SpecialCharSequenceMgr;
import com.android.contacts.activities.DialtactsActivity;
+import com.android.contacts.util.Constants;
import com.android.contacts.util.PhoneNumberFormatter;
import com.android.internal.telephony.ITelephony;
import com.android.phone.CallLogAsync;
@@ -325,7 +326,7 @@
if (Intent.ACTION_DIAL.equals(action) || Intent.ACTION_VIEW.equals(action)) {
Uri uri = intent.getData();
if (uri != null) {
- if ("tel".equals(uri.getScheme())) {
+ if (Constants.SCHEME_TEL.equals(uri.getScheme())) {
// Put the requested number into the input area
String data = uri.getSchemeSpecificPart();
setFormattedDigits(data, null);