Looks good Ziv. I've committed this CL (r911933) with just a few minor tweaks:
* Changed IllegalArgumentException to Uri.UriException * Used uri.toString() as the new value for url to be doubly-sure that the Uri's formatting is OK. http://codereview.appspot.com/215047/show
