From 8b54ca111ebd24b38d4ecf3d582aac8959ee5218 Mon Sep 17 00:00:00 2001 From: Simon Laux Date: Wed, 15 Nov 2023 02:16:12 +0100 Subject: [PATCH] remove unused, not working debug variables from context closes #1975 (read Explanation on that issue) --- DcCore/DcCore/DC/Wrapper.swift | 4 ---- DcCore/DcCore/DC/events.swift | 2 -- .../Controller/AccountSetup/AccountSetupController.swift | 2 -- 3 files changed, 8 deletions(-) diff --git a/DcCore/DcCore/DC/Wrapper.swift b/DcCore/DcCore/DC/Wrapper.swift index fb08e5e82..02936cc29 100644 --- a/DcCore/DcCore/DC/Wrapper.swift +++ b/DcCore/DcCore/DC/Wrapper.swift @@ -112,8 +112,6 @@ public class DcContext { public var logger: Logger? var contextPointer: OpaquePointer? - public var lastWarningString: String = "" // temporary thing to get a grip on some weird errors - public var maxConfigureProgress: Int = 0 // temporary thing to get a grip on some weird errors private var anyWebxdcSeen: Bool = false public init(contextPointer: OpaquePointer?, logger: Logger?) { @@ -494,8 +492,6 @@ public class DcContext { } public func configure() { - maxConfigureProgress = 0 - lastWarningString = "" dc_configure(contextPointer) } diff --git a/DcCore/DcCore/DC/events.swift b/DcCore/DcCore/DC/events.swift index 0a6f1839d..97d15f1f3 100644 --- a/DcCore/DcCore/DC/events.swift +++ b/DcCore/DcCore/DC/events.swift @@ -41,11 +41,9 @@ public class DcEventHandler { case DC_EVENT_WARNING: let s = event.data2String - dcContext.lastWarningString = s dcContext.logger?.warning("event: \(s)") case DC_EVENT_CONFIGURE_PROGRESS: - dcContext.maxConfigureProgress = max(dcContext.maxConfigureProgress, Int(data1)) dcContext.logger?.info("configure progress: \(Int(data1)) \(Int(data2))") let nc = NotificationCenter.default DispatchQueue.main.async { diff --git a/deltachat-ios/Controller/AccountSetup/AccountSetupController.swift b/deltachat-ios/Controller/AccountSetup/AccountSetupController.swift index bf0588151..18655e497 100644 --- a/deltachat-ios/Controller/AccountSetup/AccountSetupController.swift +++ b/deltachat-ios/Controller/AccountSetup/AccountSetupController.swift @@ -574,8 +574,6 @@ class AccountSetupController: UITableViewController, ProgressAlertHandler { if let reachability = appDelegate.reachability, reachability.connection == .unavailable { errorMessage = String.localized("login_error_no_internet_connection") } - } else { - errorMessage = "\(errorMessage ?? "no message")\n\n(warning=\(self.dcContext.lastWarningString) (progress=\(self.dcContext.maxConfigureProgress))" } self.updateProgressAlert(error: errorMessage) } else if let done = ui["done"] as? Bool, done {