commit b67db6b588b7de2426600335bf13b031b2d7167b
author Leon Scroggins <scroggo@google.com> Fri Feb 26 17:58:31 2010 -0500
committer Leon Scroggins <scroggo@google.com> Mon Mar 01 11:06:07 2010 -0500
tree 827b33d67c56d0043b15a29c2a5810989679d369
parent d080b185a00b299e425ac23e7109aeda69e716fe

Remove deleted files from the list of browser downloads.

Fix for http://b/issue?id=2469085

src/com/android/browser/BrowserDownloadPage.java

diff --git a/src/com/android/browser/BrowserDownloadPage.java b/src/com/android/browser/BrowserDownloadPage.java
index e472314..c8f848a 100644
--- a/src/com/android/browser/BrowserDownloadPage.java
+++ b/src/com/android/browser/BrowserDownloadPage.java
@@ -80,6 +80,7 @@
                 Downloads.Impl.COLUMN_NOTIFICATION_PACKAGE,
                 Downloads.Impl.COLUMN_LAST_MODIFICATION,
                 Downloads.Impl.COLUMN_VISIBILITY,
+                Downloads.Impl._DATA,
                 Downloads.Impl.COLUMN_MIME_TYPE},
                 null, Downloads.Impl.COLUMN_LAST_MODIFICATION + " DESC");
         
@@ -118,6 +119,38 @@
     }
 
     @Override
+    protected void onResume() {
+        super.onResume();
+        if (mDownloadCursor != null) {
+            String where = null;
+            for (mDownloadCursor.moveToFirst(); !mDownloadCursor.isAfterLast();
+                    mDownloadCursor.moveToNext()) {
+                if (!Downloads.Impl.isStatusCompleted(
+                        mDownloadCursor.getInt(mStatusColumnId))) {
+                    // Only want to check files that have completed.
+                    continue;
+                }
+                int filenameColumnId = mDownloadCursor.getColumnIndexOrThrow(
+                        Downloads.Impl._DATA);
+                String filename = mDownloadCursor.getString(filenameColumnId);
+                File file = new File(filename);
+                if (!file.exists()) {
+                    long id = mDownloadCursor.getLong(mIdColumnId);
+                    if (where == null) {
+                        where = Downloads.Impl._ID + " = '" + id + "'";
+                    } else {
+                        where += " OR " + Downloads.Impl._ID + " = '" + id + "'";
+                    }
+                }
+            }
+            if (where != null) {
+                getContentResolver().delete(Downloads.Impl.CONTENT_URI, where,
+                        null);
+            }
+        }
+    }
+
+    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         if (mDownloadCursor != null) {
             MenuInflater inflater = getMenuInflater();
@@ -339,7 +372,7 @@
         // Count the number of items that will be canceled.
         int count = 0;
         if (mDownloadCursor != null) {
-            for (mDownloadCursor.moveToFirst(); !mDownloadCursor.isAfterLast(); 
+            for (mDownloadCursor.moveToFirst(); !mDownloadCursor.isAfterLast();
                     mDownloadCursor.moveToNext()) {
                 int status = mDownloadCursor.getInt(mStatusColumnId);
                 if (!Downloads.Impl.isStatusCompleted(status)) {