catch all throwables when loading contacts

Daniel Gultsch created 9 years ago

Change summary

src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java | 2 
src/main/java/eu/siacs/conversations/utils/PhoneHelper.java                | 4 
2 files changed, 3 insertions(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java

@@ -141,7 +141,7 @@ public class PublishProfilePictureActivity extends XmppActivity {
 
 			}
 		});
-		this.defaultUri = PhoneHelper.getSefliUri(getApplicationContext());
+		this.defaultUri = PhoneHelper.getSelfiUri(getApplicationContext());
 	}
 
 	private void chooseAvatar(boolean crop) {

src/main/java/eu/siacs/conversations/utils/PhoneHelper.java

@@ -93,14 +93,14 @@ public class PhoneHelper {
 
 			try {
 				return (super.loadInBackground());
-			} catch (SecurityException e) {
+			} catch (Throwable e) {
 				return(null);
 			}
 		}
 
 	}
 
-	public static Uri getSefliUri(Context context) {
+	public static Uri getSelfiUri(Context context) {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
 				&& context.checkSelfPermission(Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
 			return null;