Merge pull request #46 from Damonvvong/fix/swift_api_support

fix: Refactor Swift Interface
Tencent · Sep 28, 2018 · b01341b · b01341b
2 parents 6ebb257 + f59315a
commit b01341b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/iOS/MMKV/MMKV/MMKV.h b/iOS/MMKV/MMKV/MMKV.h
@@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (nullable instancetype)mmkvWithID:(NSString *)mmapID cryptKey:(nullable NSData *)cryptKey NS_SWIFT_NAME(init(mmapID:cryptKey:));
 
 - (BOOL)reKey:(nullable NSData *)newKey NS_SWIFT_NAME(reset(cryptKey:));
-- (NSData *)cryptKey;
+- (nullable NSData *)cryptKey;
 
 // object: NSString/NSData/NSDate
 - (BOOL)setObject:(id)object forKey:(NSString *)key NS_SWIFT_NAME(set(_:forKey:));
@@ -89,7 +89,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)removeValueForKey:(NSString *)key NS_SWIFT_NAME(removeValue(forKey:));
 
-- (void)removeValuesForKeys:(NSArray *)arrKeys NS_SWIFT_NAME(removeValues(forKeys:));
+- (void)removeValuesForKeys:(NSArray<NSString *> *)arrKeys NS_SWIFT_NAME(removeValues(forKeys:));
 
 - (void)clearMemoryCache;
 

diff --git a/iOS/MMKV/MMKV/MMKV.mm b/iOS/MMKV/MMKV/MMKV.mm
@@ -756,7 +756,7 @@ - (void)prepareCRCFile {
 
 #pragma mark - encryption & decryption
 
-- (NSData *)cryptKey {
+- (nullable NSData *)cryptKey {
 	if (m_cryptor) {
 		NSMutableData *data = [NSMutableData dataWithLength:AES_KEY_LEN];
 		m_cryptor->getKey(data.mutableBytes);