davwillev · davwillev · Feb 21, 2019 · Nov 21, 2018 · Nov 24, 2018 · Nov 24, 2018
diff --git a/ResearchKit.xcodeproj/project.pbxproj b/ResearchKit.xcodeproj/project.pbxproj
@@ -135,8 +135,8 @@
 		2EAC5DFB201AAFF8000EF186 /* Speech.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EAC5DFA201AAFF8000EF186 /* Speech.framework */; };
 		2EBFE11D1AE1B32D00CB8254 /* ORKUIViewAccessibilityTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EBFE11C1AE1B32D00CB8254 /* ORKUIViewAccessibilityTests.m */; };
 		2EBFE1201AE1B74100CB8254 /* ORKVoiceEngineTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EBFE11F1AE1B74100CB8254 /* ORKVoiceEngineTests.m */; };
-		6146D0A31B84A91E0068491D /* ORKLineGraphAccessibilityElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 6146D0A11B84A91E0068491D /* ORKLineGraphAccessibilityElement.h */; };
-		6146D0A41B84A91E0068491D /* ORKLineGraphAccessibilityElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 6146D0A21B84A91E0068491D /* ORKLineGraphAccessibilityElement.m */; };
+		6146D0A31B84A91E0068491D /* ORKGraphChartAccessibilityElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 6146D0A11B84A91E0068491D /* ORKGraphChartAccessibilityElement.h */; };
+		6146D0A41B84A91E0068491D /* ORKGraphChartAccessibilityElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 6146D0A21B84A91E0068491D /* ORKGraphChartAccessibilityElement.m */; };
 		618DA04E1A93D0D600E63AA8 /* ORKAccessibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 618DA0481A93D0D600E63AA8 /* ORKAccessibility.h */; };
 		618DA0501A93D0D600E63AA8 /* ORKAccessibilityFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = 618DA0491A93D0D600E63AA8 /* ORKAccessibilityFunctions.h */; };
 		618DA0521A93D0D600E63AA8 /* ORKAccessibilityFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = 618DA04A1A93D0D600E63AA8 /* ORKAccessibilityFunctions.m */; };
@@ -859,8 +859,8 @@
 		2EBFE11C1AE1B32D00CB8254 /* ORKUIViewAccessibilityTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ORKUIViewAccessibilityTests.m; sourceTree = "<group>"; };
 		2EBFE11E1AE1B68800CB8254 /* ORKVoiceEngine_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ORKVoiceEngine_Internal.h; sourceTree = "<group>"; };
 		2EBFE11F1AE1B74100CB8254 /* ORKVoiceEngineTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ORKVoiceEngineTests.m; sourceTree = "<group>"; };
-		6146D0A11B84A91E0068491D /* ORKLineGraphAccessibilityElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ORKLineGraphAccessibilityElement.h; sourceTree = "<group>"; };
-		6146D0A21B84A91E0068491D /* ORKLineGraphAccessibilityElement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ORKLineGraphAccessibilityElement.m; sourceTree = "<group>"; };
+		6146D0A11B84A91E0068491D /* ORKGraphChartAccessibilityElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ORKGraphChartAccessibilityElement.h; sourceTree = "<group>"; };
+		6146D0A21B84A91E0068491D /* ORKGraphChartAccessibilityElement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ORKGraphChartAccessibilityElement.m; sourceTree = "<group>"; };
 		618DA0481A93D0D600E63AA8 /* ORKAccessibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ORKAccessibility.h; sourceTree = "<group>"; };
 		618DA0491A93D0D600E63AA8 /* ORKAccessibilityFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ORKAccessibilityFunctions.h; sourceTree = "<group>"; };
 		618DA04A1A93D0D600E63AA8 /* ORKAccessibilityFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ORKAccessibilityFunctions.m; sourceTree = "<group>"; };
@@ -1849,8 +1849,8 @@
 				618DA04A1A93D0D600E63AA8 /* ORKAccessibilityFunctions.m */,
 				618DA04B1A93D0D600E63AA8 /* UIView+ORKAccessibility.h */,
 				618DA04C1A93D0D600E63AA8 /* UIView+ORKAccessibility.m */,
-				6146D0A11B84A91E0068491D /* ORKLineGraphAccessibilityElement.h */,
-				6146D0A21B84A91E0068491D /* ORKLineGraphAccessibilityElement.m */,
+				6146D0A11B84A91E0068491D /* ORKGraphChartAccessibilityElement.h */,
+				6146D0A21B84A91E0068491D /* ORKGraphChartAccessibilityElement.m */,
 			);
 			path = Accessibility;
 			sourceTree = "<group>";
@@ -3274,7 +3274,7 @@
 				106FF2AE1B6FACA8004EACF2 /* ORKDirectionView.h in Headers */,
 				86C40DA61A8D7C5C00081FAC /* ORKSurveyAnswerCellForImageSelection.h in Headers */,
 				86C40D5E1A8D7C5C00081FAC /* ORKQuestionStep.h in Headers */,
-				6146D0A31B84A91E0068491D /* ORKLineGraphAccessibilityElement.h in Headers */,
+				6146D0A31B84A91E0068491D /* ORKGraphChartAccessibilityElement.h in Headers */,
 				86C40C841A8D7C5C00081FAC /* ORKActiveStepTimer.h in Headers */,
 				86B781BD1AA668ED00688151 /* ORKValuePicker.h in Headers */,
 				86C40DE21A8D7C5C00081FAC /* ORKVerticalContainerView_Internal.h in Headers */,
@@ -3528,10 +3528,10 @@
 				"zh-Hans",
 				"pt-PT",
 				"fr-CA",
-				"es-MX",
 				"en-GB",
 				"en-AU",
 				nb,
+				"es-419",
 			);
 			mainGroup = 3FFF18341829DB1D00167070;
 			productRefGroup = 3FFF183E1829DB1D00167070 /* Products */;
@@ -3768,7 +3768,7 @@
 				86C40C4C1A8D7C5C00081FAC /* ORKSpatialSpanTargetView.m in Sources */,
 				86C40D9E1A8D7C5C00081FAC /* ORKSubheadlineLabel.m in Sources */,
 				10864CA31B27146B000F4158 /* ORKPSATContentView.m in Sources */,
-				6146D0A41B84A91E0068491D /* ORKLineGraphAccessibilityElement.m in Sources */,
+				6146D0A41B84A91E0068491D /* ORKGraphChartAccessibilityElement.m in Sources */,
 				D42FEFB91AF7557000A124F8 /* ORKImageCaptureView.m in Sources */,
 				86C40C401A8D7C5C00081FAC /* ORKSpatialSpanMemoryContentView.m in Sources */,
 				BCB6E6671B7D535F000D5B34 /* ORKXAxisView.m in Sources */,
@@ -4027,6 +4027,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ADDRESS_SANITIZER_CONTAINER_OVERFLOW = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -4046,6 +4047,7 @@
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -4080,6 +4082,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ADDRESS_SANITIZER_CONTAINER_OVERFLOW = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -4099,6 +4102,7 @@
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -4170,7 +4174,14 @@
 		B183A5931A8535D100C76870 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
+				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
+				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_STATIC_ANALYZER_MODE = deep;
+				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_INTEGER = YES;
+				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES;
+				CLANG_WARN_ASSIGN_ENUM = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEAD_CODE_STRIPPING = YES;
@@ -4185,7 +4196,13 @@
 					"ORK_LOG_LEVEL_WARNING=1",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_SHADOW = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNKNOWN_PRAGMAS = YES;
+				GCC_WARN_UNUSED_LABEL = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/ResearchKit/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -4194,6 +4211,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.researchkit.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = ResearchKit;
+				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -4205,7 +4223,14 @@
 		B183A5941A8535D100C76870 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
+				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
+				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_STATIC_ANALYZER_MODE = deep;
+				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_INTEGER = YES;
+				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES;
+				CLANG_WARN_ASSIGN_ENUM = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEAD_CODE_STRIPPING = YES;
@@ -4217,7 +4242,13 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "ORK_LOG_LEVEL_WARNING=1";
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_SHADOW = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNKNOWN_PRAGMAS = YES;
+				GCC_WARN_UNUSED_LABEL = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/ResearchKit/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;

diff --git a/ResearchKit/Accessibility/ORKAccessibility.h b/ResearchKit/Accessibility/ORKAccessibility.h
@@ -31,5 +31,5 @@
 
 // Shared header for accessibility functionality.
 #import "ORKAccessibilityFunctions.h"
-#import "ORKLineGraphAccessibilityElement.h"
+#import "ORKGraphChartAccessibilityElement.h"
 #import "UIView+ORKAccessibility.h"
diff --git a/ResearchKit/Accessibility/ORKAccessibilityFunctions.h b/ResearchKit/Accessibility/ORKAccessibilityFunctions.h
@@ -38,8 +38,8 @@ NS_ASSUME_NONNULL_BEGIN
 @class ORKScaleSlider;
 
 // Used to properly format values from the ORKScaleSlider.
-ORK_EXTERN NSString *ORKAccessibilityFormatScaleSliderValue(CGFloat value, ORKScaleSlider *slider);
-ORK_EXTERN NSString *ORKAccessibilityFormatContinuousScaleSliderValue(CGFloat value, ORKScaleSlider *slider);
+ORK_EXTERN NSString * _Nullable ORKAccessibilityFormatScaleSliderValue(CGFloat value, ORKScaleSlider *slider);
+ORK_EXTERN NSString * _Nullable ORKAccessibilityFormatContinuousScaleSliderValue(CGFloat value, ORKScaleSlider *slider);
 
 // Performs a block on the main thread after a delay. If Voice Over is not running, the block is performed immediately.
 ORK_EXTERN void ORKAccessibilityPerformBlockAfterDelay(NSTimeInterval delay, void(^block)(void));

diff --git a/...bility/ORKLineGraphAccessibilityElement.h → ...ility/ORKGraphChartAccessibilityElement.h b/...bility/ORKLineGraphAccessibilityElement.h → ...ility/ORKGraphChartAccessibilityElement.h
@@ -34,7 +34,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface ORKLineGraphAccessibilityElement : UIAccessibilityElement
+@interface ORKGraphChartAccessibilityElement : UIAccessibilityElement
 
 - (nonnull instancetype)initWithAccessibilityContainer:(nonnull UIView *)container index:(NSInteger)index maxIndex:(NSInteger)maxIndex;
 

diff --git a/...bility/ORKLineGraphAccessibilityElement.m → ...ility/ORKGraphChartAccessibilityElement.m b/...bility/ORKLineGraphAccessibilityElement.m → ...ility/ORKGraphChartAccessibilityElement.m
@@ -28,18 +28,18 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "ORKLineGraphAccessibilityElement.h"
+#import "ORKGraphChartAccessibilityElement.h"
 
 
-@interface ORKLineGraphAccessibilityElement()
+@interface ORKGraphChartAccessibilityElement()
 
 @property (assign, nonatomic) NSInteger index;
 @property (assign, nonatomic) NSInteger maxIndex;
 
 @end
 
 
-@implementation ORKLineGraphAccessibilityElement
+@implementation ORKGraphChartAccessibilityElement
 
 - (nonnull instancetype)initWithAccessibilityContainer:(nonnull UIView *)container index:(NSInteger)index maxIndex:(NSInteger)maxIndex {
     self = [super initWithAccessibilityContainer:container];

diff --git a/ResearchKit/ActiveTasks/ORKActiveStepQuantityView.h b/ResearchKit/ActiveTasks/ORKActiveStepQuantityView.h
@@ -62,4 +62,5 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END
+
diff --git a/ResearchKit/ActiveTasks/ORKAudioContentView.m b/ResearchKit/ActiveTasks/ORKAudioContentView.m
@@ -95,8 +95,8 @@ - (instancetype)initWithFrame:(CGRect)frame {
         [self addSubview:_timerLabel];
         [self addSubview:_graphView];
 
-        _timerLabel.text = @"06:00";
         _alertLabel.text = ORKLocalizedString(@"AUDIO_TOO_LOUD_LABEL", nil);
+        // _timerLabel.text set in -updateTimerLabel:
 
         self.alertThreshold = GraphViewBlueZoneHeight / ((GraphViewRedZoneHeight * 2) + GraphViewBlueZoneHeight);
 

diff --git a/ResearchKit/ActiveTasks/ORKAudioGenerator.m b/ResearchKit/ActiveTasks/ORKAudioGenerator.m
@@ -77,12 +77,12 @@ - (void)handleInterruption:(id)sender;
 const double ORKSineWaveToneGeneratorAmplitudeDefault = 0.03f;
 const double ORKSineWaveToneGeneratorSampleRateDefault = 44100.0f;
 
-OSStatus ORKAudioGeneratorRenderTone(void *inRefCon,
-                                     AudioUnitRenderActionFlags *ioActionFlags,
-                                     const AudioTimeStamp 		*inTimeStamp,
-                                     UInt32 					inBusNumber,
-                                     UInt32 					inNumberFrames,
-                                     AudioBufferList 			*ioData) {
+static OSStatus ORKAudioGeneratorRenderTone(void *inRefCon,
+                                            AudioUnitRenderActionFlags *ioActionFlags,
+                                            const AudioTimeStamp 		*inTimeStamp,
+                                            UInt32 					inBusNumber,
+                                            UInt32 					inNumberFrames,
+                                            AudioBufferList 			*ioData) {
     // Fixed amplitude is good enough for our purposes
     const double amplitude = ORKSineWaveToneGeneratorAmplitudeDefault;
 

diff --git a/ResearchKit/ActiveTasks/ORKDataLogger.m b/ResearchKit/ActiveTasks/ORKDataLogger.m
@@ -402,12 +402,16 @@ - (BOOL)appendObjects:(NSArray *)objects fileHandle:(NSFileHandle *)fileHandle e
     // Serialize each object separately to the buffer, pending a single write, so the
     // objects form part of a single array.
     __block BOOL success = YES;
+    __block NSError *localError;
+    if (error) {
+        localError = *error;
+    }
     [objects enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
         NSData *data;
         if ([obj isKindOfClass:[NSData class]]) {
             data = obj;
         } else {
-            data = [NSJSONSerialization dataWithJSONObject:obj options:(NSJSONWritingOptions)0 error:error];
+            data = [NSJSONSerialization dataWithJSONObject:obj options:(NSJSONWritingOptions)0 error:&localError];
         }
         if (!data) {
             success = NO;

diff --git a/ResearchKit/ActiveTasks/ORKHealthClinicalTypeRecorder.m b/ResearchKit/ActiveTasks/ORKHealthClinicalTypeRecorder.m
@@ -99,18 +99,18 @@ - (void)start {
     HKSampleQuery *query = [[HKSampleQuery alloc] initWithSampleType:_healthClinicalType
                                                            predicate:_healthFHIRResourceType ? [HKQuery predicateForClinicalRecordsWithFHIRResourceType:_healthFHIRResourceType] : nil limit:HKObjectQueryNoLimit
                                                      sortDescriptors:nil
-                                                      resultsHandler:^(HKSampleQuery * _Nonnull query, NSArray<__kindof HKSample *> * _Nullable results, NSError * _Nullable error) {
-                                                          NSUInteger resultCount = results.count;
+                                                      resultsHandler:^(HKSampleQuery * _Nonnull sampleQuery, NSArray<__kindof HKSample *> * _Nullable sampleResults, NSError * _Nullable error) {
+                                                          NSUInteger resultCount = sampleResults.count;
                                                           if (resultCount == 0) {
                                                               return;
                                                           }
 
-                                                          [results enumerateObjectsUsingBlock:^(HKClinicalRecord *clinicalRecord, NSUInteger idx, BOOL *stop) {
+                                                          [sampleResults enumerateObjectsUsingBlock:^(HKClinicalRecord *clinicalRecord, NSUInteger idx, BOOL *stop) {
 
-                                                              NSError *error = nil;
-                                                              [_logger append:clinicalRecord.FHIRResource.data error:&error];
-                                                              if (error) {
-                                                                  ORK_Log_Warning(@"Failed to add health records object to the logger with error: %@", error);
+                                                              NSError *logError = nil;
+                                                              [_logger append:clinicalRecord.FHIRResource.data error:&logError];
+                                                              if (logError) {
+                                                                  ORK_Log_Warning(@"Failed to add health records object to the logger with error: %@", logError);
                                                                   return;
                                                               }
                                                           }];

diff --git a/ResearchKit/ActiveTasks/ORKReactionTimeViewController.m b/ResearchKit/ActiveTasks/ORKReactionTimeViewController.m
@@ -232,7 +232,7 @@ - (void)timeoutTimerDidFire {
 - (NSTimeInterval)stimulusInterval {
     ORKReactionTimeStep *step = [self reactionTimeStep];
     NSTimeInterval range = step.maximumStimulusInterval - step.minimumStimulusInterval;
-    NSTimeInterval randomFactor = ((NSTimeInterval)rand() / RAND_MAX) * range;
+    NSTimeInterval randomFactor = ((NSTimeInterval)arc4random() / RAND_MAX) * range;
     return randomFactor + step.minimumStimulusInterval;
 }
 

diff --git a/ResearchKit/ActiveTasks/ORKRecorder_Internal.h b/ResearchKit/ActiveTasks/ORKRecorder_Internal.h
@@ -52,7 +52,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)reset NS_REQUIRES_SUPER;
 
-- (void)reportFileResultWithFile:(NSURL *)fileUrl error:(nullable NSError *)error;
+- (void)reportFileResultWithFile:(nullable NSURL *)fileUrl error:(nullable NSError *)error;
 
 - (nullable NSURL *)recordingDirectoryURL;
 

diff --git a/ResearchKit/ActiveTasks/ORKSpatialSpanGame.m b/ResearchKit/ActiveTasks/ORKSpatialSpanGame.m
@@ -59,7 +59,7 @@ - (void)generateSequence {
     // Note: we will only use the first _sequenceLength elements of this array
     srandom(_seed);
     for (NSInteger i = 0; i < _gameSize; i++) {
-        NSInteger rand_i = random() % _gameSize;
+        NSInteger rand_i = arc4random() % _gameSize;
         NSInteger tmp = _sequence[i];
         _sequence[i] = _sequence[rand_i];
         _sequence[rand_i] = tmp;

diff --git a/ResearchKit/ActiveTasks/ORKSpeechRecognitionResult.h b/ResearchKit/ActiveTasks/ORKSpeechRecognitionResult.h
@@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
  A speech recognition result is typically generated by the framework as the task proceeds. When the task completes, it may be appropriate to serialize the sample for transmission to a server or to immediately perform analysis on it.
  */
 ORK_CLASS_AVAILABLE
-@interface ORKSpeechRecognitonResult : ORKResult
+@interface ORKSpeechRecognitionResult : ORKResult
 
 /**
  A hypothesized textual representation of recognized speech

diff --git a/ResearchKit/ActiveTasks/ORKSpeechRecognitionResult.m b/ResearchKit/ActiveTasks/ORKSpeechRecognitionResult.m
@@ -33,7 +33,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #import "ORKResult_Private.h"
 #import "ORKHelpers_Internal.h"
 
-@implementation ORKSpeechRecognitonResult
+@implementation ORKSpeechRecognitionResult
 
 - (void)encodeWithCoder:(NSCoder *)aCoder {
     [super encodeWithCoder:aCoder];
@@ -61,7 +61,7 @@ - (BOOL)isEqual:(id)object {
 }
 
 - (instancetype)copyWithZone:(NSZone *)zone {
-    ORKSpeechRecognitonResult *result = [super copyWithZone:zone];
+    ORKSpeechRecognitionResult *result = [super copyWithZone:zone];
     result.transcription = [self.transcription copy];
     return result;
 }

diff --git a/ResearchKit/ActiveTasks/ORKSpeechRecognitionStepViewController.m b/ResearchKit/ActiveTasks/ORKSpeechRecognitionStepViewController.m
@@ -68,7 +68,7 @@ @implementation ORKSpeechRecognitionStepViewController {
     ORKSpeechRecognizer *_speechRecognizer;
 
     dispatch_queue_t _speechRecognitionQueue;
-    ORKSpeechRecognitonResult *_localResult;
+    ORKSpeechRecognitionResult *_localResult;
     BOOL _errorState;
     float _peakPower;
 }
@@ -99,7 +99,7 @@ - (void)viewDidLoad {
 
     [ORKSpeechRecognizer requestAuthorization];
 
-    _localResult = [[ORKSpeechRecognitonResult alloc] initWithIdentifier:self.step.identifier];
+    _localResult = [[ORKSpeechRecognitionResult alloc] initWithIdentifier:self.step.identifier];
     _speechRecognitionQueue = dispatch_queue_create("SpeechRecognitionQueue", DISPATCH_QUEUE_SERIAL);
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,4 +62,5 @@ NS_ASSUME_NONNULL_BEGIN

		@end

		NS_ASSUME_NONNULL_END
		NS_ASSUME_NONNULL_END