From 8f31dd5827d8fe3c1ff3538b178be326e5465fa3 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Mon, 3 Oct 2011 23:01:22 -0400
Subject: [PATCH] Bug 691534 - Use asyncFetch when loading files in
 aboutHome.xhtml [r=mbrubeck]

---
 mobile/chrome/content/aboutHome.xhtml | 218 ++++++++++++--------------
 1 file changed, 103 insertions(+), 115 deletions(-)

diff --git a/mobile/chrome/content/aboutHome.xhtml b/mobile/chrome/content/aboutHome.xhtml
index 3d7877edb08..590872f95a8 100644
--- a/mobile/chrome/content/aboutHome.xhtml
+++ b/mobile/chrome/content/aboutHome.xhtml
@@ -127,7 +127,9 @@
   <script type="application/javascript;version=1.8"><![CDATA[
     let Ci = Components.interfaces, Cc = Components.classes, Cu = Components.utils;
     let gChromeWin = null;
+
     Cu.import("resource://gre/modules/AddonManager.jsm");
+    Cu.import("resource://gre/modules/NetUtil.jsm");
 
     function openLink(aElement) {
       try {
@@ -177,23 +179,21 @@
       uninitAddons();
     }
 
-    function _readFile(aFile) {
-      try {
-        let stream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(Ci.nsIFileInputStream);
-        stream.init(aFile, 0x01, 0, 0);
-        let cvstream = Cc["@mozilla.org/intl/converter-input-stream;1"].createInstance(Ci.nsIConverterInputStream);
+    function _readFile(aFile, aCallback) {
+      let channel = NetUtil.newChannel(aFile);
+      channel.contentType = "application/json";
+      NetUtil.asyncFetch(channel, function(aStream, aResult) {
+        if (!Components.isSuccessCode(aResult)) {
+          Cu.reportError("AboutHome: Could not read from " + aFile.leafName);
+          aCallback(null);
+          return;
+        }
 
-        let fileSize = stream.available();
-        cvstream.init(stream, "UTF-8", fileSize, Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
-        let data = {};
-        cvstream.readString(fileSize, data);
-        let content = data.value;
-        cvstream.close();
-        return content.replace(/\r\n?/g, "\n");
-      }
-      catch (ex) { Cu.reportError(ex); }
+        let content = NetUtil.readInputStreamToString(aStream, aStream.available()) || "";
+        aStream.close();
 
-      return null;
+        aCallback(content.replace(/\r\n?/g, "\n"));
+      });
     }
 
     function openTabs(aURLs) {
@@ -218,75 +218,77 @@
         return;
       }
 
-      let data = JSON.parse(_readFile(session));
-      if (!data || data.windows.length == 0) {
-        noRecentTabs();
-        return;
-      }
-
-      let chromeWin = getChromeWin();
-      let allPageURLs = [];
-
-      let list = document.getElementById("recentTabs");
-
-      let tabs = data.windows[0].tabs;
-      for (let i=0; i<tabs.length; i++) {
-        let tabData = tabs[i];
-        let tabEntry = tabData.entries[tabData.index - 1];
-
-        let url = tabEntry.url;
-        if (url.indexOf("about:") == 0)
-          continue;
-
-        let title = tabEntry.title;
-        if (!title)
-          continue;
-
-        let uri = chromeWin.Util.makeURI(url);
-        let favicon = chromeWin.gFaviconService.getFaviconImageForPage(uri).spec;
-
-        let outer = document.createElement("a");
-        outer.setAttribute("role", "button");
-        outer.setAttribute("href", url);
-
-        allPageURLs.push(url);
-
-        let img = document.createElement("img");
-        img.className = "favicon";
-        img.setAttribute("src", favicon);
-        outer.appendChild(img);
-
-        let inner = document.createElement("div");
-        inner.className = "inner";
-
-        let titlePart = document.createElement("div");
-        titlePart.textContent = title;
-        titlePart.className = "title";
-        inner.appendChild(titlePart);
-
-        outer.appendChild(inner);
-        list.appendChild(outer);
-      }
-
-      if (allPageURLs.length > 0) {
-        let loading = document.getElementById("loadingTabs");
-        loading.parentNode.removeChild(loading);
-
-        if (allPageURLs.length > 1) {
-          let outer = document.createElement("div");
-          outer.className = "openall";
-          outer.textContent = document.getElementById("text-openalltabs").textContent;
+      _readFile(session, function(aContent) {
+        let data = JSON.parse(aContent);
+        if (!data || data.windows.length == 0) {
+          noRecentTabs();
+          return;
+        }
+  
+        let chromeWin = getChromeWin();
+        let allPageURLs = [];
+  
+        let list = document.getElementById("recentTabs");
+  
+        let tabs = data.windows[0].tabs;
+        for (let i=0; i<tabs.length; i++) {
+          let tabData = tabs[i];
+          let tabEntry = tabData.entries[tabData.index - 1];
+  
+          let url = tabEntry.url;
+          if (url.indexOf("about:") == 0)
+            continue;
+  
+          let title = tabEntry.title;
+          if (!title)
+            continue;
+  
+          let uri = chromeWin.Util.makeURI(url);
+          let favicon = chromeWin.gFaviconService.getFaviconImageForPage(uri).spec;
+  
+          let outer = document.createElement("a");
           outer.setAttribute("role", "button");
-
-          outer.addEventListener("click", function() {
-            openTabs(allPageURLs);
-          }, false);
-
+          outer.setAttribute("href", url);
+  
+          allPageURLs.push(url);
+  
+          let img = document.createElement("img");
+          img.className = "favicon";
+          img.setAttribute("src", favicon);
+          outer.appendChild(img);
+  
+          let inner = document.createElement("div");
+          inner.className = "inner";
+  
+          let titlePart = document.createElement("div");
+          titlePart.textContent = title;
+          titlePart.className = "title";
+          inner.appendChild(titlePart);
+  
+          outer.appendChild(inner);
           list.appendChild(outer);
         }
-      } else {
-        noRecentTabs();
-      }
+  
+        if (allPageURLs.length > 0) {
+          let loading = document.getElementById("loadingTabs");
+          loading.parentNode.removeChild(loading);
+  
+          if (allPageURLs.length > 1) {
+            let outer = document.createElement("div");
+            outer.className = "openall";
+            outer.textContent = document.getElementById("text-openalltabs").textContent;
+            outer.setAttribute("role", "button");
+  
+            outer.addEventListener("click", function() {
+              openTabs(allPageURLs);
+            }, false);
+  
+            list.appendChild(outer);
+          }
+        } else {
+          noRecentTabs();
+        }
+      });
     }
 
     function openRemoteTabs() {
@@ -315,26 +317,6 @@
         return file;
       },
 
-      _readFile: function(aFile) {
-        try {
-          let stream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(Ci.nsIFileInputStream);
-          stream.init(aFile, 0x01, 0, 0);
-          let cvstream = Cc["@mozilla.org/intl/converter-input-stream;1"].createInstance(Ci.nsIConverterInputStream);
-          
-          let fileSize = stream.available();
-          cvstream.init(stream, "UTF-8", fileSize, Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
-          let data = {};
-          cvstream.readString(fileSize, data);
-          let content = data.value;
-          cvstream.close();
-          return content.replace(/\r\n?/g, "\n");
-        }
-        catch (ex) {
-          Cu.reportError(ex);
-        }
-        return null;
-      },
-
       _loadAddons: function(aAddons, aAddonCount, aTotalResults) {
         let list = document.getElementById("newAddons");
         let loading = document.getElementById("loadingAddons");
@@ -384,23 +366,29 @@
       },
 
       loadFromCacheOrScheduleUpdate: function(aDelay) {
+        let self = this;
         let file = this._getFile();
         if (file.exists()) {
-          let json = JSON.parse(this._readFile(file));
-
-          // Ignore addons already installed
-          let self = this;
-          let addonsCache = json.addons;
-          AddonManager.getAllAddons(function(aAddons) {
-            let addons = addonsCache.filter(function(addon) {
-              for (let i =0; i < aAddons.length; i++)
-                if (addon.id == aAddons[i].id)
-                  return false;
-
-              return true;
+          _readFile(file, function(aContent) {
+            let json = JSON.parse(aContent);
+            if (!json || json.addons.length == 0) {
+              self._loadAddons([], 0, 0);
+              return;
+            }
+  
+            // Ignore addons already installed
+            let addonsCache = json.addons;
+            AddonManager.getAllAddons(function(aAddons) {
+              let addons = addonsCache.filter(function(addon) {
+                for (let i =0; i < aAddons.length; i++)
+                  if (addon.id == aAddons[i].id)
+                    return false;
+  
+                return true;
+              });
+  
+              self._loadAddons(addons, addons.length, json.totalResults);
             });
-
-            self._loadAddons(addons, addons.length, json.totalResults);
           });
         } else {
           setTimeout(function() {