Merge branch 'siacs/master' into development

1 files changed, 45 insertions, 27 deletions

diff --git a/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
index 893f9eb89..6c1b4bef5 100644
--- a/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
@@ -18,17 +18,17 @@ import java.util.concurrent.RejectedExecutionException;
 
 public class PhoneHelper {
 
-	public static void loadPhoneContacts(Context context,final List<Bundle> phoneContacts, final OnPhoneContactsLoadedListener listener) {
+	public static void loadPhoneContacts(Context context, final List<Bundle> phoneContacts, final OnPhoneContactsLoadedListener listener) {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
 				&& context.checkSelfPermission(Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
 			listener.onPhoneContactsLoaded(phoneContacts);
 			return;
 		}
-		final String[] PROJECTION = new String[] { ContactsContract.Data._ID,
+		final String[] PROJECTION = new String[]{ContactsContract.Data._ID,
 				ContactsContract.Data.DISPLAY_NAME,
 				ContactsContract.Data.PHOTO_URI,
 				ContactsContract.Data.LOOKUP_KEY,
-				ContactsContract.CommonDataKinds.Im.DATA };
+				ContactsContract.CommonDataKinds.Im.DATA};
 
 		final String SELECTION = "(" + ContactsContract.Data.MIMETYPE + "=\""
 				+ ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE
@@ -36,39 +36,39 @@ public class PhoneHelper {
 				+ "=\"" + ContactsContract.CommonDataKinds.Im.PROTOCOL_JABBER
 				+ "\")";
 
-		CursorLoader mCursorLoader = new CursorLoader(context,
+		CursorLoader mCursorLoader = new NotThrowCursorLoader(context,
 				ContactsContract.Data.CONTENT_URI, PROJECTION, SELECTION, null,
 				null);
 		mCursorLoader.registerListener(0, new OnLoadCompleteListener<Cursor>() {
 
 			@Override
 			public void onLoadComplete(Loader<Cursor> arg0, Cursor cursor) {
-				if (cursor == null) {
-					return;
-				}
-				while (cursor.moveToNext()) {
-					Bundle contact = new Bundle();
-					contact.putInt("phoneid", cursor.getInt(cursor
-							.getColumnIndex(ContactsContract.Data._ID)));
-					contact.putString(
-							"displayname",
-							cursor.getString(cursor
-									.getColumnIndex(ContactsContract.Data.DISPLAY_NAME)));
-					contact.putString("photouri", cursor.getString(cursor
-							.getColumnIndex(ContactsContract.Data.PHOTO_URI)));
-					contact.putString("lookup", cursor.getString(cursor
-							.getColumnIndex(ContactsContract.Data.LOOKUP_KEY)));
-
-					contact.putString(
-							"jid",
-							cursor.getString(cursor
-									.getColumnIndex(ContactsContract.CommonDataKinds.Im.DATA)));
-					phoneContacts.add(contact);
+				if (cursor != null) {
+					while (cursor.moveToNext()) {
+						Bundle contact = new Bundle();
+						contact.putInt("phoneid", cursor.getInt(cursor
+								.getColumnIndex(ContactsContract.Data._ID)));
+						contact.putString(
+								"displayname",
+								cursor.getString(cursor
+										.getColumnIndex(ContactsContract.Data.DISPLAY_NAME)));
+						contact.putString("photouri", cursor.getString(cursor
+								.getColumnIndex(ContactsContract.Data.PHOTO_URI)));
+						contact.putString("lookup", cursor.getString(cursor
+								.getColumnIndex(ContactsContract.Data.LOOKUP_KEY)));
+
+						contact.putString(
+								"jid",
+								cursor.getString(cursor
+										.getColumnIndex(ContactsContract.CommonDataKinds.Im.DATA)));
+						phoneContacts.add(contact);
+					}
+					cursor.close();
 				}
+
 				if (listener != null) {
 					listener.onPhoneContactsLoaded(phoneContacts);
 				}
-				cursor.close();
 			}
 		});
 		try {
@@ -80,12 +80,30 @@ public class PhoneHelper {
 		}
 	}
 
+	private static class NotThrowCursorLoader extends CursorLoader {
+
+		public NotThrowCursorLoader(Context c, Uri u, String[] p, String s, String[] sa, String so) {
+			super(c, u, p, s, sa, so);
+		}
+
+		@Override
+		public Cursor loadInBackground() {
+
+			try {
+				return (super.loadInBackground());
+			} catch (SecurityException e) {
+				return(null);
+			}
+		}
+
+	}
+
 	public static Uri getSefliUri(Context context) {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
 				&& context.checkSelfPermission(Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
 			return null;
 		}
-		String[] mProjection = new String[] { Profile._ID, Profile.PHOTO_URI };
+		String[] mProjection = new String[]{Profile._ID, Profile.PHOTO_URI};
 		Cursor mProfileCursor = context.getContentResolver().query(
 				Profile.CONTENT_URI, mProjection, null, null, null);