From e58699720e21ccfc605313066cc0e0f252fc6535 Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Thu, 7 Jun 2012 17:20:38 -0700
Subject: [PATCH] Bug 744479 - Only attempt to load favicons for HTTP/HTTPS.
 r=mfinkle

---
 mobile/android/base/Favicons.java | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/Favicons.java b/mobile/android/base/Favicons.java
index ed163fb23ec..dea71886263 100644
--- a/mobile/android/base/Favicons.java
+++ b/mobile/android/base/Favicons.java
@@ -21,6 +21,8 @@ import java.io.InputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -254,6 +256,19 @@ public class Favicons {
                 return GeckoJarReader.getBitmapDrawable(mFaviconUrl);
             }
 
+            URI uri;
+            try {
+                uri = faviconUrl.toURI();
+            } catch (URISyntaxException e) {
+                Log.d(LOGTAG, "Could not get URI for favicon URL: " + mFaviconUrl);
+                return null;
+            }
+
+            // only get favicons for HTTP/HTTPS
+            String scheme = uri.getScheme();
+            if (!"http".equals(scheme) && !"https".equals(scheme))
+                return null;
+
             // skia decoder sometimes returns null; workaround is to use BufferedHttpEntity
             // http://groups.google.com/group/android-developers/browse_thread/thread/171b8bf35dbbed96/c3ec5f45436ceec8?lnk=raot 
             BitmapDrawable image = null;
@@ -264,8 +279,6 @@ public class Favicons {
                 BufferedHttpEntity bufferedEntity = new BufferedHttpEntity(entity);
                 contentStream = bufferedEntity.getContent();
                 image = (BitmapDrawable) Drawable.createFromStream(contentStream, "src");
-            } catch (IOException e) {
-                // just close up and return null
             } catch (Exception e) {
                 Log.e(LOGTAG, "Error reading favicon", e);
             } finally {