Skip to content

chore(apple): fix build issues discovered internally #1178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 2, 2025
Merged

chore(apple): fix build issues discovered internally #1178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3f0df5
chore(apple): fix build issues discovered internally
Saadnajmi Jan 31, 2025
00240ee
use NS_ASSUME_NONNULL_BEGIN/END instead
Saadnajmi Jan 31, 2025
abafda4
Update RNCAsyncStorage.h
tido64 Jan 31, 2025
9422361
docs(changeset): Mark some methods as nonnull
Saadnajmi Jan 31, 2025
b0d402d
Merge branch 'fixes' of github.com:Saadnajmi/async-storage into fixes
Saadnajmi Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/default-storage/ios/RNCAsyncStorage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@

// Grab data from the cache. ResponseBlock result array will have an error at position 0, and an
// array of arrays at position 1.
- (void)multiGet:(NSArray<NSString *> *)keys callback:(RCTResponseSenderBlock)callback;
- (void)multiGet:(NSArray<NSString *> *_Nullable)keys callback:(RCTResponseSenderBlock _Nullable )callback;

// Add multiple key value pairs to the cache.
- (void)multiSet:(NSArray<NSArray<NSString *> *> *)kvPairs
callback:(RCTResponseSenderBlock)callback;
- (void)multiSet:(NSArray<NSArray<NSString *> *> *_Nullable)kvPairs
callback:(RCTResponseSenderBlock _Nullable )callback;

// Interface for natively fetching all the keys from the storage data.
- (void)getAllKeys:(RCTResponseSenderBlock)callback;
- (void)getAllKeys:(RCTResponseSenderBlock _Nullable )callback;

@end
14 changes: 7 additions & 7 deletions packages/default-storage/ios/RNCAsyncStorage.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ static void RCTStorageDirectoryMigrate(NSString *oldDirectoryPath,
// this folder and attempt folder copying again
if (error != nil && error.code == 4 &&
[newDirectoryPath isEqualToString:RCTGetStorageDirectory()]) {
NSError *error = nil;
error = nil;
_createStorageDirectory(RCTCreateStorageDirectoryPath(@""), &error);
if (error == nil) {
RCTStorageDirectoryMigrate(
Expand Down Expand Up @@ -559,7 +559,7 @@ - (NSDictionary *)_ensureSetup
return nil;
}

- (NSDictionary *)_writeManifest:(NSMutableArray<NSDictionary *> **)errors
- (NSDictionary *)_writeManifest:(NSMutableArray<NSDictionary *> *__autoreleasing *)errors
{
NSError *error;
NSString *serialized = RCTJSONStringify(_manifest, &error);
Expand Down Expand Up @@ -587,7 +587,7 @@ - (NSDictionary *)_appendItemForKey:(NSString *)key
return errorOut;
}

- (NSString *)_getValueForKey:(NSString *)key errorOut:(NSDictionary **)errorOut
- (NSString *)_getValueForKey:(NSString *)key errorOut:(NSDictionary *__autoreleasing *)errorOut
{
NSString *value =
_manifest[key]; // nil means missing, null means there may be a data file, else: NSString
Expand Down Expand Up @@ -699,14 +699,14 @@ - (BOOL)_passthroughDelegate
}
}

NSDictionary *errorOut = [self _ensureSetup];
if (errorOut) {
callback(@[@[errorOut], (id)kCFNull]);
NSDictionary *ensureSetupErrorOut = [self _ensureSetup];
if (ensureSetupErrorOut) {
callback(@[@[ensureSetupErrorOut], (id)kCFNull]);
return;
}
[self _multiGet:keys
callback:callback
getter:^(NSUInteger i, NSString *key, NSDictionary **errorOut) {
getter:^(__unused NSUInteger i, NSString *key, NSDictionary **errorOut) {
return [self _getValueForKey:key errorOut:errorOut];
}];
}
Expand Down