浏览代码

tweak notify debug output

B. Petersen 4 年之前
父节点
当前提交
50c12be1fb
共有 1 个文件被更改,包括 6 次插入11 次删除
  1. 6 11
      deltachat-ios/Controller/SettingsController.swift

+ 6 - 11
deltachat-ios/Controller/SettingsController.swift

@@ -468,13 +468,6 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         navigationController?.pushViewController(HelpViewController(), animated: true)
     }
 
-    private func formatDebugCounter(_ name: String) -> String {
-        let val = UserDefaults.standard.integer(forKey: name + "-cnt")
-        let timestampInt = UserDefaults.standard.double(forKey: name + "-name")
-        let timestampStr = DateUtils.getExtendedRelativeTimeSpanString(timeStamp: timestampInt)
-        return "\(val) times, last time: \(timestampStr) (\(timestampInt))"
-    }
-
     private func showDebugToolkit() {
         var info: [DBCustomVariable] = dcContext.getInfo().map { kv in
             let value = kv.count > 1 ? kv[1] : ""
@@ -487,10 +480,12 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         info.append(DBCustomVariable(name: "DEBUG", value: "0"))
         #endif
 
-
-        info.append(DBCustomVariable(name: "notify-remote-receive", value: formatDebugCounter("notify-remote-receive")))
-        info.append(DBCustomVariable(name: "notify-remote-launch", value: formatDebugCounter("notify-remote-launch")))
-        info.append(DBCustomVariable(name: "notify-local-wakeup", value: formatDebugCounter("notify-local-wakeup")))
+        for name in ["notify-remote-launch", "notify-remote-receive", "notify-local-wakeup"] {
+            let cnt = UserDefaults.standard.integer(forKey: name + "-cnt")
+            let timestampInt = UserDefaults.standard.double(forKey: name + "-name")
+            let timestampStr = timestampInt==0.0 ? "" : ", last time: " + DateUtils.getExtendedRelativeTimeSpanString(timeStamp: timestampInt)
+            info.append(DBCustomVariable(name: name, value: "\(cnt) times\(timestampStr)"))
+        }
 
         DBDebugToolkit.add(info)
         DBDebugToolkit.showMenu()