Fix bug with closing output stream for external downloads.

I added a unit test to cover this, and it caught another issue with
disallowing external destinations outside of the default downloads
directory (which are now allowed with the new API).

Change-Id: I4df6442bebb06458ad28c85f6bc8cbcbf3ce67a1

2 files changed, 4 insertions, 4 deletions

diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 6cb409ef..56894feb 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -318,6 +318,7 @@ public class DownloadThread extends Thread {
             // close the file
             if (state.mStream != null) {
                 state.mStream.close();
+                state.mStream = null;
             }
         } catch (IOException ex) {
             if (Constants.LOGV) {
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java
index 58ab578a..f2988954 100644
--- a/src/com/android/providers/downloads/Helpers.java
+++ b/src/com/android/providers/downloads/Helpers.java
@@ -513,10 +513,9 @@ public class Helpers {
      * Checks whether the filename looks legitimate
      */
     public static boolean isFilenameValid(String filename) {
-        File dir = new File(filename).getParentFile();
-        return dir.equals(Environment.getDownloadCacheDirectory())
-                || dir.equals(new File(Environment.getExternalStorageDirectory()
-                        + Constants.DEFAULT_DL_SUBDIR));
+        filename = filename.replaceFirst("/+", "/"); // normalize leading slashes
+        return filename.startsWith(Environment.getDownloadCacheDirectory().toString())
+                || filename.startsWith(Environment.getExternalStorageDirectory().toString());
     }
 
     /**