From a5c125b32b32b7c14f70c950ea20207bc49d4006 Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Fri, 22 Jan 2021 14:30:21 +0000
Subject: [PATCH] Fix retrieval of htmlContent to account for asynch cache

Former-commit-id: 8c7ffcc93964106c31943d5be2ed3cfc7c6e20d8 [formerly 72c9a4fe0d66ba2d6e73b92b50cc8eb238d19d5c [formerly 8cc8eaafe8335819a9eb806861b5badb653acab8]]
Former-commit-id: e59abefe8fa8379a6c9e01e557c5c70991a575a3
Former-commit-id: 8ca55769da91c3bf6a2a6ede966a214ac8dd00dd
---
 www/js/app.js | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/www/js/app.js b/www/js/app.js
index e3ef88fb..79cdd9ce 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1378,6 +1378,10 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
                 // Make user re-pick file if we have upgraded (it's less confusing than filehandle errors) - NOT NEEDED, remove in due course
                 // settingsStore.removeItem('listOfArchives');
 
+                // If we have an update, it is best not to preserve last read article
+                params.lastPageVisit = "";
+                
+
                 //  Update the installed version
                 if (settingsStore.getItem('PWAInstalled')) {
                     params.PWAInstalled = params.version;
@@ -2776,32 +2780,40 @@ define(['jquery', 'zimArchiveLoader', 'uiUtil', 'util', 'cache', 'images', 'sett
                 //Load lastPageVisit if it is the currently requested page
                 if (!htmlContent) {
                     var lastPage = '';
+                    // NB code below must be able to run async, hence it is a function
+                    var goToRetrievedContent = function(html) {
+                        if (/<html[^>]*>/.test(html)) {
+                            console.log("Fast article retrieval from localStorage: " + lastPage);
+                            //if (~lastPage.indexOf(params.cachedStartPage)) params.isLandingPage = true;
+                            setTimeout(function () {
+                                displayArticleInForm(dirEntry, html);
+                            }, 10);
+                        } else {
+                            //if (params.contentInjectionMode === 'jquery') {
+                            // In jQuery mode, we read the article content in the backend and manually insert it in the iframe
+                            appstate.selectedArchive.readUtf8File(dirEntry, displayArticleInForm);
+                            // This is needed so that the html is cached in displayArticleInForm
+                            params.lastPageVisit = '';
+                            //}
+                        }
+                    };
                     if (params.rememberLastPage && params.lastPageVisit) lastPage = params.lastPageVisit.replace(/@kiwixKey@.+/, "");
                     if (params.rememberLastPage && (typeof Storage !== "undefined") && dirEntry.namespace + '/' + dirEntry.url == lastPage) {
                         if (!params.lastPageHTML) {
                             cache.getArticle(params.lastPageVisit.replace(/.*@kiwixKey@/, ''), lastPage, function (html) {
                                 params.lastPageHTML = html;
                                 htmlContent = params.lastPageHTML || htmlContent;
+                                goToRetrievedContent(htmlContent);
                             });
                         } else {
                             htmlContent = params.lastPageHTML;
+                            goToRetrievedContent(htmlContent);
                         }
                         
-                    }
-                    if (/<html[^>]*>/.test(htmlContent)) {
-                        console.log("Fast article retrieval from localStorage: " + lastPage);
-                        //if (~lastPage.indexOf(params.cachedStartPage)) params.isLandingPage = true;
-                        setTimeout(function () {
-                            displayArticleInForm(dirEntry, htmlContent);
-                        }, 10);
                     } else {
-                        //if (params.contentInjectionMode === 'jquery') {
-                        // In jQuery mode, we read the article content in the backend and manually insert it in the iframe
-                        appstate.selectedArchive.readUtf8File(dirEntry, displayArticleInForm);
-                        // This is needed so that the html is cached in displayArticleInForm
-                        params.lastPageVisit = '';
-                        //}
+                        goToRetrievedContent(htmlContent);
                     }
+                    
                 }
             }