Merge pull request PunchThrough#24 from PunchThrough/changing-handler…

…s-to-properties

handlers as properties

source/PTDBean.m

@@ -31,6 +31,8 @@ @interface PTDBean () <CBPeripheralDelegate, AppMessagingLayerDelegate, OAD_Dele
 @property (nonatomic, readwrite) NSString *sketchName;
 @property (nonatomic, assign) NSInteger targetFirmwareVersion;
 @property (nonatomic, copy) void (^sketchErasedHandler)(BOOL sketchErased);
+@property (nonatomic, copy) void (^firmwareVersionAvailableHandler)(BOOL firmwareAvailable, NSError *error);
+@property (nonatomic, copy) void (^hardwareVersionAvailableHandler)(BOOL hardwareAvailable, NSError *error);
 
 @end
 
@@ -53,9 +55,6 @@ @implementation PTDBean
     BeanArduinoOADLocalState    localArduinoOADState;
     NSTimer*                    arduinoOADStateTimout;
     NSTimer*                    arduinoOADChunkSendTimer;
-
-    void (^firmwareVersionAvailableHandler)(BOOL firmwareAvailable, NSError *error);
-    void (^hardwareVersionAvailableHandler)(BOOL hardwareAvailable, NSError *error);
     NSDate*                     firmwareUpdateStartTime;
 
 }
@@ -322,7 +321,7 @@ - (void)checkFirmwareVersionAvailableWithHandler:(void (^)(BOOL firmwareAvailabl
     if ( [self firmwareVersion] ) {
         handler( YES, nil );
     } else {
-        firmwareVersionAvailableHandler = handler;   // Wait until device info is valid
+        self.firmwareVersionAvailableHandler = handler;   // Wait until device info is valid
     }
 }
 
@@ -331,7 +330,7 @@ - (void)checkHardwareVersionAvailableWithHandler:(void (^)(BOOL hardwareAvailabl
     if ( [self hardwareVersion] ) {
         handler( YES, nil );
     } else {
-        hardwareVersionAvailableHandler = handler;   // Wait until device info is valid
+        self.hardwareVersionAvailableHandler = handler;   // Wait until device info is valid
     }
 }
 
@@ -927,9 +926,9 @@ -(void)batteryProfileDidUpdate
 
 - (void)hardwareVersionDidUpdate
 {
-    if (hardwareVersionAvailableHandler){
-        [self checkHardwareVersionAvailableWithHandler:hardwareVersionAvailableHandler];
-        hardwareVersionAvailableHandler = nil;
+    if (self.hardwareVersionAvailableHandler){
+        [self checkHardwareVersionAvailableWithHandler:self.hardwareVersionAvailableHandler];
+        self.hardwareVersionAvailableHandler = nil;
     }
 }
 
@@ -941,9 +940,9 @@ - (void)firmwareVersionDidUpdate
     // Don't send firmware version back to handler when firmware update is still in progress
     if (self.updateInProgress) return;
 
-    if (firmwareVersionAvailableHandler) {
-        [self checkFirmwareVersionAvailableWithHandler:firmwareVersionAvailableHandler];
-        firmwareVersionAvailableHandler = nil;
+    if (self.firmwareVersionAvailableHandler) {
+        [self checkFirmwareVersionAvailableWithHandler:self.firmwareVersionAvailableHandler];
+        self.firmwareVersionAvailableHandler = nil;
     }
 }