Merge pull request #47 from xamarin/bugs-2015-06-08

Bugs 2015 06 08
xamarin · Jun 9, 2015 · 8e5bcf4 · 8e5bcf4
2 parents 90e3a23 + ee483b1
commit 8e5bcf4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/Details.md b/Details.md
@@ -23,7 +23,7 @@ on Android):
 using Xamarin.Contacts;
 // ...
 
-var book = new AddressBook ();
+var book = new Xamarin.Contacts.AddressBook ();
 //         new AddressBook (this); on Android
 if (!await book.RequestPermission()) {
 	Console.WriteLine ("Permission denied by user or manifest");

diff --git a/GettingStarted.md b/GettingStarted.md
@@ -8,7 +8,7 @@ on Android):
 using Xamarin.Contacts;
 // ...
 
-var book = new AddressBook ();
+var book = new Xamarin.Contacts.AddressBook ();
 book.RequestPermission().ContinueWith (t => {
 	if (!t.Result) {
 		Console.WriteLine ("Permission denied by user or manifest");

diff --git a/MonoDroid/Xamarin.Mobile/Contacts/ContactHelper.cs b/MonoDroid/Xamarin.Mobile/Contacts/ContactHelper.cs
@@ -154,8 +154,11 @@ internal static IEnumerable<Contact> GetContacts (bool rawContacts, ContentResol
 				if (currentContact != null)
 					map.Add (currentContact.Id, currentContact);
 
-				for (; x < ids.Length; x++)
-					yield return map[ids[x]];
+				for (; x < ids.Length; x++) {
+					Contact tContact = null;
+					if (map.TryGetValue (ids[x], out tContact))
+						yield return tContact;
+				}
 			}
 			finally
 			{

diff --git a/MonoDroid/Xamarin.Mobile/ContentQueryTranslator.cs b/MonoDroid/Xamarin.Mobile/ContentQueryTranslator.cs
@@ -585,8 +585,12 @@ private bool TryGetTable (List<MemberExpression> memberExpressions)
 
 			Table = presult.Table;
 
-			if (presult.MimeType != null)
+			if (presult.MimeType != null) {
+				if (this.queryBuilder.Length > 0)
+					this.queryBuilder.Append (" AND ");
+
 				this.queryBuilder.Append (String.Format ("({0} = ?)", ContactsContract.DataColumns.Mimetype));
+			}
 
 			this.arguments.Add (presult.MimeType);
 
@@ -602,8 +606,12 @@ private bool TryGetTable (MemberExpression me)
 			}
 
 			TableFindResult result = this.tableFinder.Find (me);
-			if (result.MimeType != null)
+			if (result.MimeType != null) {
+				if (this.queryBuilder.Length > 0)
+					this.queryBuilder.Append (" AND ");
+
 				this.queryBuilder.Append (String.Format ("({0} = ?)", ContactsContract.DataColumns.Mimetype));
+			}
 
 			this.arguments.Add (result.MimeType);