[Android] Always return an Uri
Geoffrey Métais
git at videolan.org
Mon Jul 11 11:34:54 CEST 2016
vlc-android | branch: 2.0.x | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Jul 11 11:32:56 2016 +0200| [171eafea70a7b310deeb80a211a7c3c777fc605b] | committer: Geoffrey Métais
Always return an Uri
(cherry picked from commit 4483fed643e05118af43032bd2f21d4212a6b2da)
> https://code.videolan.org/videolan/vlc-android/commit/171eafea70a7b310deeb80a211a7c3c777fc605b
---
vlc-android/src/org/videolan/vlc/StartActivity.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/vlc-android/src/org/videolan/vlc/StartActivity.java b/vlc-android/src/org/videolan/vlc/StartActivity.java
index 241d5c6..99f9d2b 100644
--- a/vlc-android/src/org/videolan/vlc/StartActivity.java
+++ b/vlc-android/src/org/videolan/vlc/StartActivity.java
@@ -97,7 +97,7 @@ public class StartActivity extends Activity {
}
} catch (Exception e) {
Log.e(TAG, "Couldn't download file from mail URI");
- return null;
+ return data;
} finally {
Util.close(is);
Util.close(os);
@@ -130,11 +130,11 @@ public class StartActivity extends Activity {
// }
} catch (FileNotFoundException e) {
Log.e(TAG, "Couldn't understand the intent");
- return null;
+ return data;
}
}
} else
- mUri = intent.getData();
+ mUri = data;
return mUri;
}
}
More information about the Android
mailing list