From 79f8e92f08de43183eeea4694e493ec0128c0136 Mon Sep 17 00:00:00 2001
From: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date: Fri, 18 Oct 2019 08:38:34 +0200
Subject: [PATCH] fix logging mail
---
enzevalos_iphone/Logger.swift | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/enzevalos_iphone/Logger.swift b/enzevalos_iphone/Logger.swift
index 36b8eb6b..03682a6d 100644
--- a/enzevalos_iphone/Logger.swift
+++ b/enzevalos_iphone/Logger.swift
@@ -19,7 +19,8 @@ class Logger {
static fileprivate func sendCheck() {
- if nextDeadline <= Date() && AppDelegate.getAppDelegate().currentReachabilityStatus != .notReachable && UserManager.loadUserValue(Attribute.accountname) != nil && UserDefaults.standard.bool(forKey: "launchedBefore"){
+ let deadlineIsNow = nextDeadline <= Date()
+ if deadlineIsNow && AppDelegate.getAppDelegate().currentReachabilityStatus != .notReachable && UserManager.loadUserValue(Attribute.accountname) != nil && UserDefaults.standard.bool(forKey: "launchedBefore"){
//Do not send duplicate mails
let tmpNextDeadline = Date(timeIntervalSinceNow: TimeInterval(loggingInterval))
nextDeadline = tmpNextDeadline
@@ -316,7 +317,8 @@ class Logger {
static private func sendLog(logMailAddress: String = logReceiver) {
let jsonEncoder = JSONEncoder()
if let data = try? jsonEncoder.encode(Maildata()), let text = String(data: data, encoding: .utf8), text.count > 0 {
- AppDelegate.getAppDelegate().mailHandler.send([logMailAddress], ccEntrys: [], bccEntrys: [], subject: "[Enzevalos] Log", message: text, callback: sendCallback, loggingMail: true, uiState: .letter)
+ let mail = OutgoingMail.createLoggingMail(addr: logMailAddress, textcontent: text)
+ mail.send()
}
LogInUserDefaults.handler.reset()
}
--
GitLab