diff options
| author | Cary Clark <cary@android.com> | 2009-09-02 11:38:37 -0400 |
|---|---|---|
| committer | Cary Clark <cary@android.com> | 2009-09-04 13:36:29 -0400 |
| commit | 89c5a7db771a601adf20ad3e3a7a979ccacbd0d9 (patch) | |
| tree | b78e598f08fc14f14ee5ed3d25136f16811b6919 /src | |
| parent | ffbfeee4412777f1ace9bf9cedf1b5d651cba433 (diff) | |
| download | android_packages_apps_HTMLViewer-89c5a7db771a601adf20ad3e3a7a979ccacbd0d9.tar.gz android_packages_apps_HTMLViewer-89c5a7db771a601adf20ad3e3a7a979ccacbd0d9.tar.bz2 android_packages_apps_HTMLViewer-89c5a7db771a601adf20ad3e3a7a979ccacbd0d9.zip | |
Only include the intent type in loadUrl() if it is set
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/htmlviewer/HTMLViewerActivity.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/com/android/htmlviewer/HTMLViewerActivity.java b/src/com/android/htmlviewer/HTMLViewerActivity.java index 152e2b3..b8a59d3 100644 --- a/src/com/android/htmlviewer/HTMLViewerActivity.java +++ b/src/com/android/htmlviewer/HTMLViewerActivity.java @@ -99,17 +99,14 @@ public class HTMLViewerActivity extends Activity { Intent intent = getIntent(); if (intent.getData() != null) { Uri uri = intent.getData(); - if ("file".equals(uri.getScheme())) { - String contentUri = - FileContentProvider.BASE_URI + - uri.getEncodedPath() + - "?" + - intent.getType(); - mWebView.loadUrl(contentUri); - } else { - mWebView.loadUrl(intent.getData().toString() + - "?" + intent.getType()); + String contentUri = "file".equals(uri.getScheme()) + ? FileContentProvider.BASE_URI + uri.getEncodedPath() + : uri.toString(); + String intentType = intent.getType(); + if (intentType != null) { + contentUri += "?" + intentType; } + mWebView.loadUrl(contentUri); } } } |