summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* am dc738781: Merge "Improve file error reporting + new detailed error ↵Steve Howard2010-09-203-67/+103
|\ | | | | | | | | | | | | | | | | messages in UI" into gingerbread Merge commit 'dc738781156d0f5ac1db62838d42c876d740810d' into gingerbread-plus-aosp * commit 'dc738781156d0f5ac1db62838d42c876d740810d': Improve file error reporting + new detailed error messages in UI
| * Improve file error reporting + new detailed error messages in UISteve Howard2010-09-203-67/+103
| | | | | | | | | | | | | | | | | | | | | | * support new error code for "destination file already exists" * improve error handling for various file error cases to return a more specific error code when appropriate * make UI support more detailed error messages for some cases * use Uri.getPath() instead of Uri.getSchemeSpecificPart() for file URIs Change-Id: Icb01d4d3b47c7776be3ddcd8347212e950cd023e
* | am 3398db8f: Fix notification bugs, cleanup DownloadService + DownloadReceiverSteve Howard2010-09-207-641/+470
|\| | | | | | | | | | | | | Merge commit '3398db8f3b195959faa2a7cf09918f364432ac28' into gingerbread-plus-aosp * commit '3398db8f3b195959faa2a7cf09918f364432ac28': Fix notification bugs, cleanup DownloadService + DownloadReceiver
| * Fix notification bugs, cleanup DownloadService + DownloadReceiverSteve Howard2010-09-207-641/+470
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change started out just fixing a few regressions related to notifications: * Browser downloads weren't picking up a title from the determined filename. This was due to my change to default the title field to "" instead of null. * Notification click/hide events weren't being handled properly. This was due to previous change to the URI structure of DownloadProvider. DownloadReceiver needed to be changed to perform queries through /all_downloads URIs, like all other parts of the download manager code. I did some general refactoring of the DownloadReceiver code while I was there. * The code in DownloadNotification wasn't picking up some updates to downloads properly. This was due to my change to make DownloadNotification use the DownloadInfo objects rather than querying the database directly, so that it could make use of info provided by the DownloadThread that didn't go into the DB. Fixing this didn't turn out to be all that complicated, but along the way to figuring this out I made some substantial refactoring in DownloadService which made it much cleaner anyway and eliminated a lot of duplication. That's something that had to happen eventually, so I'm leaving it all in. Change-Id: I847ccf80e3d928c84e36bc24791b33204104e1b2
* | am 4bebe75b: Temporary fix to support old URIs for MarketSteve Howard2010-09-171-1/+6
|\| | | | | | | | | | | | | Merge commit '4bebe75b3e2361d7fb0aa966598c41c45ad9317f' into gingerbread-plus-aosp * commit '4bebe75b3e2361d7fb0aa966598c41c45ad9317f': Temporary fix to support old URIs for Market
| * Temporary fix to support old URIs for MarketSteve Howard2010-09-171-1/+6
| | | | | | | | | | | | | | | | Market has its own copies of the download manager URIs. This change bring back support for those so Market will keep working until they can properly update their code. Change-Id: I283ea65931085c0f083a182842d362c113427537
* | resolved conflicts for merge of 3d55d829 to gingerbread-plus-aospSteve Howard2010-09-166-230/+236
|\| | | | | | | Change-Id: I18ede2f2d5ad8aa40cd61bdb7213659d356fdf57
| * New URI structure with "my_downloads" and "all_downloads"Steve Howard2010-09-146-231/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces a second view into the download manager database via a set of URIs starting with /all_downloads, renaming the original /download URIs to /my_downloads. In addition to making things more clear, this change allows the downloads UI to grant permissions on individual downloads to viewer apps. The old semantics were: * for ordinary callers, /download included only downloads initiated by the calling UID * for intraprocess calls or calls by root, /download included all downloads The new semantics are * /my_downloads always includes only downloads initiated by the calling UID, and requires only INTERNET permission. It could just as well require no permission, but that's not possible in the framework, since path-permissions can only broaden access, not tighten it. It doesn't matter, because these URIs are useless without INTERNET permission -- if a user can't initiate downloads, there's no reason to read this. * /all_downloads always includes all downloads on the system, and requires the new permission ACCESS_ALL_DOWNLOADS. This permission is currently protectionLevel=signature -- this could be relaxed later to support third-party download managers. All download manager code has been changed to use /all_downloads URIs, except when passing a URI to another app. In making this change across the download manager code, I've taken some liberties in cleaning things up. Other apps are unchanged and will use /my_downloads. Finally, this incorporates changes to DownloadManager to return a content URI for /cache downloads -- the download UI no longer assumes it's a file URI, and it grants permissions to the receiver of the VIEW intent. The public API test has also been updated. I've also fixed some null cursor checking in DownloadManager. Change-Id: I05a501eb4388249fe80c43724405657c950d7238
* | am 13db2005: Merge "Fix silly bug with completed notifications." into ↵Steve Howard2010-09-121-2/+1
|\| | | | | | | | | | | | | | | | | gingerbread Merge commit '13db200521cf8ead0d96173bccd7e141182eeccd' into gingerbread-plus-aosp * commit '13db200521cf8ead0d96173bccd7e141182eeccd': Fix silly bug with completed notifications.
| * Merge "Fix silly bug with completed notifications." into gingerbreadSteve Howard2010-09-121-2/+1
| |\
| | * Fix silly bug with completed notifications.Steve Howard2010-09-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This functionality isn't part of the public API, hence it lacks test coverage. Rather than adding tests, I'm inclined to leave it and hopefully we'll be able to migrate existing apps to the public API soon enough. Change-Id: I1210c6525dfb7cb12c1b8e35c04684060d3ad87e
* | | am 71e7fda9: Further work on the new downloads UI.Steve Howard2010-09-122-3/+35
|\| | | | | | | | | | | | | | | | | | | | Merge commit '71e7fda9135a0915af1fd419d07ebf85ad09beb4' into gingerbread-plus-aosp * commit '71e7fda9135a0915af1fd419d07ebf85ad09beb4': Further work on the new downloads UI.
| * | Further work on the new downloads UI.Steve Howard2010-09-102-3/+35
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add support for downloads not visible in the UI * add support for restarting failed downloads and downloads for which the file is missing * add "clear selection" button to selection menu * fix DateSortedExpandableListAdapter to ensure the view refreshes properly anytime the underlying data changes * make DownloadList handle when a selected download gets deleted by another app * make DownloadList close a dialog for a pending download when the download starts * show a dialog when the user tries to open a download but the file is missing * display "<Unknown>" when no title is provided for a download * add a test case for DownloadManager.orderBy() (should've gone in the previous commit) Change-Id: Ibf3062e8228e7f2c1270be24d8d5527dfb064658
* | am 89e4816f: Added support for downloading files with unicode charactersAndreas Sandblad2010-08-301-2/+52
|\ \ | | | | | | | | | | | | | | | | | | Merge commit '89e4816fe5f06f4bc2c2fe0e38e63c7fbe468cd7' into gingerbread-plus-aosp * commit '89e4816fe5f06f4bc2c2fe0e38e63c7fbe468cd7': Added support for downloading files with unicode characters
| * | Added support for downloading files with unicode charactersAndreas Sandblad2010-08-301-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only certain ASCII characters are allowed in a filename, all other characters are replaced with an underscore. This gives bad usability for foreign languages (e.g. japanese). This fix replaces the current regexp with a method which replaces only those characters unsafe to be used on VFAT filesystems (should work on most other filesystems as well). Change-Id: I114d47b4b35f28490e6b12493138355532fda499
* | | am 97d590d5: Add UI message when queued for wifi due to size.Steve Howard2010-08-204-98/+88
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '97d590d5a1f583acb7992d20851bdc6cd0454d12' into gingerbread-plus-aosp * commit '97d590d5a1f583acb7992d20851bdc6cd0454d12': Add UI message when queued for wifi due to size.
| * | Add UI message when queued for wifi due to size.Steve Howard2010-08-204-98/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it stands, when a download is paused because it's too big to proceed over mobile, and must proceed over wifi, it looks like any other paused download, with no indication of why it's paused. That may be passable for most other reasons for pausing a download, but it seems too confusing for this case. So this change adds a simple string message that replaces the progress bar when a download is paused for this reason (the icon also changes to a warning). The implementation isn't beautiful and could use some improvement, but I think it's acceptable and necessary. The exact UI design and wording are certainly open to change. Change-Id: I753d57f463e2614b5694bdc178d2a51066da8ca3
* | | am 1df61f0e: Avoid endless restarts when waiting for connectivity.Steve Howard2010-08-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | Merge commit '1df61f0e1a275961ad9762ffc1d141adb91870e0' into gingerbread-plus-aosp * commit '1df61f0e1a275961ad9762ffc1d141adb91870e0': Avoid endless restarts when waiting for connectivity.
| * | Avoid endless restarts when waiting for connectivity.Steve Howard2010-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Adding an extra check for usable network connectivity to avoid an endless restart-pause loop while waiting for usable connectivity. Change-Id: If4da9ad222993b5479ada658508f445d10a42013
* | | am 7bdfb134: Merge "Fix and test handling of null/empty download fields." ↵Steve Howard2010-08-181-2/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '7bdfb134c6c1c4e3d4c5da61327e62bc38407c95' into gingerbread-plus-aosp * commit '7bdfb134c6c1c4e3d4c5da61327e62bc38407c95': Fix and test handling of null/empty download fields.
| * | Fix and test handling of null/empty download fields.Steve Howard2010-08-181-2/+10
| | | | | | | | | | | | | | | | | | | | | Minor change to make title/description default to blank stings, and add test case covering all null/empty download fields. Change-Id: Id44344bc2e464f46589faed49c8f383a45a8d329
* | | am adb6887d: Clean up error codes returned by download manager.Steve Howard2010-08-173-90/+99
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'adb6887d3270d180c94eaf90878d5b67d74a8f28' into gingerbread-plus-aosp * commit 'adb6887d3270d180c94eaf90878d5b67d74a8f28': Clean up error codes returned by download manager.
| * | Clean up error codes returned by download manager.Steve Howard2010-08-163-90/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This set of changes cleans up the error codes returned by the download manager in various failure cases, aiming for improved consistency. Error codes are part of the public API so it's important to get this right now. The main changes here are: * Refactoring the flow of error status information throughout DownloadThread to make it more explicit, by having StopRequest accept a status code in its constructor and eliminating State.mFinaStatus. * Eliminating the use of valid HTTP 4xx statuses when those statuses weren't actually returned by the server. Now, if the returned error code is a valid HTTP status code, that means it was returned by the server. These cases have been replaced with more sensible artificial error codes, including a new ERROR_CANNOT_RESUME when an interrupted download can't be resumed. * Improvements to some of the error handling code paths -- ensuring we don't clear the cache for external downloads, ensuring we don't fail with CANNOT_RESUME when the download hasn't actually started yet, removing the restriction on acceptable mime types for public API downloads. Change-Id: I0d825845fe0fe7ed5df74bad26e8d34ac0d1cc4e
* | | am e61798da: Extend PublicApiAccessTest to exercise DownloadManager.Steve Howard2010-08-161-0/+8
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'e61798da80558450f580ed948d0d469bd6423d8e' into gingerbread-plus-aosp * commit 'e61798da80558450f580ed948d0d469bd6423d8e': Extend PublicApiAccessTest to exercise DownloadManager.
| * | Extend PublicApiAccessTest to exercise DownloadManager.Steve Howard2010-08-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new test case to PublicApiAccessTest to enqueue a request through DownloadManager, ensuring that the values constructed by DownloadManager fit within the allowed bounds. It also fixes a bug with allowing http header values exposed by the new test. Change-Id: I94fec57d7a41298ac42ddaab338516e6a60c4e75
* | | am da5a4183: Merge "Make all public API downloads visible." into gingerbreadSteve Howard2010-08-061-2/+9
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'da5a4183312f520cf35b154d33cb7205e6ba5557' into gingerbread-plus-aosp * commit 'da5a4183312f520cf35b154d33cb7205e6ba5557': Make all public API downloads visible.
| * | Make all public API downloads visible.Steve Howard2010-07-281-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all downloads through the public API visible by default. It removes the API that had allowed applications to control notifications while the download runs. This has been replaced with a hidden API, since such behavior is needed by SystemUpdater and Market (for self-updates). Additionally, the behavior is now protected by a new permission. I'm making this permission signatureOrSystem, and changing the non-purgeable permission to the same (it should've been that, I just didn't know). I'm also adding string descriptions to appease the translation folks. Change-Id: I192e8b19ff9b0e425257cef0db081c3d75996ea5
* | | am 0d4f9f10: Get wifi limit from secure settings.Steve Howard2010-08-023-4/+11
|\| | | | | | | | | | | | | | | | | | | | Merge commit '0d4f9f105c3a31475a36e9a1edfa868c66ff455f' into gingerbread-plus-aosp * commit '0d4f9f105c3a31475a36e9a1edfa868c66ff455f': Get wifi limit from secure settings.
| * | Get wifi limit from secure settings.Steve Howard2010-07-283-4/+11
| | | | | | | | | | | | Change-Id: I750654c28cb3d9f9aa67bd56e4d8d770dbfde4b4
* | | am dea0a5f8: Add test for many interruptions to a single download.Steve Howard2010-07-301-80/+46
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'dea0a5f8e5804d3aba40eaa7de763dd88058384e' into gingerbread-plus-aosp * commit 'dea0a5f8e5804d3aba40eaa7de763dd88058384e': Add test for many interruptions to a single download.
| * | Add test for many interruptions to a single download.Steve Howard2010-07-271-80/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a new test case for downloads that undergo many interruptions (as may happen with a very large download that takes many hours). Includes some refactoring in the test suite. Early on, this test exposed a race condition in which the download manager got some I/O exception while reading from the MockWebServer. I went in and improved/refactored much of the error logging code in DownloadThread to try and track this down. Unfortunately, once I finished, the race condition no longer seems to be reproducible, even with hundreds of runs of the test case. So I've given up on it for now. In any event, error logging is better and much duplicate code has been eliminated.
* | | resolved conflicts for merge of f85aa9ef to gingerbread-plus-aospSteve Howard2010-07-301-65/+94
|\| | | | | | | | | | | Change-Id: I0adb03f16a6f0cc648886e02c79ffde63e18f99f
| * | Improved support for 302/307 redirects.Steve Howard2010-07-271-61/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the download manager's handling of 302/307 temporary redirects so that after an interruption of any kind, the delayed retry/resume will return to the original URI. This complies better with the HTTP spec. This change also makes the download manager handle other redirects immediately rather than using the delay that's otherwise applied to download errors. I made one more method extraction in DownloadThread to simplify this change, pulling the top-level logic for a single request into executeDownload(). It was then just a matter of introducing a new RetryDownload exeception, similar to StopRequest, and making the redirection code use it. Change-Id: Ic719c5725a9fd2e5eebe4dc03453ee71d9f27cd4
* | | am f6b4c24b: Fix bug with closing output stream for external downloads.Steve Howard2010-07-272-4/+4
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'f6b4c24b4a876daa3f4e91d6da418983222b9dfd' into gingerbread-plus-aosp * commit 'f6b4c24b4a876daa3f4e91d6da418983222b9dfd': Fix bug with closing output stream for external downloads.
| * | Fix bug with closing output stream for external downloads.Steve Howard2010-07-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am e6a05a1a: Serialize threading for download manager testing.Steve Howard2010-07-274-2/+12
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'e6a05a1aa4697440e9630d12b741b3bae321fe49' into gingerbread-plus-aosp * commit 'e6a05a1aa4697440e9630d12b741b3bae321fe49': Serialize threading for download manager testing.
| * | Serialize threading for download manager testing.Steve Howard2010-07-274-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The download manager uses threading in a simple way -- it launches two threads, UpdateThread and DownloadThread, and both are "fire and forget". This is fortunate for testing, since it means we can eliminate multithreading and simply run each thread in order, and everything still works. This change does just that, abstracting Thread.start() behind SystemFacade and making FakeSystemFacade put new threads into a queue and then run through them serially. This simplifies much of the test code and makes it all much more predictable. I've simplified the test code as much as possible here and moved a few more tests over to PublicApiFunctionalTest, leaving only a minimum in DownloadManagerFunctionalTest, which will eventually be deleted altogether. I've also improved testing in some areas -- for example, we can now test that running notifications get cancelled after the download completes in a robust way. There is one test case that checks for race conditions and requires multithreading. I've moved this into a new ThreadingTest class, which uses a custom FakeSystemFacade that allows multithreading. I've extracted AbstractPublicApiTest for the newly shared code. Change-Id: Ic1d5c76bfa9913fe053174c3d8b516790ca8b25f
* | | am 93155e1d: Stub out and test system notifications.Steve Howard2010-07-265-20/+49
|\| | | | | | | | | | | | | | | | | | | | Merge commit '93155e1da7e89d4925e244f5afa94afb8ada7381' into gingerbread-plus-aosp * commit '93155e1da7e89d4925e244f5afa94afb8ada7381': Stub out and test system notifications.
| * | Stub out and test system notifications.Steve Howard2010-07-235-20/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change abstracts NotificationManager interactions behind SystemFacade and takes advantage of that to test notifications, to a limited degree. It also fixes a silly typo in AbstractDownloadManagerFunctionalTest, and it introduces an extra sleep between tests to avoid some flakiness. I'll look for a better solution to that problem after this change goes in. Change-Id: I3a0307f828955cd45b0e3581ad499da28cc0556e
* | | am 71aab521: Support for non-purgeable downloads through the public API.Steve Howard2010-07-261-5/+16
|\| | | | | | | | | | | | | | | | | | | | Merge commit '71aab521efba9b28779541440c797220ec98ac97' into gingerbread-plus-aosp * commit '71aab521efba9b28779541440c797220ec98ac97': Support for non-purgeable downloads through the public API.
| * | Support for non-purgeable downloads through the public API.Steve Howard2010-07-231-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a permission, android.permission.DOWNLOAD_CACHE_NON_PURGEABLE. When an app has this permission, any downloads it requests through the public API to the download cache will automatically become non-purgeable, i.e. they'll never be automatically deleted by the download manager to free up space. This is intended for use only by the system updater. Change-Id: I35cdd44f7e5d46bc70443d1a9743f61a51395ddb
* | | am b06b739b: Make DownloadProvider accessible for public API usage.Steve Howard2010-07-262-47/+125
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'b06b739b078ce4b00600487cfec31659647bf31f' into gingerbread-plus-aosp * commit 'b06b739b078ce4b00600487cfec31659647bf31f': Make DownloadProvider accessible for public API usage.
| * | Make DownloadProvider accessible for public API usage.Steve Howard2010-07-222-47/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the requirement that apps have the ACCESS_DOWNLOAD_MANAGER permission in order to access DownloadProvider. This enables the public API to work. Instead, DownloadProvider enforces the new permissions model for the public API: * insert() requires INTERNET permission * insert() checks that input fits within the restricted input allowed for the public API * insert() also strictly checks the file URI provided with DESTINATION_FILE_URI (and still requires WRITE_EXTERNAL_STORAGE permission if that is supplied) Note that if an app has the ACCESS_DOWNLOAD_MANAGER permission, legacy behavior is retained. I've added a test to cover this new access, and updated the existing permissions tests. I also fixed a bug in WHERE clause construction in update() and delete(), and refactored the code to eliminate duplication. Change-Id: I53a08df137b35c2788c36350276c9dff24858af1
* | | am 0d8d8910: Make COLUMN_URI readable and tighten UID restrictions.Steve Howard2010-07-221-34/+15
|\| | | | | | | | | | | | | | | | | | | | Merge commit '0d8d89105c00edbad95a268aaae65f2ff94ed5a1' into gingerbread-plus-aosp * commit '0d8d89105c00edbad95a268aaae65f2ff94ed5a1': Make COLUMN_URI readable and tighten UID restrictions.
| * | Make COLUMN_URI readable and tighten UID restrictions.Steve Howard2010-07-211-34/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I need to make COLUMN_URI readable by apps, since the public API exposes that field. In order to avoid any possible security issues, I got rid of the feature that potentially allowed apps to view downloads from other UIDs. No one was using that feature and the public API exposes no such feature (yet). While at it, I cleaned up some related code in update() and delete(). Change-Id: I5384115d2a865255d009fbe37449488fd2269389
* | | am 0a77c62a: Public API support for broadcasts and connectivity control.Steve Howard2010-07-216-23/+158
|\| | | | | | | | | | | | | | | | | | | | Merge commit '0a77c62a82503b38c484e0079648f0231dd85d53' into gingerbread-plus-aosp * commit '0a77c62a82503b38c484e0079648f0231dd85d53': Public API support for broadcasts and connectivity control.
| * | Public API support for broadcasts and connectivity control.Steve Howard2010-07-216-23/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Three new DB fields, one indicating whether a download was initiated by the public API or not, two to hold connectivity control info. DB migration to add these fields and code in DownloadProvider.insert() to handle them. * Change broadcast intent code to match public API spec, for public API downloads only. (Legacy code can go away once existing clients are converted over to the new API.) * Introduce SystemFacade methods for sending broadcasts and checking package ownership; this facilitates new tests of broadcast code. * Change DownloadInfo.canUseNetwork() to obey new connectivity controls available in public API, but again, retain legacy behavior for downloads initiated directly through DownloadProvider * New test cases to cover the new behavior Also made a couple changes to reduce some test flakiness I was observing: * in tearDown(), wait for any running UpdateThread to complete * in PublicApiFunctionalTest.setUp(), if the test directory already exists, remove it rather than aborting DB changes for broadcast + roaming support Change-Id: I60f39fc133f678f3510880ea6eb9f639358914b4
* | | resolved conflicts for merge of b5629da7 to gingerbread-plus-aospSteve Howard2010-07-214-613/+737
|\| | | | | | | | | | | Change-Id: Icddfa080f43f882cce60af8a729436dcc2406384
| * | Major refactoring of DownloadThread.run().Steve Howard2010-07-204-609/+733
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivation: I need to fix the handling of 302s, so that after a disconnect, subsequent retries will use the original URI, not the redirected one. Rather than store extra information in the DB, I'd like to just keep the redirected URI in memory and make the redirected request within the same DownloadThread. This involves working with the large-scale structure of DownloadThread.run(). Since run() was a ~700 line method, I didn't feel comfortable making such changes. So this change refactors run() into a ~80 line method which calls into a collection of ~20 other short methods. The state previously kept in local variables has been pulled into a couple of state-only inner classes. The error-handling control flow, formerly handled by "break http_request_loop" statements, is now handled by throwing a "StopRequest" exception. The remaining structure of run() has been simplified -- the outermost for loop, for example, could never actually repeat and has been removed for now. Some other bits of code have been cleaned up a bit, but the functionality has not been modified. There are many good next steps to this refactoring. Besides various other cleanup bits, a major improvement would be to consolidate the State/InnerState classes, move some functionality to this new class (there are many functions of the form "void foo(State)" which would be good candidates), and promote it to a top-level class. But I want to take things one step at a time, and I think what I've got here is a major improvement and should be enough to allow me to safely implement the changes to redirection handling. In the process of doing this refactoring I added many test cases to PublicApiFunctionalTest to exercise some of the pieces of code I was moving around. I also moved some test cases from DownloadManagerFunctionalTest. Over time I'd like to move everything over to use the PublicApiFunctionalTest approach, and then I may break that into some smaller suites. Other minor changes: * use longs instead of ints to track file sizes, as these may be getting quite large in the future * provide a default DB value of -1 for COLUMN_TOTAL_BYTES, as this simplifies some logic in DownloadThread * small extensions to MockResponse to faciliate new test cases Change-Id: If7862349296ad79ff6cdc97e554ad14c01ce1f49
* | | am 5180de23: Fix bug with deciding when to restart a download.Steve Howard2010-07-202-21/+23
|\| | | | | | | | | | | | | | | | | | | | Merge commit '5180de23e77139dd6971dfd48269242e3e3562d9' into gingerbread-plus-aosp * commit '5180de23e77139dd6971dfd48269242e3e3562d9': Fix bug with deciding when to restart a download.