Merge branch 'master' into feature/209-due-by-table

BeeKit/Managers/DataPointManager.swift

@@ -43,7 +43,7 @@ public actor DataPointManager {
     }
 
     private func deleteDatapoint(goal: Goal, datapoint : DataPoint) async throws {
-        let _ = try await requestManager.delete(url: "api/v1/users/{username}/goals/\(goal.slug)/datapoints/\(datapoint.id)", parameters: nil)
+        let _ = try await requestManager.delete(url: "api/v1/users/{username}/goals/\(goal.slug)/datapoints/\(datapoint.id)")
     }
 
     private func postDatapoint(goal : Goal, params : [String : String]) async throws {

BeeKit/Managers/GoalManager.swift

@@ -60,7 +60,7 @@ public actor GoalManager {
             return
         }
 
-        let responseObject = try await requestManager.get(url: "api/v1/users/\(username)/goals.json", parameters: nil)!
+        let responseObject = try await requestManager.get(url: "api/v1/users/\(username)/goals.json")!
         let response = JSON(responseObject)
         self.updateGoalsFromJson(response) // TODO: Return failure info
 
@@ -72,7 +72,7 @@ public actor GoalManager {
     public func refreshGoal(_ goalID: NSManagedObjectID) async throws {
         let goal = try modelContext.existingObject(with: goalID) as! Goal
 
-        let responseObject = try await requestManager.get(url: "/api/v1/users/\(currentUserManager.username!)/goals/\(goal.slug)?datapoints_count=5", parameters: nil)
+        let responseObject = try await requestManager.get(url: "/api/v1/users/\(currentUserManager.username!)/goals/\(goal.slug)?datapoints_count=5")
         let goalJSON = JSON(responseObject!)
 
         // The goal may have changed during the network operation, reload latest version
@@ -85,7 +85,7 @@ public actor GoalManager {
     }
 
     public func forceAutodataRefresh(_ goal: Goal) async throws {
-        let _ = try await requestManager.get(url: "/api/v1/users/\(currentUserManager.username!)/goals/\(goal.slug)/refresh_graph.json", parameters: nil)
+        let _ = try await requestManager.get(url: "/api/v1/users/\(currentUserManager.username!)/goals/\(goal.slug)/refresh_graph.json")
     }
 
     private func updateGoalsFromJson(_ responseJSON: JSON) {

BeeKit/Managers/RequestManager.swift

@@ -29,7 +29,7 @@ public class RequestManager {
     public let baseURLString = Config().baseURLString
     private let logger = Logger(subsystem: "com.beeminder.beeminder", category: "RequestManager")
 
-    func rawRequest(url: String, method: HTTPMethod, parameters: [String: Any]?, headers: HTTPHeaders) async throws -> Any? {
+    func rawRequest(url: String, method: HTTPMethod, parameters: [String: Any]? = nil, headers: HTTPHeaders) async throws -> Any? {
 
         var urlWithSubstitutions = url
         if url.contains("{username}") {
@@ -78,20 +78,20 @@ public class RequestManager {
         }
     }
 
-    public func get(url: String, parameters: [String: Any]?) async throws -> Any? {
+    public func get(url: String, parameters: [String: Any]? = nil) async throws -> Any? {
         return try await rawRequest(url: url, method: .get, parameters: parameters, headers: authenticationHeaders())
     }
 
 
-    public func put(url: String, parameters: [String: Any]?) async throws -> Any? {
+    public func put(url: String, parameters: [String: Any]? = nil) async throws -> Any? {
         return try await rawRequest(url: url, method: .patch, parameters: parameters, headers: authenticationHeaders())
     }
 
-    public func post(url: String, parameters: [String: Any]?) async throws -> Any? {
+    public func post(url: String, parameters: [String: Any]? = nil) async throws -> Any? {
         return try await rawRequest(url: url, method: .post, parameters: parameters, headers: authenticationHeaders())
     }
 
-    public func delete(url: String, parameters: [String: Any]?) async throws -> Any? {
+    public func delete(url: String, parameters: [String: Any]? = nil) async throws -> Any? {
         return try await rawRequest(url: url, method: .delete, parameters: parameters, headers: authenticationHeaders())
     }
 

BeeKit/Managers/VersionManager.swift

@@ -63,7 +63,7 @@ public class VersionManager {
     }
 
     private func checkIfUpdateRequired() async throws -> Bool {
-        let responseJSON = try await requestManager.get(url: "api/private/app_versions.json", parameters: nil)
+        let responseJSON = try await requestManager.get(url: "api/private/app_versions.json")
 
         guard let response = JSON(responseJSON!).dictionary else {
             throw VersionError.invalidServerResponse

BeeSwift/Components/DatapointTableViewController.swift

@@ -11,7 +11,7 @@ import UIKit
 
 import BeeKit
 
-protocol DatapointTableViewControllerDelegate {
+protocol DatapointTableViewControllerDelegate: AnyObject {
     func datapointTableViewController(_ datapointTableViewController: DatapointTableViewController, didSelectDatapoint datapoint: BeeDataPoint)
 }
 
@@ -20,7 +20,7 @@ class DatapointTableViewController : UIViewController, UITableViewDelegate, UITa
     fileprivate var datapointsTableView = DatapointsTableView()
 
 
-    public var delegate : DatapointTableViewControllerDelegate?
+    public weak var delegate : DatapointTableViewControllerDelegate?
 
     public var datapoints : [BeeDataPoint] = [] {
         didSet {

BeeSwift/EditDatapointViewController.swift

@@ -235,7 +235,7 @@ class EditDatapointViewController: UIViewController, UITextFieldDelegate {
             hud.mode = .indeterminate
 
             do {
-                let _ = try await ServiceLocator.requestManager.delete(url: "api/v1/users/{username}/goals/\(self.goal.slug)/datapoints/\(self.datapoint.id).json", parameters: nil)
+                let _ = try await ServiceLocator.requestManager.delete(url: "api/v1/users/{username}/goals/\(self.goal.slug)/datapoints/\(self.datapoint.id).json")
                 try await ServiceLocator.goalManager.refreshGoal(self.goal.objectID)
 
                 hud.mode = .customView

BeeSwift/Gallery/GalleryViewController.swift

@@ -115,6 +115,7 @@ class GalleryViewController: UIViewController, UICollectionViewDelegateFlowLayou
             make.left.equalTo(10)
             make.right.equalTo(-10)
         }
+        self.deadbeatView.isHidden = true
 
         stackView.addArrangedSubview(self.outofdateView)
         self.outofdateView.accessibilityIdentifier = "outofdateView"
@@ -289,8 +290,8 @@ class GalleryViewController: UIViewController, UICollectionViewDelegateFlowLayou
 
 
     func updateDeadbeatVisibility() {
-        guard let user = currentUserManager.user(context: viewContext) else { return }
-        self.deadbeatView.isHidden = !user.deadbeat
+        let isKnownDeadbeat = currentUserManager.user(context: viewContext)?.deadbeat == true
+        self.deadbeatView.isHidden = !isKnownDeadbeat
     }
 
     private let lastUpdatedDateFormatter: RelativeDateTimeFormatter = {

BeeSwift/GoalViewController.swift

@@ -34,7 +34,7 @@ class GoalViewController: UIViewController,  UIScrollViewDelegate, DatapointTabl
     fileprivate var valueStepper = UIStepper()
     fileprivate var valueDecimalRemnant : Double = 0.0
     fileprivate var goalImageScrollView = UIScrollView()
-    fileprivate var pollTimer : Timer?
+    fileprivate var lastUpdatedTimer: Timer?
     fileprivate var countdownLabel = BSLabel()
     fileprivate let dueByLabel = BSLabel()
     fileprivate var scrollView = UIScrollView()
@@ -73,8 +73,7 @@ class GoalViewController: UIViewController,  UIScrollViewDelegate, DatapointTabl
         }
 
         self.updateLastUpdatedLabel()
-        Timer.scheduledTimer(timeInterval: 60, target: self, selector: #selector(GoalViewController.updateLastUpdatedLabel), userInfo: nil, repeats: true)
-
+        lastUpdatedTimer = Timer.scheduledTimer(timeInterval: 60, target: self, selector: #selector(GoalViewController.updateLastUpdatedLabel), userInfo: nil, repeats: true)
 
         self.view.addSubview(self.scrollView)
         self.scrollView.snp.makeConstraints { (make) -> Void in
@@ -322,6 +321,12 @@ class GoalViewController: UIViewController,  UIScrollViewDelegate, DatapointTabl
         self.commentTextField.iq.distanceFromKeyboard = addDataPointAdditionalKeyboardDistance
     }
 
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        lastUpdatedTimer?.invalidate()
+        lastUpdatedTimer = nil
+    }
+
     @objc func onGoalsUpdatedNotification() {
         updateInterfaceToMatchGoal()
     }
@@ -540,7 +545,6 @@ class GoalViewController: UIViewController,  UIScrollViewDelegate, DatapointTabl
     }
 }
 
-
 private extension DateFormatter {
     private static let urtextDateFormatter: DateFormatter = {
             let formatter = DateFormatter()