Handle null better

hansemannn · Sep 24, 2017 · 1ca5c91 · 1ca5c91
1 parent 9c3da53
commit 1ca5c91
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/ios/Classes/TiBluetoothCentralManagerProxy.m b/ios/Classes/TiBluetoothCentralManagerProxy.m
@@ -202,7 +202,7 @@ - (void)centralManager:(CBCentralManager *)central didFailToConnectPeripheral:(C
     [self fireEvent:@"didFailToConnectPeripheral"
          withObject:@{
            @"peripheral" : [self peripheralProxyFromPeripheral:peripheral],
-           @"error" : [error localizedDescription] ?: [NSNull null]
+           @"error" : NULL_IF_NIL([error localizedDescription])
          }];
   }
 }

diff --git a/ios/Classes/TiBluetoothPeripheralManagerProxy.m b/ios/Classes/TiBluetoothPeripheralManagerProxy.m
@@ -227,7 +227,7 @@ - (void)peripheralManagerDidStartAdvertising:(CBPeripheralManager *)peripheral e
     [self fireEvent:@"didStartAdvertising"
          withObject:@{
            @"success" : NUMBOOL(error == nil),
-           @"error" : [error localizedDescription] ?: [NSNull null]
+           @"error" : NULL_IF_NIL([error localizedDescription])
          }];
   }
 }
@@ -238,7 +238,7 @@ - (void)peripheralManager:(CBPeripheralManager *)peripheral didAddService:(CBSer
     [self fireEvent:@"didAddService"
          withObject:@{
            @"service" : [[TiBluetoothServiceProxy alloc] _initWithPageContext:[self pageContext] andService:service],
-           @"error" : [error localizedDescription] ?: [NSNull null]
+           @"error" : NULL_IF_NIL([error localizedDescription])
          }];
   }
 }

diff --git a/ios/Classes/TiBluetoothPeripheralProxy.m b/ios/Classes/TiBluetoothPeripheralProxy.m
@@ -230,7 +230,7 @@ - (void)peripheral:(CBPeripheral *)peripheral didDiscoverServices:(NSError *)err
     [self fireEvent:@"didDiscoverServices"
          withObject:@{
            @"peripheral" : [self peripheralProxyFromPeripheral:peripheral],
-           @"error" : [error localizedDescription] ?: [NSNull null]
+           @"error" : NULL_IF_NIL([error localizedDescription])
          }];
   }
 }
@@ -241,7 +241,7 @@ - (void)peripheral:(CBPeripheral *)peripheral didUpdateNotificationStateForChara
     [self fireEvent:@"didUpdateNotificationStateForCharacteristic"
          withObject:@{
            @"characteristic" : [self characteristicProxyFromCharacteristic:characteristic],
-           @"error" : [error localizedDescription] ?: [NSNull null]
+           @"error" : NULL_IF_NIL([error localizedDescription])
          }];
   }
 }
@@ -253,7 +253,7 @@ - (void)peripheral:(CBPeripheral *)peripheral didDiscoverCharacteristicsForServi
          withObject:@{
            @"peripheral" : [self peripheralProxyFromPeripheral:peripheral],
            @"service" : [[TiBluetoothServiceProxy alloc] _initWithPageContext:[self pageContext] andService:service],
-           @"error" : [error localizedDescription] ?: [NSNull null]
+           @"error" : NULL_IF_NIL([error localizedDescription])
          }];
   }
 }
@@ -265,7 +265,7 @@ - (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(C
          withObject:@{
            @"peripheral" : [self peripheralProxyFromPeripheral:peripheral],
            @"characteristic" : [self characteristicProxyFromCharacteristic:characteristic],
-           @"error" : [error localizedDescription] ?: [NSNull null]
+           @"error" : NULL_IF_NIL([error localizedDescription])
          }];
   }
 }
@@ -277,7 +277,7 @@ - (void)peripheral:(CBPeripheral *)peripheral didWriteValueForCharacteristic:(CB
          withObject:@{
            @"peripheral" : [self peripheralProxyFromPeripheral:peripheral],
            @"characteristic" : [self characteristicProxyFromCharacteristic:characteristic],
-           @"error" : [error localizedDescription] ?: [NSNull null]
+           @"error" : NULL_IF_NIL([error localizedDescription])
          }];
   }
 }