Merge pull request #459 from paulplant/ios17-updates

iOS17 updates

xdrip/Constants/ConstantsSounds.swift

@@ -3,19 +3,19 @@ enum ConstantsSounds: String, CaseIterable {
 
     // here using case iso properties because we want to iterate through them
     // name of the sound as shown to the user, and also stored in the alerttype
-    case batterwakeup = "Better Wake Up/betterwakeup.mp3"
-    case bruteforce = "Brute Force/bruteforce.mp3"
-    case modernalarm2 = "Modern Alert 2/modern2.mp3"
-    case modernalarm = "Modern Alert/modernalarm.mp3"
-    case shorthigh1 = "Short High 1/shorthigh1.mp3"
-    case shorthigh2 = "Short High 2/shorthigh2.mp3"
-    case shorthigh3 = "Short High 3/shorthigh3.mp3"
-    case shorthigh4 = "Short High 4/shorthigh4.mp3"
-    case shortlow1  = "Short Low 1/shortlow1.mp3"
-    case shortlow2  = "Short Low 2/shortlow2.mp3"
-    case shortlow3  = "Short Low 3/shortlow3.mp3"
-    case shortlow4  = "Short Low 4/shortlow4.mp3"
-    case spaceship = "Space Ship/spaceship.mp3"
+    case batterwakeup = "Better Wake Up/betterwakeup.caf"
+    case bruteforce = "Brute Force/bruteforce.caf"
+    case modernalarm2 = "Modern Alert 2/modern2.caf"
+    case modernalarm = "Modern Alert/modernalarm.caf"
+    case shorthigh1 = "Short High 1/shorthigh1.caf"
+    case shorthigh2 = "Short High 2/shorthigh2.caf"
+    case shorthigh3 = "Short High 3/shorthigh3.caf"
+    case shorthigh4 = "Short High 4/shorthigh4.caf"
+    case shortlow1  = "Short Low 1/shortlow1.caf"
+    case shortlow2  = "Short Low 2/shortlow2.caf"
+    case shortlow3  = "Short Low 3/shortlow3.caf"
+    case shortlow4  = "Short Low 4/shortlow4.caf"
+    case spaceship = "Space Ship/spaceship.caf"
     case xdripalert = "xDrip Alert/xdripalert.aif"
 
     // copied from Spike project https://github.com/SpikeApp/Spike/tree/master/src/assets/sounds

xdrip/Constants/ConstantsSuspensionPrevention.swift

@@ -2,7 +2,7 @@
 enum ConstantsSuspensionPrevention {
 
     /// name of the file that has the sound to play
-    static let soundFileName = "1-millisecond-of-silence.mp3"//20ms-of-silence.caf"
+    static let soundFileName = "1-millisecond-of-silence.caf"//20ms-of-silence.caf"
 
     /// how often to play the sound, in seconds
     static let interval = 5

xdrip/Managers/NightScout/NightScoutFollowManager.swift

@@ -4,32 +4,32 @@ import AVFoundation
 import AudioToolbox
 
 /// instance of this class will do the follower functionality. Just make an instance, it will listen to the settings, do the regular download if needed - it could be deallocated when isMaster setting in Userdefaults changes, but that's not necessary to do
-class NightScoutFollowManager:NSObject {
+class NightScoutFollowManager: NSObject {
 
     // MARK: - public properties
 
     // MARK: - private properties
 
     /// to solve problem that sometemes UserDefaults key value changes is triggered twice for just one change
-    private let keyValueObserverTimeKeeper:KeyValueObserverTimeKeeper = KeyValueObserverTimeKeeper()
+    private let keyValueObserverTimeKeeper: KeyValueObserverTimeKeeper = KeyValueObserverTimeKeeper()
 
     /// for logging
     private var log = OSLog(subsystem: ConstantsLog.subSystem, category: ConstantsLog.categoryNightScoutFollowManager)
 
     /// when to do next download
-    private var nextFollowDownloadTimeStamp:Date
+    private var nextFollowDownloadTimeStamp: Date
 
     /// reference to coredatamanager
-    private var coreDataManager:CoreDataManager
+    private var coreDataManager: CoreDataManager
 
     /// reference to BgReadingsAccessor
-    private var bgReadingsAccessor:BgReadingsAccessor
+    private var bgReadingsAccessor: BgReadingsAccessor
 
     /// delegate to pass back glucosedata
-    private (set) weak var nightScoutFollowerDelegate:NightScoutFollowerDelegate?
+    private (set) weak var nightScoutFollowerDelegate: NightScoutFollowerDelegate?
 
     /// AVAudioPlayer to use
-    private var audioPlayer:AVAudioPlayer?
+    private var audioPlayer: AVAudioPlayer?
 
     /// constant for key in ApplicationManager.shared.addClosureToRunWhenAppWillEnterForeground - create playsoundtimer
     private let applicationManagerKeyResumePlaySoundTimer = "NightScoutFollowerManager-ResumePlaySoundTimer"
@@ -38,15 +38,15 @@ class NightScoutFollowManager:NSObject {
     private let applicationManagerKeySuspendPlaySoundTimer = "NightScoutFollowerManager-SuspendPlaySoundTimer"
 
     /// closure to call when downloadtimer needs to be invalidated, eg when changing from master to follower
-    private var invalidateDownLoadTimerClosure:(() -> Void)?
+    private var invalidateDownLoadTimerClosure: (() -> Void)?
 
     // timer for playsound
-    private var playSoundTimer:RepeatingTimer?
+    private var playSoundTimer: RepeatingTimer?
 
     // MARK: - initializer
 
     /// initializer
-    public init(coreDataManager:CoreDataManager, nightScoutFollowerDelegate:NightScoutFollowerDelegate) {
+    public init(coreDataManager: CoreDataManager, nightScoutFollowerDelegate: NightScoutFollowerDelegate) {
 
         // initialize nextFollowDownloadTimeStamp to now, which is at the moment FollowManager is instantiated
         nextFollowDownloadTimeStamp = Date()
@@ -56,18 +56,20 @@ class NightScoutFollowManager:NSObject {
         self.bgReadingsAccessor = BgReadingsAccessor(coreDataManager: coreDataManager)
         self.nightScoutFollowerDelegate = nightScoutFollowerDelegate
 
-        // creat audioplayer
-        do {
-            // set up url to create audioplayer
-            let soundFileName = ConstantsSuspensionPrevention.soundFileName
-            if let url = Bundle.main.url(forResource: soundFileName, withExtension: "")  {
-
-                try audioPlayer = AVAudioPlayer(contentsOf: url)
-
+        // set up audioplayer
+        if let url = Bundle.main.url(forResource: ConstantsSuspensionPrevention.soundFileName, withExtension: "")  {
+
+            // create audioplayer
+            do {
+
+                audioPlayer = try AVAudioPlayer(contentsOf: url)
+
+            } catch let error {
+
+                trace("in init, exception while trying to create audoplayer, error = %{public}@", log: self.log, category: ConstantsLog.categoryNightScoutFollowManager, type: .error, error.localizedDescription)
+
             }
 
-        } catch let error {
-            trace("in init, exception while trying to create audoplayer, error = %{public}@", log: self.log, category: ConstantsLog.categoryNightScoutFollowManager, type: .error, error.localizedDescription)
         }
 
         // call super.init