Fix Xcode warnings

Emilio Pavia · Emilio Pavia · commit b8fc0bafa081 · 2020-10-09T15:21:38.000+02:00
diff --git a/ScienceJournal/ActionArea/ActionAreaController.swift b/ScienceJournal/ActionArea/ActionAreaController.swift
@@ -149,7 +149,7 @@ extension ActionArea {
         switch self {
         case .portrait:
           return "portrait(\(mode))"
-        case let .landscape(mode):
+        case let .landscape(_, mode):
           return "landscape(\(mode))"
         }
       }
@@ -983,7 +983,7 @@ private extension ActionArea.Controller {
   }
 
   func animateBarElevation(barIsElevated: Bool) {
-    guard let master = presentedMasterViewController else { return }
+    guard presentedMasterViewController != nil else { return }
 
     func animate() {
       if isExpanded {
@@ -1131,6 +1131,8 @@ extension ActionArea.Controller: UINavigationControllerDelegate {
       )
     case .push, .pop, .none:
       return nil
+    @unknown default:
+      return nil
     }
   }
 
diff --git a/ScienceJournal/ActionArea/CrossDissolveTransitionAnimation.swift b/ScienceJournal/ActionArea/CrossDissolveTransitionAnimation.swift
@@ -42,6 +42,8 @@ final class CrossDissolveTransitionAnimation: NSObject, UIViewControllerAnimated
       animatePush(using: transitionContext)
     case .pop:
       animatePop(using: transitionContext)
+    @unknown default:
+      transitionContext.completeTransition(false)
     }
   }
 
diff --git a/ScienceJournal/ActionArea/FauxdalTransitionAnimation.swift b/ScienceJournal/ActionArea/FauxdalTransitionAnimation.swift
@@ -47,6 +47,8 @@ final class FauxdalTransitionAnimation: NSObject, UIViewControllerAnimatedTransi
       animatePush(using: transitionContext)
     case .pop:
       animatePop(using: transitionContext)
+    @unknown default:
+      transitionContext.completeTransition(false)
     }
   }
 
diff --git a/ScienceJournal/ActionArea/UIKit+ActionArea.swift b/ScienceJournal/ActionArea/UIKit+ActionArea.swift
@@ -57,6 +57,8 @@ extension UINavigationController.Operation: CustomStringConvertible {
       return "push"
     case .pop:
       return "pop"
+    @unknown default:
+      return "unknown"
     }
   }
 
diff --git a/ScienceJournal/BLESupport/BLEServiceScanner.swift b/ScienceJournal/BLESupport/BLEServiceScanner.swift
@@ -201,6 +201,9 @@ class BLEServiceScanner: NSObject, CBCentralManagerDelegate {
       print("Bluetooth is powered on.")
       isBluetoothAvailable = true
       resumeScanning()
+    @unknown default:
+      print("Bluetooth unknown state.")
+      isBluetoothAvailable = false
     }
 
     if previouslyAvailable != isBluetoothAvailable {
diff --git a/ScienceJournal/CaptureSession/CameraAccessHandler.swift b/ScienceJournal/CaptureSession/CameraAccessHandler.swift
@@ -35,6 +35,7 @@ class CameraAccessHandler {
         requestCompletion?(granted)
       }
       return false
+    @unknown default: return false
     }
   }
 
diff --git a/ScienceJournal/Drive/ExperimentMerger.swift b/ScienceJournal/Drive/ExperimentMerger.swift
@@ -123,6 +123,7 @@ public class ExperimentMerger {
     case .note, .caption:
       handleNoteConflict(externalExperiment: externalExperiment, externalChange: externalChange)
     case .unknown: break
+    @unknown default: break
     }
   }
 
@@ -136,6 +137,7 @@ public class ExperimentMerger {
     case .note, .caption:
       copyNoteChange(externalExperiment: externalExperiment, externalChange: externalChange)
     case .unknown: break
+    @unknown default: break
     }
   }
 
diff --git a/ScienceJournal/Extensions/GSJTriggerInformation_TriggerWhen+ScienceJournal.swift b/ScienceJournal/Extensions/GSJTriggerInformation_TriggerWhen+ScienceJournal.swift
@@ -28,6 +28,7 @@ extension GSJTriggerInformation_TriggerWhen {
     case .triggerWhenDropsBelow: return String.triggerWhenDroppedBelow.lowercased()
     case .triggerWhenAbove: return String.triggerWhenIsAbove.lowercased()
     case .triggerWhenBelow: return String.triggerWhenIsBelow.lowercased()
+    @unknown default: return ""
     }
   }
 
@@ -38,6 +39,8 @@ extension GSJTriggerInformation_TriggerWhen {
       return true
     case .triggerWhenAt, .triggerWhenDropsBelow, .triggerWhenRisesAbove:
       return false
+    @unknown default:
+      return false
     }
   }
 
diff --git a/ScienceJournal/Metadata/ExistingDataMigrationManager.swift b/ScienceJournal/Metadata/ExistingDataMigrationManager.swift
@@ -222,7 +222,7 @@ class ExistingDataMigrationManager {
     migrateOperations.append(addExperimentAndCleanup)
 
     let migrate = GroupOperation(operations: migrateOperations)
-    migrate.addObserver(BlockObserver { _, _ in
+    migrate.addObserver(BlockObserver(finishHandler: { _, _ in
       // Errors
       var errors = [ExistingDataMigrationManagerError]()
       if !addExperimentSuccess {
@@ -238,7 +238,7 @@ class ExistingDataMigrationManager {
       DispatchQueue.main.async {
         completion(errors)
       }
-    })
+    }))
     migrate.addObserver(BackgroundTaskObserver())
 
     migrationQueue.addOperation(migrate)
diff --git a/ScienceJournal/Metadata/SensorTriggerEvaluator.swift b/ScienceJournal/Metadata/SensorTriggerEvaluator.swift
@@ -56,6 +56,8 @@ class SensorTriggerEvaluator {
         return value < sensorTrigger.triggerInformation.valueToTrigger
       case .triggerWhenAbove:
         return value > sensorTrigger.triggerInformation.valueToTrigger
+      @unknown default:
+        return false
       }
     }
     self.previousValue = value
diff --git a/ScienceJournal/Operations/GSJOperationQueue.swift b/ScienceJournal/Operations/GSJOperationQueue.swift
@@ -79,9 +79,9 @@ open class GSJOperationQueue: OperationQueue {
       if !concurrencyCategories.isEmpty {
         let exclusivityController = ExclusivityController.shared
         exclusivityController.addOperation(gsjOp, categories: concurrencyCategories)
-        gsjOp.addObserver(BlockObserver { operation, _ in
+        gsjOp.addObserver(BlockObserver(finishHandler: { operation, _ in
           exclusivityController.removeOperation(operation, categories: concurrencyCategories)
-        })
+        }))
       }
 
       // Inform the operation it is being enqueued. This is a required step for the operation to
diff --git a/ScienceJournal/Recording/Recorder.swift b/ScienceJournal/Recording/Recorder.swift
@@ -251,8 +251,12 @@ class Recorder: Equatable, SensorTriggerFrequencyObserverDelegate {
           self.triggerAlertHelper.playTriggerAlertVibration()
         case .triggerAlertVisual:
           self.delegate?.recorder(self, didFireVisualTrigger: sensorTrigger)
+        @unknown default:
+          break
         }
       }
+    @unknown default:
+      break
     }
   }
 
diff --git a/ScienceJournal/SensorData/UserAssetManager.swift b/ScienceJournal/SensorData/UserAssetManager.swift
@@ -58,13 +58,13 @@ open class UserAssetManager {
         WriteTrialSensorDataToDiskOperation(saveFileURL: saveURL,
                                             sensorDataManager: sensorDataManager,
                                             trial: trial)
-    writeTrialSensorDataToDiskOperation.addObserver(BlockObserver {
+    writeTrialSensorDataToDiskOperation.addObserver(BlockObserver(finishHandler: {
         [unowned self] (operation, _) in
       if operation.didFinishSuccessfully {
         self.driveSyncManager?.syncTrialSensorData(atURL: saveURL, experimentID: experiment.ID)
       }
       completion?()
-    })
+    }))
 
     operationQueue.addOperation(writeTrialSensorDataToDiskOperation)
   }
diff --git a/ScienceJournal/SharableDocuments/DocumentManager.swift b/ScienceJournal/SharableDocuments/DocumentManager.swift
@@ -125,7 +125,7 @@ class DocumentManager {
                                 experimentURL: newExperimentURL,
                                 sensorDataManager: sensorDataManager,
                                 metadataManager: metadataManager)
-    let observer = BlockObserver { (operation, errors) in
+    let observer = BlockObserver(finishHandler: { (operation, errors) in
       if !operation.didFinishSuccessfully {
         self.experimentDataDeleter.permanentlyDeleteExperiment(withID: newExperimentID)
 
@@ -141,7 +141,7 @@ class DocumentManager {
                                         object: self,
                                         userInfo: userInfo)
       }
-    }
+    })
     importDocumentOperation.addObserver(observer)
     importDocumentOperation.addObserver(BackgroundTaskObserver())
     operationQueue.addOperation(importDocumentOperation)
@@ -205,15 +205,15 @@ class DocumentManager {
         experiment: experiment,
         experimentURL: metadataManager.experimentDirectoryURL(for: experimentID),
         sensorDataManager: sensorDataManager)
-    let blockObserver = BlockObserver { (operation, _) in
+    let blockObserver = BlockObserver(finishHandler: { (operation, _) in
       DispatchQueue.main.async {
         guard let documentURL = (operation as? ExportDocumentOperation)?.documentURL else {
           completion(nil)
           return
         }
         completion(documentURL)
       }
-    }
+    })
     documentExportOperation.addObserver(blockObserver)
     documentExportOperation.addObserver(BackgroundTaskObserver())
 
@@ -273,7 +273,7 @@ extension DocumentManager {
                                   experimentURL: newExperimentURL,
                                   sensorDataManager: sensorDataManager,
                                   metadataManager: metadataManager)
-      let observer = BlockObserver { (operation, _) in
+      let observer = BlockObserver(finishHandler: { (operation, _) in
         if operation.didFinishSuccessfully {
           self.metadataManager.addImportedExperiment(withID: newExperimentID)
 
@@ -284,16 +284,16 @@ extension DocumentManager {
         } else {
           self.experimentDataDeleter.permanentlyDeleteExperiment(withID: newExperimentID)
         }
-      }
+      })
       importDocumentOperation.addObserver(observer)
       importDocumentOperation.addObserver(BackgroundTaskObserver())
       importOperations.append(importDocumentOperation)
     }
 
     let groupOperation = GroupOperation(operations: importOperations)
-    let groupObserver = BlockObserver { (_, _) in
+    let groupObserver = BlockObserver(finishHandler: { (_, _) in
       completion?()
-    }
+    })
     groupOperation.addObserver(groupObserver)
     operationQueue.addOperation(groupOperation)
   }
diff --git a/ScienceJournal/UI/TriggerTypeSelectorView.swift b/ScienceJournal/UI/TriggerTypeSelectorView.swift
@@ -70,6 +70,8 @@ class TriggerTypeSelectorView: TriggerOptionSelectorView {
       selectionLabel.text = String.triggerTypeStartRecording
     case .triggerActionStopRecording:
       selectionLabel.text = String.triggerTypeStopRecording
+    @unknown default:
+      selectionLabel.text = nil
     }
   }
 
diff --git a/ScienceJournal/UI/TriggerWhenSelectorView.swift b/ScienceJournal/UI/TriggerWhenSelectorView.swift
@@ -61,6 +61,8 @@ class TriggerWhenSelectorView: TriggerOptionSelectorView {
       selectionLabel.text = String.triggerWhenDropsBelow
     case .triggerWhenRisesAbove:
       selectionLabel.text = String.triggerWhenRisesAbove
+    @unknown default:
+      selectionLabel.text = nil
     }
   }
 
diff --git a/ScienceJournal/WrappedModels/ExperimentChange.swift b/ScienceJournal/WrappedModels/ExperimentChange.swift
@@ -158,6 +158,7 @@ extension GSJChangedElement_ElementType: CustomDebugStringConvertible {
     case .note: return ".note"
     case .caption: return ".caption"
     case .unknown: return ".unknown"
+    @unknown default: return ".unknown"
     }
   }
 }
@@ -170,6 +171,7 @@ extension GSJChange_ChangeType: CustomDebugStringConvertible {
     case .modify: return ".modify"
     case .merge: return ".merge"
     case .unknown: return ".unknown"
+    @unknown default: return ".unknown"
     }
   }
 }
diff --git a/ScienceJournal/WrappedModels/Note.swift b/ScienceJournal/WrappedModels/Note.swift
@@ -131,6 +131,8 @@ public class Note {
       return SnapshotNote(proto: labelProto)
     case .sensorTrigger:
       return TriggerNote(proto: labelProto)
+    @unknown default:
+      return Note(proto: labelProto)
     }
   }
 
diff --git a/ScienceJournal/WrappedModels/SensorTrigger.swift b/ScienceJournal/WrappedModels/SensorTrigger.swift
@@ -79,6 +79,7 @@ class SensorTrigger {
       case .triggerActionNote: return String.triggerTypeNote
       case .triggerActionStartRecording: return String.triggerTypeStartRecording
       case .triggerActionStopRecording: return String.triggerTypeStopRecording
+      @unknown default: return ""
       }
     }
 
@@ -90,6 +91,7 @@ class SensorTrigger {
       case .triggerWhenBelow: return String.triggerListWhenBelow
       case .triggerWhenDropsBelow: return String.triggerListWhenDroppingBelow
       case .triggerWhenRisesAbove: return String.triggerListWhenRisingAbove
+      @unknown default: return ""
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ extension ActionArea {`
`149`	`149`	`switch self {`
`150`	`150`	`case .portrait:`
`151`	`151`	`return "portrait(\(mode))"`
`152`		`- case let .landscape(mode):`
	`152`	`+ case let .landscape(_, mode):`
`153`	`153`	`return "landscape(\(mode))"`
`154`	`154`	`}`
`155`	`155`	`}`
`@@ -983,7 +983,7 @@ private extension ActionArea.Controller {`
`983`	`983`	`}`
`984`	`984`
`985`	`985`	`func animateBarElevation(barIsElevated: Bool) {`
`986`		`- guard let master = presentedMasterViewController else { return }`
	`986`	`+ guard presentedMasterViewController != nil else { return }`
`987`	`987`
`988`	`988`	`func animate() {`
`989`	`989`	`if isExpanded {`
`@@ -1131,6 +1131,8 @@ extension ActionArea.Controller: UINavigationControllerDelegate {`
`1131`	`1131`	`)`
`1132`	`1132`	`case .push, .pop, .none:`
`1133`	`1133`	`return nil`
	`1134`	`+ @unknown default:`
	`1135`	`+ return nil`
`1134`	`1136`	`}`
`1135`	`1137`	`}`
`1136`	`1138`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ final class CrossDissolveTransitionAnimation: NSObject, UIViewControllerAnimated`
`42`	`42`	`animatePush(using: transitionContext)`
`43`	`43`	`case .pop:`
`44`	`44`	`animatePop(using: transitionContext)`
	`45`	`+ @unknown default:`
	`46`	`+ transitionContext.completeTransition(false)`
`45`	`47`	`}`
`46`	`48`	`}`
`47`	`49`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ final class FauxdalTransitionAnimation: NSObject, UIViewControllerAnimatedTransi`
`47`	`47`	`animatePush(using: transitionContext)`
`48`	`48`	`case .pop:`
`49`	`49`	`animatePop(using: transitionContext)`
	`50`	`+ @unknown default:`
	`51`	`+ transitionContext.completeTransition(false)`
`50`	`52`	`}`
`51`	`53`	`}`
`52`	`54`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ extension UINavigationController.Operation: CustomStringConvertible {`
`57`	`57`	`return "push"`
`58`	`58`	`case .pop:`
`59`	`59`	`return "pop"`
	`60`	`+ @unknown default:`
	`61`	`+ return "unknown"`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`
Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,9 @@ class BLEServiceScanner: NSObject, CBCentralManagerDelegate {`
`201`	`201`	`print("Bluetooth is powered on.")`
`202`	`202`	`isBluetoothAvailable = true`
`203`	`203`	`resumeScanning()`
	`204`	`+ @unknown default:`
	`205`	`+ print("Bluetooth unknown state.")`
	`206`	`+ isBluetoothAvailable = false`
`204`	`207`	`}`
`205`	`208`
`206`	`209`	`if previouslyAvailable != isBluetoothAvailable {`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ class CameraAccessHandler {`
`35`	`35`	`requestCompletion?(granted)`
`36`	`36`	`}`
`37`	`37`	`return false`
	`38`	`+ @unknown default: return false`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ public class ExperimentMerger {`
`123`	`123`	`case .note, .caption:`
`124`	`124`	`handleNoteConflict(externalExperiment: externalExperiment, externalChange: externalChange)`
`125`	`125`	`case .unknown: break`
	`126`	`+ @unknown default: break`
`126`	`127`	`}`
`127`	`128`	`}`
`128`	`129`
`@@ -136,6 +137,7 @@ public class ExperimentMerger {`
`136`	`137`	`case .note, .caption:`
`137`	`138`	`copyNoteChange(externalExperiment: externalExperiment, externalChange: externalChange)`
`138`	`139`	`case .unknown: break`
	`140`	`+ @unknown default: break`
`139`	`141`	`}`
`140`	`142`	`}`
`141`	`143`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ extension GSJTriggerInformation_TriggerWhen {`
`28`	`28`	`case .triggerWhenDropsBelow: return String.triggerWhenDroppedBelow.lowercased()`
`29`	`29`	`case .triggerWhenAbove: return String.triggerWhenIsAbove.lowercased()`
`30`	`30`	`case .triggerWhenBelow: return String.triggerWhenIsBelow.lowercased()`
	`31`	`+ @unknown default: return ""`
`31`	`32`	`}`
`32`	`33`	`}`
`33`	`34`
`@@ -38,6 +39,8 @@ extension GSJTriggerInformation_TriggerWhen {`
`38`	`39`	`return true`
`39`	`40`	`case .triggerWhenAt, .triggerWhenDropsBelow, .triggerWhenRisesAbove:`
`40`	`41`	`return false`
	`42`	`+ @unknown default:`
	`43`	`+ return false`
`41`	`44`	`}`
`42`	`45`	`}`
`43`	`46`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ class SensorTriggerEvaluator {`
`56`	`56`	`return value < sensorTrigger.triggerInformation.valueToTrigger`
`57`	`57`	`case .triggerWhenAbove:`
`58`	`58`	`return value > sensorTrigger.triggerInformation.valueToTrigger`
	`59`	`+ @unknown default:`
	`60`	`+ return false`
`59`	`61`	`}`
`60`	`62`	`}`
`61`	`63`	`self.previousValue = value`