[Android] Prevent NPE in Uri conversion

[Geoffrey Métais]

vlc-android | branch: 2.5.x | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Dec  4 10:30:09 2017 +0100| [1e2f817b91038ebcf76a2f301216433da8ef9202] | committer: Geoffrey Métais

Prevent NPE in Uri conversion

(cherry picked from commit 9efcbd0ddbcf398f108893c70096b42b3bb98872)

> https://code.videolan.org/videolan/vlc-android/commit/1e2f817b91038ebcf76a2f301216433da8ef9202
---

 vlc-android/src/org/videolan/vlc/util/FileUtils.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/util/FileUtils.java b/vlc-android/src/org/videolan/vlc/util/FileUtils.java
index 62b0e0230..7c65af35c 100644
--- a/vlc-android/src/org/videolan/vlc/util/FileUtils.java
+++ b/vlc-android/src/org/videolan/vlc/util/FileUtils.java
@@ -25,6 +25,7 @@ package org.videolan.vlc.util;
 
 import android.annotation.TargetApi;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.res.AssetManager;
 import android.database.Cursor;
 import android.net.Uri;
@@ -326,19 +327,20 @@ public class FileUtils {
 
     public static Uri getUri(Uri data) {
         Uri uri = data;
-        if (data != null && TextUtils.equals(data.getScheme(), "content")) {
+        final Context ctx = VLCApplication.getAppContext();
+        if (data != null && ctx != null && TextUtils.equals(data.getScheme(), "content")) {
             // Mail-based apps - download the stream to a temporary file and play it
             if ("com.fsck.k9.attachmentprovider".equals(data.getHost()) || "gmail-ls".equals(data.getHost())) {
                 InputStream is = null;
                 OutputStream os = null;
                 Cursor cursor = null;
                 try {
-                    cursor = VLCApplication.getAppContext().getContentResolver().query(data,
+                    cursor = ctx.getContentResolver().query(data,
                             new String[]{MediaStore.MediaColumns.DISPLAY_NAME}, null, null, null);
                     if (cursor != null && cursor.moveToFirst()) {
                         String filename = cursor.getString(cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME));
                         Log.i(TAG, "Getting file " + filename + " from content:// URI");
-                        is = VLCApplication.getAppContext().getContentResolver().openInputStream(data);
+                        is = ctx.getContentResolver().openInputStream(data);
                         if (is == null)
                             return data;
                         os = new FileOutputStream(AndroidDevices.EXTERNAL_PUBLIC_DIRECTORY + "/Download/" + filename);
@@ -364,7 +366,8 @@ public class FileUtils {
             } else {
                 ParcelFileDescriptor inputPFD;
                 try {
-                    inputPFD = VLCApplication.getAppContext().getContentResolver().openFileDescriptor(data, "r");
+                    inputPFD = ctx.getContentResolver().openFileDescriptor(data, "r");
+                    if (inputPFD == null) return data;
                     if (AndroidUtil.isHoneycombMr1OrLater)
                         uri = AndroidUtil.LocationToUri("fd://" + inputPFD.getFd());
                     else {