فهرست منبع

add account-id to webxdc-url (#1524)

this avoids caching problems
when the same message-id is used in different accounts.

moreover, the commit moves building url-request in the worker thread
(should not make a big difference,
however, as we have the worker alrady we can also use it :)
bjoern 3 سال پیش
والد
کامیت
2cb30aafe4
1فایلهای تغییر یافته به همراه3 افزوده شده و 2 حذف شده
  1. 3 2
      deltachat-ios/Controller/WebxdcViewController.swift

+ 3 - 2
deltachat-ios/Controller/WebxdcViewController.swift

@@ -10,7 +10,6 @@ class WebxdcViewController: WebViewViewController {
         case sendStatusUpdate = "sendStatusUpdateHandler"
     }
     let INTERNALSCHEMA = "webxdc"
-    let INTERNALDOMAIN = "local.app"
     
     var messageId: Int
     var dcContext: DcContext
@@ -221,8 +220,10 @@ class WebxdcViewController: WebViewViewController {
     private func loadHtml() {
         DispatchQueue.global(qos: .userInitiated).async { [weak self] in
             guard let self = self else { return }
+            let url = URL(string: "\(self.INTERNALSCHEMA)://acc\(self.dcContext.id)-msg\(self.messageId).localhost/index.html")
+            let urlRequest = URLRequest(url: url!)
             DispatchQueue.main.async {
-                self.webView.load(URLRequest(url: URL(string: "\(self.INTERNALSCHEMA)://msg\(self.messageId).\(self.INTERNALDOMAIN)/index.html")!))
+                self.webView.load(urlRequest)
             }
         }
     }