diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-01-02 19:54:20 -0500 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-01-02 19:54:20 -0500 |
| commit | 627af1c99ccecc50a5bc03147886170ebfc7b756 (patch) | |
| tree | 5112be61548887abdac7313be92e422309d974bf | |
| parent | 781bb6d13c6eea7028bbe19d8d5b1451a2d7c08c (diff) | |
| parent | b207437ffc9fdace64f652c39a08741a3f33823f (diff) | |
| download | packages_apps_Contacts-627af1c99ccecc50a5bc03147886170ebfc7b756.tar.gz packages_apps_Contacts-627af1c99ccecc50a5bc03147886170ebfc7b756.tar.bz2 packages_apps_Contacts-627af1c99ccecc50a5bc03147886170ebfc7b756.zip | |
Merge branch 'donut' of git://github.com/Wysie/android_packages_apps_Contacts into donut
| -rwxr-xr-x | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/contacts/EditContactActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/contacts/GroupsListActivity.java | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 5a89ffa3e..f3934e4f2 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -842,7 +842,7 @@ <string name="title_about_name">Mod Name</string> <string name="summary_about_name">Wysie Contacts</string> <string name="title_about_version">Version</string> - <string name="summary_about_version">2.33</string> + <string name="summary_about_version">2.34</string> <string name="title_about_credits">Credits</string> <string name="summary_about_credits">ChainsDD and the rest of XDA! :)</string> diff --git a/src/com/android/contacts/EditContactActivity.java b/src/com/android/contacts/EditContactActivity.java index 4c8400e0b..cc96eaef7 100644 --- a/src/com/android/contacts/EditContactActivity.java +++ b/src/com/android/contacts/EditContactActivity.java @@ -2773,7 +2773,7 @@ public final class EditContactActivity extends Activity implements View.OnClickL for (int i = 0; i < selectedGroups.size(); i++) { Cursor cursor = mResolver.query(Groups.CONTENT_URI, GROUPS_PROJECTION, - Contacts.Groups.NAME + "='" + selectedGroups.get(i) + "'", null, null); + Contacts.Groups.NAME + "=?", new String[] { selectedGroups.get(i).toString() } , null); if (cursor != null) { if ((selectedGroups.get(i)).equals(Groups.GROUP_ANDROID_STARRED)) { diff --git a/src/com/android/contacts/GroupsListActivity.java b/src/com/android/contacts/GroupsListActivity.java index 29529d42b..a33262b75 100644 --- a/src/com/android/contacts/GroupsListActivity.java +++ b/src/com/android/contacts/GroupsListActivity.java @@ -298,7 +298,8 @@ public class GroupsListActivity extends ListActivity { public boolean checkGroupExists(String groupName) { boolean exists = false; - Cursor c = resolver.query(Groups.CONTENT_URI, GROUPS_PROJECTION, "UPPER(" + Groups.NAME + ")=UPPER('" + groupName + "')", null, null); + Cursor c = resolver.query(Groups.CONTENT_URI, GROUPS_PROJECTION, "UPPER(" + Groups.NAME + ")=?", + new String[] { groupName.toUpperCase() }, null); if (c.getCount() > 0) exists = true; |