Remove dependence on UIKit; fix use of deprecated UUID attribute

Adam Eberbach · Adam Eberbach · commit aa4cd233e917 · 2015-01-11T16:12:36.000+11:00
diff --git a/iPhone Apps/rfduino/RFduinoManagerDelegate.h b/iPhone Apps/rfduino/RFduinoManagerDelegate.h
@@ -39,5 +39,6 @@
 - (void)didConnectRFduino:(RFduino *)rfduino;
 - (void)didLoadServiceRFduino:(RFduino *)rfduino;
 - (void)didDisconnectRFduino:(RFduino *)rfduino;
+- (void)shouldDisplayAlertTitled:(NSString *)title messageBody:(NSString *)body;
 
 @end
diff --git a/iPhone Apps/rfduino/RfduinoManager.m b/iPhone Apps/rfduino/RfduinoManager.m
@@ -98,16 +98,7 @@ - (bool)isBluetoothLESupported
             
     }
 
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-
-    UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Bluetooth LE Support"
-                                                    message:message
-                                                   delegate:nil
-                                          cancelButtonTitle:@"OK"
-                                          otherButtonTitles:nil];
-    [alert show];
-
-#endif
+    [delegate shouldDisplayAlertTitled:@"Bluetooth LE Support" messageBody:message];
 
     return NO;
 }
@@ -193,16 +184,7 @@ - (void)centralManager:(CBCentralManager *)central didDisconnectPeripheral:(CBPe
     if (error.code) {
         cancelBlock = block;
 
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-        
-        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Peripheral Disconnected with Error"
-                                                        message:error.description
-                                                       delegate:self
-                                              cancelButtonTitle:@"OK"
-                                              otherButtonTitles:nil];
-        [alert show];
-        
-#endif
+        [delegate shouldDisplayAlertTitled:@"Peripheral Disconnected with Error" messageBody:error.description];
         
     }
     else
@@ -229,9 +211,9 @@ - (void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeri
     // NSLog(@"didDiscoverPeripheral");
 
     NSString *uuid = NULL;
-    if (peripheral.UUID) {
+    if ([peripheral.identifier.UUIDString length] > 0) {
         // only returned if you have connected to the device before
-        uuid = (__bridge_transfer NSString *)CFUUIDCreateString(NULL, peripheral.UUID);
+        uuid = peripheral.identifier.UUIDString;
     } else {
         uuid = @"";
     }
@@ -259,7 +241,7 @@ - (void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeri
     id manufacturerData = [advertisementData objectForKey:CBAdvertisementDataManufacturerDataKey];
     if (manufacturerData) {
         const uint8_t *bytes = [manufacturerData bytes];
-        int len = [manufacturerData length];
+        NSUInteger len = [manufacturerData length];
         // skip manufacturer uuid
         NSData *data = [NSData dataWithBytes:bytes+2 length:len-2];
         rfduino.advertisementData = data;
@@ -283,17 +265,7 @@ - (void)centralManager:(CBCentralManager *)central didFailToConnectPeripheral:(C
 {
     NSLog(@"didFailToConnectPeripheral");
 
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-
-    UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Connect Failed"
-                                                    message:error.description
-                                                   delegate:nil
-                                          cancelButtonTitle:@"OK"
-                                          otherButtonTitles:nil];
-    [alert show];
-
-#endif
-
+    [delegate shouldDisplayAlertTitled:@"Connect Failed" messageBody:error.description];
 }
 
 - (void)centralManager:(CBCentralManager *)central didRetrieveConnectedPeripherals:(NSArray *)peripherals
@@ -302,27 +274,14 @@ - (void)centralManager:(CBCentralManager *)central didRetrieveConnectedPeriphera
 
 - (void)centralManagerDidUpdateState:(CBCentralManager *)aCentral
 {
-    NSLog(@"central manager state = %d", [central state]);
+    NSLog(@"central manager state = %ld", [central state]);
     
     bool success = [self isBluetoothLESupported];
     if (success) {
         [self startScan];
     }
 }
 
-#pragma mark - UIAlertViewDelegate methods
-
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-
-- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger) buttonIndex
-{
-    if (buttonIndex == 0) {
-        cancelBlock();
-    }
-}
-
-#endif
-
 #pragma mark - Rfduino methods
 
 - (bool)isScanning
