Skip to content

Commit 9a54cdd

Browse files
committed
Fix RCTStorageDirectoryMigrationCheck build errors & styling
1 parent b165aa3 commit 9a54cdd

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

ios/RNCAsyncStorage.m

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,13 @@ static dispatch_queue_t RCTGetMethodQueue()
181181
static void RCTStorageDirectoryMigrationCheck() {
182182
NSString *oldStorageDir = RCTCreateStorageDirectoryPath(@"RNCAsyncLocalStorage_V1");
183183

184+
NSError *error;
184185
BOOL isDir;
185186
BOOL oldExists = [[NSFileManager defaultManager] fileExistsAtPath:oldStorageDir isDirectory:&isDir];
186187

187188
// If the old directory exists, it means we need to migrate data to the new directory
188189
if (oldExists && isDir) {
189-
NSError *error;
190+
190191
BOOL migrationSuccess;
191192
// If the new storage directory already exists, then this may be caused by ever older data being left behind from previous versions.
192193
// This old data will need to be overwritten.
@@ -196,12 +197,12 @@ static void RCTStorageDirectoryMigrationCheck() {
196197
NSString *backupStorageDir = RCTCreateStorageDirectoryPath(@"RCTBackupAsyncLocalStorage_V1");
197198
// Replace any possible existing data in the new storage with old storage directory
198199
migrationSuccess = [[NSFileManager defaultManager] replaceItemAtURL:[[NSURL alloc] initWithString:newStorageDir]
199-
withItemAtURL:[[NSURL alloc] initWithString:oldStorageDir]
200-
backupItemName:backupStorageDir
201-
options:NSFileManagerItemReplacementUsingNewMetadataOnly
202-
resultingItemURL:nil
203-
error:&error];
204-
if (error || !success) {
200+
withItemAtURL:[[NSURL alloc] initWithString:oldStorageDir]
201+
backupItemName:backupStorageDir
202+
options:NSFileManagerItemReplacementUsingNewMetadataOnly
203+
resultingItemURL:nil
204+
error:&error];
205+
if (error || !migrationSuccess) {
205206
// Attempt to recover from failed overwriting
206207
[[NSFileManager defaultManager] removeItemAtPath:newStorageDir error:nil];
207208
[[NSFileManager defaultManager] copyItemAtPath:backupStorageDir toPath:newStorageDir error:nil];
@@ -222,7 +223,7 @@ static void RCTStorageDirectoryMigrationCheck() {
222223

223224
// If the migration was a success, remove old storage directory
224225
if (migrationSuccess) {
225-
[[NSFileManager defaultManager] removeItemAtPath:oldStorageDir error:error];
226+
[[NSFileManager defaultManager] removeItemAtPath:oldStorageDir error:&error];
226227
if (error) {
227228
RCTMakeError(@"Failed to remove old storage directory after migration", error, nil);
228229
}

0 commit comments

Comments
 (0)