Make a “protected” access level for PeripheralServicesFactory propert…

…ies. Refactor some remaining parts to use subscripts instead methods.
kyzmitch · Feb 23, 2018 · f4db6a1 · f4db6a1
1 parent 231cd9c
commit f4db6a1
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 10 deletions.
diff --git a/BleScannerFramework/BleScanner.xcodeproj/project.pbxproj b/BleScannerFramework/BleScanner.xcodeproj/project.pbxproj
@@ -35,6 +35,7 @@
  849390141FFE47E4000325B3 /* BluetoothScanModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8493900A1FFE47E4000325B3 /* BluetoothScanModel.m */; };
  849390151FFE47E4000325B3 /* PeripheralInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 8493900B1FFE47E4000325B3 /* PeripheralInfo.h */; };
  849390161FFE47E4000325B3 /* PeripheralInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 8493900C1FFE47E4000325B3 /* PeripheralInfo.m */; };
+ C711A924204008ED000795FF /* PeripheralServicesFactorySubclass.h in Headers */ = {isa = PBXBuildFile; fileRef = C711A92320400783000795FF /* PeripheralServicesFactorySubclass.h */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -68,6 +69,7 @@
  8493900A1FFE47E4000325B3 /* BluetoothScanModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BluetoothScanModel.m; sourceTree = "<group>"; };
  8493900B1FFE47E4000325B3 /* PeripheralInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeripheralInfo.h; sourceTree = "<group>"; };
  8493900C1FFE47E4000325B3 /* PeripheralInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PeripheralInfo.m; sourceTree = "<group>"; };
+ C711A92320400783000795FF /* PeripheralServicesFactorySubclass.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PeripheralServicesFactorySubclass.h; path = BleScanner/Implementation/PeripheralServicesFactorySubclass.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -145,6 +147,7 @@
  8493900C1FFE47E4000325B3 /* PeripheralInfo.m */,
  844542BF201D015D0006DDC9 /* PeripheralServicesFactory.h */,
  844542C0201D015D0006DDC9 /* PeripheralServicesFactory.m */,
+ C711A92320400783000795FF /* PeripheralServicesFactorySubclass.h */,
  );
  path = Implementation;
  sourceTree = "<group>";
@@ -160,6 +163,7 @@
  84938FFD1FFE47DB000325B3 /* BluetoothPeripheralInterfaceValidator.h in Headers */,
  84938FF81FFE47DB000325B3 /* BluetoothCentralCallbacksProtocol.h in Headers */,
  84938FFE1FFE47DB000325B3 /* BluetoothScanProtocol.h in Headers */,
+ C711A924204008ED000795FF /* PeripheralServicesFactorySubclass.h in Headers */,
  84938FFB1FFE47DB000325B3 /* BluetoothEngineInterface.h in Headers */,
  849390001FFE47DB000325B3 /* PeripheralBasicInfoProtocol.h in Headers */,
  84938FFF1FFE47DB000325B3 /* BluetoothValuesProtocol.h in Headers */,

diff --git a/BleScannerFramework/BleScanner/BLEScanner.h b/BleScannerFramework/BleScanner/BLEScanner.h
@@ -19,3 +19,4 @@ FOUNDATION_EXPORT const unsigned char BLEScannerVersionString[];
 #import <BLEScanner/BluetoothConstants.h>
 #import <BLEScanner/PeripheralCharacteristicsProtocol.h>
 #import <BLEScanner/PeripheralServicesFactory.h>
+#import <BLEScanner/PeripheralServicesFactorySubclass.h>
diff --git a/BleScannerFramework/BleScanner/Implementation/PeripheralServicesFactory.h b/BleScannerFramework/BleScanner/Implementation/PeripheralServicesFactory.h
@@ -16,12 +16,9 @@
 
 @interface PeripheralServicesFactory : NSObject <BluetoothPeripheralAbstractFactory, BluetoothPeripheralInterfaceValidator, PeripheralCharacteristicsProtocol>
 
-// TODO: somehow make following properties not public or
-// not possible for modifications outside of child class init methods
-
-@property (nonatomic, strong, nonnull) NSArray<CBUUID *> *backgroundServices;
-@property (nonatomic, strong, nonnull) NSDictionary<CBUUID *, NSArray<CBUUID *> *> *characteristicsUuids;
-@property (nonatomic, strong, nonnull) NSMutableDictionary<CBUUID *, NSNumber *> *serviceChecks;
-@property (nonatomic, strong, nonnull) NSMutableDictionary<CBUUID *, NSArray<CBCharacteristic *> *> *characteristicsDictionary;
+@property (nonatomic, strong, nonnull, readonly) NSArray<CBUUID *> *backgroundServices;
+@property (nonatomic, strong, nonnull, readonly) NSDictionary<CBUUID *, NSArray<CBUUID *> *> *characteristicsUuids;
+@property (nonatomic, strong, nonnull, readonly) NSMutableDictionary<CBUUID *, NSNumber *> *serviceChecks;
+@property (nonatomic, strong, nonnull, readonly) NSMutableDictionary<CBUUID *, NSArray<CBCharacteristic *> *> *characteristicsDictionary;
 
 @end
diff --git a/BleScannerFramework/BleScanner/Implementation/PeripheralServicesFactory.m b/BleScannerFramework/BleScanner/Implementation/PeripheralServicesFactory.m
@@ -7,6 +7,7 @@
 //
 
 #import "PeripheralServicesFactory.h"
+#import "PeripheralServicesFactorySubclass.h"
 
 @implementation PeripheralServicesFactory
 
@@ -43,7 +44,7 @@ - (void)markServiceAsCheckedForUuid:(CBUUID *)checkedUuid {
 - (void)resetAllCheckmarksForServices {
  @synchronized (self) {
  for (CBUUID *key in _serviceChecks.allKeys) {
- [_serviceChecks setObject:@(NO) forKey:key];
+ _serviceChecks[key] = @(NO);
  }
  }
 }
@@ -61,7 +62,7 @@ - (BOOL)isInterfaceCompletelyMatch {
 }
 
 - (void)saveCharacteristics:(NSArray<CBCharacteristic *> *)characteristics forService:(CBUUID *)uuid{
- [_characteristicsDictionary setObject:characteristics forKey:uuid];
+ _characteristicsDictionary[uuid] = characteristics;
 }
 
 #pragma mark - PeripheralCharacteristicsProtocol

diff --git a/BleScannerFramework/BleScanner/Implementation/PeripheralServicesFactorySubclass.h b/BleScannerFramework/BleScanner/Implementation/PeripheralServicesFactorySubclass.h
@@ -0,0 +1,18 @@
+//
+// PeripheralServicesFactorySubclass.h
+// BleScanner
+//
+// Created by Andrey Ermoshin on 23/02/2018.
+// Copyright © 2018 kyzmitch. All rights reserved.
+//
+
+#import <BLEScanner/PeripheralServicesFactory.h>
+
+@interface PeripheralServicesFactory ()
+
+@property (nonatomic, strong, nonnull, readwrite) NSArray<CBUUID *> *backgroundServices;
+@property (nonatomic, strong, nonnull, readwrite) NSDictionary<CBUUID *, NSArray<CBUUID *> *> *characteristicsUuids;
+@property (nonatomic, strong, nonnull, readwrite) NSMutableDictionary<CBUUID *, NSNumber *> *serviceChecks;
+@property (nonatomic, strong, nonnull, readwrite) NSMutableDictionary<CBUUID *, NSArray<CBCharacteristic *> *> *characteristicsDictionary;
+
+@end
diff --git a/BleScannerFramework/BleScanner/Interfaces/PeripheralBasicInfoProtocol.h b/BleScannerFramework/BleScanner/Interfaces/PeripheralBasicInfoProtocol.h
@@ -12,6 +12,6 @@
 @required
 @property (nonatomic, strong) NSNumber *RSSI;
 @property (nonatomic, strong) CBPeripheral *peripheral;
-@property (nonatomic, strong) NSString *name;
+@property (nonatomic, copy) NSString *name;
 
 @end
diff --git a/FitbitBleFramework/FitbitBleFramework/FitbitFlexServicesFactory.m b/FitbitBleFramework/FitbitBleFramework/FitbitFlexServicesFactory.m
@@ -7,6 +7,7 @@
 //
 
 #import "FitbitFlexServicesFactory.h"
+#import <BLEScanner/PeripheralServicesFactorySubclass.h>
 #import <BLEScanner/BluetoothConstants.h>
 
 static NSString *backgroundSrv = @"ADAB4127-6E7D-4601-BDA2-BFFAA68956BA";