diff --git a/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift b/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift index 07573f9..3f8c47e 100644 --- a/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift +++ b/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift @@ -61,23 +61,23 @@ public func _DDLogMessage(_ message: @autoclosure () -> String, level: DDLogLeve } public func DDLogDebug(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) { - _DDLogMessage(message, level: level, flag: .debug, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) + _DDLogMessage(message(), level: level, flag: .debug, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) } public func DDLogInfo(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) { - _DDLogMessage(message, level: level, flag: .info, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) + _DDLogMessage(message(), level: level, flag: .info, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) } public func DDLogWarn(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) { - _DDLogMessage(message, level: level, flag: .warning, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) + _DDLogMessage(message(), level: level, flag: .warning, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) } public func DDLogVerbose(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = true, ddlog: DDLog = DDLog.sharedInstance) { - _DDLogMessage(message, level: level, flag: .verbose, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) + _DDLogMessage(message(), level: level, flag: .verbose, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) } public func DDLogError(_ message: @autoclosure () -> String, level: DDLogLevel = defaultDebugLevel, context: Int = 0, file: StaticString = #file, function: StaticString = #function, line: UInt = #line, tag: Any? = nil, asynchronous async: Bool = false, ddlog: DDLog = DDLog.sharedInstance) { - _DDLogMessage(message, level: level, flag: .error, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) + _DDLogMessage(message(), level: level, flag: .error, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog) } /// Returns a String of the current filename, without full path or extension. diff --git a/Pods/CryptoSwift/Sources/CryptoSwift/Array+Extension.swift b/Pods/CryptoSwift/Sources/CryptoSwift/Array+Extension.swift index b6bc433..cb9528e 100644 --- a/Pods/CryptoSwift/Sources/CryptoSwift/Array+Extension.swift +++ b/Pods/CryptoSwift/Sources/CryptoSwift/Array+Extension.swift @@ -76,7 +76,7 @@ extension Array where Element == UInt8 { extension Array where Element == UInt8 { /// split in chunks with given chunk size - @available(*, deprecated: 0.8.0, message: "") + @available(*, deprecated, message: "") public func chunks(size chunksize: Int) -> Array> { var words = Array>() words.reserveCapacity(count / chunksize) diff --git a/Pods/CryptoSwift/Sources/CryptoSwift/Digest.swift b/Pods/CryptoSwift/Sources/CryptoSwift/Digest.swift index a80f8a7..821c7ed 100644 --- a/Pods/CryptoSwift/Sources/CryptoSwift/Digest.swift +++ b/Pods/CryptoSwift/Sources/CryptoSwift/Digest.swift @@ -13,7 +13,7 @@ // - This notice may not be removed or altered from any source or binary distribution. // -@available(*, deprecated: 0.6.0, renamed: "Digest") +@available(*, deprecated, renamed: "Digest") public typealias Hash = Digest /// Hash functions to calculate Digest. diff --git a/Pods/CryptoSwift/Sources/CryptoSwift/Foundation/Array+Foundation.swift b/Pods/CryptoSwift/Sources/CryptoSwift/Foundation/Array+Foundation.swift index 46059d5..61c5f60 100644 --- a/Pods/CryptoSwift/Sources/CryptoSwift/Foundation/Array+Foundation.swift +++ b/Pods/CryptoSwift/Sources/CryptoSwift/Foundation/Array+Foundation.swift @@ -16,11 +16,11 @@ import Foundation public extension Array where Element == UInt8 { - public func toBase64() -> String? { + func toBase64() -> String? { return Data(bytes: self).base64EncodedString() } - public init(base64: String) { + init(base64: String) { self.init() guard let decodedData = Data(base64Encoded: base64) else { diff --git a/Pods/CryptoSwift/Sources/CryptoSwift/PKCS/PBKDF1.swift b/Pods/CryptoSwift/Sources/CryptoSwift/PKCS/PBKDF1.swift index 15d6f06..46f3a80 100644 --- a/Pods/CryptoSwift/Sources/CryptoSwift/PKCS/PBKDF1.swift +++ b/Pods/CryptoSwift/Sources/CryptoSwift/PKCS/PBKDF1.swift @@ -19,7 +19,7 @@ public extension PKCS5 { /// PBKDF1 is recommended only for compatibility with existing /// applications since the keys it produces may not be large enough for /// some applications. - public struct PBKDF1 { + struct PBKDF1 { public enum Error: Swift.Error { case invalidInput case derivedKeyTooLong diff --git a/Pods/CryptoSwift/Sources/CryptoSwift/PKCS/PBKDF2.swift b/Pods/CryptoSwift/Sources/CryptoSwift/PKCS/PBKDF2.swift index ad0d020..82c05fe 100644 --- a/Pods/CryptoSwift/Sources/CryptoSwift/PKCS/PBKDF2.swift +++ b/Pods/CryptoSwift/Sources/CryptoSwift/PKCS/PBKDF2.swift @@ -27,7 +27,7 @@ public extension PKCS5 { /// /// PBKDF2 - Password-Based Key Derivation Function 2. Key stretching technique. /// DK = PBKDF2(PRF, Password, Salt, c, dkLen) - public struct PBKDF2 { + struct PBKDF2 { public enum Error: Swift.Error { case invalidInput case derivedKeyTooLong diff --git a/Pods/FLAnimatedImage/FLAnimatedImage/FLAnimatedImage.m b/Pods/FLAnimatedImage/FLAnimatedImage/FLAnimatedImage.m index 3fdddc9..cf49ff2 100755 --- a/Pods/FLAnimatedImage/FLAnimatedImage/FLAnimatedImage.m +++ b/Pods/FLAnimatedImage/FLAnimatedImage/FLAnimatedImage.m @@ -299,7 +299,7 @@ - (instancetype)initWithAnimatedGIFData:(NSData *)data optimalFrameCacheSize:(NS CFRelease(frameImageRef); } else { skippedFrameCount++; - FLLog(FLLogLevelInfo, @"Dropping frame %zu because failed to `CGImageSourceCreateImageAtIndex` with image source %@", i, _imageSource); + FLLog(FLLogLevelInfo, @"Dropping frame %zu because failed to `CGImageSourceCreateImageAtIndex` with image source %@", i, self->_imageSource); } } } diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 095accd..4637f89 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -1381,25 +1381,29 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0930; - LastUpgradeCheck = 1010; + LastUpgradeCheck = 1140; TargetAttributes = { + 4A18D7FE2F24856043214265C02E4492 = { + LastSwiftMigration = 1140; + }; 88E9EC28B8B46C3631E6B242B50F4442 = { - LastSwiftMigration = 1010; + LastSwiftMigration = 1140; }; 9709635CA61F7F72E71552ACC5E71EC3 = { - LastSwiftMigration = 1010; + LastSwiftMigration = 1140; }; 9E1D16A9080089C945C065EBC2D0CE2E = { - LastSwiftMigration = 1010; + LastSwiftMigration = 1140; }; }; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 7DB346D0F39D3F0E887471402A8071AB; productRefGroup = DEA80CF3F0C509A3D0DD39FC03E9EBE9 /* Products */; @@ -1736,7 +1740,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1747,6 +1751,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -1863,7 +1868,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2027,7 +2032,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -2060,7 +2065,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -2163,7 +2168,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2230,7 +2235,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -2298,7 +2303,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -2363,7 +2368,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2374,6 +2379,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; diff --git a/TidepoolMobile.xcodeproj/project.pbxproj b/TidepoolMobile.xcodeproj/project.pbxproj index b7d0080..c661ccd 100644 --- a/TidepoolMobile.xcodeproj/project.pbxproj +++ b/TidepoolMobile.xcodeproj/project.pbxproj @@ -1109,7 +1109,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0940; + LastUpgradeCheck = 1140; ORGANIZATIONNAME = Tidepool; TargetAttributes = { 4823986D2022628200EBB13C = { @@ -1125,8 +1125,8 @@ }; 4859FCB41B9A4DE4000C1269 = { CreatedOnToolsVersion = 7.0; - DevelopmentTeam = 75U4X84TEG; - LastSwiftMigration = 1010; + DevelopmentTeam = UTCT485GR5; + LastSwiftMigration = 1140; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.BackgroundModes = { @@ -1139,17 +1139,16 @@ }; 4859FCCB1B9A4DE5000C1269 = { CreatedOnToolsVersion = 7.0; - LastSwiftMigration = 1010; + LastSwiftMigration = 1140; TestTargetID = 4859FCB41B9A4DE4000C1269; }; }; }; buildConfigurationList = 4859FCB01B9A4DE4000C1269 /* Build configuration list for PBXProject "TidepoolMobile" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -1880,6 +1879,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -1936,6 +1936,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -1994,10 +1995,12 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 75U4X84TEG; + CURRENT_PROJECT_VERSION = 620; + DEVELOPMENT_TEAM = UTCT485GR5; INFOPLIST_FILE = TidepoolMobile/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 2.1.13; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-D\" \"DEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.blipnotes; PRODUCT_NAME = TidepoolMobile; @@ -2005,7 +2008,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "TidepoolMobile/TidepoolMobile-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -2020,10 +2023,12 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 75U4X84TEG; + CURRENT_PROJECT_VERSION = 620; + DEVELOPMENT_TEAM = UTCT485GR5; INFOPLIST_FILE = TidepoolMobile/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 2.1.13; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-D\" \"RELEASE\""; PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.blipnotes; PRODUCT_NAME = TidepoolMobile; @@ -2031,7 +2036,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "TidepoolMobile/TidepoolMobile-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Osize"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -2049,7 +2054,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "TidepoolMobile/TidepoolMobileTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TidepoolMobile.app/TidepoolMobile"; }; name = Debug; @@ -2067,7 +2072,7 @@ PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.TidepoolMobileTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "TidepoolMobile/TidepoolMobileTests-Bridging-Header.h"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TidepoolMobile.app/TidepoolMobile"; }; name = Release; diff --git a/TidepoolMobile/GraphView/GraphingUtils.swift b/TidepoolMobile/GraphView/GraphingUtils.swift index df9bcea..7fccf26 100644 --- a/TidepoolMobile/GraphView/GraphingUtils.swift +++ b/TidepoolMobile/GraphView/GraphingUtils.swift @@ -213,12 +213,12 @@ open class GraphingUtils { fileprivate let kHourInSecs:TimeInterval = 3600.0 fileprivate func drawXAxisHeader() { //// General Declarations - let context = UIGraphicsGetCurrentContext() + _ = UIGraphicsGetCurrentContext() layout.figureXAxisTickTiming() let tickTiming = layout.curXAxisLabelTickTiming //// Frames - use whole view for background - let contents = CGRect(x: 0, y: 0, width: viewSize.width, height: viewSize.height) + _ = CGRect(x: 0, y: 0, width: viewSize.width, height: viewSize.height) var graphStartSecs = startTime.timeIntervalSinceReferenceDate if layout.useRelativeTimes { graphStartSecs = startTime.timeIntervalSince(layout.graphStartTime as Date) diff --git a/TidepoolMobile/Info.plist b/TidepoolMobile/Info.plist index 983f939..f1141d8 100644 --- a/TidepoolMobile/Info.plist +++ b/TidepoolMobile/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.1.12 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion - 1 + $(CURRENT_PROJECT_VERSION) ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/TidepoolMobile/Resources/TidepoolMobileUIButton.swift b/TidepoolMobile/Resources/TidepoolMobileUIButton.swift index 17e032c..97edac3 100644 --- a/TidepoolMobile/Resources/TidepoolMobileUIButton.swift +++ b/TidepoolMobile/Resources/TidepoolMobileUIButton.swift @@ -59,7 +59,7 @@ import UIKit titleLabel.font = font // Shortcut: this means the button only works with a single font color for disabled buttons: dimmedWhiteColor! if let titleStr = titleLabel.text { - let disabledTitle = NSAttributedString(string: titleStr, attributes:[NSAttributedString.Key.font: titleLabel.font, NSAttributedString.Key.foregroundColor: Styles.dimmedWhiteColor]) + let disabledTitle = NSAttributedString(string: titleStr, attributes:[NSAttributedString.Key.font: titleLabel.font!, NSAttributedString.Key.foregroundColor: Styles.dimmedWhiteColor]) self.setAttributedTitle(disabledTitle, for: UIControl.State.disabled) } } diff --git a/TidepoolMobile/Third Party/ENSideMenu/ENSideMenu.swift b/TidepoolMobile/Third Party/ENSideMenu/ENSideMenu.swift index 2b29ef6..1ae6497 100755 --- a/TidepoolMobile/Third Party/ENSideMenu/ENSideMenu.swift +++ b/TidepoolMobile/Third Party/ENSideMenu/ENSideMenu.swift @@ -40,19 +40,19 @@ public extension UIViewController { /** Changes current state of side menu view. */ - public func toggleSideMenuView () { + func toggleSideMenuView () { sideMenuController()?.sideMenu?.toggleMenu() } /** Hides the side menu view. */ - public func hideSideMenuView () { + func hideSideMenuView () { sideMenuController()?.sideMenu?.hideSideMenu() } /** Shows the side menu view. */ - public func showSideMenuView () { + func showSideMenuView () { sideMenuController()?.sideMenu?.showSideMenu() } @@ -62,7 +62,7 @@ public extension UIViewController { :returns: BOOL value */ - public func isSideMenuOpen () -> Bool { + func isSideMenuOpen () -> Bool { let sieMenuOpen = self.sideMenuController()?.sideMenu?.isMenuOpen return sieMenuOpen! } @@ -82,7 +82,7 @@ public extension UIViewController { :returns: A `UIViewController`responding to `ENSideMenuProtocol` protocol */ - public func sideMenuController () -> ENSideMenuProtocol? { + func sideMenuController () -> ENSideMenuProtocol? { var iteration : UIViewController? = self.parent if (iteration == nil) { return topMostController() diff --git a/TidepoolMobile/ViewControllers/EventListViewController.swift b/TidepoolMobile/ViewControllers/EventListViewController.swift index 5e87763..278d4a4 100644 --- a/TidepoolMobile/ViewControllers/EventListViewController.swift +++ b/TidepoolMobile/ViewControllers/EventListViewController.swift @@ -543,7 +543,7 @@ class EventListViewController: BaseUIViewController, ENSideMenuDelegate, NoteAPI let indexPathOfEditedNote = self.indexPathForNoteId(originalNote.parentmessage!) if let noteIndexPath = indexPathOfEditedNote { let noteIndex = noteIndexPath.section - var comments = filteredNotes[noteIndex].comments + let comments = filteredNotes[noteIndex].comments for i in 0..