|
|
@ -309,7 +309,7 @@ private class PrivateXMLHandler { |
|
|
|
let (xml, hasValidTokenScriptFile) = PrivateXMLHandler.storeXmlAccordingToTokenScriptStatus(xmlString: xmlString, tokenScriptStatus: tokenScriptStatus) |
|
|
|
let (xml, hasValidTokenScriptFile) = PrivateXMLHandler.storeXmlAccordingToTokenScriptStatus(xmlString: xmlString, tokenScriptStatus: tokenScriptStatus) |
|
|
|
self.xml = xml |
|
|
|
self.xml = xml |
|
|
|
self.hasValidTokenScriptFile = hasValidTokenScriptFile |
|
|
|
self.hasValidTokenScriptFile = hasValidTokenScriptFile |
|
|
|
if isBase ?? false { |
|
|
|
if isBase { |
|
|
|
self.server = .any |
|
|
|
self.server = .any |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
self.server = PrivateXMLHandler.extractServer(fromXML: xml, xmlContext: xmlContext, matchingContract: contract).flatMap { .server($0) } |
|
|
|
self.server = PrivateXMLHandler.extractServer(fromXML: xml, xmlContext: xmlContext, matchingContract: contract).flatMap { .server($0) } |
|
|
@ -680,7 +680,7 @@ public class XMLHandler { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var tokenViewIconifiedHtml: (html: String, style: String) { |
|
|
|
var tokenViewIconifiedHtml: (html: String, style: String) { |
|
|
|
let (html: html, style: style) = privateXMLHandler.tokenViewIconifiedHtml |
|
|
|
let (html: html, style: _) = privateXMLHandler.tokenViewIconifiedHtml |
|
|
|
if let baseXMLHandler = baseXMLHandler { |
|
|
|
if let baseXMLHandler = baseXMLHandler { |
|
|
|
if html.isEmpty { |
|
|
|
if html.isEmpty { |
|
|
|
return baseXMLHandler.tokenViewIconifiedHtml |
|
|
|
return baseXMLHandler.tokenViewIconifiedHtml |
|
|
@ -693,7 +693,7 @@ public class XMLHandler { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var tokenViewHtml: (html: String, style: String) { |
|
|
|
var tokenViewHtml: (html: String, style: String) { |
|
|
|
let (html: html, style: style) = privateXMLHandler.tokenViewHtml |
|
|
|
let (html: html, style: _) = privateXMLHandler.tokenViewHtml |
|
|
|
if let baseXMLHandler = baseXMLHandler { |
|
|
|
if let baseXMLHandler = baseXMLHandler { |
|
|
|
if html.isEmpty { |
|
|
|
if html.isEmpty { |
|
|
|
return baseXMLHandler.tokenViewHtml |
|
|
|
return baseXMLHandler.tokenViewHtml |
|
|
|