diff options
| author | Christian S <christian@pix-art.de> | 2015-08-26 20:03:02 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-08-26 20:03:02 +0200 |
| commit | 85e35b3a75804203f226219abcfc86582892fb30 (patch) | |
| tree | ceb391c2b3f7cf098c0dff988e02dd4be941ac5d /src/main/java/eu/siacs/conversations/utils | |
| parent | dfe58eaf341efe988f80faf5dc888900d28aa37a (diff) | |
| parent | 0f0054ef8629a285726a9190a297a43f91494af4 (diff) | |
Merge branch 'siacs-master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/FileUtils.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/FileUtils.java b/src/main/java/eu/siacs/conversations/utils/FileUtils.java index a13300d43..c29841112 100644 --- a/src/main/java/eu/siacs/conversations/utils/FileUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/FileUtils.java @@ -104,15 +104,17 @@ public class FileUtils { }; try { - cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, - null); + cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,null); if (cursor != null && cursor.moveToFirst()) { final int column_index = cursor.getColumnIndexOrThrow(column); return cursor.getString(column_index); } + } catch(Exception e) { + return null; } finally { - if (cursor != null) + if (cursor != null) { cursor.close(); + } } return null; } |