691534 - Use asyncFetch when loading files in aboutHome.xhtml

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Mark Finkle (:mfinkle) (use needinfo?)]

Attachment: patch

We are actually using sync file loading in aboutHome.xhtml - CRAZY!

This patch switches us to use asyncFetch to load the JSON data files. The patch also refactors the code to use a single _readFile method.

This should make trying to interact with Fennec easier _right_ after the home page is loaded.

Comment 1

[Matt Brubeck (:mbrubeck)]

Comment on attachment 564345 [details] [diff] [review]
patch

r=mbrubeck with some minor nits:

>+    function _readFile(aFile, aCallback) {
>       try {

You can probably remove the try/catch

>+        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 content = NetUtil.readInputStreamToString(aStream, aStream.available()) || "";
>+          aStream.close();
>+
>+          aCallback(content.replace(/\r\n?/g, "\n"));
>+          return;

No need for explicit "return" here.

>+        });
>       }
>       catch (ex) { Cu.reportError(ex); }
> 
>-      return null;
>+      aCallback(null);
>     }

Remove the aCallback(null) here.

>       loadFromCacheOrScheduleUpdate: function(aDelay) {
>+        let self = this;
>         let file = this._getFile();
>         if (file.exists()) {
>+          _readFile(file, function(aContent) {
>+            let json = JSON.parse(aContent);
>+            if (!json || json.addons.length == 0) {
>+              //noRecentTabs();

Remember to remove the commented-out line above.

Comment 2

[Mark Finkle (:mfinkle) (use needinfo?)]

Made changes

https://hg.mozilla.org/integration/mozilla-inbound/rev/26d62a2d24cb

Comment 3

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/26d62a2d24cb

Comment 4

[Mark Finkle (:mfinkle) (use needinfo?)]

Comment on attachment 564345 [details] [diff] [review]
patch

Cheap, local fix for reading two data files using async methods. Should reduce the "stall" that can occur after loading the phone page on phones with slow file systems (still looking at you Galaxy S)

Comment 5

[Matt Brubeck (:mbrubeck)]

We should hold off pushing this to Aurora unless bug 692767 is also fixed and approved for Aurora.

Comment 6

[Mark Finkle (:mfinkle) (use needinfo?)]

https://hg.mozilla.org/releases/mozilla-aurora/rev/8b1171944849