Untangle PageSummary call from page loading sequence.

app/src/main/java/org/wikipedia/bridge/CommunicationBridge.kt

@@ -7,7 +7,6 @@ import android.os.Message
 import android.webkit.*
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
-import org.wikipedia.bridge.JavaScriptActionHandler.setUp
 import org.wikipedia.dataclient.RestService
 import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.json.JsonUtil
@@ -173,7 +172,7 @@ class CommunicationBridge constructor(private val communicationBridgeListener: C
         @get:Synchronized
         @get:JavascriptInterface
         val setupSettings: String
-            get() = setUp(communicationBridgeListener.webView.context,
+            get() = JavaScriptActionHandler.setUp(communicationBridgeListener.webView.context,
                     communicationBridgeListener.model.title!!, communicationBridgeListener.isPreview,
                     communicationBridgeListener.toolbarMargin)
     }

app/src/main/java/org/wikipedia/bridge/JavaScriptActionHandler.kt

@@ -50,12 +50,26 @@ object JavaScriptActionHandler {
         return "pcs.c1.Page.getTableOfContents()"
     }
 
-    fun getProtection(): String {
-        return "pcs.c1.Page.getProtection()"
-    }
-
-    fun getRevision(): String {
-        return "pcs.c1.Page.getRevision();"
+    fun requestMetadata(): String {
+        return "var metadata = {};" +
+                "metadata.revision = parseInt(pcs.c1.Page.getRevision());" +
+                "metadata.leadImage = pcs.c1.Page.getLeadImage();" +
+                "metadata.protection = pcs.c1.Page.getProtection();" +
+                "var m = document.head.querySelector('meta[property=\"mw:pageId\"]');" +
+                "if (m) metadata.pageId = parseInt(m.getAttribute('content'));" +
+                "m = document.head.querySelector('meta[property=\"mw:pageNamespace\"]');" +
+                "if (m) metadata.pageNamespace = parseInt(m.getAttribute('content'));" +
+                "m = document.head.querySelector('meta[property=\"dc:modified\"]');" +
+                "if (m) metadata.timeStamp = m.getAttribute('content');" +
+                "m = document.head.querySelector('title');" +
+                "if (m) metadata.title = m.textContent;" +
+                "m = document.body.querySelector('#pcs-edit-section-title-description');" +
+                "if (m) {" +
+                "  metadata.description = m.textContent;" +
+                "  metadata.descriptionSource = m.getAttribute('data-description-source');" +
+                "  metadata.wikibaseItem = m.getAttribute('data-wikdata-entity-id');" +
+                "}" +
+                "metadata;"
     }
 
     fun expandCollapsedTables(expand: Boolean): String {

app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.kt

@@ -16,6 +16,7 @@ import org.wikipedia.util.UriUtil
 import org.wikipedia.util.log.L
 import java.io.IOException
 import java.nio.charset.Charset
+import java.time.Instant
 
 abstract class OkHttpWebViewClient : WebViewClient() {
     /*
@@ -26,6 +27,9 @@ abstract class OkHttpWebViewClient : WebViewClient() {
     abstract val model: PageViewModel
     abstract val linkHandler: LinkHandler
 
+    var lastPageHtmlOfflineDate: Instant? = null
+    var lastPageHtmlWasRedirect = false
+
     override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
         if (model.shouldLoadAsMobileWeb) {
             // If the page was loaded as Mobile Web, then pass all link clicks through
@@ -54,12 +58,13 @@ abstract class OkHttpWebViewClient : WebViewClient() {
         }
         var response: WebResourceResponse
         try {
-            val shouldLogLatency = request.url.encodedPath?.contains(RestService.PAGE_HTML_ENDPOINT) == true
-            if (shouldLogLatency) {
+            val isPageHtmlCall = request.url.encodedPath?.contains(RestService.PAGE_HTML_ENDPOINT) == true
+            if (isPageHtmlCall) {
                 WikipediaApp.instance.appSessionEvent.pageFetchStart()
+                lastPageHtmlOfflineDate = null
             }
             val rsp = request(request)
-            if (rsp.networkResponse != null && shouldLogLatency) {
+            if (rsp.networkResponse != null && isPageHtmlCall) {
                 WikipediaApp.instance.appSessionEvent.pageFetchEnd()
             }
             val contentType = rsp.header(HEADER_CONTENT_TYPE).orEmpty()
@@ -68,6 +73,12 @@ abstract class OkHttpWebViewClient : WebViewClient() {
                 rsp.close()
                 return null
             } else {
+                if (isPageHtmlCall) {
+                    lastPageHtmlWasRedirect = rsp.priorResponse?.isRedirect == true
+                    if (OfflineCacheInterceptor.SAVE_HEADER_SAVE == rsp.headers[OfflineCacheInterceptor.SAVE_HEADER]) {
+                        lastPageHtmlOfflineDate = rsp.headers.getInstant("date")
+                    }
+                }
                 // noinspection ConstantConditions
                 WebResourceResponse(rsp.body!!.contentType()!!.type + "/" + rsp.body!!.contentType()!!.subtype,
                     rsp.body!!.contentType()!!.charset(Charset.defaultCharset())!!.name(),